Skip to content

Commit b2abc5d

Browse files
devongovettdevongovett
authored
Upgrade Parcel and replace cssnano with Parcel CSS (#2776)
1 parent dfe72ee commit b2abc5d

9 files changed

+857
-1163
lines changed

‎.parcelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"*.html": "@parcel/packager-js"
2121
},
2222
"optimizers": {
23-
"*.html": ["parcel-optimizer-ssg", "..."]
23+
"*.html": ["parcel-optimizer-ssg", "..."],
24+
"*.css": ["@parcel/optimizer-css"]
2425
}
2526
}

‎cssnano.config.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎package.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,13 @@
6565
"@babel/register": "^7.12.10",
6666
"@babel/runtime": "^7.12.5",
6767
"@octokit/rest": "*",
68-
"@parcel/bundler-experimental": "^2.1.1",
69-
"@parcel/packager-ts": "^2.1.1",
70-
"@parcel/resolver-glob": "^2.1.1",
71-
"@parcel/transformer-inline": "^2.1.1",
72-
"@parcel/transformer-svg-react": "^2.1.1",
73-
"@parcel/transformer-typescript-types": "^2.1.1",
68+
"@parcel/bundler-experimental": "^2.2.1",
69+
"@parcel/optimizer-css": "^2.2.1",
70+
"@parcel/packager-ts": "^2.2.1",
71+
"@parcel/resolver-glob": "^2.2.1",
72+
"@parcel/transformer-inline": "^2.2.1",
73+
"@parcel/transformer-svg-react": "^2.2.1",
74+
"@parcel/transformer-typescript-types": "^2.2.1",
7475
"@spectrum-css/component-builder": "^1.0.0",
7576
"@spectrum-css/vars": "^2.3.0",
7677
"@storybook/addon-a11y": "^6.1.10",
@@ -136,7 +137,7 @@
136137
"md5": "^2.2.1",
137138
"nyc": "^10.2.0",
138139
"p-queue": "^6.2.1",
139-
"parcel": "^2.1.1",
140+
"parcel": "^2.2.1",
140141
"patch-package": "^6.2.0",
141142
"plop": "^2.4.0",
142143
"postcss": "^7.0.0",
@@ -149,7 +150,7 @@
149150
"postcss-inherit": "^4.1.0",
150151
"postcss-loader": "^3.0.0",
151152
"postcss-logical": "^4.0.0",
152-
"postcss-modules": "^1.4.1",
153+
"postcss-modules": "^3.2.2",
153154
"postcss-nested": "^4.1.2",
154155
"postcss-svg": "^3.0.0",
155156
"prop-types": "^15.6.0",
@@ -179,6 +180,7 @@
179180
"@babel/core": "7.12.10",
180181
"@babel/runtime": "7.12.5",
181182
"postcss-calc": "6.0.2",
182-
"jsdom": "16.7.0"
183+
"jsdom": "16.7.0",
184+
"postcss-modules": "^3.2.2"
183185
}
184186
}

‎patches/@babel+types+7.14.4.patch renamed to ‎patches/@babel+types+7.16.8.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js b/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js
2-
index e0f321e..1c27c38 100644
2+
index 4daaf8b..f22bb5a 100644
33
--- a/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js
44
+++ b/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js
55
@@ -72,6 +72,13 @@ getBindingIdentifiers.keys = {

‎patches/@parcel+transformer-postcss+2.1.1.patch renamed to ‎patches/@parcel+transformer-postcss+2.2.1.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js b/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js
2-
index 9e563e8..08a2af7 100644
2+
index 4792915..5149bd0 100644
33
--- a/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js
44
+++ b/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js
5-
@@ -135,10 +135,10 @@ var _default = new (_plugin().Transformer)({
5+
@@ -139,10 +139,10 @@ var _default = new (_plugin().Transformer)({
66
const postcss = await loadPostcss(options, asset.filePath);
77
return {
88
type: 'postcss',
@@ -15,16 +15,16 @@ index 9e563e8..08a2af7 100644
1515
};
1616
},
1717

18-
@@ -168,7 +168,7 @@ var _default = new (_plugin().Transformer)({
19-
}
18+
@@ -172,7 +172,7 @@ var _default = new (_plugin().Transformer)({
2019

20+
const postcss = await loadPostcss(options, asset.filePath);
2121
let ast = (0, _nullthrows().default)(await asset.getAST());
2222
- let program = postcss.fromJSON(ast.program);
2323
+ let program = ast.program;
24-
let code = asset.isASTDirty() ? null : await asset.getCode();
24+
let plugins = [...config.hydrated.plugins];
25+
let cssModules = null;
2526

26-
if (code == null || COMPOSES_RE.test(code)) {
27-
@@ -204,8 +204,8 @@ var _default = new (_plugin().Transformer)({
27+
@@ -220,8 +220,8 @@ var _default = new (_plugin().Transformer)({
2828
} = await postcss(plugins).process(program, config.hydrated);
2929
asset.setAST({
3030
type: 'postcss',
@@ -35,7 +35,7 @@ index 9e563e8..08a2af7 100644
3535
});
3636

3737
for (let msg of messages) {
38-
@@ -246,13 +246,13 @@ var _default = new (_plugin().Transformer)({
38+
@@ -262,13 +262,13 @@ var _default = new (_plugin().Transformer)({
3939
([className, classNameHashed]) => `module.exports[${JSON.stringify(className)}] = ${JSON.stringify(classNameHashed)};`).join('\n');
4040
}
4141

@@ -54,7 +54,7 @@ index 9e563e8..08a2af7 100644
5454
assets.push({
5555
type: 'js',
5656
content: code
57-
@@ -269,7 +269,7 @@ var _default = new (_plugin().Transformer)({
57+
@@ -285,7 +285,7 @@ var _default = new (_plugin().Transformer)({
5858
}) {
5959
const postcss = await loadPostcss(options, asset.filePath);
6060
let code = '';

‎scripts/buildBranchAPI.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ async function build() {
8181
fs.copySync(path.join(__dirname, '..', 'packages', 'dev'), path.join(dir, 'packages', 'dev'));
8282
fs.copySync(path.join(__dirname, '..', 'packages', '@adobe', 'spectrum-css-temp'), path.join(dir, 'packages', '@adobe', 'spectrum-css-temp'));
8383
fs.copySync(path.join(__dirname, '..', '.parcelrc'), path.join(dir, '.parcelrc'));
84-
fs.copySync(path.join(__dirname, '..', 'cssnano.config.js'), path.join(dir, 'cssnano.config.js'));
8584
fs.copySync(path.join(__dirname, '..', 'postcss.config.js'), path.join(dir, 'postcss.config.js'));
8685
fs.copySync(path.join(__dirname, '..', 'lib'), path.join(dir, 'lib'));
8786
fs.copySync(path.join(__dirname, '..', 'CONTRIBUTING.md'), path.join(dir, 'CONTRIBUTING.md'));

‎scripts/buildPublishedAPI.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ async function build() {
115115
fs.copySync(path.join(__dirname, '..', 'packages', 'dev'), path.join(dir, 'packages', 'dev'));
116116
fs.copySync(path.join(__dirname, '..', 'packages', '@adobe', 'spectrum-css-temp'), path.join(dir, 'packages', '@adobe', 'spectrum-css-temp'));
117117
fs.copySync(path.join(__dirname, '..', '.parcelrc'), path.join(dir, '.parcelrc'));
118-
fs.copySync(path.join(__dirname, '..', 'cssnano.config.js'), path.join(dir, 'cssnano.config.js'));
119118
fs.copySync(path.join(__dirname, '..', 'postcss.config.js'), path.join(dir, 'postcss.config.js'));
120119
fs.copySync(path.join(__dirname, '..', 'lib'), path.join(dir, 'lib'));
121120
fs.copySync(path.join(__dirname, '..', 'CONTRIBUTING.md'), path.join(dir, 'CONTRIBUTING.md'));

‎scripts/buildWebsite.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ async function build() {
9999
fs.removeSync(path.join(dir, 'packages', 'dev', 'v2-test-deps'));
100100
fs.copySync(path.join(__dirname, '..', 'packages', '@adobe', 'spectrum-css-temp'), path.join(dir, 'packages', '@adobe', 'spectrum-css-temp'));
101101
fs.copySync(path.join(__dirname, '..', '.parcelrc'), path.join(dir, '.parcelrc'));
102-
fs.copySync(path.join(__dirname, '..', 'cssnano.config.js'), path.join(dir, 'cssnano.config.js'));
103102
fs.copySync(path.join(__dirname, '..', 'postcss.config.js'), path.join(dir, 'postcss.config.js'));
104103
fs.copySync(path.join(__dirname, '..', 'lib'), path.join(dir, 'lib'));
105104
fs.copySync(path.join(__dirname, '..', 'CONTRIBUTING.md'), path.join(dir, 'CONTRIBUTING.md'));

0 commit comments

Comments
 (0)