feat(stark-all): move dev dependencies from packages to ROOT of proje…

…ct + Fix source-map-loader issue For source-map-loader, look at webpack-contrib/source-map-loader#60 ISSUES CLOSED: #371
NationalBankBelgium · May 15, 2018 · 98d2bc0 · 98d2bc0
1 parent 00dc6a6
commit 98d2bc0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 41 deletions.
diff --git a/package.json b/package.json
@@ -23,9 +23,10 @@
     "@angular/compiler": "5.2.10",
     "@angular/compiler-cli": "5.2.10",
     "@angular/core": "5.2.10",
-    "@angular/router": "5.2.10",
+    "@angular/material": "5.2.5",
     "@angular/platform-browser": "5.2.10",
     "@angular/platform-browser-dynamic": "5.2.10",
+    "@angular/router": "5.2.10",
     "@commitlint/cli": "6.1.3",
     "@commitlint/config-conventional": "6.1.3",
     "@ngtools/json-schema": "1.1.0",

diff --git a/packages/stark-build/config/webpack.common.js b/packages/stark-build/config/webpack.common.js
@@ -186,16 +186,13 @@ module.exports = function(options) {
 				// Source map loader support for *.js files
 				// Extracts SourceMaps for source files that as added as sourceMappingURL comment.
 				// reference: https://github.com/webpack/source-map-loader
-				...(!METADATA.AOT
-					? [
-							{
-								enforce: "pre",
-								test: /\.js$/,
-								use: ["source-map-loader"],
-								exclude: [helpers.root("node_modules/rxjs"), helpers.root("node_modules/@angular")]
-							}
-					  ]
-					: []),
+				// See: https://github.com/webpack-contrib/source-map-loader/issues/60
+				{
+					enforce: "pre",
+					test: /\.js$/,
+					use: ["source-map-loader"],
+					exclude: [/\.ngfactory\.js$/, /\.ngstyle\.js$/, helpers.root("node_modules/@ng-idle")]
+				},
 
 				/**
 				 * To string and css loader support for *.css files (from Angular components)

diff --git a/packages/stark-core/package.json b/packages/stark-core/package.json
@@ -42,29 +42,28 @@
     "deep-freeze-strict": "1.1.1",
     "ibantools": "2.0.0",
     "moment": "2.22.1",
-    "typescript": "2.6.2",
     "uuid": "3.2.1",
     "zone.js": "0.8.26"
   },
   "devDependencies": {
-    "@nationalbankbelgium/stark-testing": "../stark-testing",
-    "tslint": "5.10.0"
+    "@nationalbankbelgium/stark-testing": "../stark-testing"
   },
   "peerDependencies": {
     "@angular/common": "5.x",
     "@angular/core": "5.x",
     "@angular/router": "5.x",
-    "rxjs": "5.x"
+    "rxjs": "5.x",
+    "typescript": ">=2.6.0 && <2.7.0"
   },
   "scripts": {
     "clean": "npx rimraf dist",
     "clean:modules": "npx rimraf ./node_modules package-lock.json",
     "clean:all": "npm run clean && npm run clean:modules",
-    "ngc": "ngc -p tsconfig-build.json",
-    "lint": "tslint --config tslint.json --project ./tsconfig.spec.json --format codeFrame",
+    "ngc": "node ./../node_modules/@angular/compiler-cli/src/main.js -p tsconfig-build.json",
+    "lint": "node ../../node_modules/tslint/bin/tslint --config tslint.json --project ./tsconfig.spec.json --format codeFrame",
     "test-fast": "node ./node_modules/@nationalbankbelgium/stark-testing/node_modules/karma/bin/karma start ./karma.conf.typescript.js",
     "test-fast:ci": "node ./node_modules/@nationalbankbelgium/stark-testing/node_modules/karma/bin/karma start karma.conf.typescript.ci.js",
-    "tsc": "tsc -p tsconfig-build.json",
-    "tslint": "tslint"
+    "tsc": "node ../../node_modules/typescript/bin/tsc -p tsconfig-build.json",
+    "tslint": "node ../../node_modules/tslint/bin/tslint"
   }
 }
diff --git a/packages/stark-ui/package.json b/packages/stark-ui/package.json
@@ -27,40 +27,31 @@
   },
   "dependencies": {
     "core-js": "2.5.5",
-    "rxjs": "5.6.0-forward-compat.4",
-    "typescript": "2.6.2",
     "zone.js": "0.8.26"
   },
   "devDependencies": {
-    "@angular/common": "5.2.10",
-    "@angular/compiler": "5.2.10",
-    "@angular/compiler-cli": "5.2.10",
-    "@angular/core": "5.2.10",
-    "@angular/material": "5.2.5",
-    "@angular/platform-browser": "5.2.10",
-    "@angular/platform-browser-dynamic": "5.2.10",
-    "@angular/router": "5.2.10",
-    "@nationalbankbelgium/stark-testing": "../stark-testing",
-    "tslint": "5.9.1"
+    "@nationalbankbelgium/stark-testing": "../stark-testing"
   },
   "peerDependencies": {
     "@angular/common": "5.x",
     "@angular/compiler": "5.x",
     "@angular/core": "5.x",
+    "@angular/material": "5.x",
     "@angular/platform-browser": "5.x",
     "@angular/platform-browser-dynamic": "5.x",
     "@angular/router": "5.x",
-    "@nationalbankbelgium/stark-core": "0.0.0-PLACEHOLDER-VERSION"
+    "@nationalbankbelgium/stark-core": "0.0.0-PLACEHOLDER-VERSION",
+    "typescript": ">=2.6.0 && <2.7.0"
   },
   "scripts": {
     "clean": "npx rimraf dist",
     "clean:modules": "npx rimraf ./node_modules package-lock.json",
     "clean:all": "npm run clean && npm run clean:modules",
-    "ngc": "ngc -p tsconfig-build.json",
-    "lint": "tslint --config tslint.json --project ./tsconfig.spec.json --format codeFrame",
+    "ngc": "node ./../node_modules/@angular/compiler-cli/src/main.js -p tsconfig-build.json",
+    "lint": "node ../../node_modules/tslint/bin/tslint --config tslint.json --project ./tsconfig.spec.json --format codeFrame",
     "test-fast": "node ./node_modules/@nationalbankbelgium/stark-testing/node_modules/karma/bin/karma start ./karma.conf.typescript.js",
     "test-fast:ci": "node ./node_modules/@nationalbankbelgium/stark-testing/node_modules/karma/bin/karma start karma.conf.typescript.ci.js",
-    "tsc": "tsc -p tsconfig-build.json",
-    "tslint": "tslint"
+    "tsc": "node ../../node_modules/typescript/bin/tsc -p tsconfig-build.json",
+    "tslint": "node ../../node_modules/tslint/bin/tslint"
   }
 }
diff --git a/packages/stark-ui/tsconfig-build.json b/packages/stark-ui/tsconfig-build.json
@@ -6,7 +6,14 @@
     "typeRoots": ["./node_modules/@types", "./node_modules/@nationalbankbelgium/stark-testing/node_modules/@types"],
     "lib": ["dom", "dom.iterable", "es2017"],
     "paths": {
-      "@angular/*": ["node_modules/@angular/*"],
+      "@angular/common": ["../../node_modules/@angular/common"],
+      "@angular/compiler": ["../../node_modules/@angular/compiler"],
+      "@angular/compiler-cli": ["../../node_modules/@angular/compiler-cli"],
+      "@angular/core": ["../../node_modules/@angular/core"],
+      "@angular/material": ["../../node_modules/@angular/material"],
+      "@angular/platform-browser": ["../../node_modules/@angular/platform-browser"],
+      "@angular/platform-browser-dynamic": ["../../node_modules/@angular/platform-browser-dynamic"],
+      "@angular/router": ["../../node_modules/@angular/router"],
       "@ng-idle/*": ["../stark-core/node_modules/@ng-idle/*"],
       "@ngrx/*": ["../stark-core/node_modules/@ngrx/*"],
       "@ngx-translate/*": ["../stark-core/node_modules/@ngx-translate/*"],
@@ -15,6 +22,7 @@
       "class-validator": ["../stark-core/node_modules/class-validator"],
       "moment": ["../stark-core/node_modules/moment"],
       "ibantools": ["../stark-core/node_modules/ibantools"],
+      "rxjs/*": ["../../node_modules/rxjs/*"],
       "@nationalbankbelgium/stark-core": ["../../dist/packages/stark-core"]
     },
     "outDir": "../../dist/packages/stark-ui"

diff --git a/starter/package.json b/starter/package.json
@@ -119,8 +119,8 @@
     "@angular/platform-server": "5.2.10",
     "@angular/router": "5.2.10",
     "@mdi/angular-material": "2.2.43",
-    "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-c3fcedc.tgz",
-    "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-c3fcedc.tgz",
+    "@nationalbankbelgium/stark-core": "file:../dist/packages-dist/stark-core/nationalbankbelgium-stark-core-10.0.0-alpha.2-00dc6a6.tgz",
+    "@nationalbankbelgium/stark-ui": "file:../dist/packages-dist/stark-ui/nationalbankbelgium-stark-ui-10.0.0-alpha.2-00dc6a6.tgz",
     "@ngrx/store": "5.2.0",
     "@uirouter/angular": "1.0.1",
     "@uirouter/visualizer": "6.0.0",
@@ -135,8 +135,8 @@
     "web-animations-js": "2.3.1"
   },
   "devDependencies": {
-    "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-c3fcedc.tgz",
-    "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-c3fcedc.tgz",
+    "@nationalbankbelgium/stark-build": "file:../dist/packages-dist/stark-build/nationalbankbelgium-stark-build-10.0.0-alpha.2-00dc6a6.tgz",
+    "@nationalbankbelgium/stark-testing": "file:../dist/packages-dist/stark-testing/nationalbankbelgium-stark-testing-10.0.0-alpha.2-00dc6a6.tgz",
     "@types/core-js": "0.9.46",
     "@types/hammerjs": "2.0.35",
     "@types/node": "6.0.106",