Skip to content

The open alternative to Salesforce, designed for AI.

Rename seed dependencies to standard application dependencies (#28981)

Weiko5df36bd0b7eb
diff --git a/packages/twenty-server/nest-cli.json b/packages/twenty-server/nest-cli.json
index e63ecee83c5..f22eaf079fe 100644
--- a/packages/twenty-server/nest-cli.json
+++ b/packages/twenty-server/nest-cli.json
@@ -25,7 +25,7 @@
"outDir": "dist/assets"
},
{
- "include": "engine/core-modules/application/application-package/constants/seed-dependencies/**",
+ "include": "engine/core-modules/application/application-package/constants/standard-application-dependencies/**",
"outDir": "dist/assets"
},
{
diff --git a/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.spec.ts b/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.spec.ts
index 3730ce7b37f..6e22de4f6e1 100644
--- a/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.spec.ts
+++ b/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.spec.ts
@@ -23,7 +23,7 @@ const originalPackageJson = {
frontComponentSharedDependencies: ['react', 'twenty-ui/theme'],
};
-const seedPackageJson = {
+const standardPackageJson = {
dependencies: { axios: '^1.16.1', uuid: '^11.1.1' },
};
@@ -37,19 +37,19 @@ const readLock = (directory: string) =>
describe('generateWorkspaceCustomApplicationDependencies', () => {
let dependenciesDirectory: string;
- let seedDependenciesDirectory: string;
+ let standardDependenciesDirectory: string;
let installDirectory: string;
beforeEach(() => {
dependenciesDirectory = mkdtempSync(
join(tmpdir(), 'workspace-defaults-test-'),
);
- seedDependenciesDirectory = mkdtempSync(
- join(tmpdir(), 'seed-defaults-test-'),
+ standardDependenciesDirectory = mkdtempSync(
+ join(tmpdir(), 'standard-defaults-test-'),
);
writeFileSync(
- join(seedDependenciesDirectory, 'package.json'),
- JSON.stringify(seedPackageJson),
+ join(standardDependenciesDirectory, 'package.json'),
+ JSON.stringify(standardPackageJson),
);
writeFileSync(
join(dependenciesDirectory, 'package.json'),
@@ -67,7 +67,7 @@ describe('generateWorkspaceCustomApplicationDependencies', () => {
);
expect(readLock(installDirectory)).toBe(originalLock);
expect(readPackageJson(installDirectory).dependencies).toEqual(
- seedPackageJson.dependencies,
+ standardPackageJson.dependencies,
);
const version =
@@ -81,7 +81,7 @@ describe('generateWorkspaceCustomApplicationDependencies', () => {
afterEach(() => {
rmSync(dependenciesDirectory, { recursive: true, force: true });
- rmSync(seedDependenciesDirectory, { recursive: true, force: true });
+ rmSync(standardDependenciesDirectory, { recursive: true, force: true });
jest.resetAllMocks();
});
@@ -92,17 +92,17 @@ describe('generateWorkspaceCustomApplicationDependencies', () => {
},
{ version: '3.14.7', expectedRange: '~3.14.0' },
])(
- 'writes a matching pair for $expectedRange using the seed backend dependencies',
+ 'writes a matching pair for $expectedRange using the standard backend dependencies',
({ version, expectedRange }) => {
generateWorkspaceCustomApplicationDependencies({
version,
dependenciesDirectory,
- seedDependenciesDirectory,
+ standardDependenciesDirectory,
});
expect(readPackageJson(dependenciesDirectory)).toEqual({
...originalPackageJson,
- dependencies: seedPackageJson.dependencies,
+ dependencies: standardPackageJson.dependencies,
devDependencies: {
...originalPackageJson.devDependencies,
'twenty-ui': expectedRange,
@@ -126,7 +126,7 @@ describe('generateWorkspaceCustomApplicationDependencies', () => {
expect(() =>
generateWorkspaceCustomApplicationDependencies({
dependenciesDirectory,
- seedDependenciesDirectory,
+ standardDependenciesDirectory,
}),
).toThrow('No published version');
expect(
diff --git a/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.ts b/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.ts
index f358c927b2a..2fc5cae9fdc 100644
--- a/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.ts
+++ b/packages/twenty-server/scripts/generate-workspace-custom-application-dependencies.ts
@@ -24,23 +24,23 @@ export const generateWorkspaceCustomApplicationDependencies = ({
APPLICATION_PACKAGE_CONSTANTS_DIRECTORY,
'workspace-custom-application-dependencies',
),
- seedDependenciesDirectory = join(
+ standardDependenciesDirectory = join(
APPLICATION_PACKAGE_CONSTANTS_DIRECTORY,
- 'seed-dependencies',
+ 'standard-application-dependencies',
),
}: {
version?: string;
dependenciesDirectory?: string;
- seedDependenciesDirectory?: string;
+ standardDependenciesDirectory?: string;
} = {}): void => {
const packageJsonPath = join(dependenciesDirectory, 'package.json');
const yarnLockPath = join(dependenciesDirectory, 'yarn.lock');
const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
- const seedPackageJson = JSON.parse(
- readFileSync(join(seedDependenciesDirectory, 'package.json'), 'utf8'),
+ const standardPackageJson = JSON.parse(
+ readFileSync(join(standardDependenciesDirectory, 'package.json'), 'utf8'),
);
- packageJson.dependencies = seedPackageJson.dependencies;
+ packageJson.dependencies = standardPackageJson.dependencies;
// twenty-ui is published after deployment, so defaults use the previous release.
packageJson.devDependencies['twenty-ui'] =
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies-directory-name.ts
similarity index 62%
rename from packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname.ts
rename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies-directory-name.ts
index d0ff9f29830..adbb1e48eda 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies-directory-name.ts
@@ -2,10 +2,10 @@ import path from 'path';
import { ASSET_PATH } from 'src/constants/assets-path';
-export const SEED_DEPENDENCIES_DIRNAME = path.resolve(
+export const STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME = path.resolve(
__dirname,
path.join(
ASSET_PATH,
- 'engine/core-modules/application/application-package/constants/seed-dependencies',
+ 'engine/core-modules/application/application-package/constants/standard-application-dependencies',
),
);
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/package.json b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies/package.json
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/package.json
rename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies/package.json
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/yarn.lock b/packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies/yarn.lock
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/application/application-package/constants/seed-dependencies/yarn.lock
rename to packages/twenty-server/src/engine/core-modules/application/application-package/constants/standard-application-dependencies/yarn.lock
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/get-default-application-package-fields.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/get-default-application-package-fields.util.spec.ts
index a39766fa2b6..b51e83ddf22 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/get-default-application-package-fields.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/__tests__/get-default-application-package-fields.util.spec.ts
@@ -1,4 +1,4 @@
-import { SEED_DEPENDENCIES_DIRNAME } from 'src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname';
+import { STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME } from 'src/engine/core-modules/application/application-package/constants/standard-application-dependencies-directory-name';
import { getDefaultApplicationPackageFieldsForApplication } from 'src/engine/core-modules/application/application-package/utils/get-default-application-package-fields-for-application.util';
import { TWENTY_PREVIOUS_VERSIONS } from 'src/engine/core-modules/upgrade/constants/twenty-previous-versions.constant';
@@ -42,10 +42,18 @@ describe('application default dependency selection', () => {
'workspace-custom',
WORKSPACE_CUSTOM_APPLICATION_DEPENDENCIES_DIRECTORY_NAME,
],
- ['standard', 'workspace-custom', SEED_DEPENDENCIES_DIRNAME],
- ['installed', 'workspace-custom', SEED_DEPENDENCIES_DIRNAME],
- ['installed', null, SEED_DEPENDENCIES_DIRNAME],
- ['installed', undefined, SEED_DEPENDENCIES_DIRNAME],
+ [
+ 'standard',
+ 'workspace-custom',
+ STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME,
+ ],
+ [
+ 'installed',
+ 'workspace-custom',
+ STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME,
+ ],
+ ['installed', null, STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME],
+ ['installed', undefined, STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME],
])(
'loads %s defaults when the Workspace app is %s',
async (applicationId, workspaceCustomApplicationId, directory) => {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.ts
index 15a9e530538..8b9b32fdee9 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/utils/get-default-application-package-fields.util.ts
@@ -3,7 +3,7 @@ import { readFile } from 'fs/promises';
import path from 'path';
import { parseAvailablePackagesFromPackageJsonAndYarnLock } from 'src/engine/core-modules/application/application-package/utils/parse-available-packages-from-package-json-and-yarn-lock.util';
-import { SEED_DEPENDENCIES_DIRNAME } from 'src/engine/core-modules/application/application-package/constants/seed-dependencies-dirname';
+import { STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME } from 'src/engine/core-modules/application/application-package/constants/standard-application-dependencies-directory-name';
export type DefaultApplicationPackageFields = {
packageJsonChecksum: string;
@@ -14,7 +14,7 @@ export type DefaultApplicationPackageFields = {
};
export const getDefaultApplicationPackageFields = async ({
- directory = SEED_DEPENDENCIES_DIRNAME,
+ directory = STANDARD_APPLICATION_DEPENDENCIES_DIRECTORY_NAME,
}: { directory?: string } = {}): Promise<DefaultApplicationPackageFields> => {
const [packageJsonContent, yarnLockContent] = await Promise.all([
readFile(path.join(directory, 'package.json'), 'utf8'),