From 4c28d887caf06bbdaf1cd52235064e1aa25ea1cc Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Thu, 4 Apr 2024 13:24:51 +0200 Subject: [PATCH] Bump es-module-lexer --- code/builders/builder-vite/package.json | 2 +- .../src/plugins/inject-export-order-plugin.ts | 6 ++++-- code/builders/builder-webpack5/package.json | 2 +- code/yarn.lock | 19 ++++++------------- .../nextjs/yarn.lock | 18 +++++++++--------- .../react/yarn.lock | 10 +++++----- .../svelte/yarn.lock | 10 +++++----- .../vue3/yarn.lock | 10 +++++----- 8 files changed, 36 insertions(+), 41 deletions(-) diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json index 33a9b5ce1edb..f8967dca56fb 100644 --- a/code/builders/builder-vite/package.json +++ b/code/builders/builder-vite/package.json @@ -54,7 +54,7 @@ "@storybook/types": "workspace:*", "@types/find-cache-dir": "^3.2.1", "browser-assert": "^1.2.1", - "es-module-lexer": "^0.9.3", + "es-module-lexer": "^1.5.0", "express": "^4.17.3", "find-cache-dir": "^3.0.0", "fs-extra": "^11.1.0", diff --git a/code/builders/builder-vite/src/plugins/inject-export-order-plugin.ts b/code/builders/builder-vite/src/plugins/inject-export-order-plugin.ts index 621dae80e647..9587b23fdaf7 100644 --- a/code/builders/builder-vite/src/plugins/inject-export-order-plugin.ts +++ b/code/builders/builder-vite/src/plugins/inject-export-order-plugin.ts @@ -19,12 +19,14 @@ export async function injectExportOrderPlugin() { // instead of calling `await parse()` every time. const [, exports] = await parse(code); - if (exports.includes('__namedExportsOrder')) { + const exportNames = exports.map((e) => code.substring(e.s, e.e)); + + if (exportNames.includes('__namedExportsOrder')) { // user has defined named exports already return undefined; } const s = new MagicString(code); - const orderedExports = exports.filter((e) => e !== 'default'); + const orderedExports = exportNames.filter((e) => e !== 'default'); s.append(`;export const __namedExportsOrder = ${JSON.stringify(orderedExports)};`); return { code: s.toString(), diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json index 86a394065112..ffd1e7dff39a 100644 --- a/code/builders/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -78,7 +78,7 @@ "cjs-module-lexer": "^1.2.3", "constants-browserify": "^1.0.0", "css-loader": "^6.7.1", - "es-module-lexer": "^1.4.1", + "es-module-lexer": "^1.5.0", "express": "^4.17.3", "fork-ts-checker-webpack-plugin": "^8.0.0", "fs-extra": "^11.1.0", diff --git a/code/yarn.lock b/code/yarn.lock index de9f47dd250a..472dd503b241 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5288,7 +5288,7 @@ __metadata: "@types/find-cache-dir": "npm:^3.2.1" "@types/node": "npm:^18.0.0" browser-assert: "npm:^1.2.1" - es-module-lexer: "npm:^0.9.3" + es-module-lexer: "npm:^1.5.0" express: "npm:^4.17.3" find-cache-dir: "npm:^3.0.0" fs-extra: "npm:^11.1.0" @@ -5336,7 +5336,7 @@ __metadata: cjs-module-lexer: "npm:^1.2.3" constants-browserify: "npm:^1.0.0" css-loader: "npm:^6.7.1" - es-module-lexer: "npm:^1.4.1" + es-module-lexer: "npm:^1.5.0" express: "npm:^4.17.3" fork-ts-checker-webpack-plugin: "npm:^8.0.0" fs-extra: "npm:^11.1.0" @@ -13624,17 +13624,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.3": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 10c0/be77d73aee709fdc68d22b9938da81dfee3bc45e8d601629258643fe5bfdab253d6e2540035e035cfa8cf52a96366c1c19b46bcc23b4507b1d44e5907d2e7f6c - languageName: node - linkType: hard - -"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.4.1": - version: 1.4.1 - resolution: "es-module-lexer@npm:1.4.1" - checksum: 10c0/b7260a138668554d3f0ddcc728cb4b60c2fa463f15545cf155ecbdd5450a1348952d58298a7f48642e900ee579f21d7f5304b6b3c61b3d9fc2d4b2109b5a9dff +"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.5.0": + version: 1.5.0 + resolution: "es-module-lexer@npm:1.5.0" + checksum: 10c0/d199853404f3381801eb102befb84a8fc48f93ed86b852c2461c2c4ad4bbbc91128f3d974ff9b8718628260ae3f36e661295ab3e419222868aa31269284e34c9 languageName: node linkType: hard diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/yarn.lock b/test-storybooks/portable-stories-kitchen-sink/nextjs/yarn.lock index 22cc9c3e3a02..64f5d683addd 100644 --- a/test-storybooks/portable-stories-kitchen-sink/nextjs/yarn.lock +++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/yarn.lock @@ -2586,7 +2586,7 @@ __metadata: "@storybook/builder-webpack5@file:../../../code/builders/builder-webpack5::locator=portable-stories-nextjs%40workspace%3A.": version: 8.1.0-alpha.5 - resolution: "@storybook/builder-webpack5@file:../../../code/builders/builder-webpack5#../../../code/builders/builder-webpack5::hash=da3ffc&locator=portable-stories-nextjs%40workspace%3A." + resolution: "@storybook/builder-webpack5@file:../../../code/builders/builder-webpack5#../../../code/builders/builder-webpack5::hash=5fa617&locator=portable-stories-nextjs%40workspace%3A." dependencies: "@storybook/channels": "workspace:*" "@storybook/client-logger": "workspace:*" @@ -2603,7 +2603,7 @@ __metadata: cjs-module-lexer: "npm:^1.2.3" constants-browserify: "npm:^1.0.0" css-loader: "npm:^6.7.1" - es-module-lexer: "npm:^1.4.1" + es-module-lexer: "npm:^1.5.0" express: "npm:^4.17.3" fork-ts-checker-webpack-plugin: "npm:^8.0.0" fs-extra: "npm:^11.1.0" @@ -2625,7 +2625,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/27a2d18c41a52d0828fd7f979cfb581a8b540a2ce34d93fef6a17f6b1bcbd25b8769ea7782b480d54c0d0a3485872a99400555bf767430c0d83526b055019eab + checksum: 10/8576dca36ea1621e2b7c1723b4729a96d648a54c372175081a11763ad346ba1209a02fb6819beae592a0cc6a69a55cab44f47e92a05ce8552ca729434520a836 languageName: node linkType: hard @@ -2644,7 +2644,7 @@ __metadata: "@storybook/cli@file:../../../code/lib/cli::locator=portable-stories-nextjs%40workspace%3A.": version: 8.1.0-alpha.5 - resolution: "@storybook/cli@file:../../../code/lib/cli#../../../code/lib/cli::hash=d82dd3&locator=portable-stories-nextjs%40workspace%3A." + resolution: "@storybook/cli@file:../../../code/lib/cli#../../../code/lib/cli::hash=d07615&locator=portable-stories-nextjs%40workspace%3A." dependencies: "@babel/core": "npm:^7.23.0" "@babel/types": "npm:^7.23.0" @@ -2685,7 +2685,7 @@ __metadata: bin: getstorybook: ./bin/index.js sb: ./bin/index.js - checksum: 10/ea22cf7a46a855caad1de0176dd3c5dc53d7a1abd69932bb4153a3fa10cf87523567ebc6b47ab6669edd78c870717ee70020b9f8ebb89a58827b6e4b1aff8f59 + checksum: 10/ca2d93c888ae68445728b0dfad15917ca75e7f193c3da8e2e115386cee359246a701d4cad9edd71ebb1377bebaecf9147a267963e972c4085f10082ec4cccf93 languageName: node linkType: hard @@ -6467,10 +6467,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.4.1": - version: 1.4.1 - resolution: "es-module-lexer@npm:1.4.1" - checksum: 10/cf453613468c417af6e189b03d9521804033fdd5a229a36fedec28d37ea929fccf6822d42abff1126eb01ba1d2aa2845a48d5d1772c0724f8204464d9d3855f6 +"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.5.0": + version: 1.5.0 + resolution: "es-module-lexer@npm:1.5.0" + checksum: 10/d0e198d8642cb42aa82d86f2c6830cb6786916171a3e693046c11500c0cb62e77703940e58757db8aafa8a86fa2a9cc1c493dcd22c0b03c4a72dede3ce5c7dd1 languageName: node linkType: hard diff --git a/test-storybooks/portable-stories-kitchen-sink/react/yarn.lock b/test-storybooks/portable-stories-kitchen-sink/react/yarn.lock index 372fc7f46326..ca0b7a5ede87 100644 --- a/test-storybooks/portable-stories-kitchen-sink/react/yarn.lock +++ b/test-storybooks/portable-stories-kitchen-sink/react/yarn.lock @@ -2764,7 +2764,7 @@ __metadata: "@storybook/types": "workspace:*" "@types/find-cache-dir": "npm:^3.2.1" browser-assert: "npm:^1.2.1" - es-module-lexer: "npm:^0.9.3" + es-module-lexer: "npm:^1.5.0" express: "npm:^4.17.3" find-cache-dir: "npm:^3.0.0" fs-extra: "npm:^11.1.0" @@ -6008,10 +6008,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.3": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 10/c3e39465d06a6ecd103ccdb746508c88ee4bdd56c15238b0013de38b949a4eca91d5e44d2a9b88d772fe7821547c5fe9200ba0f3353116e208d44bb50c7bc1ea +"es-module-lexer@npm:^1.5.0": + version: 1.5.0 + resolution: "es-module-lexer@npm:1.5.0" + checksum: 10/d0e198d8642cb42aa82d86f2c6830cb6786916171a3e693046c11500c0cb62e77703940e58757db8aafa8a86fa2a9cc1c493dcd22c0b03c4a72dede3ce5c7dd1 languageName: node linkType: hard diff --git a/test-storybooks/portable-stories-kitchen-sink/svelte/yarn.lock b/test-storybooks/portable-stories-kitchen-sink/svelte/yarn.lock index 4067d4983991..c741bf702794 100644 --- a/test-storybooks/portable-stories-kitchen-sink/svelte/yarn.lock +++ b/test-storybooks/portable-stories-kitchen-sink/svelte/yarn.lock @@ -2398,7 +2398,7 @@ __metadata: "@storybook/types": "workspace:*" "@types/find-cache-dir": "npm:^3.2.1" browser-assert: "npm:^1.2.1" - es-module-lexer: "npm:^0.9.3" + es-module-lexer: "npm:^1.5.0" express: "npm:^4.17.3" find-cache-dir: "npm:^3.0.0" fs-extra: "npm:^11.1.0" @@ -4979,10 +4979,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.3": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 10/c3e39465d06a6ecd103ccdb746508c88ee4bdd56c15238b0013de38b949a4eca91d5e44d2a9b88d772fe7821547c5fe9200ba0f3353116e208d44bb50c7bc1ea +"es-module-lexer@npm:^1.5.0": + version: 1.5.0 + resolution: "es-module-lexer@npm:1.5.0" + checksum: 10/d0e198d8642cb42aa82d86f2c6830cb6786916171a3e693046c11500c0cb62e77703940e58757db8aafa8a86fa2a9cc1c493dcd22c0b03c4a72dede3ce5c7dd1 languageName: node linkType: hard diff --git a/test-storybooks/portable-stories-kitchen-sink/vue3/yarn.lock b/test-storybooks/portable-stories-kitchen-sink/vue3/yarn.lock index 106045b2d4eb..6a3a4679f469 100644 --- a/test-storybooks/portable-stories-kitchen-sink/vue3/yarn.lock +++ b/test-storybooks/portable-stories-kitchen-sink/vue3/yarn.lock @@ -2430,7 +2430,7 @@ __metadata: "@storybook/types": "workspace:*" "@types/find-cache-dir": "npm:^3.2.1" browser-assert: "npm:^1.2.1" - es-module-lexer: "npm:^0.9.3" + es-module-lexer: "npm:^1.5.0" express: "npm:^4.17.3" find-cache-dir: "npm:^3.0.0" fs-extra: "npm:^11.1.0" @@ -5263,10 +5263,10 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.3": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 10/c3e39465d06a6ecd103ccdb746508c88ee4bdd56c15238b0013de38b949a4eca91d5e44d2a9b88d772fe7821547c5fe9200ba0f3353116e208d44bb50c7bc1ea +"es-module-lexer@npm:^1.5.0": + version: 1.5.0 + resolution: "es-module-lexer@npm:1.5.0" + checksum: 10/d0e198d8642cb42aa82d86f2c6830cb6786916171a3e693046c11500c0cb62e77703940e58757db8aafa8a86fa2a9cc1c493dcd22c0b03c4a72dede3ce5c7dd1 languageName: node linkType: hard