Merge branch 'master' of https://github.com/rollup/rollup into sync-1…

…b4d1420

cli/run/loadConfigFile.ts

@@ -97,8 +97,7 @@ async function loadTranspiledConfigFile(
 	const { bundleConfigAsCjs, configPlugin, silent } = commandOptions;
 	const warnings = batchWarnings(commandOptions);
 	const inputOptions = {
-		external: (id: string) =>
-			(id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5, id.length) === '.json',
+		external: (id: string) => (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5) === '.json',
 		input: fileName,
 		onwarn: warnings.add,
 		plugins: [],

package.json

@@ -121,7 +121,7 @@
     "@codemirror/language": "^6.10.2",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.28.6",
+    "@codemirror/view": "^6.29.1",
     "@jridgewell/sourcemap-codec": "^1.5.0",
     "@mermaid-js/mermaid-cli": "^10.9.1",
     "@napi-rs/cli": "^2.18.4",
@@ -134,15 +134,15 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/pluginutils": "^5.1.0",
-    "@shikijs/vitepress-twoslash": "^1.11.0",
+    "@shikijs/vitepress-twoslash": "^1.12.0",
     "@types/eslint": "^8.56.11",
     "@types/inquirer": "^9.0.7",
     "@types/mocha": "^10.0.7",
     "@types/node": "~18.18.14",
     "@types/semver": "^7.5.8",
     "@types/yargs-parser": "^21.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^13.0.0",
     "acorn": "^8.12.1",
@@ -161,28 +161,28 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-unicorn": "^54.0.0",
+    "eslint-plugin-unicorn": "^55.0.0",
     "eslint-plugin-vue": "^9.27.0",
     "fixturify": "^3.0.0",
     "flru": "^1.0.2",
     "fs-extra": "^11.2.0",
     "github-api": "^3.4.0",
-    "husky": "^9.1.1",
-    "inquirer": "^10.1.2",
+    "husky": "^9.1.4",
+    "inquirer": "^10.1.5",
     "is-reference": "^3.0.2",
     "lint-staged": "^15.2.7",
     "locate-character": "^3.0.0",
-    "magic-string": "^0.30.10",
+    "magic-string": "^0.30.11",
     "mocha": "^10.7.0",
     "nodemon": "^3.1.4",
     "npm-audit-resolver": "^3.0.0-RC.0",
     "nyc": "^17.0.0",
-    "pinia": "^2.1.7",
+    "pinia": "^2.2.0",
     "prettier": "^3.3.3",
     "pretty-bytes": "^6.1.1",
-    "pretty-ms": "^9.0.0",
+    "pretty-ms": "^9.1.0",
     "requirejs": "^2.3.7",
-    "rollup": "^4.19.0",
+    "rollup": "^4.19.1",
     "rollup-plugin-license": "^3.5.2",
     "rollup-plugin-string": "^3.0.0",
     "semver": "^7.6.3",
@@ -194,9 +194,9 @@
     "terser": "^5.31.3",
     "tslib": "^2.6.3",
     "typescript": "^5.5.4",
-    "vite": "^5.3.4",
+    "vite": "^5.3.5",
     "vitepress": "^1.3.1",
-    "vue": "^3.4.33",
+    "vue": "^3.4.34",
     "wasm-pack": "^0.13.0",
     "yargs-parser": "^21.1.1"
   },

rust/parse_ast/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 anyhow = "1.0.86"
 swc_atoms = "0.6.7"
 swc_compiler_base = "0.15.2"
-swc_common = { version = "0.36.2", features = ["ahash", "parking_lot"] }
+swc_common = { version = "0.36.3", features = ["ahash", "parking_lot"] }
 swc_ecma_ast = "0.117.4"
-swc_ecma_parser = "0.148.1"
+swc_ecma_parser = "0.148.3"
 parking_lot = "0.12.3"

rust/xxhash/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 base-encode = "0.3.1"
-xxhash-rust = { version = "0.8.11", features = ["xxh3"] }
+xxhash-rust = { version = "0.8.12", features = ["xxh3"] }

test/cli/samples/validate/_config.js

@@ -8,11 +8,9 @@ module.exports = defineTest({
 	stderr: stderr =>
 		assertIncludes(
 			stderr,
-			`(!) out.js (3:20): Chunk "out.js" is not valid JavaScript: Unterminated block comment.
-out.js:3:20
-1: console.log(2 );
+			`(!) out.js (4:0): Chunk "out.js" is not valid JavaScript: Unterminated block comment.
+out.js:4:0
 2: 
-3: console.log("end"); /*
-                       ^`
+3: console.log("end"); /*`
 		)
 });

test/function/samples/validate-output/_config.js

@@ -11,17 +11,15 @@ module.exports = defineTest({
 	},
 	generateError: {
 		code: 'CHUNK_INVALID',
-		message: 'main.js (5:0): Chunk "main.js" is not valid JavaScript: Unterminated block comment.',
+		message: 'main.js (6:0): Chunk "main.js" is not valid JavaScript: Unterminated block comment.',
 		frame: `
-3: throw new Error('Not executed');
 4:
-5: /*
-   ^`,
+5: /*`,
 		loc: {
 			column: 0,
 			file: 'main.js',
-			line: 5
+			line: 6
 		},
-		pos: 49
+		pos: 52
 	}
 });