From 24873d0c1d05a75d2595b51fe4bdaabf170efc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Malfait?= Date: Sat, 19 Apr 2025 23:03:06 +0200 Subject: [PATCH] Remove versions from package.json (#11658) Now the source of truth for the version is set during the build process. We set it as an environment variable from the tags. We could add it back to the package.json during the build process (from the git tag), but there is not use for it at the moment since it's not npm packages. --- packages/twenty-e2e-testing/package.json | 1 - packages/twenty-emails/package.json | 1 - packages/twenty-front/package.json | 1 - .../__stories__/NavigationDrawer.stories.tsx | 9 ++++-- packages/twenty-server/package.json | 1 - packages/twenty-shared/package.json | 1 - packages/twenty-ui/package.json | 1 - packages/twenty-utils/release.js | 29 ------------------- packages/twenty-website/package.json | 1 - 9 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 packages/twenty-utils/release.js diff --git a/packages/twenty-e2e-testing/package.json b/packages/twenty-e2e-testing/package.json index 6da2007fc..cac1d8658 100644 --- a/packages/twenty-e2e-testing/package.json +++ b/packages/twenty-e2e-testing/package.json @@ -1,6 +1,5 @@ { "name": "twenty-e2e-testing", - "version": "0.52.0-canary", "description": "", "author": "", "private": true, diff --git a/packages/twenty-emails/package.json b/packages/twenty-emails/package.json index 0de387d28..ac3dd48fb 100644 --- a/packages/twenty-emails/package.json +++ b/packages/twenty-emails/package.json @@ -1,6 +1,5 @@ { "name": "twenty-emails", - "version": "0.52.0-canary", "description": "", "author": "", "private": true, diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json index 238b85cae..db08aa9d2 100644 --- a/packages/twenty-front/package.json +++ b/packages/twenty-front/package.json @@ -1,6 +1,5 @@ { "name": "twenty-front", - "version": "0.52.0-canary", "private": true, "type": "module", "scripts": { diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx index 023a7deb0..74e319d1b 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx @@ -34,11 +34,10 @@ import { IconUserCircle, IconUsers, } from 'twenty-ui/display'; -import { GithubVersionLink } from 'twenty-ui/navigation'; +import { AdvancedSettingsToggle } from 'twenty-ui/navigation'; import { getOsControlSymbol } from 'twenty-ui/utilities'; import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator'; import { getSettingsPath } from '~/utils/navigation/getSettingsPath'; -import jsonPage from '../../../../../../../package.json'; import { NavigationDrawer } from '../NavigationDrawer'; import { NavigationDrawerItem } from '../NavigationDrawerItem'; import { NavigationDrawerItemGroup } from '../NavigationDrawerItemGroup'; @@ -194,7 +193,11 @@ export const Settings: Story = { - + {}} + label="Advanced:" + /> ), diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json index 365bd7c8f..e264b3978 100644 --- a/packages/twenty-server/package.json +++ b/packages/twenty-server/package.json @@ -1,6 +1,5 @@ { "name": "twenty-server", - "version": "0.52.0-canary", "description": "", "author": "", "private": true, diff --git a/packages/twenty-shared/package.json b/packages/twenty-shared/package.json index 1513a5f17..ba2410993 100644 --- a/packages/twenty-shared/package.json +++ b/packages/twenty-shared/package.json @@ -1,6 +1,5 @@ { "name": "twenty-shared", - "version": "0.52.0-canary", "main": "dist/twenty-shared.cjs.js", "module": "dist/twenty-shared.esm.js", "license": "AGPL-3.0", diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json index 86660f8a3..bfdb45cb3 100644 --- a/packages/twenty-ui/package.json +++ b/packages/twenty-ui/package.json @@ -1,6 +1,5 @@ { "name": "twenty-ui", - "version": "0.52.0-canary", "main": "dist/index.cjs", "module": "dist/index.mjs", "style": "./dist/style.css", diff --git a/packages/twenty-utils/release.js b/packages/twenty-utils/release.js deleted file mode 100644 index f6cad34dd..000000000 --- a/packages/twenty-utils/release.js +++ /dev/null @@ -1,29 +0,0 @@ -const fs = require('fs'); -const semver = require('semver'); -const path = require('path'); - -// Get the version argument from the command line -const [, , version] = process.argv; - -if (!semver.valid(version)) { - console.error( - 'Invalid version. The format should be X.X.X where X is a positive integer (or 0).', - ); - process.exit(1); -} - -const frontPackageJson = path.join(__dirname, '../twenty-front/package.json'); -const serverPackageJson = path.join(__dirname, '../twenty-server/package.json'); -const emailPackageJson = path.join(__dirname, '../twenty-emails/package.json'); - -// Update package.json -for (let file of [ - frontPackageJson, - serverPackageJson, - docsPackageJson, - emailPackageJson, -]) { - let pkgdata = JSON.parse(fs.readFileSync(file)); - pkgdata.version = version; - fs.writeFileSync(file, JSON.stringify(pkgdata, null, 2), 'utf8'); -} diff --git a/packages/twenty-website/package.json b/packages/twenty-website/package.json index 8c26dbc7e..6255e43bc 100644 --- a/packages/twenty-website/package.json +++ b/packages/twenty-website/package.json @@ -1,6 +1,5 @@ { "name": "twenty-website", - "version": "0.52.0-canary", "private": true, "scripts": { "nx": "NX_DEFAULT_PROJECT=twenty-website node ../../node_modules/nx/bin/nx.js",