Skip to content

Commit 7a5e585

Browse files
devongovettdevongovett
authored
Upgrade Parcel and other dev dependencies (#2701)
1 parent d4669af commit 7a5e585

File tree

250 files changed

+4349
-5721
lines changed

Some content is hidden

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

250 files changed

+4349
-5721
lines changed

‎.circleci/comment.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ async function run() {
1919
body: `Build successful! 🎉
2020
2121
* [View the storybook](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook/index.html)
22-
* [View the storybook-17](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-17/index.html)
22+
* [View the storybook-16](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/storybook-16/index.html)
2323
* [View the documentation](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/docs/index.html)`
2424
});
2525
}

‎.circleci/config.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ orbs:
66
executors:
77
rsp:
88
docker:
9-
- image: cimg/node:12.22
9+
- image: cimg/node:14.16.0
1010
environment:
1111
CACHE_VERSION: v1
1212
working_directory: ~/react-spectrum
1313

1414
rsp-large:
1515
docker:
16-
- image: cimg/node:12.22
16+
- image: cimg/node:14.16.0
1717
resource_class: large
1818
environment:
1919
CACHE_VERSION: v1
2020
working_directory: ~/react-spectrum
2121

2222
rsp-xlarge:
2323
docker:
24-
- image: cimg/node:12.22
24+
- image: cimg/node:14.16.0
2525
resource_class: xlarge
2626
environment:
2727
CACHE_VERSION: v1
@@ -60,7 +60,7 @@ jobs:
6060
- ~/react-spectrum
6161
key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
6262

63-
install-17:
63+
install-16:
6464
executor: rsp-large
6565
steps:
6666
- checkout
@@ -73,12 +73,12 @@ jobs:
7373
- run:
7474
name: build
7575
command: |
76-
yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-17 --cache-folder ~/.cache/yarn
76+
yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-16 --cache-folder ~/.cache/yarn
7777
7878
- save_cache:
7979
paths:
8080
- ~/react-spectrum
81-
key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
81+
key: react-spectrum16-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
8282

8383
test-ssr:
8484
executor: rsp-xlarge
@@ -116,23 +116,23 @@ jobs:
116116
- store_artifacts:
117117
path: ~/junit
118118

119-
test-ssr-17:
119+
test-ssr-16:
120120
executor: rsp-xlarge
121121
steps:
122122
- restore_cache:
123-
key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
123+
key: react-spectrum16-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
124124

125125
- run:
126126
name: test ssr
127127
command: |
128128
yarn test:ssr
129129
130-
test-17:
130+
test-16:
131131
parallelism: 3
132132
executor: rsp-xlarge
133133
steps:
134134
- restore_cache:
135-
key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
135+
key: react-spectrum16-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
136136

137137
- run: mkdir ~/junit
138138

@@ -141,10 +141,10 @@ jobs:
141141
command: |
142142
shopt -s globstar
143143
TESTFILES=$(circleci tests glob "packages/**/*.test.[tj]{s,sx}" | circleci tests split --split-by=timings)
144-
JEST_JUNIT_OUTPUT_NAME="junit-17.xml" yarn test ${TESTFILES}
144+
JEST_JUNIT_OUTPUT_NAME="junit-16.xml" yarn test ${TESTFILES}
145145
146146
- run:
147-
command: cp junit-17.xml ~/junit/
147+
command: cp junit-16.xml ~/junit/
148148
when: always
149149
- store_test_results:
150150
path: ~/junit
@@ -176,20 +176,20 @@ jobs:
176176
paths:
177177
- '*/storybook/'
178178

179-
storybook-17:
179+
storybook-16:
180180
executor: rsp-large
181181
steps:
182182
- restore_cache:
183-
key: react-spectrum17-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
183+
key: react-spectrum16-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
184184

185185
- run:
186-
name: build storybook-17
187-
command: make storybook-17
186+
name: build storybook-16
187+
command: make storybook-16
188188

189189
- persist_to_workspace:
190190
root: dist
191191
paths:
192-
- '*/storybook-17/'
192+
- '*/storybook-16/'
193193

194194
docs:
195195
executor: rsp-xlarge
@@ -275,28 +275,28 @@ workflows:
275275
commit:
276276
jobs:
277277
- install
278-
- install-17
278+
- install-16
279279
- test-ssr:
280280
requires:
281281
- install
282282
- test:
283283
requires:
284284
- install
285-
- test-ssr-17:
285+
- test-ssr-16:
286286
requires:
287-
- install-17
288-
- test-17:
287+
- install-16
288+
- test-16:
289289
requires:
290-
- install-17
290+
- install-16
291291
- lint:
292292
requires:
293293
- install
294294
- storybook:
295295
requires:
296296
- install
297-
- storybook-17:
297+
- storybook-16:
298298
requires:
299-
- install-17
299+
- install-16
300300
- docs:
301301
requires:
302302
- install
@@ -311,10 +311,10 @@ workflows:
311311
- lint
312312
- test-ssr
313313
- test
314-
- test-ssr-17
315-
- test-17
314+
- test-ssr-16
315+
- test-16
316316
- storybook
317-
- storybook-17
317+
- storybook-16
318318
- docs
319319
- deploy-production:
320320
filters:

‎.eslintrc.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ module.exports = {
7979
'expect': true,
8080
'JSX': 'readonly',
8181
'NodeJS': 'readonly',
82-
'AsyncIterable': 'readonly'
82+
'AsyncIterable': 'readonly',
83+
'FileSystemFileEntry': 'readonly',
84+
'FileSystemDirectoryEntry': 'readonly',
85+
'FileSystemEntry': 'readonly'
8386
},
8487
settings: {
8588
jsdoc: {

‎.parcelrc‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
{
22
"extends": "@parcel/config-default",
3-
"resolvers": ["parcel-resolver-docs", "..."],
3+
"resolvers": ["@parcel/resolver-glob", "parcel-resolver-docs", "..."],
4+
"bundler": "@parcel/bundler-experimental",
45
"transformers": {
56
"apiCheck:*.{js,ts,tsx,json}": ["parcel-transformer-docs"],
67
"docs:*.{js,ts,tsx,json}": ["parcel-transformer-docs", "@parcel/transformer-inline"],
78
"docs-json:*.{js,ts,tsx,json}": ["parcel-transformer-docs"],
89
"*.{md,mdx}": ["parcel-transformer-mdx-docs"],
910
"*.svg": ["@parcel/transformer-svg-react"],
10-
"*.css": ["...", "parcel-transformer-css-env"]
11+
"*.css": ["...", "parcel-transformer-css-env"],
12+
"*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
13+
"@parcel/transformer-js",
14+
"@parcel/transformer-react-refresh-wrap"
15+
]
1116
},
1217
"namers": ["parcel-namer-docs", "..."],
1318
"packagers": {
1419
"*.json": "parcel-packager-docs",
20+
"*.html": "@parcel/packager-js"
1521
},
1622
"optimizers": {
17-
"*.js": ["parcel-optimizer-ssg", "..."]
23+
"*.html": ["parcel-optimizer-ssg", "..."]
1824
}
1925
}

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ icons: packages/@spectrum-icons/workflow/src packages/@spectrum-icons/color/src
6565
storybook:
6666
NODE_ENV=production yarn build:storybook
6767

68-
storybook-17:
69-
yarn build:storybook-17
68+
storybook-16:
69+
yarn build:storybook-16
7070

7171
# for now doesn't have deploy since v3 doesn't have a place for docs and stuff yet
7272
ci:
@@ -79,7 +79,7 @@ publish-nightly: build
7979
yarn publish:nightly
8080

8181
build:
82-
parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/*/ --no-minify
82+
parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/*/ --no-optimize
8383

8484
website:
8585
yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs

‎babel.config.json‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"presets": [
33
"@babel/preset-typescript",
44
"@babel/preset-react",
5-
["@parcel/babel-preset-env",
5+
["@babel/preset-env",
66
{
77
"loose": true
88
}
@@ -12,7 +12,7 @@
1212
"storybook": {
1313
"presets": [
1414
[
15-
"@parcel/babel-preset-env",
15+
"@babel/preset-env",
1616
{
1717
"loose": true,
1818
"targets": {
@@ -42,7 +42,7 @@
4242
},
4343
"plugins": [
4444
[
45-
"@parcel/babel-plugin-transform-runtime",
45+
"@babel/plugin-transform-runtime",
4646
{
4747
"version": "^7.6.2"
4848
}
@@ -53,15 +53,6 @@
5353
"legacy": true
5454
}
5555
],
56-
[
57-
"@babel/plugin-proposal-class-properties",
58-
{
59-
"loose": true
60-
}
61-
],
62-
"@babel/plugin-proposal-export-default-from",
63-
"@babel/plugin-proposal-export-namespace-from",
64-
"@babel/plugin-syntax-class-properties",
6556
"transform-glob-import",
6657
"babel-plugin-macros"
6758
],

‎package.json‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
],
1616
"scripts": {
1717
"check-types": "tsc",
18-
"install-17": "yarn add -W react@^17.0.1 react-dom@^17.0.1",
18+
"install-16": "yarn add -W react@^16.8.0 react-dom@^16.8.0",
1919
"start": "cross-env NODE_ENV=storybook start-storybook -p 9003 --ci -c '.storybook'",
2020
"build:storybook": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook",
21-
"build:storybook-17": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-17",
21+
"build:storybook-16": "build-storybook -c .storybook -o dist/$(git rev-parse HEAD)/storybook-16",
2222
"start:chromatic": "NODE_ENV=storybook start-storybook -p 9004 --ci -c '.chromatic'",
2323
"build:chromatic": "build-storybook -c .chromatic -o dist/$(git rev-parse HEAD)/chromatic",
2424
"start:docs": "PARCEL_WORKER_BACKEND=process DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'",
25-
"build:docs": "PARCEL_WORKER_BACKEND=process DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx' --no-scope-hoist",
25+
"build:docs": "PARCEL_WORKER_BACKEND=process DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/dev/docs/pages/**/*.mdx'",
2626
"test": "yarn jest",
2727
"build": "make build",
2828
"test:ssr": "yarn jest --config jest.ssr.config.js",
2929
"ci-test": "yarn jest --maxWorkers=2 && yarn test:ssr --runInBand",
30-
"ci-test-17": "yarn jest --maxWorkers=2 && yarn test:ssr --runInBand",
30+
"ci-test-16": "yarn jest --maxWorkers=2 && yarn test:ssr --runInBand",
3131
"lint": "concurrently \"yarn check-types\" \"eslint packages --ext .js,.ts,.tsx\" \"node scripts/lint-packages.js\"",
3232
"jest": "node scripts/jest.js",
3333
"copyrights": "babel-node --presets @babel/env ./scripts/addHeaders.js",
@@ -56,26 +56,21 @@
5656
"@babel/cli": "^7.12.10",
5757
"@babel/core": "^7.12.10",
5858
"@babel/node": "^7.12.10",
59-
"@babel/plugin-proposal-class-properties": "^7.12.1",
6059
"@babel/plugin-proposal-decorators": "^7.12.1",
61-
"@babel/plugin-proposal-export-default-from": "^7.12.1",
62-
"@babel/plugin-proposal-export-namespace-from": "^7.12.1",
63-
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
64-
"@babel/plugin-syntax-class-properties": "^7.12.1",
6560
"@babel/plugin-syntax-decorators": "^7.12.1",
66-
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
67-
"@babel/plugin-transform-async-to-generator": "^7.12.1",
6861
"@babel/plugin-transform-runtime": "^7.12.10",
6962
"@babel/preset-env": "^7.12.11",
7063
"@babel/preset-react": "^7.12.10",
7164
"@babel/preset-typescript": "^7.12.7",
7265
"@babel/register": "^7.12.10",
7366
"@babel/runtime": "^7.12.5",
7467
"@octokit/rest": "*",
75-
"@parcel/babel-plugin-transform-runtime": "nightly",
76-
"@parcel/babel-preset-env": "nightly",
77-
"@parcel/transformer-inline": "nightly",
78-
"@parcel/transformer-svg-react": "nightly",
68+
"@parcel/bundler-experimental": "2.0.0-nightly.2573",
69+
"@parcel/packager-ts": "2.0.0-nightly.951",
70+
"@parcel/resolver-glob": "2.0.2-nightly.2573",
71+
"@parcel/transformer-inline": "2.0.0-nightly.951",
72+
"@parcel/transformer-svg-react": "2.0.2-nightly.2573",
73+
"@parcel/transformer-typescript-types": "2.0.0-nightly.951",
7974
"@spectrum-css/component-builder": "^1.0.0",
8075
"@spectrum-css/vars": "^2.3.0",
8176
"@storybook/addon-a11y": "^6.1.10",
@@ -89,9 +84,9 @@
8984
"@testing-library/dom": "^8.0.0",
9085
"@testing-library/jest-dom": "^5.14.1",
9186
"@testing-library/react": "^12.0.0",
92-
"@testing-library/react-hooks": "^3.4.1",
87+
"@testing-library/react-hooks": "^7.0.2",
9388
"@testing-library/user-event": "^12.1.3",
94-
"@types/react": "^16.9.23",
89+
"@types/react": "^17.0.37",
9590
"@types/storybook__react": "^5.2.1",
9691
"@typescript-eslint/eslint-plugin": "^4.3.0",
9792
"@typescript-eslint/parser": "^4.3.0",
@@ -140,9 +135,10 @@
140135
"md5": "^2.2.1",
141136
"nyc": "^10.2.0",
142137
"p-queue": "^6.2.1",
143-
"parcel": "nightly",
138+
"parcel": "2.0.0-nightly.949",
144139
"patch-package": "^6.2.0",
145140
"plop": "^2.4.0",
141+
"postcss": "^7.0.0",
146142
"postcss-calc": "^6.0.0",
147143
"postcss-custom-properties": "6.3.1",
148144
"postcss-dir-pseudo-class": "^5.0.0",
@@ -157,9 +153,9 @@
157153
"postcss-svg": "^3.0.0",
158154
"prop-types": "^15.6.0",
159155
"raf": "^3.4.0",
160-
"react": "^16.8.0 || ^17.0.0-rc.1",
156+
"react": "^17.0.2",
161157
"react-axe": "^3.0.2",
162-
"react-dom": "^16.8.0 || ^17.0.0-rc.1",
158+
"react-dom": "^17.0.2",
163159
"react-overlays": "0.8.3",
164160
"react-test-renderer": "^16.9.0",
165161
"recursive-readdir": "^2.2.2",
@@ -169,7 +165,7 @@
169165
"storybook-dark-mode": "^1.0.3",
170166
"style-loader": "^0.23.1",
171167
"tempy": "^0.5.0",
172-
"typescript": "^3.8.3",
168+
"typescript": "^4.5.2",
173169
"url-loader": "^1.1.2",
174170
"walk-object": "^4.0.0",
175171
"webpack": "^4.44.2",

0 commit comments

Comments
 (0)