From 4ad64d160a4ce77e3e5f01a15a73b0a1d41e2e09 Mon Sep 17 00:00:00 2001 From: Marc Palm <17670840+marcpalm@users.noreply.github.com> Date: Wed, 22 May 2024 10:34:36 +0200 Subject: [PATCH 1/3] fix: remove async imports https://github.com/backstage/backstage/issues/24864 Signed-off-by: Marc Palm <17670840+marcpalm@users.noreply.github.com> Signed-off-by: Marc Palm --- packages/cli/src/lib/bundler/server.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts index 53f3b2c25a..29298dcc5f 100644 --- a/packages/cli/src/lib/bundler/server.ts +++ b/packages/cli/src/lib/bundler/server.ts @@ -165,12 +165,12 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be }); if (process.env.EXPERIMENTAL_VITE) { - const vite = await import('vite'); - const { default: viteReact } = await import('@vitejs/plugin-react'); - const { nodePolyfills: viteNodePolyfills } = await import( + const vite = require('vite'); + const { default: viteReact } = require('@vitejs/plugin-react'); + const { nodePolyfills: viteNodePolyfills } = require( 'vite-plugin-node-polyfills' ); - const { createHtmlPlugin: viteHtml } = await import('vite-plugin-html'); + const { createHtmlPlugin: viteHtml } = require('vite-plugin-html'); viteServer = await vite.createServer({ define: { global: 'window', From 111f7cf05d906dae1835b87c6057981e152d37f2 Mon Sep 17 00:00:00 2001 From: Marc Palm Date: Wed, 22 May 2024 10:45:24 +0200 Subject: [PATCH 2/3] fix: prettier Signed-off-by: Marc Palm --- packages/cli/src/lib/bundler/server.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts index 29298dcc5f..1da15cd37e 100644 --- a/packages/cli/src/lib/bundler/server.ts +++ b/packages/cli/src/lib/bundler/server.ts @@ -167,9 +167,9 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be if (process.env.EXPERIMENTAL_VITE) { const vite = require('vite'); const { default: viteReact } = require('@vitejs/plugin-react'); - const { nodePolyfills: viteNodePolyfills } = require( - 'vite-plugin-node-polyfills' - ); + const { + nodePolyfills: viteNodePolyfills, + } = require('vite-plugin-node-polyfills'); const { createHtmlPlugin: viteHtml } = require('vite-plugin-html'); viteServer = await vite.createServer({ define: { From c00f7ee0f294931139920b656df42df2b86ab246 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 24 May 2024 15:13:48 +0200 Subject: [PATCH 3/3] chore: added changeset Signed-off-by: blam --- .changeset/gold-teachers-wink.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/gold-teachers-wink.md diff --git a/.changeset/gold-teachers-wink.md b/.changeset/gold-teachers-wink.md new file mode 100644 index 0000000000..0578e8d02b --- /dev/null +++ b/.changeset/gold-teachers-wink.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Fix issue with `esm` loaded dependencies being different from the `cjs` import for Vite dependencies