From 58b1cee1538a3a5e38260f70603928a9fcaf9bdc 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: Tue, 1 Apr 2025 12:24:45 +0200 Subject: [PATCH] ci: Update project references for backend and nodes packages (no-changelog) (#14308) --- .../@n8n/nodes-langchain/tsconfig.build.json | 1 + packages/@n8n/nodes-langchain/tsconfig.json | 5 +-- packages/@n8n/nodes-langchain/tsup.config.ts | 1 + packages/cli/tsconfig.json | 4 ++- packages/nodes-base/tsconfig.build.json | 1 + packages/nodes-base/tsup.config.ts | 31 ++++++++++++------- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/packages/@n8n/nodes-langchain/tsconfig.build.json b/packages/@n8n/nodes-langchain/tsconfig.build.json index af4aa35622..bd1f33e689 100644 --- a/packages/@n8n/nodes-langchain/tsconfig.build.json +++ b/packages/@n8n/nodes-langchain/tsconfig.build.json @@ -2,6 +2,7 @@ "extends": ["./tsconfig.json", "@n8n/typescript-config/tsconfig.build.json"], "compilerOptions": { "outDir": "dist", + "composite": true, "tsBuildInfoFile": "dist/build.tsbuildinfo" }, "include": [ diff --git a/packages/@n8n/nodes-langchain/tsconfig.json b/packages/@n8n/nodes-langchain/tsconfig.json index 50ebc586c9..2ea84de001 100644 --- a/packages/@n8n/nodes-langchain/tsconfig.json +++ b/packages/@n8n/nodes-langchain/tsconfig.json @@ -21,7 +21,8 @@ "utils/**/*.ts" ], "references": [ - { "path": "../../workflow/tsconfig.build.json" }, - { "path": "../../core/tsconfig.build.json" } + { "path": "../../core/tsconfig.build.json" }, + { "path": "../../nodes-base/tsconfig.build.json" }, + { "path": "../../workflow/tsconfig.build.json" } ] } diff --git a/packages/@n8n/nodes-langchain/tsup.config.ts b/packages/@n8n/nodes-langchain/tsup.config.ts index 6661a5fbc3..545fadc477 100644 --- a/packages/@n8n/nodes-langchain/tsup.config.ts +++ b/packages/@n8n/nodes-langchain/tsup.config.ts @@ -7,4 +7,5 @@ export default defineConfig({ dts: false, bundle: false, sourcemap: true, + silent: true, }); diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 2808e5519e..7ae265fd4e 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -20,12 +20,14 @@ }, "include": ["src/**/*.ts", "test/**/*.ts", "src/sso.ee/saml/saml-schema-metadata-2.0.xsd"], "references": [ - { "path": "../workflow/tsconfig.build.json" }, { "path": "../core/tsconfig.build.json" }, + { "path": "../nodes-base/tsconfig.build.json" }, + { "path": "../workflow/tsconfig.build.json" }, { "path": "../@n8n/api-types/tsconfig.build.json" }, { "path": "../@n8n/client-oauth2/tsconfig.build.json" }, { "path": "../@n8n/config/tsconfig.build.json" }, { "path": "../@n8n/di/tsconfig.build.json" }, + { "path": "../@n8n/nodes-langchain/tsconfig.build.json" }, { "path": "../@n8n/permissions/tsconfig.build.json" } ] } diff --git a/packages/nodes-base/tsconfig.build.json b/packages/nodes-base/tsconfig.build.json index 389832c3dc..ee2e033ea3 100644 --- a/packages/nodes-base/tsconfig.build.json +++ b/packages/nodes-base/tsconfig.build.json @@ -2,6 +2,7 @@ "extends": ["./tsconfig.json", "@n8n/typescript-config/tsconfig.build.json"], "compilerOptions": { "outDir": "dist", + "composite": true, "tsBuildInfoFile": "dist/build.tsbuildinfo" }, "include": [ diff --git a/packages/nodes-base/tsup.config.ts b/packages/nodes-base/tsup.config.ts index f81f176f80..ff535a2480 100644 --- a/packages/nodes-base/tsup.config.ts +++ b/packages/nodes-base/tsup.config.ts @@ -5,14 +5,17 @@ import { readFile } from 'fs/promises'; const packagesDir = resolve(__dirname, '..'); const aiNodesDir = resolve(packagesDir, '@n8n', 'nodes-langchain'); +const cliDir = resolve(packagesDir, 'cli'); -const aiNodesFiles = await glob('nodes/**/*.ts', { cwd: aiNodesDir }); -const aiNodesFilesContents = aiNodesFiles.map((filePath) => - readFile(resolve(aiNodesDir, filePath), 'utf-8'), -); +const externalFiles = [ + ...(await glob('nodes/**/*.ts', { cwd: aiNodesDir, absolute: true })), + ...(await glob('test/integration/**/*.ts', { cwd: cliDir, absolute: true })), +]; -// Files used in @n8n/nodes-langchain package -const aiNodesPackageImports = (await Promise.all(aiNodesFilesContents)).reduce( +const externalFilesContents = externalFiles.map((filePath) => readFile(filePath, 'utf-8')); + +// Files used in other packages +const externalPackageImports = (await Promise.all(externalFilesContents)).reduce( (acc, fileContents) => { const regex = /from\s+['"](n8n-nodes-base[^'"]+)['"]/g; let match; @@ -25,8 +28,8 @@ const aiNodesPackageImports = (await Promise.all(aiNodesFilesContents)).reduce( new Set(), ); -const aiNodesPackageDependencies = Array.from(aiNodesPackageImports).map( - (i) => i.replace('n8n-nodes-base/dist/', '') + '.ts', +const externalPackageDependencies = Array.from(externalPackageImports).map( + (i) => i.replace(/^n8n-nodes-base\/(dist\/)?/, '') + '.ts', ); const commonIgnoredFiles = ['!**/*.d.ts', '!**/*.test.ts']; @@ -36,18 +39,24 @@ export default defineConfig([ entry: [ '{credentials,nodes,test,types,utils}/**/*.ts', ...commonIgnoredFiles, - ...aiNodesPackageDependencies.map((path) => `!${path}`), + ...externalPackageDependencies.map((path) => `!${path}`), ], format: ['cjs'], dts: false, bundle: false, sourcemap: true, + silent: true, }, { - entry: [...aiNodesPackageDependencies, ...commonIgnoredFiles], + entry: [...externalPackageDependencies, ...commonIgnoredFiles], format: ['cjs'], - dts: true, + dts: { + compilerOptions: { + composite: false, + }, + }, bundle: false, sourcemap: true, + silent: true, }, ]);