fix: generate tsconfig based on the nativescript-dev-webpack dependency

Author: DimitarTachev

projectFilesManager.js

@@ -1,11 +1,11 @@
 const path = require("path");
 const fs = require("fs");
 
-const { isAngular, isVue } = require("./projectHelpers");
+const { isTypeScript, isAngular, isVue } = require("./projectHelpers");
 
 function addProjectFiles(projectDir) {
     const projectTemplates = getProjectTemplates(projectDir);
-    Object.keys(projectTemplates).forEach(function(templateName) {
+    Object.keys(projectTemplates).forEach(function (templateName) {
         const templateDestination = projectTemplates[templateName];
         templateName = path.resolve(templateName);
         copyTemplate(templateName, templateDestination);
@@ -14,7 +14,7 @@ function addProjectFiles(projectDir) {
 
 function removeProjectFiles(projectDir) {
     const projectTemplates = getProjectTemplates(projectDir);
-    Object.keys(projectTemplates).forEach(function(templateName) {
+    Object.keys(projectTemplates).forEach(function (templateName) {
         const templateDestination = projectTemplates[templateName];
         deleteFile(templateDestination);
     });
@@ -65,8 +65,10 @@ function getProjectTemplates(projectDir) {
         templates = getAngularTemplates(WEBPACK_CONFIG_NAME, TSCONFIG_TNS_NAME);
     } else if (isVue({ projectDir })) {
         templates = getVueTemplates(WEBPACK_CONFIG_NAME);
-    } else {
+    } else if (isTypeScript({ projectDir })) {
         templates = getTypeScriptTemplates(WEBPACK_CONFIG_NAME, TSCONFIG_TNS_NAME);
+    } else {
+        templates = getJavaScriptTemplates(WEBPACK_CONFIG_NAME);
     }
 
     return getFullTemplatesPath(projectDir, templates);
@@ -92,6 +94,12 @@ function getVueTemplates(webpackConfigName) {
     };
 }
 
+function getJavaScriptTemplates(webpackConfigName) {
+    return {
+        "webpack.typescript.js": webpackConfigName,
+    };
+}
+
 function getFullTemplatesPath(projectDir, templates) {
     let updatedTemplates = {};
 

projectHelpers.js

@@ -8,6 +8,20 @@ const PROJECT_DATA_GETTERS = {
     appResourcesPath: "getAppResourcesRelativeDirectoryPath",
 };
 
+const isTypeScript = ({ projectDir, packageJson } = {}) => {
+    packageJson = packageJson || getPackageJson(projectDir);
+
+    return (
+        packageJson.dependencies &&
+        (packageJson.dependencies.hasOwnProperty("nativescript-dev-typescript") ||
+            packageJson.dependencies.hasOwnProperty("typescript"))
+    ) || (
+            packageJson.devDependencies &&
+            (packageJson.devDependencies.hasOwnProperty("nativescript-dev-typescript") ||
+                packageJson.devDependencies.hasOwnProperty("typescript"))
+        ) || isAngular({ packageJson });
+};
+
 const isAngular = ({ projectDir, packageJson } = {}) => {
     packageJson = packageJson || getPackageJson(projectDir);
 
@@ -80,6 +94,7 @@ module.exports = {
     isIos,
     isAngular,
     isVue,
+    isTypeScript,
     writePackageJson,
     convertSlashesInPath
 };

templates/webpack.typescript.js

@@ -102,7 +102,7 @@ module.exports = env => {
             "__dirname": false,
         },
         devtool: sourceMap ? "inline-source-map" : "none",
-        optimization:  {
+        optimization: {
             splitChunks: {
                 cacheGroups: {
                     vendor: {
@@ -111,7 +111,7 @@ module.exports = env => {
                         test: (module, chunks) => {
                             const moduleName = module.nameForCondition ? module.nameForCondition() : '';
                             return /[\\/]node_modules[\\/]/.test(moduleName) ||
-                                    appComponents.some(comp => comp === moduleName);
+                                appComponents.some(comp => comp === moduleName);
 
                         },
                         enforce: true,
@@ -140,7 +140,7 @@ module.exports = env => {
         module: {
             rules: [
                 {
-                    test: new RegExp(entryPath + "\.[jt]s"),
+                    test: new RegExp(entryPath + "\.(js|ts)"),
                     use: [
                         // Require all Android app components
                         platform === "android" && {
@@ -158,7 +158,7 @@ module.exports = env => {
                 },
 
                 {
-                    test: /-page\.[jt]s$/,
+                    test: /-page\.(js|ts)$/,
                     use: "nativescript-dev-webpack/script-hot-loader"
                 },
 
@@ -172,7 +172,7 @@ module.exports = env => {
                     use: "nativescript-dev-webpack/markup-hot-loader"
                 },
 
-                { test: /\.(html|xml)$/, use: "nativescript-dev-webpack/xml-namespace-loader"},
+                { test: /\.(html|xml)$/, use: "nativescript-dev-webpack/xml-namespace-loader" },
 
                 {
                     test: /\.css$/,
@@ -203,14 +203,14 @@ module.exports = env => {
                 "process": undefined,
             }),
             // Remove all files from the out dir.
-            new CleanWebpackPlugin([ `${dist}/**/*` ]),
+            new CleanWebpackPlugin([`${dist}/**/*`]),
             // Copy native app resources to out dir.
             new CopyWebpackPlugin([
-              {
-                from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
-                to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
-                context: projectRoot
-              },
+                {
+                    from: `${appResourcesFullPath}/${appResourcesPlatformDir}`,
+                    to: `${dist}/App_Resources/${appResourcesPlatformDir}`,
+                    context: projectRoot
+                },
             ]),
             // Copy assets to out dir. Add your own globs as needed.
             new CopyWebpackPlugin([