From 151598efdf954a0dbe1558d464f2f3eb8914f177 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Sat, 15 Jul 2023 18:48:20 +0200 Subject: [PATCH 1/4] Fix manualChunks for Deno Deploy --- src/presets/deno-deploy.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/presets/deno-deploy.ts b/src/presets/deno-deploy.ts index 6e7fb31543..109b31a070 100644 --- a/src/presets/deno-deploy.ts +++ b/src/presets/deno-deploy.ts @@ -19,7 +19,9 @@ export const denoDeploy = defineNitroPreset({ external: ["https://deno.land/std/http/server.ts"], output: { entryFileNames: "index.ts", - manualChunks: () => "index", + manualChunks: (id) => { + if (id !== "https://deno.land/std/http/server.ts") { return "index"; } + }, format: "esm", }, }, From 925f285f9449bbf55c64fd8d650020edff7b5ae1 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 17:11:19 +0000 Subject: [PATCH 2/4] [autofix.ci] apply automated fixes --- src/presets/deno-deploy.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/presets/deno-deploy.ts b/src/presets/deno-deploy.ts index 109b31a070..951d8d7d61 100644 --- a/src/presets/deno-deploy.ts +++ b/src/presets/deno-deploy.ts @@ -20,7 +20,9 @@ export const denoDeploy = defineNitroPreset({ output: { entryFileNames: "index.ts", manualChunks: (id) => { - if (id !== "https://deno.land/std/http/server.ts") { return "index"; } + if (id !== "https://deno.land/std/http/server.ts") { + return "index"; + } }, format: "esm", }, From 00b12c92903d572c7078d9b41982b28e683f929a Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Tue, 18 Jul 2023 07:47:10 +0200 Subject: [PATCH 3/4] Treat all https:// modules as external --- src/presets/deno-deploy.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/presets/deno-deploy.ts b/src/presets/deno-deploy.ts index 951d8d7d61..466a6e5d8f 100644 --- a/src/presets/deno-deploy.ts +++ b/src/presets/deno-deploy.ts @@ -16,14 +16,10 @@ export const denoDeploy = defineNitroPreset({ }, rollupConfig: { preserveEntrySignatures: false, - external: ["https://deno.land/std/http/server.ts"], + external: (id) => id.startsWith("https://"), output: { entryFileNames: "index.ts", - manualChunks: (id) => { - if (id !== "https://deno.land/std/http/server.ts") { - return "index"; - } - }, + manualChunks: (id) => "index", format: "esm", }, }, From 2642f93fbdd124f1a27ef7b0d623d2675d4684c1 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Tue, 18 Jul 2023 20:47:17 +0200 Subject: [PATCH 4/4] Update rollup --- package.json | 4 +- pnpm-lock.yaml | 112 ++++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 573f6d5206..a4a85f35ab 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "pkg-types": "^1.0.3", "pretty-bytes": "^6.1.0", "radix3": "^1.0.1", - "rollup": "^3.26.2", + "rollup": "^3.26.3", "rollup-plugin-visualizer": "^5.9.2", "scule": "^1.0.0", "semver": "^7.5.4", @@ -152,4 +152,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f9089deb1..2541d0bc7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,31 +20,31 @@ importers: version: 1.6.0 '@rollup/plugin-alias': specifier: ^5.0.0 - version: 5.0.0(rollup@3.26.2) + version: 5.0.0(rollup@3.26.3) '@rollup/plugin-commonjs': specifier: ^25.0.3 - version: 25.0.3(rollup@3.26.2) + version: 25.0.3(rollup@3.26.3) '@rollup/plugin-inject': specifier: ^5.0.3 - version: 5.0.3(rollup@3.26.2) + version: 5.0.3(rollup@3.26.3) '@rollup/plugin-json': specifier: ^6.0.0 - version: 6.0.0(rollup@3.26.2) + version: 6.0.0(rollup@3.26.3) '@rollup/plugin-node-resolve': specifier: ^15.1.0 - version: 15.1.0(rollup@3.26.2) + version: 15.1.0(rollup@3.26.3) '@rollup/plugin-replace': specifier: ^5.0.2 - version: 5.0.2(rollup@3.26.2) + version: 5.0.2(rollup@3.26.3) '@rollup/plugin-terser': specifier: ^0.4.3 - version: 0.4.3(rollup@3.26.2) + version: 0.4.3(rollup@3.26.3) '@rollup/plugin-wasm': specifier: ^6.1.3 - version: 6.1.3(rollup@3.26.2) + version: 6.1.3(rollup@3.26.3) '@rollup/pluginutils': specifier: ^5.0.2 - version: 5.0.2(rollup@3.26.2) + version: 5.0.2(rollup@3.26.3) '@types/http-proxy': specifier: ^1.17.11 version: 1.17.11 @@ -166,11 +166,11 @@ importers: specifier: ^1.0.1 version: 1.0.1 rollup: - specifier: ^3.26.2 - version: 3.26.2 + specifier: ^3.26.3 + version: 3.26.3 rollup-plugin-visualizer: specifier: ^5.9.2 - version: 5.9.2(rollup@3.26.2) + version: 5.9.2(rollup@3.26.3) scule: specifier: ^1.0.0 version: 1.0.0 @@ -200,7 +200,7 @@ importers: version: 1.5.2 unimport: specifier: ^3.0.14 - version: 3.0.14(rollup@3.26.2) + version: 3.0.14(rollup@3.26.3) unstorage: specifier: ^1.8.0 version: 1.8.0 @@ -1283,7 +1283,7 @@ packages: tslib: 2.6.0 dev: true - /@rollup/plugin-alias@5.0.0(rollup@3.26.2): + /@rollup/plugin-alias@5.0.0(rollup@3.26.3): resolution: {integrity: sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1292,10 +1292,10 @@ packages: rollup: optional: true dependencies: - rollup: 3.26.2 + rollup: 3.26.3 slash: 4.0.0 - /@rollup/plugin-commonjs@24.1.0(rollup@3.26.2): + /@rollup/plugin-commonjs@24.1.0(rollup@3.26.3): resolution: {integrity: sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1304,16 +1304,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.27.0 - rollup: 3.26.2 + rollup: 3.26.3 dev: true - /@rollup/plugin-commonjs@25.0.3(rollup@3.26.2): + /@rollup/plugin-commonjs@25.0.3(rollup@3.26.3): resolution: {integrity: sha512-uBdtWr/H3BVcgm97MUdq2oJmqBR23ny1hOrWe2PKo9FTbjsGqg32jfasJUKYAI5ouqacjRnj65mBB/S79F+GQA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1322,16 +1322,16 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.27.0 - rollup: 3.26.2 + rollup: 3.26.3 dev: false - /@rollup/plugin-inject@5.0.3(rollup@3.26.2): + /@rollup/plugin-inject@5.0.3(rollup@3.26.3): resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1340,13 +1340,13 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) estree-walker: 2.0.2 magic-string: 0.27.0 - rollup: 3.26.2 + rollup: 3.26.3 dev: false - /@rollup/plugin-json@6.0.0(rollup@3.26.2): + /@rollup/plugin-json@6.0.0(rollup@3.26.3): resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1355,10 +1355,10 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) - rollup: 3.26.2 + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) + rollup: 3.26.3 - /@rollup/plugin-node-resolve@15.1.0(rollup@3.26.2): + /@rollup/plugin-node-resolve@15.1.0(rollup@3.26.3): resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1367,15 +1367,15 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.2 - rollup: 3.26.2 + rollup: 3.26.3 - /@rollup/plugin-replace@5.0.2(rollup@3.26.2): + /@rollup/plugin-replace@5.0.2(rollup@3.26.3): resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1384,11 +1384,11 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) magic-string: 0.27.0 - rollup: 3.26.2 + rollup: 3.26.3 - /@rollup/plugin-terser@0.4.3(rollup@3.26.2): + /@rollup/plugin-terser@0.4.3(rollup@3.26.3): resolution: {integrity: sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1397,13 +1397,13 @@ packages: rollup: optional: true dependencies: - rollup: 3.26.2 + rollup: 3.26.3 serialize-javascript: 6.0.1 smob: 1.4.0 terser: 5.19.0 dev: false - /@rollup/plugin-wasm@6.1.3(rollup@3.26.2): + /@rollup/plugin-wasm@6.1.3(rollup@3.26.3): resolution: {integrity: sha512-7ItTTeyauE6lwdDtQWceEHZ9+txbi4RRy0mYPFn9BW7rD7YdgBDu7HTHsLtHrRzJc313RM/1m6GKgV3np/aEaw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1412,7 +1412,7 @@ packages: rollup: optional: true dependencies: - rollup: 3.26.2 + rollup: 3.26.3 dev: false /@rollup/pluginutils@4.2.1: @@ -1423,7 +1423,7 @@ packages: picomatch: 2.3.1 dev: false - /@rollup/pluginutils@5.0.2(rollup@3.26.2): + /@rollup/pluginutils@5.0.2(rollup@3.26.3): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1435,7 +1435,7 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.26.2 + rollup: 3.26.3 /@sinclair/typebox@0.27.8: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} @@ -4777,7 +4777,7 @@ packages: dependencies: glob: 7.2.3 - /rollup-plugin-dts@5.3.0(rollup@3.26.2)(typescript@5.1.6): + /rollup-plugin-dts@5.3.0(rollup@3.26.3)(typescript@5.1.6): resolution: {integrity: sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==} engines: {node: '>=v14'} peerDependencies: @@ -4785,13 +4785,13 @@ packages: typescript: ^4.1 || ^5.0 dependencies: magic-string: 0.30.1 - rollup: 3.26.2 + rollup: 3.26.3 typescript: 5.1.6 optionalDependencies: '@babel/code-frame': 7.22.5 dev: true - /rollup-plugin-visualizer@5.9.2(rollup@3.26.2): + /rollup-plugin-visualizer@5.9.2(rollup@3.26.3): resolution: {integrity: sha512-waHktD5mlWrYFrhOLbti4YgQCn1uR24nYsNuXxg7LkPH8KdTXVWR9DNY1WU0QqokyMixVXJS4J04HNrVTMP01A==} engines: {node: '>=14'} hasBin: true @@ -4803,13 +4803,13 @@ packages: dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: 3.26.2 + rollup: 3.26.3 source-map: 0.7.4 yargs: 17.7.2 dev: false - /rollup@3.26.2: - resolution: {integrity: sha512-6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA==} + /rollup@3.26.3: + resolution: {integrity: sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -5357,12 +5357,12 @@ packages: resolution: {integrity: sha512-J4efk69Aye43tWcBPCsLK7TIRppGrEN4pAlDzRKo3HSE6MgTSTBxSEuE3ccx7ixc62JvGQ/CoFXYqqF2AHozow==} hasBin: true dependencies: - '@rollup/plugin-alias': 5.0.0(rollup@3.26.2) - '@rollup/plugin-commonjs': 24.1.0(rollup@3.26.2) - '@rollup/plugin-json': 6.0.0(rollup@3.26.2) - '@rollup/plugin-node-resolve': 15.1.0(rollup@3.26.2) - '@rollup/plugin-replace': 5.0.2(rollup@3.26.2) - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/plugin-alias': 5.0.0(rollup@3.26.3) + '@rollup/plugin-commonjs': 24.1.0(rollup@3.26.3) + '@rollup/plugin-json': 6.0.0(rollup@3.26.3) + '@rollup/plugin-node-resolve': 15.1.0(rollup@3.26.3) + '@rollup/plugin-replace': 5.0.2(rollup@3.26.3) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) chalk: 5.3.0 consola: 3.2.3 defu: 6.1.2 @@ -5377,8 +5377,8 @@ packages: pathe: 1.1.1 pkg-types: 1.0.3 pretty-bytes: 6.1.0 - rollup: 3.26.2 - rollup-plugin-dts: 5.3.0(rollup@3.26.2)(typescript@5.1.6) + rollup: 3.26.3 + rollup-plugin-dts: 5.3.0(rollup@3.26.3)(typescript@5.1.6) scule: 1.0.0 typescript: 5.1.6 untyped: 1.3.2 @@ -5407,10 +5407,10 @@ packages: pathe: 1.1.1 dev: false - /unimport@3.0.14(rollup@3.26.2): + /unimport@3.0.14(rollup@3.26.3): resolution: {integrity: sha512-67Rh/sGpEuVqdHWkXaZ6NOq+I7sKt86o+DUtKeGB6dh4Hk1A8AQrzyVGg2+LaVEYotStH7HwvV9YSaRjyT7Uqg==} dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rollup/pluginutils': 5.0.2(rollup@3.26.3) escape-string-regexp: 5.0.0 fast-glob: 3.3.0 local-pkg: 0.4.3 @@ -5606,7 +5606,7 @@ packages: '@types/node': 20.4.2 esbuild: 0.18.13 postcss: 8.4.26 - rollup: 3.26.2 + rollup: 3.26.3 optionalDependencies: fsevents: 2.3.2 dev: true