Skip to content

Commit

Permalink
Merge branch 'v2' into runtime-order
Browse files Browse the repository at this point in the history
  • Loading branch information
mattcompiles committed Apr 17, 2024
2 parents 882d395 + ecf737e commit 406c0ce
Show file tree
Hide file tree
Showing 110 changed files with 185 additions and 117 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"sinon": "^7.3.1"
},
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"lint-staged": {
"*.{js,json,md,ts}": "prettier --write",
Expand Down
2 changes: 1 addition & 1 deletion packages/bundlers/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/DefaultBundler.js",
"source": "src/DefaultBundler.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/bundlers/library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/LibraryBundler.js",
"source": "src/LibraryBundler.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/compressors/brotli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/BrotliCompressor.js",
"source": "src/BrotliCompressor.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/compressors/gzip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/GzipCompressor.js",
"source": "src/GzipCompressor.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/compressors/raw/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/RawCompressor.js",
"source": "src/RawCompressor.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"source": "src/index.js",
"types": "index.d.ts",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"build-ts": "mkdir -p lib && flow-to-ts src/types.js > lib/types.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/codeframe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/codeframe.js",
"source": "src/codeframe.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"targets": {
"main": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/index.js",
"source": "src/index.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"test": "mocha",
Expand Down
9 changes: 6 additions & 3 deletions packages/core/core/src/RequestTracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
import {hashString} from '@parcel/rust';
import {ContentGraph} from '@parcel/graph';
import {deserialize, serialize} from './serializer';
import {assertSignalNotAborted, hashFromOption} from './utils';
import {BuildAbortError, assertSignalNotAborted, hashFromOption} from './utils';
import {
type ProjectPath,
fromProjectPathRelative,
Expand Down Expand Up @@ -1225,7 +1225,10 @@ export default class RequestTracker {
deferred.resolve(true);
return result;
} catch (err) {
if (request.type === requestTypes.dev_dep_request) {
if (
!(err instanceof BuildAbortError) &&
request.type === requestTypes.dev_dep_request
) {
logger.verbose({
origin: '@parcel/core',
message: `Failed DevDepRequest`,
Expand Down Expand Up @@ -1442,7 +1445,7 @@ export default class RequestTracker {
queue
.add(() =>
this.options.inputFS.writeSnapshot(
this.options.projectRoot,
this.options.watchDir,
snapshotPath,
opts,
),
Expand Down
2 changes: 1 addition & 1 deletion packages/core/diagnostic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"source": "src/diagnostic.js",
"types": "lib/diagnostic.d.ts",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"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",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/fs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"source": "src/index.js",
"types": "index.d.ts",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"targets": {
"types": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/graph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/index.js",
"source": "src/index.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"dependencies": {
"nullthrows": "^1.1.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"modern": {
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"yarn": "^1.13.0"
}
}
Expand Down
47 changes: 47 additions & 0 deletions packages/core/integration-tests/test/javascript.js
Original file line number Diff line number Diff line change
Expand Up @@ -6438,6 +6438,53 @@ describe('javascript', function () {
}
});

it(`should also fail on recoverable parse errors`, async () => {
await fsFixture(overlayFS, __dirname)`
js-recoverable-parse-errors
index.js:
1 / {2}`;

const fixture = path.join(
__dirname,
'/js-recoverable-parse-errors/index.js',
);

await assert.rejects(
() =>
bundle(fixture, {
inputFS: overlayFS,
}),
{
name: 'BuildError',
diagnostics: [
{
origin: '@parcel/transformer-js',
message: 'Unexpected token `}`. Expected identifier',
hints: null,
codeFrames: [
{
filePath: fixture,
codeHighlights: [
{
message: undefined,
start: {
column: 7,
line: 1,
},
end: {
column: 7,
line: 1,
},
},
],
},
],
},
],
},
);
});

for (let shouldScopeHoist of [false, true]) {
let options = {
defaultTargetOptions: {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/Logger.js",
"source": "src/Logger.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"dependencies": {
"@parcel/diagnostic": "2.12.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/markdown-ansi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/markdown-ansi.js",
"source": "src/markdown-ansi.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"dependencies": {
"chalk": "^4.1.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"source": "src/index.js",
"types": "index.d.ts",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"build-ts": "mkdir -p lib && flow-to-ts src/index.js > lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"main": "lib/bin.js",
"source": "src/bin.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"dependencies": {
"@parcel/config-default": "2.12.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"source": "src/PluginAPI.js",
"types": "src/PluginAPI.d.ts",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"check-ts": "tsc --noEmit src/PluginAPI.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/profiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/index.js",
"source": "src/index.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"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",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/register/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/register.js",
"source": "src/register.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"scripts": {
"run-example": "node ./example/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/rust/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"name": "parcel-node-bindings"
},
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"files": [
"browser.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"main": "src/utils.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"dependencies": {
"@parcel/config-default": "2.12.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"main": "lib/index.js",
"source": "src/index.js",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"targets": {
"main": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/workers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"source": "src/index.js",
"types": "index.d.ts",
"engines": {
"node": ">= 12.0.0"
"node": ">= 16.0.0"
},
"dependencies": {
"@parcel/diagnostic": "2.12.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/babel-preset/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = api => {
{
modules: false,
targets: {
node: 12,
node: 16,
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/bundle-stats-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"parcel-bundle-stats": "src/bin.js"
},
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/namers/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/DefaultNamer.js",
"source": "src/DefaultNamer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/blob-url/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/BlobURLOptimizer.js",
"source": "src/BlobURLOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/CSSOptimizer.js",
"source": "src/CSSOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/cssnano/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/CSSNanoOptimizer.js",
"source": "src/CSSNanoOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/data-url/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/DataURLOptimizer.js",
"source": "src/DataURLOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/htmlnano/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/HTMLNanoOptimizer.js",
"source": "src/HTMLNanoOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/image/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"url": "https://github.com/parcel-bundler/parcel.git"
},
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/svgo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/SVGOOptimizer.js",
"source": "src/SVGOOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/swc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"main": "lib/SwcOptimizer.js",
"source": "src/SwcOptimizer.js",
"engines": {
"node": ">= 12.0.0",
"node": ">= 16.0.0",
"parcel": "^2.12.0"
},
"dependencies": {
Expand Down
Loading

0 comments on commit 406c0ce

Please sign in to comment.