feat(ng-package): Replace ngm-cli to ng-packagr

EndyKaufman · EndyKaufman · commit 9b5aa1f1ea85 · 2018-01-08T03:27:45.000+05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,28 +46,28 @@
 		"srcgen"
 	],
 	"devDependencies": {
-		"@types/chai": "^4.0.10",
-		"@types/mocha": "^2.2.44",
-		"@types/node": "^8.5.1",
+		"@types/chai": "^4.1.0",
+		"@types/mocha": "^2.2.46",
+		"@types/node": "^8.5.7",
 		"@types/sinon": "^4.1.2",
 		"chai": "^4.1.2",
-		"mocha": "^4.0.1",
+		"mocha": "^4.1.0",
 		"sinon": "^4.1.3",
-		"ts-node": "^4.0.1",
+		"ts-node": "^4.1.0",
 		"typescript": "2.5.3"
 	},
 	"dependencies": {
-		"@angular/common": "5.1.1",
-		"@angular/compiler": "5.1.1",
-		"@angular/core": "5.1.1",
+		"@angular/common": "5.1.3",
+		"@angular/compiler": "5.1.3",
+		"@angular/core": "5.1.3",
 		"@biesbjerg/ngx-translate-extract": "^2.3.4",
-		"@types/cheerio": "^0.22.6",
+		"@types/cheerio": "^0.22.7",
 		"@types/commander": "^2.12.2",
 		"@types/del": "^3.0.0",
 		"@types/dotenv": "^4.0.2",
 		"@types/fs-extra": "^5.0.0",
 		"@types/inflection": "^1.5.28",
-		"@types/lodash": "^4.14.89",
+		"@types/lodash": "^4.14.92",
 		"@types/loglevel": "^1.5.3",
 		"cheerio": "^1.0.0-rc.2",
 		"commander": "^2.12.2",
@@ -83,7 +83,7 @@
 		"lodash": "^4.17.4",
 		"loglevel": "^1.6.0",
 		"loglevel-colored-level-prefix": "^1.0.0",
-		"ngm-cli": "^0.8.3",
+		"ng-packagr": "^1.6.0",
 		"npm-run": "^4.1.2",
 		"po2json": "^0.4.5",
 		"recursive-readdir": "^2.2.1",
diff --git a/src/lib/base.ts b/src/lib/base.ts
@@ -106,7 +106,8 @@ export class Base {
             folder = customOptions.srcFolder;
         }
         this.log('build').debug(folder);
-        const commandString = 'ngm build -p ' + folder + ' --clean';
+        
+        const commandString = 'ng-packagr -p ' + folder + '/ng-package.json';
         if (!fsExtra.existsSync(folder)) {
             this.log('build').debug(commandString);
             this.log('build').error(`Folder does not exists: ${folder}`);
@@ -139,12 +140,12 @@ export class Base {
     }
     async linkDist(customOptions?: { folder?: string, srcFolder?: string }) {
         this.log('linkDist').debug('start');
-        let folder = path.resolve(this.folder + '/src');
+        let folder = path.resolve(this.folder + '/dist');
         if (customOptions && customOptions.srcFolder) {
             folder = customOptions.srcFolder;
         }
         this.log('linkDist').debug(folder);
-        const commandString = 'ngm link -p ' + folder + ' --here';
+        const commandString = 'npm link ' + folder;
         if (!fsExtra.existsSync(folder)) {
             this.log('linkDist').debug(commandString);
             this.log('linkDist').error(`Folder does not exists: ${folder}`);
diff --git a/srcgen/web-app-empty/libs/core/src/package.json b/srcgen/web-app-empty/libs/core/src/package.json
@@ -1,6 +1,5 @@
 {
     "name": "@<%=app.name%>/core",
-    "main": "index.js",
     "version": "0.0.0",
     "peerDependencies": {
         "@angular/common": "*",
@@ -14,4 +13,4 @@
         "lodash": "*",
         "moment": "*"
     }
-}
+}
diff --git a/srcgen/web-app-empty/package.json b/srcgen/web-app-empty/package.json
@@ -30,51 +30,51 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.1.1",
-    "@angular/common": "^5.1.1",
-    "@angular/compiler": "^5.1.1",
-    "@angular/core": "^5.1.1",
-    "@angular/forms": "^5.1.1",
-    "@angular/http": "^5.1.1",
-    "@angular/platform-browser": "^5.1.1",
-    "@angular/platform-browser-dynamic": "^5.1.1",
-    "@angular/router": "^5.1.1",
+    "@angular/animations": "^5.1.3",
+    "@angular/common": "^5.1.3",
+    "@angular/compiler": "^5.1.3",
+    "@angular/core": "^5.1.3",
+    "@angular/forms": "^5.1.3",
+    "@angular/http": "^5.1.3",
+    "@angular/platform-browser": "^5.1.3",
+    "@angular/platform-browser-dynamic": "^5.1.3",
+    "@angular/router": "^5.1.3",
     "core-js": "^2.5.3",
-    "rxjs": "^5.5.5",
-    "zone.js": "^0.8.18",
+    "rxjs": "^5.5.6",
+    "zone.js": "^0.8.19",
     "@rucken/core": "^1.29.1",
     "@rucken/web": "^1.29.1",
-    "@ngui/auto-complete": "^0.16.0",
-    "@ngx-translate/core": "^9.0.1",
+    "@ngui/auto-complete": "^0.16.1",
+    "@ngx-translate/core": "^9.0.2",
     "ladda": "^1.0.5",
     "lodash": "^4.17.4",
-    "ngx-bootstrap": "^2.0.0-beta.11",
+    "ngx-bootstrap": "^2.0.0-rc.0",
     "text-mask-addons": "^3.7.1",
-    "angular2-ladda": "^1.2.2",
+    "angular2-ladda": "^1.2.3",
     "angular2-text-mask": "^8.0.4"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.1",
-    "@angular/compiler-cli": "^5.1.1",
-    "@angular/language-service": "^5.1.1",
-    "@types/jasmine": "~2.8.2",
+    "@angular/cli": "1.6.3",
+    "@angular/compiler-cli": "^5.1.3",
+    "@angular/language-service": "^5.1.3",
+    "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "~8.5.1",
+    "@types/node": "~8.5.7",
     "codelyzer": "^4.0.2",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~1.7.1",
+    "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.3.0",
+    "karma-coverage-istanbul-reporter": "^1.3.3",
     "karma-jasmine": "~1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.2.2",
-    "ts-node": "~4.0.1",
+    "ts-node": "~4.1.0",
     "tslint": "~5.8.0",
-    "typescript": "~2.5.3",
-    "typescript-formatter": "^7.0.0",
-    "@rucken/cli": "1.5.5",
+    "typescript": "~2.6.2",
+    "typescript-formatter": "^7.0.1",
+    "@rucken/cli": "1.5.6",
     "npm-run-all": "^4.1.2"
   }
 }
diff --git a/test/fixture/libs/lib1/src/ng-package.json b/test/fixture/libs/lib1/src/ng-package.json
@@ -0,0 +1,7 @@
+{
+    "lib": {
+        "entryFile": "index.ts"
+    },
+    "dest":"../dist",
+    "workingDirectory": "../.tmp"
+}
diff --git a/test/fixture/libs/lib1/src/package.json b/test/fixture/libs/lib1/src/package.json
@@ -1,9 +1,9 @@
 {
     "name": "@test/lib1",
     "version": "1.5.6",
-    "peerDependencies": {
-        "@angular/common": "*",
-        "@angular/compiler": "*",
-        "@angular/core": "*"
+    "dependencies": {
+        "@angular/common": "5.1.3",
+        "@angular/compiler": "5.1.3",
+        "@angular/core": "5.1.3"
     }
 }
diff --git a/test/fixture/libs/lib1/src/shared/services/service1.service.ts b/test/fixture/libs/lib1/src/shared/services/service1.service.ts
@@ -1,2 +1,5 @@
+import { Injectable } from '@angular/core';
+
+@Injectable()
 export class Service1Service {
 }
diff --git a/test/fixture/libs/lib3/src/ng-package.json b/test/fixture/libs/lib3/src/ng-package.json
@@ -0,0 +1,7 @@
+{
+    "lib": {
+        "entryFile": "index.ts"
+    },
+    "dest":"../dist",
+    "workingDirectory": "../.tmp"
+}
diff --git a/test/fixture/libs/lib3/src/shared/services/service11.service.ts b/test/fixture/libs/lib3/src/shared/services/service11.service.ts
@@ -1,2 +1,5 @@
+import { Injectable } from '@angular/core';
+
+@Injectable()
 export class Service11Service {
 }
diff --git a/test/fixture/libs/subFolder/lib2/src/ng-package.json b/test/fixture/libs/subFolder/lib2/src/ng-package.json
@@ -0,0 +1,7 @@
+{
+    "lib": {
+        "entryFile": "index.ts"
+    },
+    "dest":"../dist",
+    "workingDirectory": "../.tmp"
+}
diff --git a/test/fixture/libs/subFolder/lib2/src/package.json b/test/fixture/libs/subFolder/lib2/src/package.json
@@ -1,9 +1,9 @@
 {
     "name": "@test/lib2",
     "version": "1.5.6",
-    "peerDependencies": {
-        "@angular/common": "*",
-        "@angular/compiler": "*",
-        "@angular/core": "*"
+    "dependencies": {
+        "@angular/common": "5.1.3",
+        "@angular/compiler": "5.1.3",
+        "@angular/core": "5.1.3"
     }
 }
diff --git a/test/fixture/libs/subFolder/lib2/src/shared/services/service2.service.ts b/test/fixture/libs/subFolder/lib2/src/shared/services/service2.service.ts
@@ -1,2 +1,5 @@
+import { Injectable } from '@angular/core';
+
+@Injectable()
 export class Service2Service {
 }
diff --git a/test/lib._spec.ts b/test/lib._spec.ts
@@ -58,7 +58,7 @@ describe('Lib', () => {
     describe('#build()', () => {
         const dir = path.resolve(`${__dirname}/fixture/libs/lib1`);
         const dirDist = path.resolve(`${dir}/dist`);
-        const dirDistIndex = path.resolve(`${dirDist}/index.js`);
+        const dirDistIndex = path.resolve(`${dirDist}/index.d.ts`);
         beforeEach(() => {
             if (fsExtra.existsSync(dirDist)) {
                 del.sync([dirDist]);
@@ -70,7 +70,7 @@ describe('Lib', () => {
         it(`not exists ${dirDistIndex}`, () => {
             assert.equal(fsExtra.existsSync(dirDistIndex), false);
         });
-        it('ngm build -p ./test/fixture/libs/lib1/src --clean', (done) => {
+        it('ng-packagr -p ./test/fixture/libs/lib1/src/ng-package.json', (done) => {
             const lib = new Lib(dir);
             lib.debug = debug;
             lib.build().then((data: any) => {
@@ -85,7 +85,7 @@ describe('Lib', () => {
     describe('#link()', () => {
         const dir = path.resolve(`${__dirname}/fixture/libs/lib1`);
         const dirDist = path.resolve(`${dir}/../../../../node_modules/@test/lib1`);
-        const dirDistIndex = path.resolve(`${dirDist}/index.js`);
+        const dirDistIndex = path.resolve(`${dirDist}/index.d.ts`);
         beforeEach(() => {
             if (fsExtra.existsSync(dirDist)) {
                 del.sync([dirDist]);
@@ -97,7 +97,7 @@ describe('Lib', () => {
         it(`not exists ${dirDistIndex}`, () => {
             assert.equal(fsExtra.existsSync(dirDistIndex), false);
         });
-        it('ngm link -p ./test/fixture/libs/lib1/src --here', (done) => {
+        it('npm link ./test/fixture/libs/lib1/dist', (done) => {
             const lib = new Lib(dir);
             lib.debug = debug;
             lib.link().then((data: boolean) => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@<%=app.name%>/core",`
`3`		`- "main": "index.js",`
`4`	`3`	`"version": "0.0.0",`
`5`	`4`	`"peerDependencies": {`
`6`	`5`	`"@angular/common": "*",`
`@@ -14,4 +13,4 @@`
`14`	`13`	`"lodash": "*",`
`15`	`14`	`"moment": "*"`
`16`	`15`	`}`
`17`		`-}`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@test/lib1",`
`3`	`3`	`"version": "1.5.6",`
`4`		`- "peerDependencies": {`
`5`		`- "@angular/common": "*",`
`6`		`- "@angular/compiler": "*",`
`7`		`- "@angular/core": "*"`
	`4`	`+ "dependencies": {`
	`5`	`+ "@angular/common": "5.1.3",`
	`6`	`+ "@angular/compiler": "5.1.3",`
	`7`	`+ "@angular/core": "5.1.3"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,5 @@`
	`1`	`+import { Injectable } from '@angular/core';`
	`2`	`+`
	`3`	`+@Injectable()`
`1`	`4`	`export class Service1Service {`
`2`	`5`	`}`