refactor: update paths from modules/@angular to packages

This commit is contained in:
Jason Aden
2017-03-07 11:04:30 -08:00
parent da8ea350b2
commit b74ab83d2c
53 changed files with 232 additions and 104 deletions

View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
const testingPlatformServer = require('../../all/@angular/platform-server/testing/server.js');
const testingPlatformServer = require('../../all/@angular/platform-server/testing/src/server.js');
const coreTesting = require('../../all/@angular/core/testing');
coreTesting.TestBed.initTestEnvironment(

View File

@ -1,6 +1,6 @@
// clang-format entry points
const srcsToFmt = [
'modules/@angular/**/*.{js,ts}',
'packages/**/*.{js,ts}',
'modules/benchmarks/**/*.{js,ts}',
'modules/e2e_util/**/*.{js,ts}',
'modules/playground/**/*.{js,ts}',

View File

@ -7,7 +7,7 @@ const entrypoints = [
//'dist/packages-dist/compiler/index.d.ts',
//'dist/packages-dist/compiler/testing.d.ts',
'dist/packages-dist/upgrade/typings/upgrade.d.ts',
'dist/packages-dist/upgrade/typings/static/static.d.ts',
'dist/packages-dist/upgrade/typings/static/index.d.ts',
'dist/packages-dist/platform-browser/typings/platform-browser.d.ts',
'dist/packages-dist/platform-browser/typings/testing/index.d.ts',
'dist/packages-dist/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts',
@ -19,7 +19,7 @@ const entrypoints = [
'dist/packages-dist/http/typings/http.d.ts', 'dist/packages-dist/http/typings/testing/index.d.ts',
'dist/packages-dist/forms/typings/forms.d.ts', 'dist/packages-dist/router/typings/router.d.ts',
'dist/packages-dist/animations/typings/animations.d.ts',
'dist/packages-dist/platform-browser/typings/animations/animations.d.ts',
'dist/packages-dist/platform-browser/typings/animations/index.d.ts',
'dist/packages-dist/platform-browser/typings/animations/testing/index.d.ts'
];

View File

@ -9,7 +9,8 @@
class RollupNG2 {
resolveId(id, from) {
if (id.startsWith('@angular/')) {
return `${__dirname}/../../packages-dist/${id.split('/')[1]}/esm/index.js`;
const packageName = id.split('/')[1];
return `${__dirname}/../../packages-dist/${packageName}/@angular/packageName.es5.js`;
}
// if(id.startsWith('rxjs/')){

View File

@ -38,7 +38,7 @@ const BaseConfig = {
if (platform == 'node') {
tscWatch = new TscWatch(Object.assign(
{
tsconfig: 'modules/tsconfig.json',
tsconfig: 'packages/tsconfig.json',
onChangeCmds: [[
'node', 'dist/tools/cjs-jasmine', '--', '@angular/**/*_spec.js',
'@angular/compiler-cli/test/**/*_spec.js', '@angular/benchpress/test/**/*_spec.js'
@ -48,7 +48,7 @@ if (platform == 'node') {
} else if (platform == 'browser') {
tscWatch = new TscWatch(Object.assign(
{
tsconfig: 'modules/tsconfig.json',
tsconfig: 'packages/tsconfig.json',
onStartCmds: [
[
'node', 'node_modules/karma/bin/karma', 'start', '--no-auto-watch', '--port=9876',
@ -56,7 +56,7 @@ if (platform == 'node') {
],
[
'node', 'node_modules/karma/bin/karma', 'start', '--no-auto-watch', '--port=9877',
'modules/@angular/router/karma.conf.js'
'packages/router/karma.conf.js'
],
],
onChangeCmds: [
@ -68,11 +68,11 @@ if (platform == 'node') {
} else if (platform == 'router') {
tscWatch = new TscWatch(Object.assign(
{
tsconfig: 'modules/tsconfig.json',
tsconfig: 'packages/tsconfig.json',
onStartCmds: [
[
'node', 'node_modules/karma/bin/karma', 'start', '--no-auto-watch', '--port=9877',
'modules/@angular/router/karma.conf.js'
'packages/router/karma.conf.js'
],
],
onChangeCmds: [
@ -83,7 +83,7 @@ if (platform == 'node') {
} else if (platform == 'browserNoRouter') {
tscWatch = new TscWatch(Object.assign(
{
tsconfig: 'modules/tsconfig.json',
tsconfig: 'packages/tsconfig.json',
onStartCmds: [[
'node', 'node_modules/karma/bin/karma', 'start', '--no-auto-watch', '--port=9876',
'karma-js.conf.js'