diff --git a/installer.js b/installer.js index 7bc83dd3..3d43ffbe 100644 --- a/installer.js +++ b/installer.js @@ -10,14 +10,14 @@ const PROJECT_DIR = path.dirname(path.dirname(__dirname)); const APP_DIR = path.resolve(PROJECT_DIR, "app"); function install() { - let packageJson = helpers.getPackageJson(PROJECT_DIR); + const packageJson = helpers.getPackageJson(PROJECT_DIR); projectFilesManager.addProjectFiles(PROJECT_DIR, APP_DIR); projectFilesManager.editExistingProjectFiles(PROJECT_DIR); - let scripts = packageJson.scripts || {}; - scripts = npmScriptsManager.removeDeprecatedNpmScripts(scripts); - scripts = npmScriptsManager.addNpmScripts(scripts); + const scripts = packageJson.scripts || {}; + npmScriptsManager.removeDeprecatedNpmScripts(scripts); + npmScriptsManager.addNpmScripts(scripts); packageJson.scripts = scripts; const postinstallOptions = dependencyManager.addProjectDeps(packageJson); @@ -29,16 +29,17 @@ function install() { } function uninstall() { - let packageJson = helpers.getPackageJson(PROJECT_DIR); + const packageJson = helpers.getPackageJson(PROJECT_DIR); projectFilesManager.removeProjectFiles(PROJECT_DIR, APP_DIR); - npmScriptsManager.removeDeprecatedNpmScripts(packageJson); - let scripts = packageJson.scripts; - scripts = npmScriptsManager.removeNpmScripts(scripts); - packageJson.scripts = scripts; + console.log("Removing npm scripts..."); + npmScriptsManager.removeDeprecatedNpmScripts(packageJson); + npmScriptsManager.removeNpmScripts(packageJson.scripts); helpers.writePackageJson(packageJson, PROJECT_DIR); + + console.log("NativeScript Webpack removed!"); } module.exports = { diff --git a/npmScriptsManager.js b/npmScriptsManager.js index af5d99cd..ba129288 100644 --- a/npmScriptsManager.js +++ b/npmScriptsManager.js @@ -17,14 +17,10 @@ const DEPRECATED_SCRIPT_TEMPLATES = Object.freeze([ const PLATFORMS = Object.freeze(["android", "ios"]); -function addNpmScripts(scripts) { - scripts = scripts || {}; - +function addNpmScripts(scripts = {}) { Object.keys(SCRIPT_TEMPLATES).forEach(name => { - packageJson = addPlatformScript(scripts, name, SCRIPT_TEMPLATES[name]); + addPlatformScript(scripts, name, SCRIPT_TEMPLATES[name]); }); - - return scripts; } function removeDeprecatedNpmScripts(scripts) { @@ -32,15 +28,13 @@ function removeDeprecatedNpmScripts(scripts) { } function removeNpmScripts(scripts, scriptTemplates = Object.keys(SCRIPT_TEMPLATES)) { - scriptTemplates.forEach(function(templateName) { - scripts = removePlatformScripts(scripts, templateName); + scriptTemplates.forEach(templateName => { + removePlatformScripts(scripts, templateName); }); - - return scripts; } function addPlatformScript(scripts, nameTemplate, commandTemplate) { - PLATFORMS.forEach(function (platform) { + PLATFORMS.forEach(platform => { const name = nameTemplate.replace(/\[PLATFORM\]/g, platform); const command = commandTemplate.replace(/\[PLATFORM\]/g, platform); @@ -49,25 +43,13 @@ function addPlatformScript(scripts, nameTemplate, commandTemplate) { scripts[name] = command; } }); - - return scripts; } function removePlatformScripts(scripts, nameTemplate) { - if (!scripts || Object.keys(SCRIPT_TEMPLATES).includes(nameTemplate)) { - return scripts; - } - - PLATFORMS.forEach(function (platform) { + PLATFORMS.forEach(platform => { const name = nameTemplate.replace(/\[PLATFORM\]/g, platform); - - if (scripts[name]) { - console.info(`Removing script: ${name}`); - delete scripts[name]; - } + delete scripts[name]; }); - - return scripts; } module.exports = {