From 6f93a28c888f12f96c136f86b5096922daadbc7e Mon Sep 17 00:00:00 2001 From: bhvgt Date: Thu, 15 Dec 2022 16:28:04 +0530 Subject: [PATCH 1/2] fix(plugin-sveltekit): upgraded sveltekit support to svelltekit v1.0.0. - changed viteIgnorePlugins to vite-plugin-sveltekit-compile - fixed pluginOption awaiting logic - upgraded sveltekit example to `v1.0.0` Closes: #392,#397 --- examples/sveltekit/package.json | 46 +-- .../src/{hooks.ts => hooks.server.ts} | 0 examples/sveltekit/svelte.config.js | 5 - packages/histoire-plugin-svelte/src/index.ts | 2 +- packages/histoire/src/node/vite.ts | 7 +- pnpm-lock.yaml | 361 +++++++++++++++++- 6 files changed, 370 insertions(+), 51 deletions(-) rename examples/sveltekit/src/{hooks.ts => hooks.server.ts} (100%) diff --git a/examples/sveltekit/package.json b/examples/sveltekit/package.json index 8c763134..e220f87c 100644 --- a/examples/sveltekit/package.json +++ b/examples/sveltekit/package.json @@ -1,34 +1,34 @@ { - "name": "sveltekit", - "version": "0.0.1", + "name": "sveltekit", + "version": "0.0.1", "private": true, - "scripts": { - "sk:dev": "vite dev", - "sk:build": "vite build", - "sk:package": "svelte-kit package", - "sk:preview": "vite preview", - "sk:check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", - "sk:check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", + "scripts": { + "sk:dev": "vite dev", + "sk:build": "vite build", + "sk:package": "svelte-kit package", + "sk:preview": "vite preview", + "sk:check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", + "sk:check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "story:dev": "histoire dev", "story:build": "histoire build", "story:preview": "histoire preview --port 4567" - }, - "type": "module", - "dependencies": { - "@fontsource/fira-mono": "^4.5.0", - "cookie": "^0.4.1" - }, - "devDependencies": { + }, + "type": "module", + "dependencies": { + "@fontsource/fira-mono": "^4.5.0", + "cookie": "^0.4.1" + }, + "devDependencies": { "@histoire/plugin-svelte": "workspace:*", - "@sveltejs/adapter-auto": "next", - "@sveltejs/kit": "next", - "@types/cookie": "^0.5.1", + "@sveltejs/adapter-auto": "^1.0.0", + "@sveltejs/kit": "^1.0.0", + "@types/cookie": "^0.5.1", "histoire": "workspace:*", "svelte": "^3.49.0", - "svelte-check": "^2.7.1", + "svelte-check": "^2.7.1", "svelte-preprocess": "^4.10.7", - "tslib": "^2.3.1", + "tslib": "^2.3.1", "typescript": "^4.7.4", - "vite": "^3.0.5" - } + "vite": "^4.0.0" + } } diff --git a/examples/sveltekit/src/hooks.ts b/examples/sveltekit/src/hooks.server.ts similarity index 100% rename from examples/sveltekit/src/hooks.ts rename to examples/sveltekit/src/hooks.server.ts diff --git a/examples/sveltekit/svelte.config.js b/examples/sveltekit/svelte.config.js index 1fa366b0..80034679 100644 --- a/examples/sveltekit/svelte.config.js +++ b/examples/sveltekit/svelte.config.js @@ -9,11 +9,6 @@ const config = { kit: { adapter: adapter(), - - // Override http methods in the Todo forms - methodOverride: { - allowed: ['PATCH', 'DELETE'] - } } }; diff --git a/packages/histoire-plugin-svelte/src/index.ts b/packages/histoire-plugin-svelte/src/index.ts index 2783a6c4..4ff121ee 100644 --- a/packages/histoire-plugin-svelte/src/index.ts +++ b/packages/histoire-plugin-svelte/src/index.ts @@ -28,7 +28,7 @@ export function HstSvelte (): Plugin { }, }, viteIgnorePlugins: [ - 'vite-plugin-svelte-kit', + 'vite-plugin-sveltekit-compile', ], } }, diff --git a/packages/histoire/src/node/vite.ts b/packages/histoire/src/node/vite.ts index be394b58..9ffae053 100644 --- a/packages/histoire/src/node/vite.ts +++ b/packages/histoire/src/node/vite.ts @@ -78,10 +78,11 @@ export async function mergeHistoireViteConfig (viteConfig: InlineConfig, ctx: Co let flatPlugins = [] if (viteConfig.plugins) { for (const pluginOption of viteConfig.plugins) { - if (Array.isArray(pluginOption)) { - flatPlugins.push(...await Promise.all(pluginOption)) + const resolvedPluginOption = await pluginOption + if (Array.isArray(resolvedPluginOption)) { + flatPlugins.push(...resolvedPluginOption) } else { - flatPlugins.push(await pluginOption) + flatPlugins.push(resolvedPluginOption) } } flatPlugins = flatPlugins.filter(Boolean) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 66aa3d27..320f11d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -103,8 +103,8 @@ importers: specifiers: '@fontsource/fira-mono': ^4.5.0 '@histoire/plugin-svelte': workspace:* - '@sveltejs/adapter-auto': next - '@sveltejs/kit': next + '@sveltejs/adapter-auto': ^1.0.0 + '@sveltejs/kit': ^1.0.0 '@types/cookie': ^0.5.1 cookie: ^0.4.1 histoire: workspace:* @@ -113,14 +113,14 @@ importers: svelte-preprocess: ^4.10.7 tslib: ^2.3.1 typescript: ^4.7.4 - vite: ^3.0.5 + vite: ^4.0.0 dependencies: '@fontsource/fira-mono': 4.5.10 cookie: 0.4.2 devDependencies: '@histoire/plugin-svelte': link:../../packages/histoire-plugin-svelte - '@sveltejs/adapter-auto': 1.0.0-next.90 - '@sveltejs/kit': 1.0.0-next.571_svelte@3.53.1+vite@3.2.4 + '@sveltejs/adapter-auto': 1.0.0_@sveltejs+kit@1.0.0 + '@sveltejs/kit': 1.0.0_svelte@3.53.1+vite@4.0.1 '@types/cookie': 0.5.1 histoire: link:../../packages/histoire svelte: 3.53.1 @@ -128,7 +128,7 @@ importers: svelte-preprocess: 4.10.7_7dvewpees4iyn2tkw2qzal77a4 tslib: 2.4.1 typescript: 4.9.3 - vite: 3.2.4 + vite: 4.0.1 examples/vue2: specifiers: @@ -1373,6 +1373,96 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm/0.16.7: + resolution: {integrity: sha512-yhzDbiVcmq6T1/XEvdcJIVcXHdLjDJ5cQ0Dp9R9p9ERMBTeO1dR5tc8YYv8zwDeBw1xZm+Eo3MRo8cwclhBS0g==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64/0.16.7: + resolution: {integrity: sha512-tYFw0lBJSEvLoGzzYh1kXuzoX1iPkbOk3O29VqzQb0HbOy7t/yw1hGkvwoJhXHwzQUPsShyYcTgRf6bDBcfnTw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64/0.16.7: + resolution: {integrity: sha512-3P2OuTxwAtM3k/yEWTNUJRjMPG1ce8rXs51GTtvEC5z1j8fC1plHeVVczdeHECU7aM2/Buc0MwZ6ciM/zysnWg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64/0.16.7: + resolution: {integrity: sha512-VUb9GK23z8jkosHU9yJNUgQpsfJn+7ZyBm6adi2Ec5/U241eR1tAn82QicnUzaFDaffeixiHwikjmnec/YXEZg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64/0.16.7: + resolution: {integrity: sha512-duterlv3tit3HI9vhzMWnSVaB1B6YsXpFq1Ntd6Fou82BB1l4tucYy3FI9dHv3tvtDuS0NiGf/k6XsdBqPZ01w==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64/0.16.7: + resolution: {integrity: sha512-9kkycpBFes/vhi7B7o0cf+q2WdJi+EpVzpVTqtWFNiutARWDFFLcB93J8PR1cG228sucsl3B+7Ts27izE6qiaQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64/0.16.7: + resolution: {integrity: sha512-5Ahf6jzWXJ4J2uh9dpy5DKOO+PeRUE/9DMys6VuYfwgQzd6n5+pVFm58L2Z2gRe611RX6SdydnNaiIKM3svY7g==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm/0.16.7: + resolution: {integrity: sha512-QqJnyCfu5OF78Olt7JJSZ7OSv/B4Hf+ZJWp4kkq9xwMsgu7yWq3crIic8gGOpDYTqVKKMDAVDgRXy5Wd/nWZyQ==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64/0.16.7: + resolution: {integrity: sha512-2wv0xYDskk2+MzIm/AEprDip39a23Chptc4mL7hsHg26P0gD8RUhzmDu0KCH2vMThUI1sChXXoK9uH0KYQKaDg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32/0.16.7: + resolution: {integrity: sha512-APVYbEilKbD5ptmKdnIcXej2/+GdV65TfTjxR2Uk8t1EsOk49t6HapZW6DS/Bwlvh5hDwtLapdSumIVNGxgqLg==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-loong64/0.14.54: resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==} engines: {node: '>=12'} @@ -1389,6 +1479,114 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-loong64/0.16.7: + resolution: {integrity: sha512-5wPUAGclplQrAW7EFr3F84Y/d++7G0KykohaF4p54+iNWhUnMVU8Bh2sxiEOXUy4zKIdpHByMgJ5/Ko6QhtTUw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-mips64el/0.16.7: + resolution: {integrity: sha512-hxzlXtWF6yWfkE/SMTscNiVqLOAn7fOuIF3q/kiZaXxftz1DhZW/HpnTmTTWrzrS7zJWQxHHT4QSxyAj33COmA==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64/0.16.7: + resolution: {integrity: sha512-WM83Dac0LdXty5xPhlOuCD5Egfk1xLND/oRLYeB7Jb/tY4kzFSDgLlq91wYbHua/s03tQGA9iXvyjgymMw62Vw==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64/0.16.7: + resolution: {integrity: sha512-3nkNnNg4Ax6MS/l8O8Ynq2lGEVJYyJ2EoY3PHjNJ4PuZ80EYLMrFTFZ4L/Hc16AxgtXKwmNP9TM0YKNiBzBiJQ==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x/0.16.7: + resolution: {integrity: sha512-3SA/2VJuv0o1uD7zuqxEP+RrAyRxnkGddq0bwHQ98v1KNlzXD/JvxwTO3T6GM5RH6JUd29RTVQTOJfyzMkkppA==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64/0.16.7: + resolution: {integrity: sha512-xi/tbqCqvPIzU+zJVyrpz12xqciTAPMi2fXEWGnapZymoGhuL2GIWIRXg4O2v5BXaYA5TSaiKYE14L0QhUTuQg==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64/0.16.7: + resolution: {integrity: sha512-NUsYbq3B+JdNKn8SXkItFvdes9qTwEoS3aLALtiWciW/ystiCKM20Fgv9XQBOXfhUHyh5CLEeZDXzLOrwBXuCQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64/0.16.7: + resolution: {integrity: sha512-qjwzsgeve9I8Tbsko2FEkdSk2iiezuNGFgipQxY/736NePXDaDZRodIejYGWOlbYXugdxb0nif5yvypH6lKBmA==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64/0.16.7: + resolution: {integrity: sha512-mFWDz4RoBTzPphTCkM7Kc7Qpa0o/Z01acajR+Ai7LdfKgcP/C6jYOaKwv7nKzD0+MjOT20j7You9g4ozYy1dKQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64/0.16.7: + resolution: {integrity: sha512-m39UmX19RvEIuC8sYZ0M+eQtdXw4IePDSZ78ZQmYyFaXY9krq4YzQCK2XWIJomNLtg4q+W5aXr8bW3AbqWNoVg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32/0.16.7: + resolution: {integrity: sha512-1cbzSEZA1fANwmT6rjJ4G1qQXHxCxGIcNYFYR9ctI82/prT38lnwSRZ0i5p/MVXksw9eMlHlet6pGu2/qkXFCg==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64/0.16.7: + resolution: {integrity: sha512-QaQ8IH0JLacfGf5cf0HCCPnQuCTd/dAI257vXBgb/cccKGbH/6pVtI1gwhdAQ0Y48QSpTIFrh9etVyNdZY+zzw==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -2437,35 +2635,39 @@ packages: resolution: {integrity: sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==} dev: true - /@sveltejs/adapter-auto/1.0.0-next.90: - resolution: {integrity: sha512-qxH46Oqqn40998wTmnbffONI0HcW/kiZ3OIjZoysjONne+LU4uEsG425MZ2RHDxmR04zxhsdjCAsn6B4du8D7w==} + /@sveltejs/adapter-auto/1.0.0_@sveltejs+kit@1.0.0: + resolution: {integrity: sha512-yKyPvlLVua1bJ/42FrR3X041mFGdB4GzTZOAEoHUcNBRE5Mhx94+eqHpC3hNvAOiLEDcKfVO0ObyKSu7qldU+w==} + peerDependencies: + '@sveltejs/kit': ^1.0.0 dependencies: + '@sveltejs/kit': 1.0.0_svelte@3.53.1+vite@4.0.1 import-meta-resolve: 2.2.0 dev: true - /@sveltejs/kit/1.0.0-next.571_svelte@3.53.1+vite@3.2.4: - resolution: {integrity: sha512-J+J0UXBiAh569l4ZxKm6eIZJS4lbcP8MgF9fU+DbVplCJ8nqo9wUmirUHZkJoBoB0FUlZSgA0R7N471MnUNNBw==} + /@sveltejs/kit/1.0.0_svelte@3.53.1+vite@4.0.1: + resolution: {integrity: sha512-6VgD5C3i2XOT7GRBi5LaPPLiFAmpiDkhKJNVt8fLg1RmaL6f7rT4Kiwi2XGpYRj3V1F4t1QRdsfmAkkDUKY3OA==} engines: {node: '>=16.14'} hasBin: true requiresBuild: true peerDependencies: - svelte: ^3.44.0 - vite: ^3.2.0 || ^2.9.0 || ^3.0.0 + svelte: ^3.54.0 + vite: ^4.0.0 || ^2.9.0 || ^3.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 1.4.0_svelte@3.53.1+vite@3.2.4 + '@sveltejs/vite-plugin-svelte': 2.0.2_svelte@3.53.1+vite@4.0.1 '@types/cookie': 0.5.1 cookie: 0.5.0 devalue: 4.2.0 + esm-env: 1.0.0 kleur: 4.1.5 - magic-string: 0.26.7 + magic-string: 0.27.0 mime: 3.0.0 sade: 1.8.1 set-cookie-parser: 2.5.1 sirv: 2.0.2 svelte: 3.53.1 tiny-glob: 0.2.9 - undici: 5.13.0 - vite: 3.2.4 + undici: 5.14.0 + vite: 4.0.1 transitivePeerDependencies: - supports-color dev: true @@ -2489,6 +2691,25 @@ packages: - supports-color dev: true + /@sveltejs/vite-plugin-svelte/2.0.2_svelte@3.53.1+vite@4.0.1: + resolution: {integrity: sha512-xCEan0/NNpQuL0l5aS42FjwQ6wwskdxC3pW1OeFtEKNZwRg7Evro9lac9HesGP6TdFsTv2xMes5ASQVKbCacxg==} + engines: {node: ^14.18.0 || >= 16} + peerDependencies: + svelte: ^3.54.0 + vite: ^4.0.0 || ^2.9.0 || ^3.0.0 + dependencies: + debug: 4.3.4 + deepmerge: 4.2.2 + kleur: 4.1.5 + magic-string: 0.27.0 + svelte: 3.53.1 + svelte-hmr: 0.15.1_svelte@3.53.1 + vite: 4.0.1 + vitefu: 0.2.3_vite@4.0.1 + transitivePeerDependencies: + - supports-color + dev: true + /@tailwindcss/typography/0.5.8_tailwindcss@3.2.4: resolution: {integrity: sha512-xGQEp8KXN8Sd8m6R4xYmwxghmswrd0cPnNI2Lc6fmrC3OojysTBJJGSIVwPV56q4t6THFUK3HJ0EaWwpglSxWw==} peerDependencies: @@ -5867,6 +6088,36 @@ packages: esbuild-windows-64: 0.15.16 esbuild-windows-arm64: 0.15.16 + /esbuild/0.16.7: + resolution: {integrity: sha512-P6OBFYFSQOGzfApqCeYKqfKRRbCIRsdppTXFo4aAvtiW3o8TTyiIplBvHJI171saPAiy3WlawJHCveJVIOIx1A==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.16.7 + '@esbuild/android-arm64': 0.16.7 + '@esbuild/android-x64': 0.16.7 + '@esbuild/darwin-arm64': 0.16.7 + '@esbuild/darwin-x64': 0.16.7 + '@esbuild/freebsd-arm64': 0.16.7 + '@esbuild/freebsd-x64': 0.16.7 + '@esbuild/linux-arm': 0.16.7 + '@esbuild/linux-arm64': 0.16.7 + '@esbuild/linux-ia32': 0.16.7 + '@esbuild/linux-loong64': 0.16.7 + '@esbuild/linux-mips64el': 0.16.7 + '@esbuild/linux-ppc64': 0.16.7 + '@esbuild/linux-riscv64': 0.16.7 + '@esbuild/linux-s390x': 0.16.7 + '@esbuild/linux-x64': 0.16.7 + '@esbuild/netbsd-x64': 0.16.7 + '@esbuild/openbsd-x64': 0.16.7 + '@esbuild/sunos-x64': 0.16.7 + '@esbuild/win32-arm64': 0.16.7 + '@esbuild/win32-ia32': 0.16.7 + '@esbuild/win32-x64': 0.16.7 + dev: true + /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -6195,6 +6446,10 @@ packages: - supports-color dev: true + /esm-env/1.0.0: + resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==} + dev: true + /espree/9.4.1: resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8311,6 +8566,13 @@ packages: dependencies: sourcemap-codec: 1.4.8 + /magic-string/0.27.0: + resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.14 + dev: true + /make-dir/3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -8989,7 +9251,7 @@ packages: destr: 1.2.1 node-fetch-native: 0.1.8 ufo: 0.8.6 - undici: 5.13.0 + undici: 5.14.0 dev: true /on-finished/2.3.0: @@ -9873,6 +10135,15 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss/8.4.20: + resolution: {integrity: sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.4 + picocolors: 1.0.0 + source-map-js: 1.0.2 + dev: true + /pragma/1.0.0: resolution: {integrity: sha512-oJ+eL72877Ynjq1N8mMwE51R5hBsYfnCpu1PpqexrngZWnOUHUC5YtxuPg5eZsLyoZEOwfwoyXlTjy694wjQRA==} dependencies: @@ -10327,6 +10598,14 @@ packages: optionalDependencies: fsevents: 2.3.2 + /rollup/3.7.4: + resolution: {integrity: sha512-jN9rx3k5pfg9H9al0r0y1EYKSeiRANZRYX32SuNXAnKzh6cVyf4LZVto1KAuDnbHT03E1CpsgqDKaqQ8FZtgxw==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /run-async/2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} engines: {node: '>=0.12.0'} @@ -11523,8 +11802,8 @@ packages: magic-string: 0.26.7 unplugin: 1.0.0 - /undici/5.13.0: - resolution: {integrity: sha512-UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q==} + /undici/5.14.0: + resolution: {integrity: sha512-yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ==} engines: {node: '>=12.18'} dependencies: busboy: 1.6.0 @@ -11964,6 +12243,39 @@ packages: fsevents: 2.3.2 dev: true + /vite/4.0.1: + resolution: {integrity: sha512-kZQPzbDau35iWOhy3CpkrRC7It+HIHtulAzBhMqzGHKRf/4+vmh8rPDDdv98SWQrFWo6//3ozwsRmwQIPZsK9g==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.16.7 + postcss: 8.4.20 + resolve: 1.22.1 + rollup: 3.7.4 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /vitefu/0.2.2_vite@3.2.4: resolution: {integrity: sha512-8CKEIWPm4B4DUDN+h+hVJa9pyNi7rzc5MYmbxhs1wcMakueGFNWB5/DL30USm9qU3xUPnL4/rrLEAwwFiD1tag==} peerDependencies: @@ -11975,6 +12287,17 @@ packages: vite: 3.2.4 dev: true + /vitefu/0.2.3_vite@4.0.1: + resolution: {integrity: sha512-75l7TTuU8isAhz1QFtNKjDkqjxvndfMC1AfIMjJ0ZQ59ZD0Ow9QOIsJJX16Wv9PS8f+zMzp6fHy5cCbKG/yVUQ==} + peerDependencies: + vite: ^3.0.0 || ^4.0.0 || ^2.9.0 + peerDependenciesMeta: + vite: + optional: true + dependencies: + vite: 4.0.1 + dev: true + /vitepress/1.0.0-alpha.10: resolution: {integrity: sha512-RGPU+YApj2jaYplAIJUe+2qlDks9FzPX1QGK+7NdGByeCCVZg6z9eYWjjvfvA/sgCtG3yeJE/4/jCwlv4Y8bVw==} hasBin: true From 67e7accd43cb5033341ecdcae72b68562cb437e0 Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Thu, 15 Dec 2022 15:17:42 +0100 Subject: [PATCH 2/2] fix: handle array of promises --- packages/histoire/src/node/vite.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/histoire/src/node/vite.ts b/packages/histoire/src/node/vite.ts index 9ffae053..3041df4c 100644 --- a/packages/histoire/src/node/vite.ts +++ b/packages/histoire/src/node/vite.ts @@ -80,7 +80,7 @@ export async function mergeHistoireViteConfig (viteConfig: InlineConfig, ctx: Co for (const pluginOption of viteConfig.plugins) { const resolvedPluginOption = await pluginOption if (Array.isArray(resolvedPluginOption)) { - flatPlugins.push(...resolvedPluginOption) + flatPlugins.push(...await Promise.all(resolvedPluginOption)) } else { flatPlugins.push(resolvedPluginOption) }