Skip to content

Commit 3ae40c2

Browse files
authored
Merge pull request #29 from andybywire/studio-v3
Merge Studio-v3 to v2
2 parents 2a9e89b + 50185ff commit 3ae40c2

4 files changed

Lines changed: 44 additions & 34 deletions

File tree

.github/workflows/build-studio.yml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,31 @@ on:
99
jobs:
1010
build-and-deploy:
1111
name: Build & Deploy Sanity Studio
12-
if: ${{ github.ref == 'refs/heads/main' }}
12+
if: ${{ github.ref == 'refs/heads/studio-v3' }}
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout Code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717

1818
- name: Install Node.js
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v4
2020
with:
21-
node-version: '17.x'
21+
node-version: '23'
2222

2323
- name: Install Project Dependencies
2424
run: npm ci --legacy-peer-deps
2525
working-directory: studio
2626

27-
- name: Install Sanity CLI
28-
run: npm install -g @sanity/cli
29-
working-directory: studio
30-
3127
- name: Build Studio
32-
run: sanity build
33-
working-directory: studio
34-
35-
- name: Verify Build
36-
run: ls -la dist
28+
run: npx sanity build --no-auto-updates
3729
working-directory: studio
3830

3931
- name: Set Up SSH
4032
run: |
4133
mkdir -p ~/.ssh/
42-
echo "${{ secrets.UXM_CMS_DREAMHOST_SSH_KEY }}" > ~/.ssh/uxm_cms
43-
sudo chmod 600 ~/.ssh/uxm_cms
44-
ssh-keyscan -H "jacksonville.dreamhost.com" > ~/.ssh/known_hosts
34+
echo "${{ secrets.DO_UXM_CMS_SSH_KEY }}" > ~/.ssh/do_uxm_cms
35+
sudo chmod 600 ~/.ssh/do_uxm_cms
36+
ssh-keyscan -H "24.199.98.130" > ~/.ssh/known_hosts
4537
4638
- name: SFTP Upload
47-
run: sftp -i ~/.ssh/uxm_cms uxm_cms@jacksonville.dreamhost.com <<< $'cd cms.uxmethods.org \n put -r studio/dist/*'
39+
run: sftp -i ~/.ssh/do_uxm_cms cms@24.199.98.130 <<< $'cd /var/www/cms/html \n put -r studio/dist/*'

package-lock.json

Lines changed: 26 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
],
1010
"type": "module",
1111
"engines": {
12-
"node": ">=18.0.0"
13-
},
12+
"node": ">=18.0.0"
13+
},
1414
"scripts": {
1515
"dev": "npm-run-all --parallel dev:*",
1616
"dev:studio": "npm run dev --workspace=studio",
@@ -22,5 +22,8 @@
2222
],
2323
"devDependencies": {
2424
"npm-run-all": "^4.1.5"
25+
},
26+
"dependencies": {
27+
"styled-components": "^6.1.15"
2528
}
2629
}

studio/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@
1515
],
1616
"dependencies": {
1717
"@sanity/vision": "^3.72.1",
18+
"@types/react-dom": "^19.0.4",
1819
"react": "^18.3.1",
19-
"react-dom": "^18.2.0",
20+
"react-dom": "^18.3.1",
2021
"react-icons": "^5.4.0",
22+
"react-is": "^19.0.0",
2123
"sanity": "^3.72.1",
2224
"sanity-plugin-taxonomy-manager": "^3.2.6",
2325
"styled-components": "^6.1.8"
2426
},
2527
"devDependencies": {
2628
"@sanity/eslint-config-studio": "^5.0.1",
27-
"@types/react": "^18.0.25",
29+
"@types/react": "^18.3.18",
2830
"eslint": "^9.9.0",
2931
"prettier": "^3.0.2",
3032
"typescript": "^5.1.6"

0 commit comments

Comments
 (0)