refactor: remove the vendor.ts/js files

Author: sis0k0

installer.js

@@ -4,10 +4,9 @@ const dependencyManager = require("./dependencyManager");
 
 function install() {
     const projectDir = helpers.getProjectDir();
-    const appPath = helpers.getAppPath();
     const packageJson = helpers.getPackageJson(projectDir);
 
-    projectFilesManager.addProjectFiles(projectDir, appPath);
+    projectFilesManager.addProjectFiles(projectDir);
 
     const postinstallOptions = dependencyManager.addProjectDeps(packageJson);
     packageJson.devDependencies = postinstallOptions.deps;
@@ -19,8 +18,7 @@ function install() {
 
 function uninstall() {
     const projectDir = helpers.getProjectDir();
-    const appPath = helpers.getAppPath();
-    projectFilesManager.removeProjectFiles(projectDir, appPath);
+    projectFilesManager.removeProjectFiles(projectDir);
 
     console.log("NativeScript Webpack removed!");
 }

nsCliHelpers.js

@@ -3,38 +3,26 @@ const fs = require("fs");
 
 const { isTypeScript, isAngular } = require("./projectHelpers");
 
-function addProjectFiles(projectDir, appDir) {
+function addProjectFiles(projectDir) {
     const projectTemplates = getProjectTemplates(projectDir);
     Object.keys(projectTemplates).forEach(function(templateName) {
         const templateDestination = projectTemplates[templateName];
         templateName = path.resolve(templateName);
         copyTemplate(templateName, templateDestination);
     });
-
-    const appTemplates = getAppTemplates(projectDir, appDir);
-    Object.keys(appTemplates).forEach(function(templateName) {
-        const templateDestination = appTemplates[templateName];
-        copyTemplate(templateName, templateDestination)
-    });
 }
 
-function removeProjectFiles(projectDir, appDir) {
+function removeProjectFiles(projectDir) {
     const projectTemplates = getProjectTemplates(projectDir);
     Object.keys(projectTemplates).forEach(function(templateName) {
         const templateDestination = projectTemplates[templateName];
         deleteFile(templateDestination);
     });
-
-    const appTemplates = getAppTemplates(projectDir, appDir);
-    Object.keys(appTemplates).forEach(function(templateName) {
-        const templateDestination = appTemplates[templateName];
-        deleteFile(templateDestination);
-    });
 }
 
-function forceUpdateProjectFiles(projectDir, appDir) {
-    removeProjectFiles(projectDir, appDir);
-    addProjectFiles(projectDir, appDir);
+function forceUpdateProjectFiles(projectDir) {
+    removeProjectFiles(projectDir);
+    addProjectFiles(projectDir);
 }
 
 function compareProjectFiles(projectDir) {
@@ -69,31 +57,20 @@ function copyTemplate(templateName, destinationPath) {
 }
 
 function getProjectTemplates(projectDir) {
-    let templates = {}
+    const templates = {}
+    const CONFIG_NAME = "webpack.config.js";
 
     if (isAngular({projectDir})) {
-        templates["webpack.angular.js"] = "webpack.config.js";
+        templates["webpack.angular.js"] = CONFIG_NAME;
     } else if (isTypeScript({projectDir})) {
-        templates["webpack.typescript.js"] = "webpack.config.js";
+        templates["webpack.typescript.js"] = CONFIG_NAME;
     } else {
-        templates["webpack.javascript.js"] = "webpack.config.js";
+        templates["webpack.javascript.js"] = CONFIG_NAME;
     }
 
     return getFullTemplatesPath(projectDir, templates);
 }
 
-function getAppTemplates(projectDir, appDir) {
-    const templates = {};
-
-    if (isAngular({projectDir})) {
-        templates["vendor.angular.ts"] = tsOrJs(projectDir, "vendor");
-    } else {
-        templates["vendor.nativescript.ts"] = tsOrJs(projectDir, "vendor");
-    }
-
-    return getFullTemplatesPath(appDir, templates);
-}
-
 function getFullTemplatesPath(projectDir, templates) {
     let updatedTemplates = {};
 
@@ -111,15 +88,9 @@ function getFullPath(projectDir, filePath) {
     return path.resolve(projectDir, filePath);
 }
 
-function tsOrJs(projectDir, name) {
-    const extension = isTypeScript({projectDir}) ? "ts" : "js";
-    return `${name}.${extension}`;
-}
-
 module.exports = {
     addProjectFiles,
     removeProjectFiles,
     forceUpdateProjectFiles,
     compareProjectFiles,
 };
-

projectFilesManager.js

@@ -4,11 +4,10 @@ const semver = require("semver");
 const { EOL } = require("os");
 const hook = require("nativescript-hook")(__dirname);
 
-const {
-    PROJECT_DATA_GETTERS,
-    getProjectData,
-    safeGet,
-} = require("./nsCliHelpers");
+const PROJECT_DATA_GETTERS = {
+    appPath: "getAppDirectoryRelativePath",
+    appResourcesPath: "getAppResourcesRelativeDirectoryPath",
+};
 
 const APP_DIR = "app";
 const ANDROID_PROJECT_PATH = "platforms/android";
@@ -150,16 +149,6 @@ const getPackageJsonPath = projectDir => path.resolve(projectDir, "package.json"
 const isAndroid = platform => /android/i.test(platform);
 const isIos = platform => /ios/i.test(platform);
 
-function getAppPath() {
-    const projectDir = getProjectDir();
-    const projectData = getProjectData(projectDir);
-    const appDir = getAppPathFromProjectData(projectData) || APP_DIR;
-
-    const appPath = path.resolve(projectDir, appDir);
-
-    return appPath;
-}
-
 function getAppPathFromProjectData(data) {
     return safeGet(data, PROJECT_DATA_GETTERS.appPath);
 }
@@ -168,9 +157,23 @@ function getAppResourcesPathFromProjectData(data) {
     return safeGet(data, PROJECT_DATA_GETTERS.appResourcesPath);
 }
 
+function safeGet(object, property, ...args) {
+    if (!object) {
+        return;
+    }
+
+    const value = object[property];
+    if (!value) {
+        return;
+    }
+
+    return typeof value === "function" ?
+        value.bind(object)(...args) :
+        value;
+}
+
 module.exports = {
     APP_DIR,
-    getAppPath,
     getAppPathFromProjectData,
     getAppResourcesPathFromProjectData,
     getAndroidProjectPath,

projectHelpers.js

@@ -2,7 +2,6 @@ const { spawn } = require("child_process");
 const { resolve: pathResolve } = require("path");
 
 const {
-    getAppPath,
     getPackageJson,
     getProjectDir,
     writePackageJson,
@@ -48,9 +47,7 @@ function updateDeps(projectDir) {
 
 function updateConfigs(projectDir) {
     console.info("Updating configuration files...");
-
-    const appDir = getAppPath();
-    forceUpdateProjectFiles(projectDir, appDir);
+    forceUpdateProjectFiles(projectDir);
 }
 
 function execute(command) {