From 8e36553ce49d90cacabcd5081770ef5f1ceb41f9 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Mon, 29 Jul 2019 20:54:14 +0300 Subject: [PATCH 1/3] add lerna to ng packages --- npm/ng-packs/lerna.json | 6 ++++++ npm/ng-packs/package.json | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 npm/ng-packs/lerna.json diff --git a/npm/ng-packs/lerna.json b/npm/ng-packs/lerna.json new file mode 100644 index 0000000000..4bf8306654 --- /dev/null +++ b/npm/ng-packs/lerna.json @@ -0,0 +1,6 @@ +{ + "version": "0.7.5", + "packages": ["packages/*"], + "npmClient": "yarn", + "lerna": "2.11.0" +} diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 30b97e9100..999b9d96b2 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -1,6 +1,4 @@ { - "name": "abp-ng-packages", - "version": "0.7.1", "scripts": { "ng": "ng", "start": "ng serve", @@ -9,7 +7,6 @@ "lint": "ng lint", "e2e": "ng e2e" }, - "private": true, "dependencies": { "@angular/animations": "~8.1.2", "@angular/common": "~8.1.2", @@ -40,6 +37,7 @@ "karma-coverage-istanbul-reporter": "~2.0.1", "karma-jasmine": "~2.0.1", "karma-jasmine-html-reporter": "^1.4.0", + "lerna": "^3.16.4", "ng-packagr": "^5.1.0", "protractor": "~5.4.0", "symlink-manager": "^1.1.2", From 1d2178639a40f69872a981d5d23d578d7f43bc6d Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 30 Jul 2019 08:19:25 +0300 Subject: [PATCH 2/3] rebuild tenant-management add devDependencies to main package.json --- .../bundles/abp-ng.tenant-management.umd.js | 70 +++++++++---------- .../dist/tenant-management/package.json | 8 ++- npm/ng-packs/package.json | 28 +++++--- 3 files changed, 58 insertions(+), 48 deletions(-) diff --git a/npm/ng-packs/dist/tenant-management/bundles/abp-ng.tenant-management.umd.js b/npm/ng-packs/dist/tenant-management/bundles/abp-ng.tenant-management.umd.js index 2b3bd85179..a407e2b913 100644 --- a/npm/ng-packs/dist/tenant-management/bundles/abp-ng.tenant-management.umd.js +++ b/npm/ng-packs/dist/tenant-management/bundles/abp-ng.tenant-management.umd.js @@ -4,41 +4,41 @@ (global = global || self, factory((global.abp = global.abp || {}, global.abp.ng = global.abp.ng || {}, global.abp.ng['tenant-management'] = {}), global.ng_core, global.ng_theme_shared, global.ng.core, global.ngBootstrap, global.store, global.table, global.ng.forms, global.rxjs, global.rxjs.operators, global.ng.router)); }(this, function (exports, ng_core, ng_theme_shared, core, ngBootstrap, store, table, forms, rxjs, operators, router) { 'use strict'; - /*! ***************************************************************************** - Copyright (c) Microsoft Corporation. All rights reserved. - Licensed under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of the - License at http://www.apache.org/licenses/LICENSE-2.0 - - THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED - WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, - MERCHANTABLITY OR NON-INFRINGEMENT. - - See the Apache Version 2.0 License for specific language governing permissions - and limitations under the License. - ***************************************************************************** */ - - var __assign = function() { - __assign = Object.assign || function __assign(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); - }; - - function __decorate(decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; - } - - function __metadata(metadataKey, metadataValue) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue); + /*! ***************************************************************************** + Copyright (c) Microsoft Corporation. All rights reserved. + Licensed under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of the + License at http://www.apache.org/licenses/LICENSE-2.0 + + THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED + WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, + MERCHANTABLITY OR NON-INFRINGEMENT. + + See the Apache Version 2.0 License for specific language governing permissions + and limitations under the License. + ***************************************************************************** */ + + var __assign = function() { + __assign = Object.assign || function __assign(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); + }; + + function __decorate(decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; + } + + function __metadata(metadataKey, metadataValue) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue); } /** diff --git a/npm/ng-packs/dist/tenant-management/package.json b/npm/ng-packs/dist/tenant-management/package.json index 79f98493fa..d28f1b9d6a 100644 --- a/npm/ng-packs/dist/tenant-management/package.json +++ b/npm/ng-packs/dist/tenant-management/package.json @@ -1,10 +1,13 @@ { "name": "@abp/ng.tenant-management", - "version": "0.7.4", + "version": "0.5.0", "dependencies": { "@abp/ng.theme.shared": "^0.5.0", "tslib": "^1.9.0" }, + "publishConfig": { + "access": "public" + }, "main": "bundles/abp-ng.tenant-management.umd.js", "module": "fesm5/abp-ng.tenant-management.js", "es2015": "fesm2015/abp-ng.tenant-management.js", @@ -14,6 +17,5 @@ "fesm2015": "fesm2015/abp-ng.tenant-management.js", "typings": "abp-ng.tenant-management.d.ts", "metadata": "abp-ng.tenant-management.metadata.json", - "sideEffects": false, - "gitHead": "84a2f81bbe0701d0758450f344adfb0998db6bb7" + "sideEffects": false } diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 999b9d96b2..9451ef1554 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -1,13 +1,9 @@ { "scripts": { "ng": "ng", - "start": "ng serve", - "build": "ng build", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" + "lerna": "lerna" }, - "dependencies": { + "devDependencies": { "@angular/animations": "~8.1.2", "@angular/common": "~8.1.2", "@angular/compiler": "~8.1.2", @@ -18,9 +14,7 @@ "@angular/router": "~8.1.2", "rxjs": "~6.4.0", "tslib": "^1.9.0", - "zone.js": "~0.9.1" - }, - "devDependencies": { + "zone.js": "~0.9.1", "@angular-devkit/build-angular": "~0.801.2", "@angular-devkit/build-ng-packagr": "~0.801.2", "@angular/cli": "~8.1.2", @@ -44,6 +38,20 @@ "ts-node": "~7.0.0", "tsickle": "^0.35.0", "tslint": "~5.15.0", - "typescript": "~3.4.3" + "typescript": "~3.4.3", + "@ngxs/router-plugin": "^3.5.0", + "@ngxs/storage-plugin": "^3.5.0", + "@ngxs/store": "^3.5.0", + "angular-oauth2-oidc": "^8.0.1", + "just-compare": "^1.3.0", + "snq": "^1.0.3", + "@angular/cdk": "^8.0.1", + "@ng-bootstrap/ng-bootstrap": "^5.0.0-rc.1", + "@ngx-validate/core": "^0.0.1", + "bootstrap": "^4.3.1", + "font-awesome": "^4.7.0", + "ngx-perfect-scrollbar": "^8.0.0", + "primeicons": "^1.0.0", + "primeng": "^8.0.0" } } From fba7c884fe9119ae0eb793b28ae6583d25255baf Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 30 Jul 2019 09:37:18 +0300 Subject: [PATCH 3/3] feature: add sync script for versions --- npm/ng-packs/package.json | 46 +++++++++++++++---------------- npm/ng-packs/scripts/.yarn.js | 28 +++++++++++++++++++ npm/ng-packs/scripts/.yarnrc | 1 + npm/ng-packs/scripts/build.js | 1 + npm/ng-packs/scripts/index.js | 4 +++ npm/ng-packs/scripts/package.json | 20 ++++++++++++++ npm/ng-packs/scripts/sync.js | 24 ++++++++++++++++ 7 files changed, 101 insertions(+), 23 deletions(-) create mode 100644 npm/ng-packs/scripts/.yarn.js create mode 100644 npm/ng-packs/scripts/.yarnrc create mode 100644 npm/ng-packs/scripts/build.js create mode 100644 npm/ng-packs/scripts/index.js create mode 100644 npm/ng-packs/scripts/package.json create mode 100644 npm/ng-packs/scripts/sync.js diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 9451ef1554..2f441106c2 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -4,28 +4,35 @@ "lerna": "lerna" }, "devDependencies": { + "@angular-devkit/build-angular": "~0.801.2", + "@angular-devkit/build-ng-packagr": "~0.801.2", "@angular/animations": "~8.1.2", + "@angular/cdk": "^8.0.1", + "@angular/cli": "~8.1.2", "@angular/common": "~8.1.2", "@angular/compiler": "~8.1.2", + "@angular/compiler-cli": "~8.1.2", "@angular/core": "~8.1.2", "@angular/forms": "~8.1.2", + "@angular/language-service": "~8.1.2", "@angular/platform-browser": "~8.1.2", "@angular/platform-browser-dynamic": "~8.1.2", "@angular/router": "~8.1.2", - "rxjs": "~6.4.0", - "tslib": "^1.9.0", - "zone.js": "~0.9.1", - "@angular-devkit/build-angular": "~0.801.2", - "@angular-devkit/build-ng-packagr": "~0.801.2", - "@angular/cli": "~8.1.2", - "@angular/compiler-cli": "~8.1.2", - "@angular/language-service": "~8.1.2", + "@ng-bootstrap/ng-bootstrap": "^5.0.0-rc.1", + "@ngx-validate/core": "^0.0.1", + "@ngxs/router-plugin": "^3.5.0", + "@ngxs/storage-plugin": "^3.5.0", + "@ngxs/store": "^3.5.0", "@types/jasmine": "~3.3.8", "@types/jasminewd2": "~2.0.3", "@types/node": "~8.9.4", + "angular-oauth2-oidc": "^8.0.1", + "bootstrap": "^4.3.1", "codelyzer": "^5.0.0", + "font-awesome": "^4.7.0", "jasmine-core": "~3.4.0", "jasmine-spec-reporter": "~4.2.1", + "just-compare": "^1.3.0", "karma": "~4.1.0", "karma-chrome-launcher": "~2.2.0", "karma-coverage-istanbul-reporter": "~2.0.1", @@ -33,25 +40,18 @@ "karma-jasmine-html-reporter": "^1.4.0", "lerna": "^3.16.4", "ng-packagr": "^5.1.0", + "ngx-perfect-scrollbar": "^8.0.0", + "primeicons": "^1.0.0", + "primeng": "^8.0.0", "protractor": "~5.4.0", - "symlink-manager": "^1.1.2", + "rxjs": "~6.4.0", + "snq": "^1.0.3", + "symlink-manager": "^1.2.0", "ts-node": "~7.0.0", "tsickle": "^0.35.0", + "tslib": "^1.9.0", "tslint": "~5.15.0", "typescript": "~3.4.3", - "@ngxs/router-plugin": "^3.5.0", - "@ngxs/storage-plugin": "^3.5.0", - "@ngxs/store": "^3.5.0", - "angular-oauth2-oidc": "^8.0.1", - "just-compare": "^1.3.0", - "snq": "^1.0.3", - "@angular/cdk": "^8.0.1", - "@ng-bootstrap/ng-bootstrap": "^5.0.0-rc.1", - "@ngx-validate/core": "^0.0.1", - "bootstrap": "^4.3.1", - "font-awesome": "^4.7.0", - "ngx-perfect-scrollbar": "^8.0.0", - "primeicons": "^1.0.0", - "primeng": "^8.0.0" + "zone.js": "~0.9.1" } } diff --git a/npm/ng-packs/scripts/.yarn.js b/npm/ng-packs/scripts/.yarn.js new file mode 100644 index 0000000000..1961f886a5 --- /dev/null +++ b/npm/ng-packs/scripts/.yarn.js @@ -0,0 +1,28 @@ +"use strict" + +const child_process = require("child_process") +const { env } = process +const { parent } = module + +const REQUIRE_ESM = "--require esm" +const REQUIRE_DOT_YARN = "--require ./.yarn.js" + +let { NODE_OPTIONS } = env + +if (typeof NODE_OPTIONS === "string") { + NODE_OPTIONS += " " +} else { + NODE_OPTIONS = "" +} + +if (parent != null && + parent.id === "internal/preload") { + env.NODE_OPTIONS = NODE_OPTIONS.replace(REQUIRE_DOT_YARN, REQUIRE_ESM) +} else { + child_process.spawn("yarn", process.argv.slice(2), { + env: Object.assign({}, env, { + NODE_OPTIONS: REQUIRE_DOT_YARN + " " + NODE_OPTIONS + }), + stdio: "inherit" + }) +} diff --git a/npm/ng-packs/scripts/.yarnrc b/npm/ng-packs/scripts/.yarnrc new file mode 100644 index 0000000000..8db01eba40 --- /dev/null +++ b/npm/ng-packs/scripts/.yarnrc @@ -0,0 +1 @@ +yarn-path "./.yarn.js" diff --git a/npm/ng-packs/scripts/build.js b/npm/ng-packs/scripts/build.js new file mode 100644 index 0000000000..e2fa882625 --- /dev/null +++ b/npm/ng-packs/scripts/build.js @@ -0,0 +1 @@ +import execa from 'execa'; diff --git a/npm/ng-packs/scripts/index.js b/npm/ng-packs/scripts/index.js new file mode 100644 index 0000000000..a82d62f972 --- /dev/null +++ b/npm/ng-packs/scripts/index.js @@ -0,0 +1,4 @@ +// Set options as a parameter, environment variable, or rc file. +// eslint-disable-next-line no-global-assign +require = require('esm')(module /* , options */); +module.exports = require('./main.js'); diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json new file mode 100644 index 0000000000..a69ea2101d --- /dev/null +++ b/npm/ng-packs/scripts/package.json @@ -0,0 +1,20 @@ +{ + "name": "scripts", + "version": "1.0.0", + "description": "Abp publish helper scripts", + "main": "index.js", + "modules": "[build.js, sync.js]", + "scripts": { + "build": "node -r esm build.js", + "sync": "node -r esm sync.js", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "babel-preset-node6": "^11.0.0", + "esm": "^3.2.25", + "execa": "^2.0.3", + "fs-extra": "^8.1.0" + } +} diff --git a/npm/ng-packs/scripts/sync.js b/npm/ng-packs/scripts/sync.js new file mode 100644 index 0000000000..366057bf8e --- /dev/null +++ b/npm/ng-packs/scripts/sync.js @@ -0,0 +1,24 @@ +// ESM syntax is supported. +import execa from 'execa'; +import fse from 'fs-extra'; + +(async () => { + const { projects } = await fse.readJSON('../angular.json'); + const projectNames = Object.keys(projects); + + projectNames.forEach(async project => { + const { dependencies: distDependencies, version } = await fse.readJSON(`../dist/${project}/package.json`); + const srcPackagePath = `../packages/${project}/package.json`; + const srcPackage = await fse.readJSON(srcPackagePath); + + if (distDependencies) { + for (const key in srcPackage.dependencies) { + if (distDependencies.hasOwnProperty(key)) { + srcPackage.dependencies[key] = distDependencies[key]; + } + } + } + + await fse.writeJSON(srcPackagePath, { ...srcPackage, version }, { spaces: 2 }); + }); +})();