From 9c705af799ff675231a83ac24bfcb38f552e9b1d Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 17 Aug 2021 17:06:11 +0300 Subject: [PATCH] add prod flag to nx run-many command --- npm/ng-packs/angular.json | 4 +-- npm/ng-packs/package.json | 2 +- npm/ng-packs/scripts/build.ts | 58 +++++++-------------------------- npm/ng-packs/scripts/publish.ts | 6 ++-- npm/ng-packs/yarn.lock | 18 +++++----- 5 files changed, 27 insertions(+), 61 deletions(-) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 02c7205849..977cf101ee 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -437,8 +437,8 @@ "build": { "builder": "@angular-devkit/build-ng-packagr:build", "options": { - "tsConfig": "packages/identity/tsconfig.lib.json", - "project": "packages/identity/ng-package.json" + "tsConfig": "packages/tenant-management/tsconfig.lib.json", + "project": "packages/tenant-management/ng-package.json" }, "configurations": { "production": { diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 2d07f10ccd..aa92664dc9 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -7,7 +7,7 @@ "nx": "nx", "start": "ng serve", "build": "ng build", - "build:all": "nx run-many --target=build --all --exclude=dev-app,schematics", + "build:all": "nx run-many --target=build --all --exclude=dev-app,schematics --prod && yarn build:schematics", "test": "ng test --detect-open-handles=true --run-in-band=true --watch-all=true", "test:all": "nx run-many --target=test --all", "lint": "nx workspace-lint && ng lint", diff --git a/npm/ng-packs/scripts/build.ts b/npm/ng-packs/scripts/build.ts index eddb6d4560..d6bc4aee41 100644 --- a/npm/ng-packs/scripts/build.ts +++ b/npm/ng-packs/scripts/build.ts @@ -12,53 +12,17 @@ import execa from 'execa'; await execa('yarn', ['install'], { stdout: 'inherit', cwd: '../' }); } - // await execa( - // 'yarn', - // [ - // 'symlink', - // 'copy', - // '--angular', - // '--prod', - // '--no-watch', - // '--sync', - // '--packages', - // '@abp/ng.core,@abp/ng.theme.shared,@abp/ng.components', - // ], - // { stdout: 'inherit', cwd: '../' }, - // ); - - // await execa( - // 'yarn', - // [ - // 'symlink', - // 'copy', - // '--angular', - // '--prod', - // '--no-watch', - // '--packages', - // '@abp/ng.feature-management,@abp/ng.permission-management,@abp/ng.account.core', - // ], - // { stdout: 'inherit', cwd: '../' }, - // ); - - // await execa( - // 'yarn', - // [ - // 'symlink', - // 'copy', - // '--angular', - // '--prod', - // '--no-watch', - // '--all-packages', - // '--excluded-packages', - // '@abp/ng.schematics,@abp/ng.core,@abp/ng.theme.shared,@abp/ng.components,@abp/ng.feature-management,@abp/ng.permission-management,@abp/ng.account.core', - // ], - // { stdout: 'inherit', cwd: '../' }, - // ); - await execa( 'yarn', - ['nx', 'run-many', '--target', 'build', '--projects', 'core,theme-shared,components'], + [ + 'nx', + 'run-many', + '--target', + 'build', + '--prod', + '--projects', + 'core,theme-shared,components', + ], { stdout: 'inherit', cwd: '../' }, ); @@ -69,6 +33,7 @@ import execa from 'execa'; 'run-many', '--target', 'build', + '--prod', '--projects', 'feature-management,permission-management,account-core', '--parallel', @@ -83,6 +48,7 @@ import execa from 'execa'; 'run-many', '--target', 'build', + '--prod', '--all', '--exclude', 'schematics,core,theme-shared,components,feature-management,permission-management,account-core', @@ -91,7 +57,7 @@ import execa from 'execa'; { stdout: 'inherit', cwd: '../' }, ); - // if (!program.skipNgcc) await execa('yarn', ['compile:ivy'], { stdout: 'inherit', cwd: '../' }); + if (!program.skipNgcc) await execa('yarn', ['compile:ivy'], { stdout: 'inherit', cwd: '../' }); } catch (error) { console.error(error.stderr); process.exit(1); diff --git a/npm/ng-packs/scripts/publish.ts b/npm/ng-packs/scripts/publish.ts index 624ffb2bc5..75f677b4b9 100644 --- a/npm/ng-packs/scripts/publish.ts +++ b/npm/ng-packs/scripts/publish.ts @@ -30,7 +30,7 @@ program.parse(process.argv); try { await fse.remove('../dist/packages'); - await execa('yarn', ['install', '--ignore-scripts'], { stdout: 'inherit', cwd: '../' }); + await execa('yarn', ['install'], { stdout: 'inherit', cwd: '../' }); await updateVersion(program.nextVersion); @@ -39,10 +39,9 @@ program.parse(process.argv); await execa('yarn', ['build', '--noInstall', '--skipNgcc'], { stdout: 'inherit' }); await execa('yarn', ['build:schematics'], { stdout: 'inherit' }); } catch (error) { - await updateVersion(oldVersion); - console.error(error.stderr); console.error('\n\nAn error has occurred! Rolling back the changed package versions.'); + await updateVersion(oldVersion); process.exit(1); } @@ -66,6 +65,7 @@ program.parse(process.argv); } catch (error) { console.error(error.stderr); console.error('\n\nAn error has occurred while publishing to the NPM!'); + await fse.rename('../lerna.json', '../lerna.publish.json'); process.exit(1); } diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index 4f9ccf29e7..e6dde4bfb8 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -5612,17 +5612,17 @@ copy-webpack-plugin@9.0.1: serialize-javascript "^6.0.0" core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.16.0: - version "3.16.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d" - integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ== + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.2.tgz#442ef1d933ca6fc80859bd5a1db7a3ba716aaf56" + integrity sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ== dependencies: browserslist "^4.16.7" semver "7.0.0" core-js-pure@^3.16.0: - version "3.16.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e" - integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg== + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.2.tgz#0ef4b79cabafb251ea86eb7d139b42bd98c533e8" + integrity sha512-oxKe64UH049mJqrKkynWp6Vu0Rlm/BTXO/bJZuN2mmR3RtOFNepLlSWDd1eo16PzHpQAoNG97rLU1V/YxesJjw== core-js@3.16.0: version "3.16.0" @@ -5630,9 +5630,9 @@ core-js@3.16.0: integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g== core-js@^3.6.5: - version "3.16.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249" - integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw== + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4" + integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2"