Skip to content

Upgrade Parcel and replace cssnano with Parcel CSS #2776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 9, 2022
Merged

Upgrade Parcel and replace cssnano with Parcel CSS #2776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf40faa
Upgrade Parcel and replace cssnano with Parcel CSS
devongovett Jan 26, 2022
281da4b
bump
devongovett Feb 8, 2022
af14255
Merge branch 'main' of github.com:adobe/react-spectrum into parcel-css
devongovett Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .parcelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"*.html": "@parcel/packager-js"
},
"optimizers": {
"*.html": ["parcel-optimizer-ssg", "..."]
"*.html": ["parcel-optimizer-ssg", "..."],
"*.css": ["@parcel/optimizer-css"]
}
}
8 changes: 0 additions & 8 deletions cssnano.config.js
View file
Open in desktop

This file was deleted.

20 changes: 11 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,13 @@
"@babel/register": "^7.12.10",
"@babel/runtime": "^7.12.5",
"@octokit/rest": "*",
"@parcel/bundler-experimental": "^2.1.1",
"@parcel/packager-ts": "^2.1.1",
"@parcel/resolver-glob": "^2.1.1",
"@parcel/transformer-inline": "^2.1.1",
"@parcel/transformer-svg-react": "^2.1.1",
"@parcel/transformer-typescript-types": "^2.1.1",
"@parcel/bundler-experimental": "^2.2.1",
"@parcel/optimizer-css": "^2.2.1",
"@parcel/packager-ts": "^2.2.1",
"@parcel/resolver-glob": "^2.2.1",
"@parcel/transformer-inline": "^2.2.1",
"@parcel/transformer-svg-react": "^2.2.1",
"@parcel/transformer-typescript-types": "^2.2.1",
"@spectrum-css/component-builder": "^1.0.0",
"@spectrum-css/vars": "^2.3.0",
"@storybook/addon-a11y": "^6.1.10",
Expand Down Expand Up @@ -136,7 +137,7 @@
"md5": "^2.2.1",
"nyc": "^10.2.0",
"p-queue": "^6.2.1",
"parcel": "^2.1.1",
"parcel": "^2.2.1",
"patch-package": "^6.2.0",
"plop": "^2.4.0",
"postcss": "^7.0.0",
Expand All @@ -149,7 +150,7 @@
"postcss-inherit": "^4.1.0",
"postcss-loader": "^3.0.0",
"postcss-logical": "^4.0.0",
"postcss-modules": "^1.4.1",
"postcss-modules": "^3.2.2",
"postcss-nested": "^4.1.2",
"postcss-svg": "^3.0.0",
"prop-types": "^15.6.0",
Expand Down Expand Up @@ -179,6 +180,7 @@
"@babel/core": "7.12.10",
"@babel/runtime": "7.12.5",
"postcss-calc": "6.0.2",
"jsdom": "16.7.0"
"jsdom": "16.7.0",
"postcss-modules": "^3.2.2"
}
}
2 changes: 1 addition & 1 deletion patches/@babel+types+7.14.4.patch → patches/@babel+types+7.16.8.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js b/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js
index e0f321e..1c27c38 100644
index 4daaf8b..f22bb5a 100644
--- a/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js
+++ b/node_modules/@babel/types/lib/retrievers/getBindingIdentifiers.js
@@ -72,6 +72,13 @@ getBindingIdentifiers.keys = {
Expand Down
18 changes: 9 additions & 9 deletions ...s/@parcel+transformer-postcss+2.1.1.patch → ...s/@parcel+transformer-postcss+2.2.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js b/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js
index 9e563e8..08a2af7 100644
index 4792915..5149bd0 100644
--- a/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js
+++ b/node_modules/@parcel/transformer-postcss/lib/PostCSSTransformer.js
@@ -135,10 +135,10 @@ var _default = new (_plugin().Transformer)({
@@ -139,10 +139,10 @@ var _default = new (_plugin().Transformer)({
const postcss = await loadPostcss(options, asset.filePath);
return {
type: 'postcss',
Expand All @@ -15,16 +15,16 @@ index 9e563e8..08a2af7 100644
};
},

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

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

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

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

Expand All @@ -54,7 +54,7 @@ index 9e563e8..08a2af7 100644
assets.push({
type: 'js',
content: code
@@ -269,7 +269,7 @@ var _default = new (_plugin().Transformer)({
@@ -285,7 +285,7 @@ var _default = new (_plugin().Transformer)({
}) {
const postcss = await loadPostcss(options, asset.filePath);
let code = '';
Expand Down
1 change: 0 additions & 1 deletion scripts/buildBranchAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ async function build() {
fs.copySync(path.join(__dirname, '..', 'packages', 'dev'), path.join(dir, 'packages', 'dev'));
fs.copySync(path.join(__dirname, '..', 'packages', '@adobe', 'spectrum-css-temp'), path.join(dir, 'packages', '@adobe', 'spectrum-css-temp'));
fs.copySync(path.join(__dirname, '..', '.parcelrc'), path.join(dir, '.parcelrc'));
fs.copySync(path.join(__dirname, '..', 'cssnano.config.js'), path.join(dir, 'cssnano.config.js'));
fs.copySync(path.join(__dirname, '..', 'postcss.config.js'), path.join(dir, 'postcss.config.js'));
fs.copySync(path.join(__dirname, '..', 'lib'), path.join(dir, 'lib'));
fs.copySync(path.join(__dirname, '..', 'CONTRIBUTING.md'), path.join(dir, 'CONTRIBUTING.md'));
Expand Down
1 change: 0 additions & 1 deletion scripts/buildPublishedAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ async function build() {
fs.copySync(path.join(__dirname, '..', 'packages', 'dev'), path.join(dir, 'packages', 'dev'));
fs.copySync(path.join(__dirname, '..', 'packages', '@adobe', 'spectrum-css-temp'), path.join(dir, 'packages', '@adobe', 'spectrum-css-temp'));
fs.copySync(path.join(__dirname, '..', '.parcelrc'), path.join(dir, '.parcelrc'));
fs.copySync(path.join(__dirname, '..', 'cssnano.config.js'), path.join(dir, 'cssnano.config.js'));
fs.copySync(path.join(__dirname, '..', 'postcss.config.js'), path.join(dir, 'postcss.config.js'));
fs.copySync(path.join(__dirname, '..', 'lib'), path.join(dir, 'lib'));
fs.copySync(path.join(__dirname, '..', 'CONTRIBUTING.md'), path.join(dir, 'CONTRIBUTING.md'));
Expand Down
1 change: 0 additions & 1 deletion scripts/buildWebsite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ async function build() {
fs.removeSync(path.join(dir, 'packages', 'dev', 'v2-test-deps'));
fs.copySync(path.join(__dirname, '..', 'packages', '@adobe', 'spectrum-css-temp'), path.join(dir, 'packages', '@adobe', 'spectrum-css-temp'));
fs.copySync(path.join(__dirname, '..', '.parcelrc'), path.join(dir, '.parcelrc'));
fs.copySync(path.join(__dirname, '..', 'cssnano.config.js'), path.join(dir, 'cssnano.config.js'));
fs.copySync(path.join(__dirname, '..', 'postcss.config.js'), path.join(dir, 'postcss.config.js'));
fs.copySync(path.join(__dirname, '..', 'lib'), path.join(dir, 'lib'));
fs.copySync(path.join(__dirname, '..', 'CONTRIBUTING.md'), path.join(dir, 'CONTRIBUTING.md'));
Expand Down
Loading