Skip to content

Commit f4c44f2

Browse files
nicolethoennicolethoen
authored
Merge pull request #89 from nicolethoen/fix_build_update_deps
fix: update to yarn 4 and other deps
2 parents ce0c461 + 3fd4921 commit f4c44f2

File tree

7 files changed

+17118
-11969
lines changed

7 files changed

+17118
-11969
lines changed

‎.github/workflows/build-lint-test.yml‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,35 @@ jobs:
77
env:
88
GH_PR_NUM: ${{ github.event.number }}
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
- run: |
1212
if [[ ! -z "${GH_PR_NUM}" ]]; then
1313
echo "Checking out PR"
1414
git fetch origin pull/$GH_PR_NUM/head:tmp
1515
git checkout tmp
1616
fi
17-
- uses: actions/setup-node@v1
17+
- uses: actions/setup-node@v4
1818
with:
1919
node-version: '18'
20+
- run: corepack enable
2021
- uses: actions/cache@v4
2122
id: yarn-cache
2223
name: Cache npm deps
2324
with:
2425
path: |
2526
node_modules
2627
**/node_modules
27-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
28-
- run: yarn install --frozen-lockfile
28+
.yarn/cache
29+
key: ${{ runner.os }}-yarn-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
30+
- run: yarn install --immutable
2931
if: steps.yarn-cache.outputs.cache-hit != 'true'
3032
- uses: actions/cache@v4
3133
id: dist
3234
name: Cache dist
3335
with:
3436
path: |
3537
packages/*/dist
36-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
38+
key: ${{ runner.os }}-dist-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
3739
- name: Build dist
3840
run: yarn build
3941
if: steps.dist.outputs.cache-hit != 'true'
@@ -43,32 +45,34 @@ jobs:
4345
GH_PR_NUM: ${{ github.event.number }}
4446
needs: build
4547
steps:
46-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v4
4749
- run: |
4850
if [[ ! -z "${GH_PR_NUM}" ]]; then
4951
echo "Checking out PR"
5052
git fetch origin pull/$GH_PR_NUM/head:tmp
5153
git checkout tmp
5254
fi
53-
- uses: actions/setup-node@v1
55+
- uses: actions/setup-node@v4
5456
with:
5557
node-version: '18'
58+
- run: corepack enable
5659
- uses: actions/cache@v4
5760
id: yarn-cache
5861
name: Cache npm deps
5962
with:
6063
path: |
6164
node_modules
6265
**/node_modules
63-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
64-
- run: yarn install --frozen-lockfile
66+
.yarn/cache
67+
key: ${{ runner.os }}-yarn-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
68+
- run: yarn install --immutable
6569
if: steps.yarn-cache.outputs.cache-hit != 'true'
6670
- uses: actions/cache@v4
6771
id: lint-cache
6872
name: Load lint cache
6973
with:
7074
path: '.eslintcache'
71-
key: ${{ runner.os }}-lint-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
75+
key: ${{ runner.os }}-lint-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
7276
- name: ESLint
7377
run: yarn lint:js
7478
- name: MDLint
@@ -79,17 +83,18 @@ jobs:
7983
GH_PR_NUM: ${{ github.event.number }}
8084
needs: build
8185
steps:
82-
- uses: actions/checkout@v2
86+
- uses: actions/checkout@v4
8387
# Yes, we really want to checkout the PR
8488
- run: |
8589
if [[ ! -z "${GH_PR_NUM}" ]]; then
8690
echo "Checking out PR"
8791
git fetch origin pull/$GH_PR_NUM/head:tmp
8892
git checkout tmp
8993
fi
90-
- uses: actions/setup-node@v1
94+
- uses: actions/setup-node@v4
9195
with:
9296
node-version: '18'
97+
- run: corepack enable
9398
- uses: actions/cache@v4
9499
id: yarn-cache
95100
name: Cache npm deps
@@ -99,7 +104,7 @@ jobs:
99104
**/node_modules
100105
~/.cache/Cypress
101106
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
102-
- run: yarn install --frozen-lockfile
107+
- run: yarn install --immutable
103108
if: steps.yarn-cache.outputs.cache-hit != 'true'
104109
- uses: actions/cache@v4
105110
id: dist
@@ -108,7 +113,7 @@ jobs:
108113
path: |
109114
packages/*/dist
110115
packages/react-styles/css
111-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
116+
key: ${{ runner.os }}-dist-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
112117
- name: Build dist
113118
run: yarn build
114119
if: steps.dist.outputs.cache-hit != 'true'
@@ -120,17 +125,18 @@ jobs:
120125
GH_PR_NUM: ${{ github.event.number }}
121126
needs: build
122127
steps:
123-
- uses: actions/checkout@v2
128+
- uses: actions/checkout@v4
124129
# Yes, we really want to checkout the PR
125130
- run: |
126131
if [[ ! -z "${GH_PR_NUM}" ]]; then
127132
echo "Checking out PR"
128133
git fetch origin pull/$GH_PR_NUM/head:tmp
129134
git checkout tmp
130135
fi
131-
- uses: actions/setup-node@v1
136+
- uses: actions/setup-node@v4
132137
with:
133138
node-version: '18'
139+
- run: corepack enable
134140
- uses: actions/cache@v4
135141
id: yarn-cache
136142
name: Cache npm deps
@@ -140,7 +146,7 @@ jobs:
140146
**/node_modules
141147
~/.cache/Cypress
142148
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
143-
- run: yarn install --frozen-lockfile
149+
- run: yarn install --immutable
144150
if: steps.yarn-cache.outputs.cache-hit != 'true'
145151
- uses: actions/cache@v4
146152
id: dist
@@ -149,7 +155,7 @@ jobs:
149155
path: |
150156
packages/*/dist
151157
packages/react-styles/css
152-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
158+
key: ${{ runner.os }}-dist-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
153159
- name: Build dist
154160
run: yarn build
155161
if: steps.dist.outputs.cache-hit != 'true'

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,22 @@ jobs:
1414
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1515
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1616
steps:
17-
- uses: actions/checkout@v2
18-
- uses: actions/setup-node@v1
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-node@v4
1919
with:
2020
node-version: '18'
21+
- run: corepack enable
2122
- uses: actions/cache@v4
2223
id: yarn-cache
2324
name: Cache npm deps
2425
with:
2526
path: |
2627
node_modules
2728
**/node_modules
29+
.yarn/cache
2830
~/.cache/Cypress
29-
key: ${{ runner.os }}-yarn-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
30-
- run: yarn install --frozen-lockfile
31+
key: ${{ runner.os }}-yarn-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock') }}
32+
- run: yarn install --immutable
3133
if: steps.yarn-cache.outputs.cache-hit != 'true'
3234
- uses: actions/cache@v4
3335
id: dist
@@ -36,7 +38,7 @@ jobs:
3638
path: |
3739
packages/*/dist
3840
packages/react-styles/css
39-
key: ${{ runner.os }}-dist-14-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
41+
key: ${{ runner.os }}-dist-4-${{ secrets.CACHE_VERSION }}-${{ hashFiles('yarn.lock', 'package.json', 'packages/*/*', '!packages/*/dist', '!packages/*/node_modules') }}
4042
- name: Build dist
4143
run: yarn build
4244
if: steps.dist.outputs.cache-hit != 'true'

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ generated
1515
# package managers
1616
yarn-error.log
1717
lerna-debug.log
18+
.yarn/cache
19+
.yarn/unplugged
20+
.yarn/build-state.yml
21+
.yarn/install-state.gz
22+
.pnp.*
1823

1924
# IDEs and editors
2025
.idea

‎.yarnrc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

‎package.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@
2323
"update": "node scripts/importUpdatesFromOldRepo.js"
2424
},
2525
"devDependencies": {
26-
"react": "^18",
27-
"react-dom": "^18",
26+
"@babel/core": "^7.19.6",
27+
"@babel/preset-env": "^7.19.4",
28+
"@babel/preset-flow": "^7.18.6",
29+
"@babel/preset-react": "^7.24.6",
30+
"@babel/preset-typescript": "^7.24.6",
31+
"@testing-library/dom": "^10.4.0",
32+
"@testing-library/jest-dom": "^6.6.3",
33+
"@testing-library/react": "^16.3.0",
34+
"@testing-library/user-event": "^14.6.1",
35+
"@types/react": "^18.0.0",
36+
"@types/react-dom": "^18.0.0",
37+
"@typescript-eslint/eslint-plugin": "^5.42.0",
38+
"@typescript-eslint/parser": "^5.42.0",
39+
"babel-jest": "^29.2.2",
2840
"concurrently": "^5.3.0",
2941
"eslint": "^8.0.1",
30-
"eslint-plugin-markdown": "^1.0.2",
42+
"eslint-config-prettier": "^8.5.0",
3143
"eslint-config-standard-with-typescript": "^23.0.0",
44+
"eslint-plugin-import": "^2.25.2",
45+
"eslint-plugin-markdown": "^1.0.2",
3246
"eslint-plugin-n": "^15.0.0",
3347
"eslint-plugin-patternfly-react": "^4.80.5-alpha.0",
34-
"eslint-plugin-import": "^2.25.2",
3548
"eslint-plugin-promise": "^6.0.0",
36-
"eslint-config-prettier": "8.5.0",
37-
"typescript": "^4.7.4",
38-
"@types/react": "^17.0.0",
39-
"@types/react-dom": "^17.0.0",
40-
"@typescript-eslint/eslint-plugin": "^5.42.0",
41-
"@typescript-eslint/parser": "^5.42.0",
42-
"prettier": "2.7.1",
4349
"jest": "^29.2.2",
44-
"babel-jest": "^29.2.2",
45-
"@babel/core": "^7.19.6",
46-
"@babel/preset-env": "^7.19.4",
47-
"@babel/preset-react": "^7.18.6",
48-
"@babel/preset-flow": "^7.18.6",
49-
"@babel/preset-typescript": "^7.18.6",
50-
"@testing-library/dom": "^10.4.0",
51-
"@testing-library/jest-dom": "^6.6.3",
52-
"@testing-library/react": "^16.3.0",
53-
"@testing-library/user-event": "14.6.1",
5450
"jest-environment-jsdom": "^29.2.2",
5551
"jest-transform-stub": "^2.0.0",
56-
"serve": "^14.1.2"
52+
"prettier": "^2.7.1",
53+
"react": "^18",
54+
"react-dom": "^18",
55+
"serve": "^14.1.2",
56+
"typescript": "^4.7.4"
5757
},
58-
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
58+
"packageManager": "yarn@4.5.3"
5959
}

‎packages/module/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@
4949
"react-dom": "^17 || ^18 || ^19"
5050
},
5151
"devDependencies": {
52-
"@patternfly/patternfly": "^6.1.0",
52+
"@octokit/rest": "^18.0.0",
5353
"@patternfly/documentation-framework": "6.8.2",
54-
"@patternfly/react-table": "^6.1.0",
54+
"@patternfly/patternfly": "^6.1.0",
55+
"@patternfly/patternfly-a11y": "^4.3.1",
5556
"@patternfly/react-code-editor": "^6.1.0",
56-
"@octokit/rest": "^18.0.0",
57-
"surge": "^0.23.1",
58-
"react-monaco-editor": "0.51.0",
57+
"@patternfly/react-table": "^6.1.0",
5958
"monaco-editor": "0.34.1",
59+
"react-monaco-editor": "0.51.0",
6060
"rimraf": "^2.6.2",
61-
"sass": "^1.42.1",
61+
"sass": "^1.80.0",
6262
"shx": "^0.3.2",
63-
"tslib": "^2.0.0",
64-
"@patternfly/patternfly-a11y": "^4.3.1"
63+
"surge": "^0.23.1",
64+
"tslib": "^2.0.0"
6565
}
6666
}

0 commit comments

Comments
 (0)