Skip to content

fix: update-app-ng-deps works for all @angular packages #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 38 additions & 23 deletions nativescript-angular/bin/update-app-ng-deps
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,56 @@
const path = require("path");
const fs = require("fs");

const browserDynamicDependency = "@angular/platform-browser-dynamic";
const binPath = __dirname;
const pluginPath = path.dirname(binPath);
const pluginPackageJsonPath = path.join(pluginPath, "package.json");
const pluginPackageJson = JSON.parse(fs.readFileSync(pluginPackageJsonPath, "utf8"));
const pluginPeerDeps = pluginPackageJson.peerDependencies;

const projectPath = path.dirname(path.dirname(pluginPath));
const appPackageJsonPath = path.join(projectPath, "package.json");
const appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8"));

const shouldUpdateDependency = name => name.startsWith("@angular") ||
const isNgDependency = name => name.startsWith("@angular") ||
name === "rxjs" ||
name === "zone.js";

let updatedDependencies = appPackageJson.dependencies;
function updateDeps(deps, newDeps) {
// set app dependencies to ones required from plugin
Object.keys(newDeps)
.filter(isNgDependency)
.filter(dependencyName => deps.hasOwnProperty(dependencyName))
.map(dependencyName => ({
dependencyName,
version: pluginPackageJson.peerDependencies[dependencyName]
}))
.filter(({ dependencyName, version }) => deps[dependencyName] !== version)
.forEach(({ dependencyName, version }) => {
deps[dependencyName] = version;
console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
});

// remove platform-browser-dynamic if present
if (deps.hasOwnProperty(browserDynamicDependency)) {
delete deps[browserDynamicDependency];
console.log(`Removed ${browserDynamicDependency}`);
}


return deps;
}

// set app dependencies to ones required from plugin (peer)
Object.keys(pluginPeerDeps)
.filter(shouldUpdateDependency)
.forEach(dependencyName => {
const version = pluginPackageJson.peerDependencies[dependencyName];
updatedDependencies[dependencyName] = version;
console.log(`Updated dependency ${dependencyName} to version: ${version}.`);
let pluginDeps = pluginPackageJson.peerDependencies;
Object.keys(pluginPackageJson.devDependencies)
.filter(isNgDependency)
.filter(depName => !pluginDeps.hasOwnProperty(depName))
.forEach(depName => {
pluginDeps[depName] = pluginPackageJson.devDependencies[depName];
});

// remove platform-browser-dynamic if present
const browserDynamicDependency = "@angular/platform-browser-dynamic";
if (updatedDependencies.hasOwnProperty(browserDynamicDependency)) {
delete updatedDependencies[browserDynamicDependency];
console.log(`Removed ${browserDynamicDependency}`);
}
const projectPath = path.dirname(path.dirname(pluginPath));
const appPackageJsonPath = path.join(projectPath, "package.json");
const appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8"));

let updatedPackageJson = appPackageJson;
updatedPackageJson.dependencies = updatedDependencies;
appPackageJson.dependencies = updateDeps(appPackageJson.dependencies, pluginDeps);
appPackageJson.devDependencies = updateDeps(appPackageJson.devDependencies, pluginDeps);

fs.writeFileSync(appPackageJsonPath, JSON.stringify(updatedPackageJson, null, 2));
fs.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2));

console.log("\nAngular dependencies updated. Don't forget to run `npm install`.");