Merge branch 'master' into release

Author: SvetoslavTsenov

Diff for: demo/TypeScriptApp/webpack.config.js

@@ -88,8 +88,8 @@ module.exports = env => {
             alias: {
                 '~': appFullPath
             },
-            // don't resolve symlinks to symlinked modules
-            symlinks: false
+            // resolve symlinks to symlinked modules
+            symlinks: true
         },
         resolveLoader: {
             // don't resolve symlinks to symlinked loaders
@@ -192,10 +192,14 @@ module.exports = env => {
                 {
                     test: /\.ts$/,
                     use: {
-                        loader: "awesome-typescript-loader",
-                        options: { configFileName: "tsconfig.tns.json" },
+                        loader: "ts-loader",
+                        options: {
+                            configFile: "tsconfig.tns.json",
+                            allowTsInNodeModules: true,
+                        },
                     }
                 },
+
             ]
         },
         plugins: [

Diff for: dependencyManager.js

@@ -57,7 +57,6 @@ function removeObsoleteDeps(packageJson) {
         "uglifyjs-webpack-plugin",
         "@angular-devkit/core",
         "resolve-url-loader",
-        "awesome-typescript-loader",
         "sass-loader",
     ];
 

Diff for: package.json

@@ -75,29 +75,28 @@
   },
   "dependencies": {
     "@angular-devkit/core": "~7.1.0",
-    "awesome-typescript-loader": "~5.2.1",
     "clean-webpack-plugin": "~1.0.0",
     "copy-webpack-plugin": "~4.6.0",
     "css-loader": "~1.0.0",
     "global-modules-path": "2.0.0",
     "minimatch": "3.0.4",
     "nativescript-hook": "0.2.4",
+    "nativescript-worker-loader": "~0.9.0",
     "proxy-lib": "0.4.0",
+    "raw-loader": "~0.5.1",
     "request": "2.88.0",
+    "resolve-url-loader": "~3.0.0",
+    "sass-loader": "~7.1.0",
     "schema-utils": "0.4.5",
     "semver": "5.4.1",
     "shelljs": "0.6.0",
     "tapable": "1.0.0",
+    "ts-loader": "^5.3.1",
+    "uglifyjs-webpack-plugin": "~1.2.5",
     "webpack": "~4.27.0",
-    "webpack-cli": "~3.1.1",
     "webpack-bundle-analyzer": "~3.0.2",
-    "webpack-sources": "~1.3.0",
-    "raw-loader": "~0.5.1",
-    "nativescript-worker-loader": "~0.9.0",
-    "extract-text-webpack-plugin": "~3.0.2",
-    "uglifyjs-webpack-plugin": "~1.2.5",
-    "resolve-url-loader": "~3.0.0",
-    "sass-loader": "~7.1.0"
+    "webpack-cli": "~3.1.1",
+    "webpack-sources": "~1.3.0"
   },
   "devDependencies": {
     "@ngtools/webpack": "~7.1.0",

Diff for: templates/webpack.typescript.js

@@ -86,8 +86,8 @@ module.exports = env => {
             alias: {
                 '~': appFullPath
             },
-            // don't resolve symlinks to symlinked modules
-            symlinks: false
+            // resolve symlinks to symlinked modules
+            symlinks: true
         },
         resolveLoader: {
             // don't resolve symlinks to symlinked loaders
@@ -190,8 +190,11 @@ module.exports = env => {
                 {
                     test: /\.ts$/,
                     use: {
-                        loader: "awesome-typescript-loader",
-                        options: { configFileName: "tsconfig.tns.json" },
+                        loader: "ts-loader",
+                        options: {
+                            configFile: "tsconfig.tns.json",
+                            allowTsInNodeModules: true,
+                        },
                     }
                 },
             ]

Diff for: templates/webpack.vue.js

@@ -56,7 +56,7 @@ module.exports = env => {
     const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
 
     const entryModule = nsWebpack.getEntryModule(appFullPath);
-    const entryPath = `.${sep}${entryModule}.js`;
+    const entryPath = `.${sep}${entryModule}`;
     console.log(`Bundling application for entryPath ${entryPath}...`);
 
     const config = {
@@ -83,7 +83,7 @@ module.exports = env => {
             globalObject: "global",
         },
         resolve: {
-            extensions: [".vue", ".js", ".scss", ".css"],
+            extensions: [".vue", ".ts", ".js", ".scss", ".css"],
             // Resolve {N} system modules from tns-core-modules
             modules: [
                 resolve(__dirname, "node_modules/tns-core-modules"),
@@ -96,8 +96,8 @@ module.exports = env => {
                 '@': appFullPath,
                 'vue': 'nativescript-vue'
             },
-            // don't resolve symlinks to symlinked modules
-            symlinks: false,
+            // resolve symlinks to symlinked modules
+            symlinks: true,
         },
         resolveLoader: {
             // don't resolve symlinks to symlinked loaders
@@ -187,6 +187,14 @@ module.exports = env => {
                     test: /\.js$/,
                     loader: 'babel-loader',
                 },
+                {
+                    test: /\.ts$/,
+                    loader: 'ts-loader',
+                    options: {
+                        appendTsSuffixTo: [/\.vue$/],
+                        allowTsInNodeModules: true,
+                    },
+                },
                 {
                     test: /\.vue$/,
                     loader: "vue-loader",
@@ -263,4 +271,4 @@ module.exports = env => {
     }
 
     return config;
-};
+};