diff --git a/frontend/packages/fusion-frontend/package.json b/frontend/packages/fusion-frontend/package.json index 1ae94f56f7..7efbb69322 100644 --- a/frontend/packages/fusion-frontend/package.json +++ b/frontend/packages/fusion-frontend/package.json @@ -45,7 +45,7 @@ "access": "public" }, "dependencies": { - "@vaadin/common-frontend": "^22.0.0-alpha1", + "@vaadin/common-frontend": "^0.0.10", "lit": "^2.0.0-rc.2" }, "devDependencies": { diff --git a/frontend/scripts/bump/exec.sh b/frontend/scripts/bump/exec.sh index aeeaaeeb50..d6fead7614 100644 --- a/frontend/scripts/bump/exec.sh +++ b/frontend/scripts/bump/exec.sh @@ -12,7 +12,10 @@ alias ghr="curl https://api.github.com/repos/$REPO/branches/$branch/protection \ -H 'Authorization: token $GIT_RELEASE_TOKEN' \ -s" -node "$dir"/update-package-versions.js "$VERSION_TAG" +# Updating the registration version for all packages +find "$PWD"/packages/*/src/index.ts -exec sed -i "s/version:.\+\$/version: \/* updated-by-script *\/ \'$VERSION_TAG\',/m" {} + + +npx lerna version "$VERSION_TAG" --no-git-tag-version --no-push --yes git add --all diff --git a/frontend/scripts/bump/update-package-versions.js b/frontend/scripts/bump/update-package-versions.js deleted file mode 100644 index 482f09aeae..0000000000 --- a/frontend/scripts/bump/update-package-versions.js +++ /dev/null @@ -1,54 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies,no-console */ -import { readdir, readFile, writeFile } from 'fs/promises'; -import meow from 'meow'; -import { dirname, resolve } from 'path'; -import { fileURLToPath } from 'url'; - -function log(message) { - console.log(`[${new Date().toISOString()}][info]: ${message}`); -} - -const { - input: [version], -} = meow({ importMeta: import.meta }); - -const root = resolve(dirname(fileURLToPath(import.meta.url)), '../..'); - -async function updateLernaConfig() { - const lernaConfigFile = resolve(root, 'lerna.json'); - const file = await readFile(lernaConfigFile, 'utf8'); - - const config = { - ...JSON.parse(file), - version, - }; - - await writeFile(lernaConfigFile, JSON.stringify(config, null, 2), 'utf8'); - - log('lerna.json updated'); -} - -async function updatePackageRegistrations() { - const versionPattern = /version:.+$/m; - const packagesRoot = resolve(root, 'packages'); - // Removing folders like .DS_Store - const packages = (await readdir(packagesRoot)).filter((dir) => !dir.startsWith('.')); - - await Promise.all( - packages.map(async (_package) => { - const indexFile = resolve(packagesRoot, _package, 'src/index.ts'); - const packageFile = resolve(packagesRoot, _package, 'package.json'); - const [indexContent, packageContent] = await Promise.all([ - readFile(indexFile, 'utf8'), - readFile(packageFile, 'utf8'), - ]); - const indexUpdated = indexContent.replace(versionPattern, `version: /* updated-by-script */ '${version}',`); - const packageUpdated = JSON.stringify({ ...JSON.parse(packageContent), version }, null, 2); - await Promise.all([writeFile(indexFile, indexUpdated, 'utf8'), writeFile(packageFile, packageUpdated, 'utf8')]); - - log(`@vaadin/${_package} version and registration updated`); - }) - ); -} - -await Promise.all([updateLernaConfig(), updatePackageRegistrations()]);