Revert "refactor: generate webpack.common templates on prepublish (#150)"

This reverts commit 4756198.

Author: sis0k0

Diff for: bin/ns-bundle

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 
-const { spawn } = require("child_process");
-const { resolve: pathResolve } = require("path");
-const { getPackageJson } = require("../projectHelpers");
+const spawn = require("child_process").spawn;
+const resolve = require("path").resolve;
 
-const PROJECT_DIR = pathResolve(__dirname, "../../../");
+const getPackageJson = require("../projectHelpers").getPackageJson;
+
+const PROJECT_DIR = resolve(__dirname, "../../../");
 const packageJson = getPackageJson(PROJECT_DIR);
 
 if (!process.env.npm_config_argv) {
@@ -66,16 +67,7 @@ function webpack(platform) {
     return new Promise(function (resolve, reject) {
         console.log(`Running webpack for ${platform}...`);
 
-        const args = [
-            true, // show output on console
-            `webpack`,
-            `--config=webpack.config.js`,
-            `--progress`,
-            `--env.${platform}`,
-            process.env.npm_config_uglify && `--env.uglify`,
-        ];
-
-        spawnChildProcess(...args)
+        spawnChildProcess(true, "webpack", `--config=webpack.${platform}.js`, "--progress")
             .then(resolve)
             .catch(throwError);
     });

Diff for: npmScriptsManager.js

@@ -17,8 +17,6 @@ const DEPRECATED_SCRIPT_TEMPLATES = Object.freeze([
 const PLATFORMS = Object.freeze(["android", "ios"]);
 
 function addNpmScripts(scripts) {
-    scripts = scripts || {};
-
     Object.keys(SCRIPT_TEMPLATES).forEach(name => {
         packageJson = addPlatformScript(scripts, name, SCRIPT_TEMPLATES[name]);
     });
@@ -53,8 +51,8 @@ function addPlatformScript(scripts, nameTemplate, commandTemplate) {
 }
 
 function removePlatformScripts(scripts, nameTemplate) {
-    if (!scripts || Object.keys(SCRIPT_TEMPLATES).includes(nameTemplate)) {
-        return scripts;
+    if (!scripts) {
+        return;
     }
 
     PLATFORMS.forEach(function (platform) {

Diff for: package.json

@@ -14,8 +14,7 @@
     "url": "https://github.com/NativeScript/nativescript-dev-webpack.git"
   },
   "scripts": {
-    "postinstall": "node postinstall.js",
-    "prepublishOnly": "node ./templates/buildTemplates.js"
+    "postinstall": "node postinstall.js"
   },
   "bin": {
     "install-ns-webpack": "./bin/install-ns-webpack",

Diff for: projectFilesManager.js

@@ -7,7 +7,7 @@ function addProjectFiles(projectDir, appDir) {
     const projectTemplates = getProjectTemplates(projectDir);
     Object.keys(projectTemplates).forEach(function(templateName) {
         const templateDestination = projectTemplates[templateName];
-        templateName = path.resolve(templateName);
+        templateName = path.resolve(templateName)
         copyTemplate(templateName, templateDestination);
     });
 
@@ -43,22 +43,24 @@ function copyTemplate(templateName, destinationPath) {
     // Create destination file, only if not present.
     if (!fs.existsSync(destinationPath)) {
         console.info(`Creating file: ${destinationPath}`);
-        console.log(templateName)
         const content = fs.readFileSync(templateName, "utf8");
         fs.writeFileSync(destinationPath, content);
     }
 }
 
 function getProjectTemplates(projectDir) {
-    let templates = {}
+    let templates = {
+        "webpack.android.js.template": "webpack.android.js",
+        "webpack.ios.js.template": "webpack.ios.js",
+    };
 
     if (helpers.isAngular({projectDir})) {
-        templates["webpack.config.js.ng.template"] = "webpack.config.js";
+        templates["webpack.common.js.angular.template"] = "webpack.common.js";
         templates["tsconfig.aot.json.template"] = "tsconfig.aot.json";
     } else if (helpers.isTypeScript({projectDir})) {
-        templates["webpack.config.js.ts.template"] = "webpack.config.js";
+        templates["webpack.common.js.typescript.template"] = "webpack.common.js";
     } else {
-        templates["webpack.config.js.js.template"] = "webpack.config.js";
+        templates["webpack.common.js.javascript.template"] = "webpack.common.js";
     }
 
     return getFullTemplatesPath(projectDir, templates);
@@ -83,7 +85,7 @@ function getFullTemplatesPath(projectDir, templates) {
     let updatedTemplates = {};
 
     Object.keys(templates).forEach(key => {
-        const updatedKey = getFullPath(path.join(__dirname, "templates"), key);
+        const updatedKey = getFullPath(__dirname, key);
         const updatedValue = getFullPath(projectDir, templates[key])
 
         updatedTemplates[updatedKey] = updatedValue;