Skip to content

Commit 0142318

Browse files
jkasterbryans99
andauthored
chore: update to React 17 (#1415)
* chore: update react to 17 * using syncpack to start cleaning up refs * fix location use in tests * update node for workflows * package updates --------- Co-authored-by: Bryn Ryans <bnryans@google.com>
1 parent bfdd760 commit 0142318

File tree

54 files changed

+1509
-1558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1509
-1558
lines changed

.github/workflows/apix-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
matrix:
4040
os:
4141
- ubuntu
42-
node-version: [16.x]
42+
node-version: [18.x]
4343

4444
steps:
4545
- name: Cancel Previous Runs

.github/workflows/codegen-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
7474
- uses: actions/setup-node@v3
7575
with:
76-
node-version: 16.x
76+
node-version: 18.x
7777

7878
- name: Install dependencies
7979
run: |

.github/workflows/hackathon-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
matrix:
3434
os:
3535
- ubuntu
36-
node-version: [16.x]
36+
node-version: [18.x]
3737

3838
steps:
3939
- name: Cancel Previous Runs

.github/workflows/lerna-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
5757
- uses: actions/setup-node@v3
5858
with:
59-
node-version: 16
59+
node-version: 18.x
6060
registry-url: https://wombat-dressing-room.appspot.com
6161

6262
- name: Install dependencies and build

.github/workflows/resources-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Install Node
3939
uses: actions/setup-node@v3
4040
with:
41-
node-version: 16
41+
node-version: 18.x
4242

4343
- name: Install Dependencies
4444
run: |

.github/workflows/tssdk-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
matrix:
4444
os:
4545
- ubuntu
46-
node-version: [14.x, 16.x]
46+
node-version: [18.x, 20.x]
4747

4848
steps:
4949
- name: Cancel Previous Runs
@@ -122,7 +122,7 @@ jobs:
122122
runs-on: ${{ matrix.os }}-latest
123123
strategy:
124124
matrix:
125-
node-version: [16.x]
125+
node-version: [18.x, 20.x]
126126
os:
127127
- ubuntu
128128
looker: ${{ fromJson(needs.setup.outputs.matrix_json) }}

bin/looker-resources-index/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"author": "Looker",
1717
"license": "MIT",
1818
"devDependencies": {
19-
"@types/node": "^14.18.36",
19+
"@types/node": "14.18.63",
2020
"typescript": "4.6.3"
2121
}
2222
}

jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
setupFilesAfterEnv: [
4747
// eslint-disable-next-line node/no-path-concat
4848
`${__dirname}/jest.setup.js`,
49-
'@testing-library/jest-dom/extend-expect',
49+
'@testing-library/jest-dom',
5050
'regenerator-runtime/runtime',
5151
],
5252
setupFiles: ['jest-localstorage-mock'],

jest.setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const Adapter = require('enzyme-adapter-react-16')
2929
const { configure } = require('enzyme')
3030
const ResizeObserver = require('resize-observer-polyfill')
3131

32-
require('@testing-library/jest-dom/extend-expect')
32+
require('@testing-library/jest-dom')
3333
require('jest-canvas-mock')
3434
require('jest-styled-components')
3535
require('jest-environment-jsdom')

package.json

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -90,60 +90,60 @@
9090
"@babel/runtime": "^7.14.0",
9191
"@babel/runtime-corejs3": "^7.14.0",
9292
"@looker/eslint-config-oss": "1.7.14",
93-
"@testing-library/jest-dom": "^5.16.5",
93+
"@testing-library/jest-dom": "5.16.5",
9494
"@types/blueimp-md5": "^2.7.0",
9595
"@types/ini": "^1.3.30",
96-
"@types/jest": "^29.4.0",
96+
"@types/jest": "29.2.4",
9797
"@types/js-yaml": "^3.12.1",
98-
"@types/lodash": "^4.14.162",
99-
"@types/node": "^14.18.36",
100-
"@types/prettier": "^2.3.2",
98+
"@types/lodash": "4.14.172",
99+
"@types/node": "14.18.63",
100+
"@types/prettier": "2.3.2",
101101
"@types/readable-stream": "2.3.9",
102-
"@types/request": "^2.48.3",
103-
"@types/request-promise-native": "^1.0.17",
102+
"@types/request": "2.48.12",
103+
"@types/request-promise-native": "1.0.21",
104104
"@types/uuid": "^8.3.4",
105105
"babel-core": "^7.0.0-bridge",
106-
"babel-loader-exclude-node-modules-except": "^1.1.2",
107-
"babel-plugin-styled-components": "^1.10.7",
108-
"core-js": "^3.6.5",
106+
"babel-loader-exclude-node-modules-except": "1.1.2",
107+
"babel-plugin-styled-components": "1.10.7",
108+
"core-js": "3.6.5",
109109
"enzyme": "^3.11.0",
110-
"enzyme-adapter-react-16": "^1.15.2",
111-
"eslint": "^7.32.0",
112-
"eslint-plugin-jest": "^27.2.1",
113-
"eslint-plugin-jest-dom": "^4.0.3",
110+
"enzyme-adapter-react-16": "1.15.2",
111+
"eslint": "7.32.0",
112+
"eslint-plugin-jest": "27.2.1",
113+
"eslint-plugin-jest-dom": "4.0.3",
114114
"eslint-plugin-prettier": "4.0.0",
115-
"jest": "^29.4.2",
116-
"jest-canvas-mock": "^2.4.0",
117-
"jest-environment-jsdom": "^29.4.2",
118-
"jest-junit": "^12.0.0",
119-
"jest-styled-components": "^7.1.1",
120-
"js-yaml": "^3.13.1",
121-
"jsdom": "^21.1.0",
122-
"lerna": "^3.20.2",
123-
"lint-staged": "^10.2.2",
124-
"lodash": "^4.17.15",
125-
"node-fetch": "^2.6.7",
126-
"node-forge": "^1.3.1",
127-
"npm-run-all": "^4.1.5",
128-
"openapi3-ts": "^1.3.0",
115+
"jest": "29.3.1",
116+
"jest-canvas-mock": "2.4.0",
117+
"jest-environment-jsdom": "29.7.0",
118+
"jest-junit": "12.3.0",
119+
"jest-styled-components": "7.1.1",
120+
"js-yaml": "3.14.1",
121+
"jsdom": "21.1.2",
122+
"lerna": "3.22.1",
123+
"lint-staged": "10.2.2",
124+
"lodash": "^4.17.21",
125+
"node-fetch": "2.6.7",
126+
"node-forge": "1.3.1",
127+
"npm-run-all": "4.1.5",
128+
"openapi3-ts": "2.0.2",
129129
"pre-commit": "1.2.2",
130130
"prettier": "^2.4.1",
131-
"react": "^16.14.0",
132-
"react-dom": "^16.14.0",
133-
"regenerator-runtime": "^0.13.11",
134-
"resize-observer-polyfill": "^1.5.1",
135-
"styled-components": "^5.2.1",
131+
"react": "^17.0.2",
132+
"react-dom": "^17.0.2",
133+
"regenerator-runtime": "0.13.11",
134+
"resize-observer-polyfill": "1.5.1",
135+
"styled-components": "^5.3.1",
136+
"syncpack": "11.2.1",
136137
"ts-jest": "^29.0.5",
137-
"ts-node": "^10.9.1",
138+
"ts-node": "10.9.1",
138139
"typescript": "4.6.3",
139-
"url-loader": "^4.1.1",
140-
"uuid": "^9.0.0",
141-
"webpack": "^5.10.0",
140+
"url-loader": "4.1.1",
141+
"uuid": "9.0.1",
142+
"webpack": "5.10.0",
142143
"webpack-bundle-analyzer": "^4.4.1",
143144
"webpack-merge": "^5.7.3",
144-
"yarn-deduplicate": "^6.0.0"
145+
"yarn-deduplicate": "6.0.0"
145146
},
146-
"dependencies": {},
147147
"lint-staged": {
148148
"**/*.ts?(x)": [
149149
"eslint"
@@ -301,8 +301,8 @@
301301
],
302302
"keywords": [],
303303
"resolutions": {
304-
"@types/react": "^16.14.2",
305-
"react": "^16.14.0",
304+
"@types/react": "17.0.65",
305+
"react": "^17.0.2",
306306
"set-value": "^2.0.1",
307307
"trim": ">= 0.0.3",
308308
"trim-newlines": ">= 3.0.1",

0 commit comments

Comments
 (0)