Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-15 18:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): relax compatible angular check package location

Browse Source
This commit is contained in:
Charles Lyding 2018-09-19 21:23:37 -04:00 committed by Hans
parent 2397920ff3
commit d24db32c40
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/angular/cli/upgrade/version.ts
View File

@ -41,17 +41,6 @@ export class Version {
let angularPkgJson;
let rxjsPkgJson;
const isInside = (base: string, potential: string): boolean => {
const absoluteBase = path.resolve(base);
const absolutePotential = path.resolve(potential);
const relativePotential = path.relative(absoluteBase, absolutePotential);
if (!relativePotential.startsWith('..') && !path.isAbsolute(relativePotential)) {
return true;
}
return false;
};
try {
const resolveOptions = {
basedir: projectRoot,
@ -61,11 +50,6 @@ export class Version {
const angularPackagePath = resolve('@angular/core/package.json', resolveOptions);
const rxjsPackagePath = resolve('rxjs/package.json', resolveOptions);
if (!isInside(projectRoot, angularPackagePath)
|| !isInside(projectRoot, rxjsPackagePath)) {
throw new Error();
}
angularPkgJson = require(angularPackagePath);
rxjsPkgJson = require(rxjsPackagePath);
} catch {