Skip to content

Commit 406c0ce

Browse files
mattcompilesmattcompiles
authored
Merge branch 'v2' into runtime-order
2 parents 882d395 + ecf737e commit 406c0ce

File tree

110 files changed

+185
-117
lines changed

Some content is hidden

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

110 files changed

+185
-117
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"sinon": "^7.3.1"
6666
},
6767
"engines": {
68-
"node": ">= 12.0.0"
68+
"node": ">= 16.0.0"
6969
},
7070
"lint-staged": {
7171
"*.{js,json,md,ts}": "prettier --write",

‎packages/bundlers/default/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/DefaultBundler.js",
1717
"source": "src/DefaultBundler.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/bundlers/library/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/LibraryBundler.js",
1717
"source": "src/LibraryBundler.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/compressors/brotli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/BrotliCompressor.js",
1717
"source": "src/BrotliCompressor.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/compressors/gzip/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/GzipCompressor.js",
1717
"source": "src/GzipCompressor.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/compressors/raw/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/RawCompressor.js",
1717
"source": "src/RawCompressor.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/core/cache/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"source": "src/index.js",
1818
"types": "index.d.ts",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"scripts": {
2323
"build-ts": "mkdir -p lib && flow-to-ts src/types.js > lib/types.d.ts",

‎packages/core/codeframe/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/codeframe.js",
1818
"source": "src/codeframe.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"targets": {
2323
"main": {

‎packages/core/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/index.js",
1717
"source": "src/index.js",
1818
"engines": {
19-
"node": ">= 12.0.0"
19+
"node": ">= 16.0.0"
2020
},
2121
"scripts": {
2222
"test": "mocha",

‎packages/core/core/src/RequestTracker.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
import {hashString} from '@parcel/rust';
3030
import {ContentGraph} from '@parcel/graph';
3131
import {deserialize, serialize} from './serializer';
32-
import {assertSignalNotAborted, hashFromOption} from './utils';
32+
import {BuildAbortError, assertSignalNotAborted, hashFromOption} from './utils';
3333
import {
3434
type ProjectPath,
3535
fromProjectPathRelative,
@@ -1225,7 +1225,10 @@ export default class RequestTracker {
12251225
deferred.resolve(true);
12261226
return result;
12271227
} catch (err) {
1228-
if (request.type === requestTypes.dev_dep_request) {
1228+
if (
1229+
!(err instanceof BuildAbortError) &&
1230+
request.type === requestTypes.dev_dep_request
1231+
) {
12291232
logger.verbose({
12301233
origin: '@parcel/core',
12311234
message: `Failed DevDepRequest`,
@@ -1442,7 +1445,7 @@ export default class RequestTracker {
14421445
queue
14431446
.add(() =>
14441447
this.options.inputFS.writeSnapshot(
1445-
this.options.projectRoot,
1448+
this.options.watchDir,
14461449
snapshotPath,
14471450
opts,
14481451
),

‎packages/core/diagnostic/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"source": "src/diagnostic.js",
1818
"types": "lib/diagnostic.d.ts",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"scripts": {
2323
"build-ts": "flow-to-ts src/*.js --write && tsc --emitDeclarationOnly --declaration --esModuleInterop src/*.ts && mkdir -p lib && mv src/*.d.ts lib/. && rm src/*.ts",

‎packages/core/fs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"source": "src/index.js",
1919
"types": "index.d.ts",
2020
"engines": {
21-
"node": ">= 12.0.0"
21+
"node": ">= 16.0.0"
2222
},
2323
"targets": {
2424
"types": false,

‎packages/core/graph/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/index.js",
1818
"source": "src/index.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"dependencies": {
2323
"nullthrows": "^1.1.1"

‎packages/core/integration-tests/test/integration/babel-semver-engine/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"modern": {
1313
"engines": {
14-
"node": ">= 12.0.0",
14+
"node": ">= 16.0.0",
1515
"yarn": "^1.13.0"
1616
}
1717
}

‎packages/core/integration-tests/test/javascript.js

+47
Original file line numberDiff line numberDiff line change
@@ -6438,6 +6438,53 @@ describe('javascript', function () {
64386438
}
64396439
});
64406440

6441+
it(`should also fail on recoverable parse errors`, async () => {
6442+
await fsFixture(overlayFS, __dirname)`
6443+
js-recoverable-parse-errors
6444+
index.js:
6445+
1 / {2}`;
6446+
6447+
const fixture = path.join(
6448+
__dirname,
6449+
'/js-recoverable-parse-errors/index.js',
6450+
);
6451+
6452+
await assert.rejects(
6453+
() =>
6454+
bundle(fixture, {
6455+
inputFS: overlayFS,
6456+
}),
6457+
{
6458+
name: 'BuildError',
6459+
diagnostics: [
6460+
{
6461+
origin: '@parcel/transformer-js',
6462+
message: 'Unexpected token `}`. Expected identifier',
6463+
hints: null,
6464+
codeFrames: [
6465+
{
6466+
filePath: fixture,
6467+
codeHighlights: [
6468+
{
6469+
message: undefined,
6470+
start: {
6471+
column: 7,
6472+
line: 1,
6473+
},
6474+
end: {
6475+
column: 7,
6476+
line: 1,
6477+
},
6478+
},
6479+
],
6480+
},
6481+
],
6482+
},
6483+
],
6484+
},
6485+
);
6486+
});
6487+
64416488
for (let shouldScopeHoist of [false, true]) {
64426489
let options = {
64436490
defaultTargetOptions: {

‎packages/core/logger/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/Logger.js",
1818
"source": "src/Logger.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"dependencies": {
2323
"@parcel/diagnostic": "2.12.0",

‎packages/core/markdown-ansi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/markdown-ansi.js",
1818
"source": "src/markdown-ansi.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"dependencies": {
2323
"chalk": "^4.1.0"

‎packages/core/package-manager/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"source": "src/index.js",
1919
"types": "index.d.ts",
2020
"engines": {
21-
"node": ">= 12.0.0"
21+
"node": ">= 16.0.0"
2222
},
2323
"scripts": {
2424
"build-ts": "mkdir -p lib && flow-to-ts src/index.js > lib/index.d.ts",

‎packages/core/parcel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"main": "lib/bin.js",
1919
"source": "src/bin.js",
2020
"engines": {
21-
"node": ">= 12.0.0"
21+
"node": ">= 16.0.0"
2222
},
2323
"dependencies": {
2424
"@parcel/config-default": "2.12.0",

‎packages/core/plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"source": "src/PluginAPI.js",
1818
"types": "src/PluginAPI.d.ts",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"scripts": {
2323
"check-ts": "tsc --noEmit src/PluginAPI.d.ts"

‎packages/core/profiler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/index.js",
1818
"source": "src/index.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"scripts": {
2323
"build-ts": "flow-to-ts src/*.js --write && rm -f ./src/*.d.ts && tsc --emitDeclarationOnly --declaration --esModuleInterop --target es2015 --moduleResolution node16 --module node16 src/*.ts && mkdir -p lib && mv src/*.d.ts lib/. && rm src/*.ts && node build-ts.js",

‎packages/core/register/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/register.js",
1818
"source": "src/register.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"scripts": {
2323
"run-example": "node ./example/index.js",

‎packages/core/rust/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"name": "parcel-node-bindings"
2020
},
2121
"engines": {
22-
"node": ">= 12.0.0"
22+
"node": ">= 16.0.0"
2323
},
2424
"files": [
2525
"browser.js",

‎packages/core/test-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"main": "src/utils.js",
1212
"engines": {
13-
"node": ">= 12.0.0"
13+
"node": ">= 16.0.0"
1414
},
1515
"dependencies": {
1616
"@parcel/config-default": "2.12.0",

‎packages/core/utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"main": "lib/index.js",
1818
"source": "src/index.js",
1919
"engines": {
20-
"node": ">= 12.0.0"
20+
"node": ">= 16.0.0"
2121
},
2222
"targets": {
2323
"main": {

‎packages/core/workers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"source": "src/index.js",
1919
"types": "index.d.ts",
2020
"engines": {
21-
"node": ">= 12.0.0"
21+
"node": ">= 16.0.0"
2222
},
2323
"dependencies": {
2424
"@parcel/diagnostic": "2.12.0",

‎packages/dev/babel-preset/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = api => {
2222
{
2323
modules: false,
2424
targets: {
25-
node: 12,
25+
node: 16,
2626
},
2727
},
2828
],

‎packages/dev/bundle-stats-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"parcel-bundle-stats": "src/bin.js"
2020
},
2121
"engines": {
22-
"node": ">= 12.0.0",
22+
"node": ">= 16.0.0",
2323
"parcel": "^2.12.0"
2424
},
2525
"dependencies": {

‎packages/namers/default/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/DefaultNamer.js",
1717
"source": "src/DefaultNamer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/blob-url/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/BlobURLOptimizer.js",
1717
"source": "src/BlobURLOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/css/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/CSSOptimizer.js",
1717
"source": "src/CSSOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/cssnano/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/CSSNanoOptimizer.js",
1717
"source": "src/CSSNanoOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/data-url/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/DataURLOptimizer.js",
1717
"source": "src/DataURLOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/htmlnano/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/HTMLNanoOptimizer.js",
1717
"source": "src/HTMLNanoOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/image/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"url": "https://github.com/parcel-bundler/parcel.git"
1717
},
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"files": [

‎packages/optimizers/svgo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/SVGOOptimizer.js",
1717
"source": "src/SVGOOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

‎packages/optimizers/swc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"main": "lib/SwcOptimizer.js",
1717
"source": "src/SwcOptimizer.js",
1818
"engines": {
19-
"node": ">= 12.0.0",
19+
"node": ">= 16.0.0",
2020
"parcel": "^2.12.0"
2121
},
2222
"dependencies": {

0 commit comments

Comments
 (0)