Merge remote-tracking branch 'origin' into merge-release-in-master

Author: SvetoslavTsenov

Diff for: .gitignore

@@ -36,5 +36,6 @@ bundle-config-loader.js
 
 hooks
 .DS_Store
-
+.nyc_output
+coverage
 !projectHelpers.spec.js

Diff for: .npmignore

@@ -7,6 +7,8 @@ demo
 *.spec.*
 .vscode/
 .github/
+.nyc_output
+coverage/
 jasmine-config/
 CONTRIBUTING.md
 CODE_OF_CONDUCT.md

Diff for: .nycrc

@@ -0,0 +1,5 @@
+{
+    "extends": "@istanbuljs/nyc-config-typescript",
+    "exclude": ["/demo/**"],
+    "reporter": ["text", "lcov"]
+}

Diff for: jasmine-config/jasmine.json

@@ -3,7 +3,7 @@
   "spec_files": [
 	"!node_modules/**/*.spec.js",
 	"!demo/**/*.spec.js",
-	"./*.spec.js"
+	"./**/*.spec.js"
   ],
   "helpers": [
     "jasmine-config/**/*.js"

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-webpack",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "main": "index",
   "description": "",
   "homepage": "http://www.telerik.com",
@@ -35,6 +35,7 @@
     "prepare": "npm run tsc && npm run jasmine",
     "test": "npm run prepare",
     "jasmine": "jasmine --config=jasmine-config/jasmine.json",
+    "coverage": "nyc npm run test",
     "version": "rm package-lock.json && conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md"
   },
   "bin": {
@@ -50,7 +51,7 @@
     "clean-webpack-plugin": "~1.0.0",
     "copy-webpack-plugin": "~4.6.0",
     "css-loader": "~2.1.1",
-    "extra-watch-webpack-plugin": "1.0.3",
+    "escape-string-regexp": "1.0.5",
     "fork-ts-checker-webpack-plugin": "1.3.0",
     "global-modules-path": "2.0.0",
     "loader-utils": "^1.2.3",
@@ -77,6 +78,7 @@
   "devDependencies": {
     "@angular/compiler": "8.2.0",
     "@angular/compiler-cli": "8.2.0",
+    "@istanbuljs/nyc-config-typescript": "^0.1.3",
     "@ngtools/webpack": "8.2.0",
     "@types/jasmine": "^3.3.7",
     "@types/loader-utils": "^1.1.3",
@@ -87,7 +89,9 @@
     "conventional-changelog-cli": "^1.3.22",
     "jasmine": "^3.2.0",
     "jasmine-spec-reporter": "^4.2.1",
+    "nyc": "^14.1.1",
     "proxyquire": "2.1.0",
+    "source-map-support": "^0.5.13",
     "tns-core-modules": "next",
     "typescript": "~3.5.3"
   }

Diff for: templates/webpack.config.spec.ts

@@ -32,7 +32,9 @@ const nativeScriptDevWebpack = {
     getEntryModule: () => 'EntryModule',
     getResolver: () => null,
     getConvertedExternals: nsWebpackIndex.getConvertedExternals,
-    getSourceMapFilename: nsWebpackIndex.getSourceMapFilename
+    getSourceMapFilename: nsWebpackIndex.getSourceMapFilename,
+    processAppComponents: nsWebpackIndex.processAppComponents,
+    getUserDefinedEntries: nsWebpackIndex.getUserDefinedEntries,
 };
 
 const emptyObject = {};