Skip to content

Commit 803927d

Browse files
authored
chore: Upgrade Parcel to v2.14.0 (adobe#7956)
* update parcel to canary * fix * update to stable
1 parent 1651867 commit 803927d

File tree

22 files changed

+810
-837
lines changed

22 files changed

+810
-837
lines changed

package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@
8787
"@faker-js/faker": "^8.4.1",
8888
"@jdb8/eslint-plugin-monorepo": "^1.0.1",
8989
"@octokit/rest": "*",
90-
"@parcel/bundler-library": "^2.12.1",
91-
"@parcel/config-default": "^2.13.1",
92-
"@parcel/config-storybook": "^0.0.2",
93-
"@parcel/core": "^2.13.1",
94-
"@parcel/optimizer-data-url": "^2.13.1",
95-
"@parcel/optimizer-terser": "^2.13.1",
96-
"@parcel/packager-ts": "^2.13.1",
97-
"@parcel/reporter-cli": "^2.13.1",
98-
"@parcel/resolver-glob": "^2.13.1",
99-
"@parcel/transformer-inline": "^2.13.1",
100-
"@parcel/transformer-inline-string": "^2.13.1",
101-
"@parcel/transformer-svg-react": "^2.13.1",
102-
"@parcel/transformer-typescript-types": "^2.13.1",
90+
"@parcel/bundler-library": "^2.14.0",
91+
"@parcel/config-default": "^2.14.0",
92+
"@parcel/config-storybook": "0.0.2",
93+
"@parcel/core": "^2.14.0",
94+
"@parcel/optimizer-data-url": "^2.14.0",
95+
"@parcel/optimizer-terser": "^2.14.0",
96+
"@parcel/packager-ts": "^2.14.0",
97+
"@parcel/reporter-cli": "^2.14.0",
98+
"@parcel/resolver-glob": "^2.14.0",
99+
"@parcel/transformer-inline": "^2.14.0",
100+
"@parcel/transformer-inline-string": "^2.14.0",
101+
"@parcel/transformer-svg-react": "^2.14.0",
102+
"@parcel/transformer-typescript-types": "^2.14.0",
103103
"@react-spectrum/s2-icon-builder": "^0.2.0",
104104
"@spectrum-css/component-builder": "1.0.1",
105105
"@spectrum-css/vars": "^2.3.0",
@@ -178,7 +178,7 @@
178178
"npm-cli-login": "^1.0.0",
179179
"nyc": "^10.2.0",
180180
"p-queue": "^6.2.1",
181-
"parcel": "^2.13.1",
181+
"parcel": "^2.14.0",
182182
"parcel-optimizer-strict-mode": "workspace:^",
183183
"patch-package": "^6.2.0",
184184
"playwright": "^1.45.3",

packages/@react-spectrum/s2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
},
122122
"devDependencies": {
123123
"@adobe/spectrum-tokens": "^13.0.0-beta.56",
124-
"@parcel/macros": "^2.13.0",
124+
"@parcel/macros": "^2.14.0",
125125
"@react-aria/test-utils": "1.0.0-alpha.3",
126126
"@testing-library/dom": "^10.1.0",
127127
"@testing-library/react": "^15.0.7",

packages/dev/parcel-namer-docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/plugin": "^2.14.0"
1111
}
1212
}

packages/dev/parcel-namer-intl/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/plugin": "^2.14.0"
1111
}
1212
}

packages/dev/parcel-namer-s2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/plugin": "^2.14.0"
1111
},
1212
"rsp": {
1313
"type": "cli"

packages/dev/parcel-optimizer-strict-mode/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/plugin": "^2.14.0"
1111
}
1212
}

packages/dev/parcel-packager-docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/plugin": "^2.14.0"
1111
}
1212
}

packages/dev/parcel-packager-ssg/SSGPackager.js

+35-7
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ const path = require('path');
1616
const ReactDOMServer = require('react-dom/server');
1717
const React = require('react');
1818
const vm = require('vm');
19-
const {createBuildCache} = require('@parcel/core/lib/buildCache');
2019

21-
const packagingBundles = createBuildCache();
22-
const moduleCache = createBuildCache();
20+
const packagingBundles = new Map();
21+
const moduleCache = new Map();
2322

2423
module.exports = new Packager({
24+
async loadConfig({config}) {
25+
config.invalidateOnBuild();
26+
packagingBundles.clear();
27+
moduleCache.clear();
28+
},
2529
async package({bundle, bundleGraph, getInlineBundleContents}) {
2630
let queue = new PromiseQueue({maxConcurrent: 32});
2731
bundle.traverse(node => {
@@ -57,7 +61,7 @@ module.exports = new Packager({
5761
}
5862

5963
let [asset, code] = assets.get(id);
60-
let moduleFunction = vm.compileFunction(code, ['exports', 'require', 'module', '__dirname', '__filename'], {
64+
let moduleFunction = vm.compileFunction(code, ['exports', 'require', 'module', '__dirname', '__filename', 'parcelRequire'], {
6165
filename: asset.filePath
6266
});
6367

@@ -106,19 +110,42 @@ module.exports = new Packager({
106110

107111
require.resolve = defaultRequire.resolve;
108112

113+
let parcelRequire = () => {
114+
throw new Error('UNKNOWN');
115+
};
116+
117+
parcelRequire.root = parcelRequire;
118+
119+
parcelRequire.meta = {
120+
distDir: bundle.target.distDir,
121+
publicUrl: bundle.target.publicUrl
122+
};
123+
124+
parcelRequire.resolve = (url) => {
125+
let bundle = bundleGraph
126+
.getBundles()
127+
.find(b => b.publicId === url || b.name === url);
128+
if (bundle) {
129+
return urlJoin(bundle.target.publicUrl, bundle.name);
130+
} else {
131+
throw new Error('Bundle not found');
132+
}
133+
};
134+
109135
let dirname = path.dirname(asset.filePath);
110136
let module = {
111137
exports: {},
112138
require,
113139
children: [],
114140
filename: asset.filePath,
115141
id,
116-
path: dirname
142+
path: dirname,
143+
bundle: parcelRequire
117144
};
118145

119146
moduleCache.set(id, module);
120-
121-
moduleFunction(module.exports, require, module, dirname, asset.filePath);
147+
148+
moduleFunction(module.exports, require, module, dirname, asset.filePath, parcelRequire);
122149
return module.exports;
123150
};
124151

@@ -180,6 +207,7 @@ module.exports = new Packager({
180207
);
181208

182209
return {
210+
type: 'html',
183211
contents: '<!doctype html>' + code
184212
};
185213
}

packages/dev/parcel-packager-ssg/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0",
11-
"@parcel/utils": "^2.13.0"
10+
"@parcel/plugin": "^2.14.0",
11+
"@parcel/utils": "^2.14.0"
1212
},
1313
"peerDependencies": {
1414
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",

packages/dev/parcel-resolver-build/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/core": "^2.13.0",
11-
"@parcel/node-resolver-core": "^3.4.0",
12-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/core": "^2.14.0",
11+
"@parcel/node-resolver-core": "^3.5.0",
12+
"@parcel/plugin": "^2.14.0"
1313
}
1414
}

packages/dev/parcel-resolver-docs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/core": "^2.13.0",
11-
"@parcel/node-resolver-core": "^3.4.0",
12-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/core": "^2.14.0",
11+
"@parcel/node-resolver-core": "^3.5.0",
12+
"@parcel/plugin": "^2.14.0"
1313
}
1414
}

packages/dev/parcel-resolver-optimize-locales/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"parcel": "^2.12.0"
77
},
88
"dependencies": {
9-
"@parcel/plugin": "^2.0.0"
9+
"@parcel/plugin": "^2.14.0"
1010
},
1111
"publishConfig": {
1212
"access": "public"

packages/dev/parcel-transformer-css-env/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"parcel": "^2.0.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0"
10+
"@parcel/plugin": "^2.14.0"
1111
}
1212
}

packages/dev/parcel-transformer-docs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"@babel/parser": "^7.24.0",
1111
"@babel/traverse": "^7.24.0",
1212
"@babel/types": "^7.24.0",
13-
"@parcel/plugin": "^2.0.0",
13+
"@parcel/plugin": "^2.14.0",
1414
"doctrine": "^3.0.0"
1515
},
1616
"devDependencies": {
17-
"@parcel/core": "^2.13.0",
18-
"@parcel/fs": "^2.13.0"
17+
"@parcel/core": "^2.14.0",
18+
"@parcel/fs": "^2.14.0"
1919
}
2020
}

packages/dev/parcel-transformer-intl/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
},
99
"dependencies": {
1010
"@internationalized/string-compiler": "^3.0.0",
11-
"@parcel/plugin": "^2.0.0"
11+
"@parcel/plugin": "^2.14.0"
1212
}
1313
}

packages/dev/parcel-transformer-mdx-docs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"dependencies": {
1010
"@mdx-js/mdx": "next",
1111
"@mdx-js/react": "next",
12-
"@parcel/core": "^2.13.0",
13-
"@parcel/plugin": "^2.0.0",
12+
"@parcel/core": "^2.14.0",
13+
"@parcel/plugin": "^2.14.0",
1414
"dprint-node": "^1.0.7",
1515
"js-yaml": "^3.13.1",
1616
"mdast-util-toc": "^6.1.0",

packages/dev/parcel-transformer-mdx-extract/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"parcel": "^2.12.0"
88
},
99
"dependencies": {
10-
"@parcel/plugin": "^2.0.0",
10+
"@parcel/plugin": "^2.14.0",
1111
"remark-mdx": "^2.0.0-rc.2",
1212
"remark-parse": "^10.0.1",
1313
"unified": "^10.0.1",

packages/dev/parcel-transformer-mdx-storybook/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@mdx-js/mdx": "next",
1111
"@mdx-js/react": "next",
12-
"@parcel/plugin": "^2.0.0"
12+
"@parcel/plugin": "^2.14.0"
1313
},
1414
"peerDependencies": {
1515
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"

packages/dev/parcel-transformer-s2-icon/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"dependencies": {
99
"@adobe/spectrum-tokens": "^13.0.0-beta.56",
10-
"@parcel/plugin": "^2.0.0",
10+
"@parcel/plugin": "^2.14.0",
1111
"@svgr/core": "^8.1.0",
1212
"@svgr/plugin-jsx": "^8.1.0",
1313
"@svgr/plugin-svgo": "^8.1.0"

packages/dev/s2-icon-builder/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"transform-icons": "index.js"
1111
},
1212
"dependencies": {
13-
"@parcel/bundler-library": "^2.12.1",
14-
"@parcel/compressor-raw": "^2.13.1",
15-
"@parcel/core": "^2.13.1",
16-
"@parcel/namer-default": "^2.13.1",
17-
"@parcel/packager-raw": "^2.13.1",
18-
"@parcel/reporter-cli": "^2.13.1",
19-
"@parcel/resolver-default": "^2.13.1",
20-
"@parcel/transformer-raw": "^2.13.1",
13+
"@parcel/bundler-library": "^2.14.0",
14+
"@parcel/compressor-raw": "^2.14.0",
15+
"@parcel/core": "^2.14.0",
16+
"@parcel/namer-default": "^2.14.0",
17+
"@parcel/packager-raw": "^2.14.0",
18+
"@parcel/reporter-cli": "^2.14.0",
19+
"@parcel/resolver-default": "^2.14.0",
20+
"@parcel/transformer-raw": "^2.14.0",
2121
"@react-spectrum/parcel-transformer-s2-icon": "^0.2.1"
2222
},
2323
"files": [

patches/@parcel+core+2.0.0-dev.1599.patch

-73
This file was deleted.

0 commit comments

Comments
 (0)