Fix packing "devextreme-themebuilder" package (#25908)

DevExpress · Oct 27, 2023 · 85d4d7b · 85d4d7b
1 parent 0e74de9
commit 85d4d7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/build/build-all.ts b/build/build-all.ts
@@ -33,6 +33,7 @@ sh.rm('-rf', DOCUMENTATION_TEMP_DIR);
 sh.exec('npm run devextreme:inject-descriptions');
 
 sh.exec('npm run build-dist -w devextreme-main');
+sh.exec('npm run build -w devextreme-themebuilder');
 
 // Copy artifacts for DXBuild (Installation)
 sh.pushd(path.join(MONOREPO_ROOT, 'packages/devextreme/artifacts'));
@@ -65,13 +66,13 @@ sh.exec('npm pack', { silent: true });
 sh.cp('*.tgz', NPM_OUTPUT_DIR);
 sh.popd();
 
-sh.pushd(path.join(MONOREPO_ROOT, 'packages', 'devextreme-themebuilder'))
-sh.exec('npm run build');
-sh.exec('npm run pack', { silent: true });
-sh.cp('dist/*.tgz', NPM_OUTPUT_DIR);
+sh.pushd(path.join(MONOREPO_ROOT, 'packages', 'devextreme-themebuilder', 'dist'));
+sh.exec(`npm pkg set version="${devextremeNpmVersion}"`);
+sh.exec('npm pack', { silent: true });
+sh.cp('*.tgz', NPM_OUTPUT_DIR);
 sh.popd();
 
-sh.exec('npm run pack --ws --if-present', { silent: true });
+sh.exec('npm run pack -w devextreme-angular -w devextreme-react -w devextreme-vue', { silent: true });
 
 sh.cp(path.join(MONOREPO_ROOT, 'packages', 'devextreme-angular', 'npm', 'dist', '*.tgz'), NPM_OUTPUT_DIR);
 sh.cp(path.join(MONOREPO_ROOT, 'packages', 'devextreme-react', 'npm', '*.tgz'), NPM_OUTPUT_DIR);

diff --git a/build/update-version.ts b/build/update-version.ts
@@ -8,11 +8,13 @@ if (version == null) {
     process.exit(1);
 }
 
+sh.set('-e');
+
 const MONOREPO_ROOT = path.join(__dirname, '..');
 const packagesPath = path.join(MONOREPO_ROOT, 'packages', '**', 'package.json');
 const playgroundsPath = path.join(MONOREPO_ROOT, 'playgrounds', '**', 'package.json');
 
-sh.exec(`npm version ${version} -ws --include-workspace-root --git-tag-version=false --workspaces-update=false`);
+sh.exec(`npm version ${version} -ws --allow-same-version --include-workspace-root --git-tag-version=false --workspaces-update=false`);
 
 sh.sed('-i', /"devextreme(-angular|-react|-vue)?": ".*"/, `"devextreme$1": "~${version}"`, [packagesPath, playgroundsPath]);