From d08c885734ddfdd5189aef5675f85fdf29158254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Wed, 5 Apr 2023 12:39:22 +0200 Subject: [PATCH] ci(editor): Apply monaco-editor alias override only during tests (no-changelog) (#5908) --- packages/editor-ui/vite.config.ts | 78 +++++++++++++++---------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts index 92054f873..2649ec354 100644 --- a/packages/editor-ui/vite.config.ts +++ b/packages/editor-ui/vite.config.ts @@ -43,6 +43,43 @@ const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/'; const { NODE_ENV } = process.env; +const alias = [ + { find: '@', replacement: resolve(__dirname, 'src') }, + { find: 'stream', replacement: 'stream-browserify' }, + { + find: /^n8n-design-system\//, + replacement: resolve(__dirname, '..', 'design-system', 'src') + '/', + }, + ...['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCase'].map((name) => ({ + find: new RegExp(`^lodash.${name}$`, 'i'), + replacement: require.resolve(`lodash-es/${name}`), + })), + { + find: /^lodash\.(.+)$/, + replacement: 'lodash-es/$1', + }, + { + find: 'vue2-boring-avatars', + replacement: require.resolve('vue2-boring-avatars'), + }, + { + find: /element-ui\/(packages|lib)\/button$/, + replacement: path.resolve( + __dirname, + '..', + 'design-system/src/components/N8nButton/overrides/ElButton.ts', + ), + }, +]; + +// https://github.com/vitest-dev/vitest/discussions/1806 +if (NODE_ENV === 'test') { + alias.push({ + find: /^monaco-editor$/, + replacement: __dirname + '/node_modules/monaco-editor/esm/vs/editor/editor.api', + }); +} + export default mergeConfig( defineConfig({ define: { @@ -62,36 +99,7 @@ export default mergeConfig( `${root}/${buildOutDir}/assets/monaco-editor`, }), ], - resolve: { - alias: [ - { find: '@', replacement: resolve(__dirname, 'src') }, - { find: 'stream', replacement: 'stream-browserify' }, - { - find: /^n8n-design-system\//, - replacement: resolve(__dirname, '..', 'design-system', 'src') + '/', - }, - ...['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCase'].map((name) => ({ - find: new RegExp(`^lodash.${name}$`, 'i'), - replacement: require.resolve(`lodash-es/${name}`), - })), - { - find: /^lodash\.(.+)$/, - replacement: 'lodash-es/$1', - }, - { - find: 'vue2-boring-avatars', - replacement: require.resolve('vue2-boring-avatars'), - }, - { - find: /element-ui\/(packages|lib)\/button$/, - replacement: path.resolve( - __dirname, - '..', - 'design-system/src/components/N8nButton/overrides/ElButton.ts', - ), - }, - ], - }, + resolve: { alias }, base: publicPath, envPrefix: 'VUE_APP', css: { @@ -132,15 +140,5 @@ export default mergeConfig( }, }, }, - resolve: { - alias: [ - // https://github.com/vitest-dev/vitest/discussions/1806 - { - find: /^monaco-editor$/, - replacement: - __dirname + "/node_modules/monaco-editor/esm/vs/editor/editor.api", - }, - ], - }, }), );