From c8f0029bc5d5e839c55679fa8897b6ee24d8a7c2 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: Thu, 13 Jun 2024 16:46:25 +0200 Subject: [PATCH] ci: Move type-checking out of the build process (no-changelog) (#9730) --- package.json | 4 +- packages/@n8n/chat/vite.config.mts | 24 ++--- packages/design-system/vite.config.mts | 10 +-- packages/editor-ui/vite.config.mts | 8 -- patches/vite-plugin-checker@0.6.4.patch | 13 --- pnpm-lock.yaml | 114 ------------------------ 6 files changed, 12 insertions(+), 161 deletions(-) delete mode 100644 patches/vite-plugin-checker@0.6.4.patch diff --git a/package.json b/package.json index 151beeb2bf..8579322d8c 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "build": "turbo run build", "build:backend": "pnpm --filter=!@n8n/chat --filter=!@n8n/codemirror-lang --filter=!n8n-design-system --filter=!n8n-editor-ui build", "build:frontend": "pnpm --filter=@n8n/chat --filter=@n8n/codemirror-lang --filter=n8n-design-system --filter=n8n-editor-ui build", - "typecheck": "pnpm --filter=!@n8n/chat --filter=!@n8n/storybook --filter=!n8n-core --filter=!n8n-editor-ui --filter=!n8n-workflow --filter=!n8n typecheck", + "typecheck": "pnpm --filter=!@n8n/storybook --filter=!n8n-core --filter=!n8n-workflow --filter=!n8n typecheck", "dev": "turbo run dev --parallel --filter=!n8n-design-system --filter=!@n8n/chat", "dev:ai": "turbo run dev --parallel --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core", "clean": "turbo run clean --parallel", @@ -58,7 +58,6 @@ "turbo": "1.13.3", "typescript": "*", "vite": "^5.2.12", - "vite-plugin-checker": "^0.6.4", "vitest": "^1.6.0", "vue-tsc": "^2.0.19" }, @@ -86,7 +85,6 @@ "pyodide@0.23.4": "patches/pyodide@0.23.4.patch", "@types/express-serve-static-core@4.17.43": "patches/@types__express-serve-static-core@4.17.43.patch", "@types/ws@8.5.4": "patches/@types__ws@8.5.4.patch", - "vite-plugin-checker@0.6.4": "patches/vite-plugin-checker@0.6.4.patch", "@types/uuencode@0.0.3": "patches/@types__uuencode@0.0.3.patch" } } diff --git a/packages/@n8n/chat/vite.config.mts b/packages/@n8n/chat/vite.config.mts index 44f987e5e1..75fc314ab4 100644 --- a/packages/@n8n/chat/vite.config.mts +++ b/packages/@n8n/chat/vite.config.mts @@ -1,5 +1,4 @@ import { defineConfig } from 'vite'; -import checker from 'vite-plugin-checker'; import { resolve } from 'path'; import vue from '@vitejs/plugin-vue'; import icons from 'unplugin-icons/vite'; @@ -8,21 +7,16 @@ import dts from 'vite-plugin-dts'; const includeVue = process.env.INCLUDE_VUE === 'true'; const srcPath = resolve(__dirname, 'src'); -const plugins = [ - vue(), - icons({ - compiler: 'vue3', - autoInstall: true, - }), - dts(), -]; -if (!process.env.VITEST) { - plugins.push(checker({ vueTsc: true })); -} - // https://vitejs.dev/config/ export default defineConfig({ - plugins, + plugins: [ + vue(), + icons({ + compiler: 'vue3', + autoInstall: true, + }), + dts(), + ], resolve: { alias: { '@': srcPath, @@ -52,7 +46,7 @@ export default defineConfig({ ? {} : { vue: 'Vue', - }, + }, }, }, }, diff --git a/packages/design-system/vite.config.mts b/packages/design-system/vite.config.mts index bbfeb89a08..8b2ab60ab1 100644 --- a/packages/design-system/vite.config.mts +++ b/packages/design-system/vite.config.mts @@ -1,7 +1,6 @@ import vue from '@vitejs/plugin-vue'; import { resolve } from 'path'; import { defineConfig, mergeConfig } from 'vite'; -import checker from 'vite-plugin-checker'; import { type UserConfig } from 'vitest'; import { defineConfig as defineVitestConfig } from 'vitest/config'; @@ -19,7 +18,7 @@ export const vitestConfig = defineVitestConfig({ reporter: process.env.CI === 'true' ? 'cobertura' : 'text-summary', all: true, }, - } + } : {}), css: { modules: { @@ -29,14 +28,9 @@ export const vitestConfig = defineVitestConfig({ }, }) as UserConfig; -const plugins = [vue()]; -if (!process.env.VITEST) { - plugins.push(checker({ vueTsc: true })); -} - export default mergeConfig( defineConfig({ - plugins, + plugins: [vue()], resolve: { alias: { '@': resolve(__dirname, 'src'), diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts index 7689d93af1..e9546b810b 100644 --- a/packages/editor-ui/vite.config.mts +++ b/packages/editor-ui/vite.config.mts @@ -2,7 +2,6 @@ import vue from '@vitejs/plugin-vue'; import { resolve } from 'path'; import { defineConfig, mergeConfig } from 'vite'; import { sentryVitePlugin } from '@sentry/vite-plugin'; -import checker from 'vite-plugin-checker'; import packageJSON from './package.json'; import { vitestConfig } from '../design-system/vite.config.mts'; @@ -78,13 +77,6 @@ const plugins = [ vue(), ]; -if (!process.env.VITEST) { - plugins.push({ - ...checker({ vueTsc: true }), - apply: 'build' - }); -} - const { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env; if (release && authToken) { plugins.push( diff --git a/patches/vite-plugin-checker@0.6.4.patch b/patches/vite-plugin-checker@0.6.4.patch deleted file mode 100644 index 32f00fd32d..0000000000 --- a/patches/vite-plugin-checker@0.6.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dist/esm/checkers/vueTsc/prepareVueTsc.js b/dist/esm/checkers/vueTsc/prepareVueTsc.js -index 94334b8862feddf28cf32cad5a67112eb3a58cec..f5693c9b8ec1b74e54cb18c9ba72bac3b761d231 100644 ---- a/dist/esm/checkers/vueTsc/prepareVueTsc.js -+++ b/dist/esm/checkers/vueTsc/prepareVueTsc.js -@@ -8,7 +8,7 @@ const { copy, mkdir } = fsExtra; - const _require = createRequire(import.meta.url); - const _filename = fileURLToPath(import.meta.url); - const _dirname = dirname(_filename); --const proxyApiPath = _require.resolve("vue-tsc/out/index"); -+const proxyApiPath = _require.resolve("vue-tsc/index"); - async function prepareVueTsc() { - const targetTsDir = path.resolve(_dirname, "typescript-vue-tsc"); - const vueTscFlagFile = path.resolve(targetTsDir, "vue-tsc-resolve-path"); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a170404683..5437ffad47 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,9 +39,6 @@ patchedDependencies: typedi@0.10.0: hash: sk6omkefrosihg7lmqbzh7vfxe path: patches/typedi@0.10.0.patch - vite-plugin-checker@0.6.4: - hash: emhml6hz55p6dz7xjncbjppjdm - path: patches/vite-plugin-checker@0.6.4.patch importers: @@ -110,9 +107,6 @@ importers: vite: specifier: ^5.2.12 version: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1) - vite-plugin-checker: - specifier: ^0.6.4 - version: 0.6.4(patch_hash=emhml6hz55p6dz7xjncbjppjdm)(eslint@8.57.0)(optionator@0.9.3)(typescript@5.4.2)(vite@5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue-tsc@2.0.19(typescript@5.4.2)) vitest: specifier: ^1.6.0 version: 1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1) @@ -7031,10 +7025,6 @@ packages: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} engines: {node: '>= 10'} - commander@8.3.0: - resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} - engines: {node: '>= 12'} - commander@9.4.1: resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==} engines: {node: ^12.20.0 || >=14} @@ -13217,37 +13207,6 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true - vite-plugin-checker@0.6.4: - resolution: {integrity: sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==} - engines: {node: '>=14.16'} - peerDependencies: - eslint: '>=7' - meow: ^9.0.0 - optionator: ^0.9.1 - stylelint: '>=13' - typescript: ^5.4.2 - vite: '>=2.0.0' - vls: '*' - vti: '*' - vue-tsc: '>=1.3.9' - peerDependenciesMeta: - eslint: - optional: true - meow: - optional: true - optionator: - optional: true - stylelint: - optional: true - typescript: - optional: true - vls: - optional: true - vti: - optional: true - vue-tsc: - optional: true - vite-plugin-dts@3.7.3: resolution: {integrity: sha512-26eTlBYdpjRLWCsTJebM8vkCieE+p9gP3raf+ecDnzzK5E3FG6VE1wcy55OkRpfWWVlVvKkYFe6uvRHYWx7Nog==} engines: {node: ^14.18.0 || >=16.0.0} @@ -13315,30 +13274,6 @@ packages: resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==} engines: {node: '>=0.10.0'} - vscode-jsonrpc@6.0.0: - resolution: {integrity: sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==} - engines: {node: '>=8.0.0 || >=10.0.0'} - - vscode-languageclient@7.0.0: - resolution: {integrity: sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==} - engines: {vscode: ^1.52.0} - - vscode-languageserver-protocol@3.16.0: - resolution: {integrity: sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==} - - vscode-languageserver-textdocument@1.0.11: - resolution: {integrity: sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==} - - vscode-languageserver-types@3.16.0: - resolution: {integrity: sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==} - - vscode-languageserver@7.0.0: - resolution: {integrity: sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==} - hasBin: true - - vscode-uri@3.0.8: - resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==} - vue-agile@2.0.0: resolution: {integrity: sha512-5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g==} @@ -21153,8 +21088,6 @@ snapshots: commander@7.2.0: {} - commander@8.3.0: {} - commander@9.4.1: {} commist@3.2.0: {} @@ -28412,30 +28345,6 @@ snapshots: - supports-color - terser - vite-plugin-checker@0.6.4(patch_hash=emhml6hz55p6dz7xjncbjppjdm)(eslint@8.57.0)(optionator@0.9.3)(typescript@5.4.2)(vite@5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue-tsc@2.0.19(typescript@5.4.2)): - dependencies: - '@babel/code-frame': 7.23.5 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - chokidar: 3.5.2 - commander: 8.3.0 - fast-glob: 3.2.12 - fs-extra: 11.1.1 - npm-run-path: 4.0.1 - semver: 7.6.0 - strip-ansi: 6.0.1 - tiny-invariant: 1.3.3 - vite: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1) - vscode-languageclient: 7.0.0 - vscode-languageserver: 7.0.0 - vscode-languageserver-textdocument: 1.0.11 - vscode-uri: 3.0.8 - optionalDependencies: - eslint: 8.57.0 - optionator: 0.9.3 - typescript: 5.4.2 - vue-tsc: 2.0.19(typescript@5.4.2) - vite-plugin-dts@3.7.3(@types/node@18.16.16)(rollup@3.29.4)(typescript@5.4.2)(vite@5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)): dependencies: '@microsoft/api-extractor': 7.39.0(@types/node@18.16.16) @@ -28499,29 +28408,6 @@ snapshots: void-elements@3.1.0: {} - vscode-jsonrpc@6.0.0: {} - - vscode-languageclient@7.0.0: - dependencies: - minimatch: 3.1.2 - semver: 7.6.0 - vscode-languageserver-protocol: 3.16.0 - - vscode-languageserver-protocol@3.16.0: - dependencies: - vscode-jsonrpc: 6.0.0 - vscode-languageserver-types: 3.16.0 - - vscode-languageserver-textdocument@1.0.11: {} - - vscode-languageserver-types@3.16.0: {} - - vscode-languageserver@7.0.0: - dependencies: - vscode-languageserver-protocol: 3.16.0 - - vscode-uri@3.0.8: {} - vue-agile@2.0.0: dependencies: lodash.orderby: 4.6.0