diff --git a/package.json b/package.json index 3b622aa3d1..b12fae97de 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "pkg-types": "^1.0.3", "pretty-bytes": "^6.1.1", "radix3": "^1.1.0", - "rollup": "^3.29.4", + "rollup": "^4.5.0", "rollup-plugin-visualizer": "^5.9.2", "scule": "^1.1.0", "semver": "^7.5.4", @@ -172,4 +172,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f4f4a1c6a..b2020910f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,31 +20,31 @@ importers: version: 2.4.0 '@rollup/plugin-alias': specifier: ^5.0.1 - version: 5.0.1(rollup@3.29.4) + version: 5.0.1(rollup@4.5.0) '@rollup/plugin-commonjs': specifier: ^25.0.7 - version: 25.0.7(rollup@3.29.4) + version: 25.0.7(rollup@4.5.0) '@rollup/plugin-inject': specifier: ^5.0.5 - version: 5.0.5(rollup@3.29.4) + version: 5.0.5(rollup@4.5.0) '@rollup/plugin-json': specifier: ^6.0.1 - version: 6.0.1(rollup@3.29.4) + version: 6.0.1(rollup@4.5.0) '@rollup/plugin-node-resolve': specifier: ^15.2.3 - version: 15.2.3(rollup@3.29.4) + version: 15.2.3(rollup@4.5.0) '@rollup/plugin-replace': specifier: ^5.0.5 - version: 5.0.5(rollup@3.29.4) + version: 5.0.5(rollup@4.5.0) '@rollup/plugin-terser': specifier: ^0.4.4 - version: 0.4.4(rollup@3.29.4) + version: 0.4.4(rollup@4.5.0) '@rollup/plugin-wasm': specifier: ^6.2.2 - version: 6.2.2(rollup@3.29.4) + version: 6.2.2(rollup@4.5.0) '@rollup/pluginutils': specifier: ^5.0.5 - version: 5.0.5(rollup@3.29.4) + version: 5.0.5(rollup@4.5.0) '@types/http-proxy': specifier: ^1.17.14 version: 1.17.14 @@ -163,11 +163,11 @@ importers: specifier: ^1.1.0 version: 1.1.0 rollup: - specifier: ^3.29.4 - version: 3.29.4 + specifier: ^4.5.0 + version: 4.5.0 rollup-plugin-visualizer: specifier: ^5.9.2 - version: 5.9.2(rollup@3.29.4) + version: 5.9.2(rollup@4.5.0) scule: specifier: ^1.1.0 version: 1.1.0 @@ -197,7 +197,7 @@ importers: version: 1.7.4 unimport: specifier: ^3.5.0 - version: 3.5.0(rollup@3.29.4) + version: 3.5.0(rollup@4.5.0) unstorage: specifier: ^1.10.1 version: 1.10.1 @@ -1359,7 +1359,6 @@ packages: dependencies: is-glob: 4.0.3 micromatch: 4.0.5 - napi-wasm: 1.1.0 dev: false bundledDependencies: - napi-wasm @@ -1468,6 +1467,20 @@ packages: dependencies: rollup: 3.29.4 slash: 4.0.0 + dev: true + + /@rollup/plugin-alias@5.0.1(rollup@4.5.0): + resolution: {integrity: sha512-JObvbWdOHoMy9W7SU0lvGhDtWq9PllP5mjpAy+TUslZG/WzOId9u80Hsqq1vCUn9pFJ0cxpdcnAv+QzU2zFH3Q==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + rollup: 4.5.0 + slash: 4.0.0 + dev: false /@rollup/plugin-commonjs@25.0.7(rollup@3.29.4): resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} @@ -1485,8 +1498,27 @@ packages: is-reference: 1.2.1 magic-string: 0.30.5 rollup: 3.29.4 + dev: true + + /@rollup/plugin-commonjs@25.0.7(rollup@4.5.0): + resolution: {integrity: sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.68.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) + commondir: 1.0.1 + estree-walker: 2.0.2 + glob: 8.1.0 + is-reference: 1.2.1 + magic-string: 0.30.5 + rollup: 4.5.0 + dev: false - /@rollup/plugin-inject@5.0.5(rollup@3.29.4): + /@rollup/plugin-inject@5.0.5(rollup@4.5.0): resolution: {integrity: sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1495,10 +1527,10 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@3.29.4) + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) estree-walker: 2.0.2 magic-string: 0.30.5 - rollup: 3.29.4 + rollup: 4.5.0 dev: false /@rollup/plugin-json@6.0.1(rollup@3.29.4): @@ -1512,6 +1544,20 @@ packages: dependencies: '@rollup/pluginutils': 5.0.5(rollup@3.29.4) rollup: 3.29.4 + dev: true + + /@rollup/plugin-json@6.0.1(rollup@4.5.0): + resolution: {integrity: sha512-RgVfl5hWMkxN1h/uZj8FVESvPuBJ/uf6ly6GTj0GONnkfoBN5KC0MSz+PN2OLDgYXMhtG0mWpTrkiOjoxAIevw==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) + rollup: 4.5.0 + dev: false /@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4): resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} @@ -1529,6 +1575,25 @@ packages: is-module: 1.0.0 resolve: 1.22.8 rollup: 3.29.4 + dev: true + + /@rollup/plugin-node-resolve@15.2.3(rollup@4.5.0): + resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.78.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) + '@types/resolve': 1.20.2 + deepmerge: 4.3.1 + is-builtin-module: 3.2.1 + is-module: 1.0.0 + resolve: 1.22.8 + rollup: 4.5.0 + dev: false /@rollup/plugin-replace@5.0.5(rollup@3.29.4): resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==} @@ -1542,8 +1607,23 @@ packages: '@rollup/pluginutils': 5.0.5(rollup@3.29.4) magic-string: 0.30.5 rollup: 3.29.4 + dev: true - /@rollup/plugin-terser@0.4.4(rollup@3.29.4): + /@rollup/plugin-replace@5.0.5(rollup@4.5.0): + resolution: {integrity: sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) + magic-string: 0.30.5 + rollup: 4.5.0 + dev: false + + /@rollup/plugin-terser@0.4.4(rollup@4.5.0): resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1552,13 +1632,13 @@ packages: rollup: optional: true dependencies: - rollup: 3.29.4 + rollup: 4.5.0 serialize-javascript: 6.0.1 smob: 1.4.1 terser: 5.24.0 dev: false - /@rollup/plugin-wasm@6.2.2(rollup@3.29.4): + /@rollup/plugin-wasm@6.2.2(rollup@4.5.0): resolution: {integrity: sha512-gpC4R1G9Ni92ZIRTexqbhX7U+9estZrbhP+9SRb0DW9xpB9g7j34r+J2hqrcW/lRI7dJaU84MxZM0Rt82tqYPQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1567,8 +1647,8 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.5(rollup@3.29.4) - rollup: 3.29.4 + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) + rollup: 4.5.0 dev: false /@rollup/pluginutils@4.2.1: @@ -1592,13 +1672,28 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.1 rollup: 3.29.4 + dev: true + + /@rollup/pluginutils@5.0.5(rollup@4.5.0): + resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@types/estree': 1.0.5 + estree-walker: 2.0.2 + picomatch: 2.3.1 + rollup: 4.5.0 + dev: false /@rollup/rollup-android-arm-eabi@4.5.0: resolution: {integrity: sha512-OINaBGY+Wc++U0rdr7BLuFClxcoWaVW3vQYqmQq6B3bqQ/2olkaoz+K8+af/Mmka/C2yN5j+L9scBkv4BtKsDA==} cpu: [arm] os: [android] requiresBuild: true - dev: true optional: true /@rollup/rollup-android-arm64@4.5.0: @@ -1606,7 +1701,6 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: true optional: true /@rollup/rollup-darwin-arm64@4.5.0: @@ -1614,7 +1708,6 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: true optional: true /@rollup/rollup-darwin-x64@4.5.0: @@ -1622,7 +1715,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true optional: true /@rollup/rollup-linux-arm-gnueabihf@4.5.0: @@ -1630,7 +1722,6 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: true optional: true /@rollup/rollup-linux-arm64-gnu@4.5.0: @@ -1638,7 +1729,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true optional: true /@rollup/rollup-linux-arm64-musl@4.5.0: @@ -1646,7 +1736,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true optional: true /@rollup/rollup-linux-x64-gnu@4.5.0: @@ -1654,7 +1743,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true optional: true /@rollup/rollup-linux-x64-musl@4.5.0: @@ -1662,7 +1750,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true optional: true /@rollup/rollup-win32-arm64-msvc@4.5.0: @@ -1670,7 +1757,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true optional: true /@rollup/rollup-win32-ia32-msvc@4.5.0: @@ -1678,7 +1764,6 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: true optional: true /@rollup/rollup-win32-x64-msvc@4.5.0: @@ -1686,7 +1771,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true optional: true /@sinclair/typebox@0.27.8: @@ -5209,7 +5293,6 @@ packages: /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} - requiresBuild: true dev: true /mime-types@2.1.35: @@ -5383,10 +5466,6 @@ packages: hasBin: true dev: true - /napi-wasm@1.1.0: - resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==} - dev: false - /natural-compare-lite@1.4.0: resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} dev: true @@ -6119,7 +6198,7 @@ packages: '@babel/code-frame': 7.22.13 dev: true - /rollup-plugin-visualizer@5.9.2(rollup@3.29.4): + /rollup-plugin-visualizer@5.9.2(rollup@4.5.0): resolution: {integrity: sha512-waHktD5mlWrYFrhOLbti4YgQCn1uR24nYsNuXxg7LkPH8KdTXVWR9DNY1WU0QqokyMixVXJS4J04HNrVTMP01A==} engines: {node: '>=14'} hasBin: true @@ -6131,7 +6210,7 @@ packages: dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: 3.29.4 + rollup: 4.5.0 source-map: 0.7.4 yargs: 17.7.2 dev: false @@ -6142,6 +6221,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.3 + dev: true /rollup@4.5.0: resolution: {integrity: sha512-41xsWhzxqjMDASCxH5ibw1mXk+3c4TNI2UjKbLxe6iEzrSQnqOzmmK8/3mufCPbzHNJ2e04Fc1ddI35hHy+8zg==} @@ -6161,7 +6241,6 @@ packages: '@rollup/rollup-win32-ia32-msvc': 4.5.0 '@rollup/rollup-win32-x64-msvc': 4.5.0 fsevents: 2.3.3 - dev: true /run-applescript@5.0.0: resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} @@ -6925,10 +7004,10 @@ packages: engines: {node: '>=18'} dev: false - /unimport@3.5.0(rollup@3.29.4): + /unimport@3.5.0(rollup@4.5.0): resolution: {integrity: sha512-0Ei1iTeSYxs7oxxUf79/KaBc2dPjZxe7qdVpw7yIz5YcdTZjmBYO6ToLDW+fX9QOHiueZ3xtwb5Z/wqaSfXx6A==} dependencies: - '@rollup/pluginutils': 5.0.5(rollup@3.29.4) + '@rollup/pluginutils': 5.0.5(rollup@4.5.0) escape-string-regexp: 5.0.0 fast-glob: 3.3.2 local-pkg: 0.5.0 diff --git a/src/rollup/config.ts b/src/rollup/config.ts index 952c25f930..5d699ca00f 100644 --- a/src/rollup/config.ts +++ b/src/rollup/config.ts @@ -345,10 +345,7 @@ export const plugins = [ ) { return { id, external: true }; } - const resolved = await this.resolve(id, from, { - ...options, - skipSelf: true, - }); + const resolved = await this.resolve(id, from, options); if (!resolved) { const _resolved = await resolvePath(id, { url: nitro.options.nodeModulesDirs, diff --git a/src/rollup/plugins/externals-legacy.ts b/src/rollup/plugins/externals-legacy.ts index f2e8b88d3a..1cb7d1076b 100644 --- a/src/rollup/plugins/externals-legacy.ts +++ b/src/rollup/plugins/externals-legacy.ts @@ -86,10 +86,9 @@ export function externals(opts: NodeExternalsOptions): Plugin { } // Resolve id using rollup resolver - const resolved = (await this.resolve(originalId, importer, { - ...options, - skipSelf: true, - })) || { id }; + const resolved = (await this.resolve(originalId, importer, options)) || { + id, + }; // Try resolving with mlly as fallback if ( diff --git a/src/rollup/plugins/externals.ts b/src/rollup/plugins/externals.ts index b686b802a7..6e17b3cb7a 100644 --- a/src/rollup/plugins/externals.ts +++ b/src/rollup/plugins/externals.ts @@ -94,10 +94,9 @@ export function externals(opts: NodeExternalsOptions): Plugin { } // Resolve id using rollup resolver - const resolved = (await this.resolve(originalId, importer, { - ...options, - skipSelf: true, - })) || { id }; + const resolved = (await this.resolve(originalId, importer, options)) || { + id, + }; // Try resolving with mlly as fallback if ( diff --git a/src/rollup/plugins/wasm.ts b/src/rollup/plugins/wasm.ts index d15c1dabc7..2d510a3929 100644 --- a/src/rollup/plugins/wasm.ts +++ b/src/rollup/plugins/wasm.ts @@ -25,8 +25,7 @@ export function wasmImport(): Plugin { }; } if (wasmRegex.test(id)) { - const { id: filepath } = - (await this.resolve(id, importer, { skipSelf: true })) || {}; + const { id: filepath } = (await this.resolve(id, importer)) || {}; if (!filepath || filepath === id) { return null; }