mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-18 02:21:13 +00:00
refactor(core): Abstract away InstanceSettings and encryptionKey into injectable services (no-changelog) (#7471)
This change ensures that things like `encryptionKey` and `instanceId` are always available directly where they are needed, instead of passing them around throughout the code.
This commit is contained in:
committed by
GitHub
parent
519680c2cf
commit
b6de910cbe
@@ -1,4 +1,5 @@
|
||||
import { UserSettings } from 'n8n-core';
|
||||
import { Container } from 'typedi';
|
||||
import { InstanceSettings } from 'n8n-core';
|
||||
import { Command, flags } from '@oclif/command';
|
||||
|
||||
import type { IBuildOptions } from '../src';
|
||||
@@ -17,7 +18,9 @@ export class Build extends Command {
|
||||
help: flags.help({ char: 'h' }),
|
||||
destination: flags.string({
|
||||
char: 'd',
|
||||
description: `The path to copy the compiles files to [default: ${UserSettings.getUserN8nFolderCustomExtensionPath()}]`,
|
||||
description: `The path to copy the compiled files to [default: ${
|
||||
Container.get(InstanceSettings).customExtensionDir
|
||||
}]`,
|
||||
}),
|
||||
watch: flags.boolean({
|
||||
description:
|
||||
|
||||
@@ -59,6 +59,7 @@
|
||||
"n8n-core": "workspace:*",
|
||||
"n8n-workflow": "workspace:*",
|
||||
"replace-in-file": "^6.0.0",
|
||||
"tmp-promise": "^3.0.3"
|
||||
"tmp-promise": "^3.0.3",
|
||||
"typedi": "^0.10.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,11 @@ import glob from 'fast-glob';
|
||||
import { spawn } from 'child_process';
|
||||
import { copyFile, mkdir, readFile, writeFile } from 'fs/promises';
|
||||
import { join, dirname, resolve as resolvePath } from 'path';
|
||||
import { Container } from 'typedi';
|
||||
import { file as tmpFile } from 'tmp-promise';
|
||||
|
||||
import { jsonParse } from 'n8n-workflow';
|
||||
import { UserSettings } from 'n8n-core';
|
||||
import { InstanceSettings } from 'n8n-core';
|
||||
import type { IBuildOptions } from './Interfaces';
|
||||
|
||||
/**
|
||||
@@ -49,7 +50,7 @@ export async function createCustomTsconfig() {
|
||||
* @param {IBuildOptions} [options] Options to overwrite default behavior
|
||||
*/
|
||||
export async function buildFiles({
|
||||
destinationFolder = UserSettings.getUserN8nFolderCustomExtensionPath(),
|
||||
destinationFolder = Container.get(InstanceSettings).customExtensionDir,
|
||||
watch,
|
||||
}: IBuildOptions): Promise<string> {
|
||||
const tscPath = join(dirname(require.resolve('typescript')), 'tsc');
|
||||
|
||||
Reference in New Issue
Block a user