diff --git a/demo/AngularApp/package.json b/demo/AngularApp/package.json index 79551755..acf83ad0 100644 --- a/demo/AngularApp/package.json +++ b/demo/AngularApp/package.json @@ -29,7 +29,7 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.7.0-beta.1", + "@ngtools/webpack": "~6.1.0-rc.0", "@angular/compiler-cli": "~6.1.0-beta.1", "@types/chai": "^4.0.2", "@types/mocha": "^2.2.41", diff --git a/dependencyManager.js b/dependencyManager.js index 510be021..400f38fc 100644 --- a/dependencyManager.js +++ b/dependencyManager.js @@ -56,7 +56,6 @@ function removeObsoleteDeps(packageJson) { "nativescript-worker-loader", "extract-text-webpack-plugin", "uglifyjs-webpack-plugin", - "@ngtools/webpack", "@angular-devkit/core", "resolve-url-loader", "awesome-typescript-loader", @@ -82,12 +81,29 @@ function addDependency(deps, name, version, force) { } function getRequiredDeps(packageJson) { - return isAngular({packageJson}) ? - { - "@angular-devkit/build-angular": "~0.7.0-rc.0", - "@angular/compiler-cli": "~6.1.0-beta.1", - } : - { }; + if (!isAngular({packageJson})) { + return false; + } + + const deps = { + "@angular/compiler-cli": "~6.1.0-beta.3", + }; + + if (!dependsOn(packageJson, "@angular-devkit/build-angular")) { + deps["@ngtools/webpack"] = "~6.1.0-rc.0"; + } + + return deps; +} + + +function dependsOn(packageJson, package) { + if (!packageJson) { + return false; + } + + return packageJson.dependencies.hasOwnProperty(package) || + packageJson.devDependencies.hasOwnProperty(package); } function showHelperMessages({ newDepsAdded, hasOldDeps }) {