iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build(aio): temporarily use RxJS from root `node_modules/` when using local packages (#22573) 

PR Close #22573
This commit is contained in:
George Kalpakas 2018-03-06 19:01:25 +02:00 committed by Igor Minar
parent 2b3de6390f
commit e5fcf650f8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aio/tools/ng-packages-installer/index.js
View File

@ -165,6 +165,12 @@ class NgPackagesInstaller {
.forEach(key => peerDependencies[key] = sourcePackagePeerDeps[key]); .forEach(key => peerDependencies[key] = sourcePackagePeerDeps[key]);
} }
}); });
// FIXME: Temporarily use RxJS from root `node_modules/`.
if (peerDependencies.rxjs) {
peerDependencies.rxjs = `file:${ANGULAR_ROOT_DIR}/node_modules/rxjs`;
}
return [mergedDependencies, peerDependencies]; return [mergedDependencies, peerDependencies];
} }

4
aio/tools/ng-packages-installer/index.spec.js
View File

@ -58,7 +58,7 @@ describe('NgPackagesInstaller', () => {
'@angular/core': { '@angular/core': {
parentDir: packagesDir, parentDir: packagesDir,
packageJsonPath: `${packagesDir}/core/package.json`, packageJsonPath: `${packagesDir}/core/package.json`,
config: { peerDependencies: { rxjs: '5.0.1' } } config: { peerDependencies: { 'some-package': '5.0.1' } }
}, },
'@angular/common': { '@angular/common': {
parentDir: packagesDir, parentDir: packagesDir,
@ -112,7 +112,7 @@ describe('NgPackagesInstaller', () => {
}, },
devDependencies: { devDependencies: {
'@angular/compiler-cli': `file:${toolsDir}/compiler-cli`, '@angular/compiler-cli': `file:${toolsDir}/compiler-cli`,
rxjs: '5.0.1', 'some-package': '5.0.1',
typescript: '^2.4.2' typescript: '^2.4.2'
}, },
__angular: { local: true } __angular: { local: true }