build: fix file paths after moving modules/@angular/* to packages/*
This commit is contained in:
@ -5,7 +5,7 @@
|
||||
"main": "./bundles/router.umd.js",
|
||||
"module": "./@angular/router.es5.js",
|
||||
"es2015": "./@angular/router.js",
|
||||
"typings": "./typings/router.d.ts",
|
||||
"typings": "./typings/index.d.ts",
|
||||
"keywords": [
|
||||
"angular",
|
||||
"router"
|
||||
|
21
packages/router/rollup-testing.config.js
Normal file
21
packages/router/rollup-testing.config.js
Normal file
@ -0,0 +1,21 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google Inc. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
export default {
|
||||
entry: '../../../dist/packages-dist/router/testing/index.js',
|
||||
dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
|
||||
format: 'umd',
|
||||
moduleName: 'ng.router.testing',
|
||||
globals: {
|
||||
'@angular/core': 'ng.core',
|
||||
'@angular/common': 'ng.common',
|
||||
'@angular/common/testing': 'ng.common.testing',
|
||||
'@angular/platform-browser': 'ng.platformBrowser',
|
||||
'@angular/router': 'ng.router'
|
||||
}
|
||||
};
|
20
packages/router/rollup-upgrade.config.js
Normal file
20
packages/router/rollup-upgrade.config.js
Normal file
@ -0,0 +1,20 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google Inc. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
export default {
|
||||
entry: '../../../dist/packages-dist/router/upgrade.js',
|
||||
dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js',
|
||||
format: 'umd',
|
||||
moduleName: 'ng.router.upgrade',
|
||||
globals: {
|
||||
'@angular/core': 'ng.core',
|
||||
'@angular/common': 'ng.common',
|
||||
'@angular/router': 'ng.router',
|
||||
'@angular/upgrade/static': 'ng.upgrade.static'
|
||||
}
|
||||
};
|
44
packages/router/rollup.config.js
Normal file
44
packages/router/rollup.config.js
Normal file
@ -0,0 +1,44 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google Inc. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
export default {
|
||||
entry: '../../../dist/packages-dist/router/@angular/index.js',
|
||||
dest: '../../../dist/packages-dist/router/bundles/router.umd.js',
|
||||
format: 'umd',
|
||||
moduleName: 'ng.router',
|
||||
globals: {
|
||||
'@angular/core': 'ng.core',
|
||||
'@angular/common': 'ng.common',
|
||||
'@angular/platform-browser': 'ng.platformBrowser',
|
||||
|
||||
'rxjs/BehaviorSubject': 'Rx',
|
||||
'rxjs/Observable': 'Rx',
|
||||
'rxjs/Subject': 'Rx',
|
||||
'rxjs/Subscription': 'Rx',
|
||||
'rxjs/util/EmptyError': 'Rx',
|
||||
|
||||
'rxjs/observable/from': 'Rx.Observable',
|
||||
'rxjs/observable/fromPromise': 'Rx.Observable',
|
||||
'rxjs/observable/forkJoin': 'Rx.Observable',
|
||||
'rxjs/observable/of': 'Rx.Observable',
|
||||
|
||||
'rxjs/operator/toPromise': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/map': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/mergeAll': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/concatAll': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/mergeMap': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/reduce': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/every': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/first': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/catch': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/last': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/filter': 'Rx.Observable.prototype',
|
||||
'rxjs/operator/concatMap': 'Rx.Observable.prototype'
|
||||
},
|
||||
plugins: []
|
||||
};
|
@ -10,7 +10,7 @@ import {CommonModule, Location} from '@angular/common';
|
||||
import {Component, NgModule, NgModuleFactoryLoader} from '@angular/core';
|
||||
import {ComponentFixture, TestBed, fakeAsync, inject, tick} from '@angular/core/testing';
|
||||
import {By} from '@angular/platform-browser/src/dom/debug/by';
|
||||
import {expect} from '@angular/platform-browser/testing/matchers';
|
||||
import {expect} from '@angular/platform-browser/testing/src/matchers';
|
||||
import {Observable} from 'rxjs/Observable';
|
||||
import {map} from 'rxjs/operator/map';
|
||||
|
||||
|
@ -15,7 +15,7 @@ import {RouterOutletMap} from '../src/router_outlet_map';
|
||||
import {ActivatedRouteSnapshot, RouterStateSnapshot, createEmptyStateSnapshot} from '../src/router_state';
|
||||
import {DefaultUrlSerializer} from '../src/url_tree';
|
||||
import {TreeNode} from '../src/utils/tree';
|
||||
import {RouterTestingModule} from '../testing/router_testing_module';
|
||||
import {RouterTestingModule} from '../testing/src/router_testing_module';
|
||||
|
||||
describe('Router', () => {
|
||||
describe('resetRootComponentType', () => {
|
||||
@ -117,4 +117,4 @@ function createActivatedRouteSnapshot(cmp: string, extra: any = {}): ActivatedRo
|
||||
return new ActivatedRouteSnapshot(
|
||||
<any>[], {}, <any>null, <any>null, <any>null, <any>null, <any>cmp, <any>{}, <any>null, -1,
|
||||
extra.resolve);
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
import {fakeAsync, tick} from '@angular/core/testing';
|
||||
import {SpyNgModuleFactoryLoader} from '../testing/router_testing_module';
|
||||
import {SpyNgModuleFactoryLoader} from '../testing/src/router_testing_module';
|
||||
|
||||
describe('SpyNgModuleFactoryLoader', () => {
|
||||
it('should invoke the compiler when the setter is called', () => {
|
||||
@ -42,4 +42,4 @@ describe('SpyNgModuleFactoryLoader', () => {
|
||||
|
||||
expect(error).toEqual(new Error('Cannot find module two'));
|
||||
}));
|
||||
});
|
||||
});
|
||||
|
15
packages/router/testing/index.ts
Normal file
15
packages/router/testing/index.ts
Normal file
@ -0,0 +1,15 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google Inc. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
/**
|
||||
* @module
|
||||
* @description
|
||||
* Entry point for all public APIs of the router/testing package.
|
||||
*/
|
||||
|
||||
export * from './src/testing';
|
6
packages/router/testing/package.json
Normal file
6
packages/router/testing/package.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"typings": "../typings/testing/index.d.ts",
|
||||
"main": "../bundles/router-testing.umd.js",
|
||||
"module": "../@angular/router/testing.es5.js",
|
||||
"es2015": "../@angular/router/testing.js"
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
{
|
||||
"extends": "../tsconfig",
|
||||
"extends": "../tsconfig-build",
|
||||
"compilerOptions": {
|
||||
"paths": {
|
||||
"@angular/core": ["../../../dist/packages/core"],
|
||||
"@angular/common": ["../../../dist/packages/common"],
|
||||
"@angular/common/testing": ["../../../dist/packages/common/testing"],
|
||||
"@angular/platform-browser": ["../../../dist/packages/platform-browser"],
|
||||
"@angular/router": ["../../../dist/packages/router"]
|
||||
"@angular/core": ["../../dist/packages/core"],
|
||||
"@angular/common": ["../../dist/packages/common"],
|
||||
"@angular/common/testing": ["../../dist/packages/common/testing"],
|
||||
"@angular/platform-browser": ["../../dist/packages/platform-browser"],
|
||||
"@angular/router": ["../../dist/packages/router"]
|
||||
}
|
||||
},
|
||||
"files": [
|
||||
|
18
packages/router/testingmvsconfig-json.json
Normal file
18
packages/router/testingmvsconfig-json.json
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
"extends": "../tsconfig",
|
||||
"compilerOptions": {
|
||||
"paths": {
|
||||
"@angular/core": ["../../../dist/packages/core"],
|
||||
"@angular/common": ["../../../dist/packages/common"],
|
||||
"@angular/common/testing": ["../../../dist/packages/common/testing"],
|
||||
"@angular/platform-browser": ["../../../dist/packages/platform-browser"],
|
||||
"@angular/router": ["../../../dist/packages/router"]
|
||||
}
|
||||
},
|
||||
"files": [
|
||||
"index.ts"
|
||||
],
|
||||
"angularCompilerOptions": {
|
||||
"strictMetadataEmit": true
|
||||
}
|
||||
}
|
@ -10,11 +10,11 @@
|
||||
"noEmitOnError": false,
|
||||
"noImplicitAny": true,
|
||||
"noImplicitReturns": true,
|
||||
"outDir": "../../../dist/packages-dist/router",
|
||||
"outDir": "../../dist/packages/router",
|
||||
"paths": {
|
||||
"@angular/core": ["../../../dist/packages-dist/core"],
|
||||
"@angular/common": ["../../../dist/packages-dist/common"],
|
||||
"@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"]
|
||||
"@angular/core": ["../../dist/packages/core"],
|
||||
"@angular/common": ["../../dist/packages/common"],
|
||||
"@angular/platform-browser": ["../../dist/packages/platform-browser"]
|
||||
},
|
||||
"rootDir": ".",
|
||||
"sourceMap": true,
|
||||
|
15
packages/router/upgrade/index.ts
Normal file
15
packages/router/upgrade/index.ts
Normal file
@ -0,0 +1,15 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright Google Inc. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by an MIT-style license that can be
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
/**
|
||||
* @module
|
||||
* @description
|
||||
* Entry point for all public APIs of the router/upgrade package.
|
||||
*/
|
||||
|
||||
export * from './src/upgrade';
|
6
packages/router/upgrade/package.json
Normal file
6
packages/router/upgrade/package.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"typings": "../typings/upgrade/upgrade.d.ts",
|
||||
"main": "../bundles/router-upgrade.umd.js",
|
||||
"module": "../@angular/router/upgrade.es5.js",
|
||||
"es2015": "../@angular/router/upgrade.js"
|
||||
}
|
@ -1,16 +1,15 @@
|
||||
{
|
||||
"extends": "./tsconfig-build",
|
||||
"extends": "../tsconfig-build",
|
||||
"compilerOptions": {
|
||||
"outDir": "../../../dist/packages-dist/router/upgrade",
|
||||
"paths": {
|
||||
"@angular/core": ["../../../dist/packages-dist/core"],
|
||||
"@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
|
||||
"@angular/router": ["../../../dist/packages-dist/router"],
|
||||
"@angular/upgrade/static": ["../../../dist/packages-dist/upgrade/static"]
|
||||
"@angular/core": ["../../dist/packages/core"],
|
||||
"@angular/platform-browser": ["../../dist/packages/platform-browser"],
|
||||
"@angular/router": ["../../dist/packages/router"],
|
||||
"@angular/upgrade/static": ["../../dist/packages/upgrade/static"]
|
||||
}
|
||||
},
|
||||
"files": [
|
||||
"upgrade.ts"
|
||||
"index.ts"
|
||||
],
|
||||
"angularCompilerOptions": {
|
||||
"strictMetadataEmit": true
|
||||
|
Reference in New Issue
Block a user