Revert "refactor: add license header to JS files & format files (#12035)"

This reverts commit 8310c918236c2bc085a0fd4278ee96106c5c2f1a.
This commit is contained in:
Chuck Jazdzewski 2016-10-04 14:06:41 -07:00
parent 8310c91823
commit 43d3a84df3
73 changed files with 947 additions and 1173 deletions

View File

@ -1,16 +1,6 @@
/** // Unique place to configure the browsers which are used in the different CI jobs in Sauce Labs (SL) and BrowserStack (BS).
* @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
*/
// Unique place to configure the browsers which are used in the different CI jobs in Sauce Labs (SL)
// and BrowserStack (BS).
// If the target is set to null, then the browser is not run anywhere during CI. // If the target is set to null, then the browser is not run anywhere during CI.
// If a category becomes empty (e.g. BS and required), then the corresponding job must be commented // If a category becomes empty (e.g. BS and required), then the corresponding job must be commented out in Travis configuration.
// out in Travis configuration.
var CIconfiguration = { var CIconfiguration = {
'Chrome': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Chrome': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
'Firefox': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}}, 'Firefox': { unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
@ -41,58 +31,212 @@ var CIconfiguration = {
}; };
var customLaunchers = { var customLaunchers = {
'DartiumWithWebPlatform': 'DartiumWithWebPlatform': {
{base: 'Dartium', flags: ['--enable-experimental-web-platform-features']}, base: 'Dartium',
'ChromeNoSandbox': {base: 'Chrome', flags: ['--no-sandbox']}, flags: ['--enable-experimental-web-platform-features'] },
'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '52'}, 'ChromeNoSandbox': {
'SL_CHROMEBETA': {base: 'SauceLabs', browserName: 'chrome', version: 'beta'}, base: 'Chrome',
'SL_CHROMEDEV': {base: 'SauceLabs', browserName: 'chrome', version: 'dev'}, flags: ['--no-sandbox'] },
'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '46'}, 'SL_CHROME': {
'SL_FIREFOXBETA': {base: 'SauceLabs', browserName: 'firefox', version: 'beta'}, base: 'SauceLabs',
'SL_FIREFOXDEV': {base: 'SauceLabs', browserName: 'firefox', version: 'dev'}, browserName: 'chrome',
'SL_SAFARI7': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.9', version: '7.0'}, version: '52'
'SL_SAFARI8': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.10', version: '8.0'}, },
'SL_SAFARI9': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.11', version: '9.0'}, 'SL_CHROMEBETA': {
'SL_SAFARI10': base: 'SauceLabs',
{base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.12', version: '10.0'}, browserName: 'chrome',
'SL_IOS7': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '7.1'}, version: 'beta'
'SL_IOS8': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '8.4'}, },
'SL_IOS9': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '9.3'}, 'SL_CHROMEDEV': {
'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.0'}, base: 'SauceLabs',
'SL_IE9': browserName: 'chrome',
{base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'}, version: 'dev'
},
'SL_FIREFOX': {
base: 'SauceLabs',
browserName: 'firefox',
version: '46'
},
'SL_FIREFOXBETA': {
base: 'SauceLabs',
browserName: 'firefox',
version: 'beta'
},
'SL_FIREFOXDEV': {
base: 'SauceLabs',
browserName: 'firefox',
version: 'dev'
},
'SL_SAFARI7': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.9',
version: '7.0'
},
'SL_SAFARI8': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.10',
version: '8.0'
},
'SL_SAFARI9': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.11',
version: '9.0'
},
'SL_SAFARI10': {
base: 'SauceLabs',
browserName: 'safari',
platform: 'OS X 10.12',
version: '10.0'
},
'SL_IOS7': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '7.1'
},
'SL_IOS8': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '8.4'
},
'SL_IOS9': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '9.3'
},
'SL_IOS10': {
base: 'SauceLabs',
browserName: 'iphone',
platform: 'OS X 10.10',
version: '10.0'
},
'SL_IE9': {
base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 2008',
version: '9'
},
'SL_IE10': { 'SL_IE10': {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'internet explorer', browserName: 'internet explorer',
platform: 'Windows 2012', platform: 'Windows 2012',
version: '10' version: '10'
}, },
'SL_IE11': 'SL_IE11': {
{base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8.1', version: '11'}, base: 'SauceLabs',
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
},
'SL_EDGE': { 'SL_EDGE': {
base: 'SauceLabs', base: 'SauceLabs',
browserName: 'MicrosoftEdge', browserName: 'MicrosoftEdge',
platform: 'Windows 10', platform: 'Windows 10',
version: '13.10586' version: '13.10586'
}, },
'SL_ANDROID4.1': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.1'}, 'SL_ANDROID4.1': {
'SL_ANDROID4.2': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.2'}, base: 'SauceLabs',
'SL_ANDROID4.3': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.3'}, browserName: 'android',
'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'}, platform: 'Linux',
'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'}, version: '4.1'
},
'SL_ANDROID4.2': {
base: 'SauceLabs',
browserName: 'android',
platform: 'Linux',
version: '4.2'
},
'SL_ANDROID4.3': {
base: 'SauceLabs',
browserName: 'android',
platform: 'Linux',
version: '4.3'
},
'SL_ANDROID4.4': {
base: 'SauceLabs',
browserName: 'android',
platform: 'Linux',
version: '4.4'
},
'SL_ANDROID5': {
base: 'SauceLabs',
browserName: 'android',
platform: 'Linux',
version: '5.1'
},
'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'}, 'BS_CHROME': {
'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'}, base: 'BrowserStack',
'BS_SAFARI7': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Mavericks'}, browser: 'chrome',
'BS_SAFARI8': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Yosemite'}, os: 'OS X',
'BS_SAFARI9': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'El Capitan'}, os_version: 'Yosemite'
'BS_SAFARI10': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Sierra'}, },
'BS_IOS7': {base: 'BrowserStack', device: 'iPhone 5S', os: 'ios', os_version: '7.0'}, 'BS_FIREFOX': {
'BS_IOS8': {base: 'BrowserStack', device: 'iPhone 6', os: 'ios', os_version: '8.3'}, base: 'BrowserStack',
'BS_IOS9': {base: 'BrowserStack', device: 'iPhone 6S', os: 'ios', os_version: '9.1'}, browser: 'firefox',
'BS_IOS10': {base: 'BrowserStack', device: 'iPhone SE', os: 'ios', os_version: '10.0'}, os: 'Windows',
'BS_IE9': os_version: '10'
{base: 'BrowserStack', browser: 'ie', browser_version: '9.0', os: 'Windows', os_version: '7'}, },
'BS_SAFARI7': {
base: 'BrowserStack',
browser: 'safari',
os: 'OS X',
os_version: 'Mavericks'
},
'BS_SAFARI8': {
base: 'BrowserStack',
browser: 'safari',
os: 'OS X',
os_version: 'Yosemite'
},
'BS_SAFARI9': {
base: 'BrowserStack',
browser: 'safari',
os: 'OS X',
os_version: 'El Capitan'
},
'BS_SAFARI10': {
base: 'BrowserStack',
browser: 'safari',
os: 'OS X',
os_version: 'Sierra'
},
'BS_IOS7': {
base: 'BrowserStack',
device: 'iPhone 5S',
os: 'ios',
os_version: '7.0'
},
'BS_IOS8': {
base: 'BrowserStack',
device: 'iPhone 6',
os: 'ios',
os_version: '8.3'
},
'BS_IOS9': {
base: 'BrowserStack',
device: 'iPhone 6S',
os: 'ios',
os_version: '9.1'
},
'BS_IOS10': {
base: 'BrowserStack',
device: 'iPhone SE',
os: 'ios',
os_version: '10.0'
},
'BS_IE9': {
base: 'BrowserStack',
browser: 'ie',
browser_version: '9.0',
os: 'Windows',
os_version: '7'
},
'BS_IE10': { 'BS_IE10': {
base: 'BrowserStack', base: 'BrowserStack',
browser: 'ie', browser: 'ie',
@ -107,31 +251,54 @@ var customLaunchers = {
os: 'Windows', os: 'Windows',
os_version: '10' os_version: '10'
}, },
'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'}, 'BS_EDGE': {
'BS_WINDOWSPHONE': base: 'BrowserStack',
{base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'}, browser: 'edge',
'BS_ANDROID5': {base: 'BrowserStack', device: 'Google Nexus 5', os: 'android', os_version: '5.0'}, os: 'Windows',
'BS_ANDROID4.4': {base: 'BrowserStack', device: 'HTC One M8', os: 'android', os_version: '4.4'}, os_version: '10'
'BS_ANDROID4.3': },
{base: 'BrowserStack', device: 'Samsung Galaxy S4', os: 'android', os_version: '4.3'}, 'BS_WINDOWSPHONE' : {
'BS_ANDROID4.2': base: 'BrowserStack',
{base: 'BrowserStack', device: 'Google Nexus 4', os: 'android', os_version: '4.2'}, device: 'Nokia Lumia 930',
'BS_ANDROID4.1': os: 'winphone',
{base: 'BrowserStack', device: 'Google Nexus 7', os: 'android', os_version: '4.1'} os_version: '8.1'
},
'BS_ANDROID5': {
base: 'BrowserStack',
device: 'Google Nexus 5',
os: 'android',
os_version: '5.0'
},
'BS_ANDROID4.4': {
base: 'BrowserStack',
device: 'HTC One M8',
os: 'android',
os_version: '4.4'
},
'BS_ANDROID4.3': {
base: 'BrowserStack',
device: 'Samsung Galaxy S4',
os: 'android',
os_version: '4.3'
},
'BS_ANDROID4.2': {
base: 'BrowserStack',
device: 'Google Nexus 4',
os: 'android',
os_version: '4.2'
},
'BS_ANDROID4.1': {
base: 'BrowserStack',
device: 'Google Nexus 7',
os: 'android',
os_version: '4.1'
}
}; };
var sauceAliases = { var sauceAliases = {
'ALL': Object.keys(customLaunchers).filter(function(item) { 'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'SauceLabs';}),
return customLaunchers[item].base == 'SauceLabs'; 'DESKTOP': ['SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'],
}), 'MOBILE': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
'DESKTOP': [
'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7',
'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'
],
'MOBILE': [
'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5', 'SL_IOS7',
'SL_IOS8', 'SL_IOS9', 'SL_IOS10'
],
'ANDROID': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5'], 'ANDROID': ['SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5'],
'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'], 'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'], 'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
@ -143,16 +310,9 @@ var sauceAliases = {
}; };
var browserstackAliases = { var browserstackAliases = {
'ALL': Object.keys(customLaunchers).filter(function(item) { 'ALL': Object.keys(customLaunchers).filter(function(item) {return customLaunchers[item].base == 'BrowserStack';}),
return customLaunchers[item].base == 'BrowserStack'; 'DESKTOP': ['BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'],
}), 'MOBILE': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'],
'DESKTOP': [
'BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7',
'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'
],
'MOBILE': [
'BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'
],
'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4'], 'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4'],
'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'], 'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'], 'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'],
@ -173,5 +333,7 @@ function buildConfiguration(type, target, required) {
var conf = CIconfiguration[item][type]; var conf = CIconfiguration[item][type];
return conf.required === required && conf.target === target; return conf.required === required && conf.target === target;
}) })
.map((item) => target + '_' + item.toUpperCase()); .map((item) => {
return target + '_' + item.toUpperCase();
});
} }

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
// THIS CHECK SHOULD BE THE FIRST THING IN THIS FILE // THIS CHECK SHOULD BE THE FIRST THING IN THIS FILE
@ -21,13 +13,12 @@ const os = require('os');
// clang-format entry points // clang-format entry points
const srcsToFmt = [ const srcsToFmt = [
'modules/@angular/**/*.{js,ts}', 'modules/@angular/**/*.ts',
'modules/benchmarks/**/*.{js,ts}', 'modules/benchmarks/**/*.ts',
'modules/e2e_util/**/*.{js,ts}', 'modules/e2e_util/**/*.ts',
'modules/playground/**/*.{js,ts}', 'modules/playground/**/*.ts',
'tools/**/*.{js,ts}', 'tools/**/*.ts',
'!tools/public_api_guard/**/*.d.ts', '!tools/public_api_guard/**/*.d.ts',
'./*.{js,ts}',
]; ];
// Check source code for formatting errors (clang-format) // Check source code for formatting errors (clang-format)
@ -42,9 +33,8 @@ gulp.task('format:enforce', () => {
gulp.task('format', () => { gulp.task('format', () => {
const format = require('gulp-clang-format'); const format = require('gulp-clang-format');
const clangFormat = require('clang-format'); const clangFormat = require('clang-format');
return gulp.src(srcsToFmt, {base: '.'}) return gulp.src(srcsToFmt, { base: '.' }).pipe(
.pipe(format.format('file', clangFormat)) format.format('file', clangFormat)).pipe(gulp.dest('.'));
.pipe(gulp.dest('.'));
}); });
const entrypoints = [ const entrypoints = [
@ -72,18 +62,12 @@ const entrypoints = [
]; ];
const publicApiDir = path.normalize('tools/public_api_guard'); const publicApiDir = path.normalize('tools/public_api_guard');
const publicApiArgs = [ const publicApiArgs = [
'--rootDir', '--rootDir', 'dist/packages-dist',
'dist/packages-dist', '--stripExportPattern', '^__',
'--stripExportPattern', '--allowModuleIdentifiers', 'jasmine',
'^__', '--allowModuleIdentifiers', 'protractor',
'--allowModuleIdentifiers', '--allowModuleIdentifiers', 'angular',
'jasmine', '--onStabilityMissing', 'error',
'--allowModuleIdentifiers',
'protractor',
'--allowModuleIdentifiers',
'angular',
'--onStabilityMissing',
'error',
].concat(entrypoints); ].concat(entrypoints);
// Build angular // Build angular
@ -123,18 +107,14 @@ gulp.task('public-api:update', ['build.sh'], (done) => {
.on('close', done); .on('close', done);
}); });
// Checks tests for presence of ddescribe, fdescribe, fit, iit and fails the build if one of the // Checks tests for presence of ddescribe, fdescribe, fit, iit and fails the build if one of the focused tests is found.
// focused tests is found. // Currently xdescribe and xit are _not_ reported as errors since there are a couple of excluded tests in our code base.
// Currently xdescribe and xit are _not_ reported as errors since there are a couple of excluded
// tests in our code base.
gulp.task('check-tests', function() { gulp.task('check-tests', function() {
const ddescribeIit = require('gulp-ddescribe-iit'); const ddescribeIit = require('gulp-ddescribe-iit');
return gulp return gulp.src([
.src([
'modules/**/*.spec.ts', 'modules/**/*.spec.ts',
'modules/**/*_spec.ts', 'modules/**/*_spec.ts',
]) ]).pipe(ddescribeIit({allowDisabledTests: true}));
.pipe(ddescribeIit({allowDisabledTests: true}));
}); });
// Check the coding standards and programming errors // Check the coding standards and programming errors
@ -143,14 +123,7 @@ gulp.task('lint', ['check-tests', 'format:enforce', 'tools:build'], () => {
// Built-in rules are at // Built-in rules are at
// https://github.com/palantir/tslint#supported-rules // https://github.com/palantir/tslint#supported-rules
const tslintConfig = require('./tslint.json'); const tslintConfig = require('./tslint.json');
return gulp return gulp.src(['modules/@angular/**/*.ts', 'modules/benchpress/**/*.ts'])
.src([
// todo(vicb): add .js files when supported
// see https://github.com/palantir/tslint/pull/1515
'modules/@angular/**/*.ts',
'modules/benchpress/**/*.ts',
'./*.ts',
])
.pipe(tslint({ .pipe(tslint({
tslint: require('tslint').default, tslint: require('tslint').default,
configuration: tslintConfig, configuration: tslintConfig,
@ -169,7 +142,7 @@ gulp.task('check-cycle', (done) => {
const dependencyObject = madge(['dist/all/'], { const dependencyObject = madge(['dist/all/'], {
format: 'cjs', format: 'cjs',
extensions: ['.js'], extensions: ['.js'],
onParseFile: function(data) { data.src = data.src.replace(/\/\* circular \*\//g, '//'); } onParseFile: function(data) { data.src = data.src.replace(/\/\* circular \*\//g, "//"); }
}); });
const circularDependencies = dependencyObject.circular().getArray(); const circularDependencies = dependencyObject.circular().getArray();
if (circularDependencies.length > 0) { if (circularDependencies.length > 0) {
@ -214,7 +187,10 @@ gulp.task('changelog', () => {
const conventionalChangelog = require('gulp-conventional-changelog'); const conventionalChangelog = require('gulp-conventional-changelog');
return gulp.src('CHANGELOG.md') return gulp.src('CHANGELOG.md')
.pipe(conventionalChangelog({preset: 'angular', releaseCount: 1}, { .pipe(conventionalChangelog({
preset: 'angular',
releaseCount: 1
}, {
// Conventional Changelog Context // Conventional Changelog Context
// We have to manually set version number so it doesn't get prefixed with `v` // We have to manually set version number so it doesn't get prefixed with `v`
// See https://github.com/conventional-changelog/conventional-changelog-core/issues/10 // See https://github.com/conventional-changelog/conventional-changelog-core/issues/10
@ -229,7 +205,8 @@ function tsc(projectPath, done) {
childProcess childProcess
.spawn( .spawn(
path.normalize(platformScriptPath(`${__dirname}/node_modules/.bin/tsc`)), path.normalize(platformScriptPath(`${__dirname}/node_modules/.bin/tsc`)),
['-p', path.join(__dirname, projectPath)], {stdio: 'inherit'}) ['-p', path.join(__dirname, projectPath)],
{stdio: 'inherit'})
.on('close', done); .on('close', done);
} }

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var browserProvidersConf = require('./browser-providers.conf.js'); var browserProvidersConf = require('./browser-providers.conf.js');
var internalAngularReporter = require('./tools/karma/reporter.js'); var internalAngularReporter = require('./tools/karma/reporter.js');
@ -25,25 +17,24 @@ module.exports = function(config) {
// include Angular v1 for upgrade module testing // include Angular v1 for upgrade module testing
'node_modules/angular/angular.min.js', 'node_modules/angular/angular.min.js',
'node_modules/zone.js/dist/zone.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js', 'node_modules/zone.js/dist/zone.js',
'node_modules/zone.js/dist/proxy.js', 'node_modules/zone.js/dist/sync-test.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/jasmine-patch.js', 'node_modules/zone.js/dist/async-test.js', 'node_modules/zone.js/dist/proxy.js',
'node_modules/zone.js/dist/sync-test.js',
'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/zone.js/dist/async-test.js',
'node_modules/zone.js/dist/fake-async-test.js', 'node_modules/zone.js/dist/fake-async-test.js',
// Including systemjs because it defines `__eval`, which produces correct stack traces. // Including systemjs because it defines `__eval`, which produces correct stack traces.
'shims_for_IE.js', 'node_modules/systemjs/dist/system.src.js', 'shims_for_IE.js',
'node_modules/systemjs/dist/system.src.js',
{pattern: 'node_modules/rxjs/**', included: false, watched: false, served: true}, {pattern: 'node_modules/rxjs/**', included: false, watched: false, served: true},
'node_modules/reflect-metadata/Reflect.js', 'tools/build/file2modulename.js', 'test-main.js', 'node_modules/reflect-metadata/Reflect.js',
{pattern: 'dist/all/empty.*', included: false, watched: false}, { 'tools/build/file2modulename.js',
pattern: 'modules/@angular/platform-browser/test/static_assets/**', 'test-main.js',
included: false, {pattern: 'dist/all/empty.*', included: false, watched: false},
watched: false {pattern: 'modules/@angular/platform-browser/test/static_assets/**', included: false, watched: false},
}, {pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**', included: false, watched: false}
{
pattern: 'modules/@angular/platform-browser/test/browser/static_assets/**',
included: false,
watched: false,
}
], ],
exclude: [ exclude: [
@ -53,7 +44,7 @@ module.exports = function(config) {
'dist/all/@angular/benchpress/**', 'dist/all/@angular/benchpress/**',
'dist/all/angular1_router.js', 'dist/all/angular1_router.js',
'dist/all/@angular/platform-browser/testing/e2e_util.js', 'dist/all/@angular/platform-browser/testing/e2e_util.js',
'dist/examples/**/e2e_test/**', 'dist/examples/**/e2e_test/**'
], ],
customLaunchers: browserProvidersConf.customLaunchers, customLaunchers: browserProvidersConf.customLaunchers,
@ -64,11 +55,11 @@ module.exports = function(config) {
'karma-sauce-launcher', 'karma-sauce-launcher',
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-sourcemap-loader', 'karma-sourcemap-loader',
internalAngularReporter, internalAngularReporter
], ],
preprocessors: { preprocessors: {
'**/*.js': ['sourcemap'], '**/*.js': ['sourcemap']
}, },
reporters: ['internal-angular'], reporters: ['internal-angular'],
@ -82,7 +73,7 @@ module.exports = function(config) {
'selenium-version': '2.53.0', 'selenium-version': '2.53.0',
'command-timeout': 600, 'command-timeout': 600,
'idle-timeout': 600, 'idle-timeout': 600,
'max-duration': 5400, 'max-duration': 5400
} }
}, },
@ -91,7 +82,7 @@ module.exports = function(config) {
startTunnel: false, startTunnel: false,
retryLimit: 3, retryLimit: 3,
timeout: 600, timeout: 600,
pollingTimeout: 10000, pollingTimeout: 10000
}, },
browsers: ['Chrome'], browsers: ['Chrome'],
@ -104,8 +95,7 @@ module.exports = function(config) {
}); });
if (process.env.TRAVIS) { if (process.env.TRAVIS) {
var buildId = var buildId = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
if (process.env.CI_MODE.startsWith('saucelabs')) { if (process.env.CI_MODE.startsWith('saucelabs')) {
config.sauceLabs.build = buildId; config.sauceLabs.build = buildId;
config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER; config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/common/testing/index.js', entry: '../../../dist/packages-dist/common/testing/index.js',
@ -17,4 +10,4 @@ export default {
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx' 'rxjs/Subject': 'Rx'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/common/index.js', entry: '../../../dist/packages-dist/common/index.js',
@ -14,6 +7,6 @@ export default {
globals: { globals: {
'@angular/core': 'ng.core', '@angular/core': 'ng.core',
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx', 'rxjs/Subject': 'Rx'
}
} }
};

View File

@ -1,14 +1,10 @@
/**
* @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.exports = { module.exports = {
target: 'node', target: 'node',
entry: './test/all_spec.js', entry: './test/all_spec.js',
output: {filename: './all_spec.js'}, output: {
resolve: {extensions: ['.js']}, filename: './all_spec.js'
},
resolve: {
extensions: ['.js']
},
}; };

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/compiler/testing/index.js', entry: '../../../dist/packages-dist/compiler/testing/index.js',
@ -18,4 +11,4 @@ export default {
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx' 'rxjs/Subject': 'Rx'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/compiler/index.js', entry: '../../../dist/packages-dist/compiler/index.js',
@ -14,9 +7,9 @@ export default {
globals: { globals: {
'@angular/core': 'ng.core', '@angular/core': 'ng.core',
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx', 'rxjs/Subject': 'Rx'
}, },
plugins: [ plugins: [
// nodeResolve({ jsnext: true, main: true }), // nodeResolve({ jsnext: true, main: true }),
] ]
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/core/testing/index.js', entry: '../../../dist/packages-dist/core/testing/index.js',
@ -14,6 +7,7 @@ export default {
globals: { globals: {
'@angular/core': 'ng.core', '@angular/core': 'ng.core',
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx', 'rxjs/Subject': 'Rx'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/core/index.js', entry: '../../../dist/packages-dist/core/index.js',
@ -13,6 +6,7 @@ export default {
moduleName: 'ng.core', moduleName: 'ng.core',
globals: { globals: {
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx', 'rxjs/Subject': 'Rx'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/forms/index.js', entry: '../../../dist/packages-dist/forms/index.js',
@ -20,4 +13,4 @@ export default {
'rxjs/observable/fromPromise': 'Rx.Observable', 'rxjs/observable/fromPromise': 'Rx.Observable',
'rxjs/operator/toPromise': 'Rx.Observable.prototype' 'rxjs/operator/toPromise': 'Rx.Observable.prototype'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/http/testing/index.js', entry: '../../../dist/packages-dist/http/testing/index.js',
@ -21,4 +14,4 @@ export default {
'rxjs/Subject': 'Rx', 'rxjs/Subject': 'Rx',
'rxjs/operator/take': 'Rx.Observable.prototype' 'rxjs/operator/take': 'Rx.Observable.prototype'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/http/index.js', entry: '../../../dist/packages-dist/http/index.js',
@ -18,4 +11,4 @@ export default {
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx' 'rxjs/Subject': 'Rx'
} }
}; }

View File

@ -1,15 +1,6 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-browser-dynamic/testing/index.js', entry: '../../../dist/packages-dist/platform-browser-dynamic/testing/index.js',
dest: dest: '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
'../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
format: 'umd', format: 'umd',
moduleName: 'ng.platformBrowserDynamic.testing', moduleName: 'ng.platformBrowserDynamic.testing',
globals: { globals: {
@ -22,4 +13,4 @@ export default {
'@angular/platform-browser/testing': 'ng.platformBrowser.testing', '@angular/platform-browser/testing': 'ng.platformBrowser.testing',
'@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic' '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic'
} }
}; }

View File

@ -1,21 +1,12 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-browser-dynamic/index.js', entry: '../../../dist/packages-dist/platform-browser-dynamic/index.js',
dest: dest: '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
format: 'umd', format: 'umd',
moduleName: 'ng.platformBrowserDynamic', moduleName: 'ng.platformBrowserDynamic',
globals: { globals: {
'@angular/core': 'ng.core', '@angular/core': 'ng.core',
'@angular/common': 'ng.common', '@angular/common': 'ng.common',
'@angular/compiler': 'ng.compiler', '@angular/compiler': 'ng.compiler',
'@angular/platform-browser': 'ng.platformBrowser', '@angular/platform-browser': 'ng.platformBrowser'
}
} }
};

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-browser/testing/index.js', entry: '../../../dist/packages-dist/platform-browser/testing/index.js',
@ -16,4 +9,4 @@ export default {
'@angular/common': 'ng.common', '@angular/common': 'ng.common',
'@angular/platform-browser': 'ng.platformBrowser' '@angular/platform-browser': 'ng.platformBrowser'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-browser/index.js', entry: '../../../dist/packages-dist/platform-browser/index.js',
@ -13,6 +6,6 @@ export default {
moduleName: 'ng.platformBrowser', moduleName: 'ng.platformBrowser',
globals: { globals: {
'@angular/core': 'ng.core', '@angular/core': 'ng.core',
'@angular/common': 'ng.common', '@angular/common': 'ng.common'
}
} }
};

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-server/testing/index.js', entry: '../../../dist/packages-dist/platform-server/testing/index.js',
@ -20,4 +13,4 @@ export default {
'@angular/platform-server': 'ng.platformServer', '@angular/platform-server': 'ng.platformServer',
'@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing' '@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing'
} }
}; }

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-server/index.js', entry: '../../../dist/packages-dist/platform-server/index.js',
@ -17,4 +10,4 @@ export default {
'@angular/compiler': 'ng.compiler', '@angular/compiler': 'ng.compiler',
'@angular/platform-browser': 'ng.platformBrowser' '@angular/platform-browser': 'ng.platformBrowser'
} }
}; }

View File

@ -1,15 +1,6 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-webworker-dynamic/index.js', entry: '../../../dist/packages-dist/platform-webworker-dynamic/index.js',
dest: dest: '../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
'../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
format: 'umd', format: 'umd',
moduleName: 'ng.platformWebworkerDynamic', moduleName: 'ng.platformWebworkerDynamic',
globals: { globals: {
@ -18,6 +9,6 @@ export default {
'@angular/compiler': 'ng.compiler', '@angular/compiler': 'ng.compiler',
'@angular/platform-browser': 'ng.platformBrowser', '@angular/platform-browser': 'ng.platformBrowser',
'@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic', '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
'@angular/platform-webworker': 'ng.platformWebworker', '@angular/platform-webworker': 'ng.platformWebworker'
}
} }
};

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/platform-webworker/index.js', entry: '../../../dist/packages-dist/platform-webworker/index.js',
@ -18,4 +11,4 @@ export default {
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx',
'rxjs/Subject': 'Rx' 'rxjs/Subject': 'Rx'
} }
}; }

View File

@ -1,16 +1,9 @@
/**
* @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
*/
/*global jasmine, __karma__, window*/ /*global jasmine, __karma__, window*/
Error.stackTraceLimit = 5; Error.stackTraceLimit = 5;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
__karma__.loaded = function() {}; __karma__.loaded = function () {
};
function isJsFile(path) { function isJsFile(path) {
return path.slice(-3) == '.js'; return path.slice(-3) == '.js';
@ -25,38 +18,81 @@ function isBuiltFile(path) {
return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath); return isJsFile(path) && (path.substr(0, builtPath.length) == builtPath);
} }
var allSpecFiles = Object.keys(window.__karma__.files).filter(isSpecFile).filter(isBuiltFile); var allSpecFiles = Object.keys(window.__karma__.files)
.filter(isSpecFile)
.filter(isBuiltFile);
// Load our SystemJS configuration. // Load our SystemJS configuration.
System.config({ System.config({
baseURL: '/base', baseURL: '/base'
}); });
System.config({ System.config(
map: {'rxjs': 'node_modules/rxjs', '@angular': 'dist/all/@angular'}, {
map: {
'rxjs': 'node_modules/rxjs',
'@angular': 'dist/all/@angular'
},
packages: { packages: {
'@angular/core/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/core/testing': {
'@angular/core': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/compiler/testing': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, },
'@angular/common/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/core': {
'@angular/common': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/platform-browser/testing': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'}, },
'@angular/platform-browser-dynamic/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/compiler/testing': {
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/router/testing': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, },
'rxjs': {main: 'Rx.js', defaultExtension: 'js'}, '@angular/compiler': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/common/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/common': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser-dynamic/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser-dynamic': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/router/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/router': {
main: 'index.js',
defaultExtension: 'js'
},
'rxjs': {
main: 'Rx.js',
defaultExtension: 'js'
}
} }
}); });
Promise Promise.all([
.all([
System.import('@angular/core/testing'), System.import('@angular/core/testing'),
System.import('@angular/platform-browser-dynamic/testing') System.import('@angular/platform-browser-dynamic/testing')
]) ]).then(function (providers) {
.then(function(providers) {
var testing = providers[0]; var testing = providers[0];
var testingBrowser = providers[1]; var testingBrowser = providers[1];
@ -64,11 +100,11 @@ Promise
testingBrowser.BrowserDynamicTestingModule, testingBrowser.BrowserDynamicTestingModule,
testingBrowser.platformBrowserDynamicTesting()); testingBrowser.platformBrowserDynamicTesting());
}) }).then(function() {
.then(function() {
// Finally, load all spec files. // Finally, load all spec files.
// This will run the tests directly. // This will run the tests directly.
return Promise.all( return Promise.all(
allSpecFiles.map(function(moduleName) { return System.import(moduleName); })); allSpecFiles.map(function (moduleName) {
}) return System.import(moduleName);
.then(__karma__.start, __karma__.error); }));
}).then(__karma__.start, __karma__.error);

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var browserProvidersConf = require('../../../browser-providers.conf.js'); var browserProvidersConf = require('../../../browser-providers.conf.js');
// Karma configuration // Karma configuration
@ -57,23 +49,11 @@ module.exports = function(config) {
{pattern: 'dist/all/@angular/platform-browser/*.js', included: false, watched: false}, {pattern: 'dist/all/@angular/platform-browser/*.js', included: false, watched: false},
{pattern: 'dist/all/@angular/platform-browser/src/**/*.js', included: false, watched: false}, {pattern: 'dist/all/@angular/platform-browser/src/**/*.js', included: false, watched: false},
{ {pattern: 'dist/all/@angular/platform-browser/testing/**/*.js', included: false, watched: false},
pattern: 'dist/all/@angular/platform-browser/testing/**/*.js',
included: false,
watched: false,
},
{pattern: 'dist/all/@angular/platform-browser-dynamic/*.js', included: false, watched: false}, {pattern: 'dist/all/@angular/platform-browser-dynamic/*.js', included: false, watched: false},
{ {pattern: 'dist/all/@angular/platform-browser-dynamic/src/**/*.js', included: false, watched: false},
pattern: 'dist/all/@angular/platform-browser-dynamic/src/**/*.js', {pattern: 'dist/all/@angular/platform-browser-dynamic/testing/**/*.js', included: false, watched: false},
included: false,
watched: false,
},
{
pattern: 'dist/all/@angular/platform-browser-dynamic/testing/**/*.js',
included: false,
watched: false,
},
// Router // Router
{pattern: 'dist/all/@angular/router/**/*.js', included: false, watched: true} {pattern: 'dist/all/@angular/router/**/*.js', included: false, watched: true}
@ -86,11 +66,11 @@ module.exports = function(config) {
'karma-browserstack-launcher', 'karma-browserstack-launcher',
'karma-sauce-launcher', 'karma-sauce-launcher',
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-sourcemap-loader', 'karma-sourcemap-loader'
], ],
preprocessors: { preprocessors: {
'**/*.js': ['sourcemap'], '**/*.js': ['sourcemap']
}, },
reporters: ['dots'], reporters: ['dots'],
@ -103,6 +83,6 @@ module.exports = function(config) {
captureTimeout: 60000, captureTimeout: 60000,
browserDisconnectTimeout : 60000, browserDisconnectTimeout : 60000,
browserDisconnectTolerance : 3, browserDisconnectTolerance : 3,
browserNoActivityTimeout: 60000, browserNoActivityTimeout : 60000
}); });
}; };

View File

@ -1,11 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/router/testing/index.js', entry: '../../../dist/packages-dist/router/testing/index.js',
dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js', dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
@ -18,4 +10,4 @@ export default {
'@angular/platform-browser': 'ng.platformBrowser', '@angular/platform-browser': 'ng.platformBrowser',
'@angular/router': 'ng.router' '@angular/router': 'ng.router'
} }
}; }

View File

@ -1,11 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/router/index.js', entry: '../../../dist/packages-dist/router/index.js',
dest: '../../../dist/packages-dist/router/bundles/router.umd.js', dest: '../../../dist/packages-dist/router/bundles/router.umd.js',
@ -36,7 +28,8 @@ export default {
'rxjs/operator/every': 'Rx.Observable.prototype', 'rxjs/operator/every': 'Rx.Observable.prototype',
'rxjs/operator/first': 'Rx.Observable.prototype', 'rxjs/operator/first': 'Rx.Observable.prototype',
'rxjs/operator/catch': 'Rx.Observable.prototype', 'rxjs/operator/catch': 'Rx.Observable.prototype',
'rxjs/operator/last': 'Rx.Observable.prototype', 'rxjs/operator/last': 'Rx.Observable.prototype'
}, },
plugins: [] plugins: [
}; ]
}

View File

@ -1,10 +1,3 @@
/**
* @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 { export default {
entry: '../../../dist/packages-dist/upgrade/index.js', entry: '../../../dist/packages-dist/upgrade/index.js',
@ -18,9 +11,8 @@ export default {
'@angular/platform-browser': 'ng.platformBrowser', '@angular/platform-browser': 'ng.platformBrowser',
'@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic', '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
'rxjs/Subject': 'Rx', 'rxjs/Subject': 'Rx',
'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs 'rxjs/observable/PromiseObservable': 'Rx', // this is wrong, but this stuff has changed in rxjs b.6 so we need to fix it when we update.
// b.6 so we need to fix it when we update.
'rxjs/operator/toPromise': 'Rx.Observable.prototype', 'rxjs/operator/toPromise': 'Rx.Observable.prototype',
'rxjs/Observable': 'Rx', 'rxjs/Observable': 'Rx'
}
} }
};

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
var fs = require('fs'); var fs = require('fs');

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
var browserProvidersConf = require('../../browser-providers.conf.js'); var browserProvidersConf = require('../../browser-providers.conf.js');

View File

@ -1,10 +1,3 @@
/**
* @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
*/
angular.module('ngComponentRouter'). angular.module('ngComponentRouter').
value('$route', null). // can be overloaded with ngRouteShim value('$route', null). // can be overloaded with ngRouteShim

View File

@ -1,11 +1,4 @@
/** /** @license Copyright 2014-2016 Google, Inc. http://github.com/angular/angular/LICENSE */
* @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
*/
(function () { (function () {
'use strict'; 'use strict';

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
describe('ngOutlet animations', function () { describe('ngOutlet animations', function () {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
describe('Navigation lifecycle', function () { describe('Navigation lifecycle', function () {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
describe('navigation', function () { describe('navigation', function () {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
describe('router', function () { describe('router', function () {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
describe('ngRoute shim', function () { describe('ngRoute shim', function () {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
describe('ngLink', function () { describe('ngLink', function () {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
/* /*
* Helpers to keep tests DRY * Helpers to keep tests DRY
*/ */

View File

@ -1,4 +1,3 @@
// clang-format off
var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
;(function (exports) { ;(function (exports) {

View File

@ -68,7 +68,7 @@ Bitmap.prototype.subsample =
function gamma(v) { return sample(Math.pow(v, .45455)); } function gamma(v) { return sample(Math.pow(v, .45455)); }
function row(pixel, width, y) { function row(pixel, width, y) {
var data = '\0'; var data = "\0";
for (var x = 0; x < width; x++) { for (var x = 0; x < width; x++) {
var r = pixel[x][y]; var r = pixel[x][y];
data += String.fromCharCode(gamma(r[0]), gamma(r[1]), gamma(r[2]), sample(r[3])); data += String.fromCharCode(gamma(r[0]), gamma(r[1]), gamma(r[2]), sample(r[3]));
@ -77,7 +77,7 @@ Bitmap.prototype.subsample =
} }
function rows(pixel, width, height) { function rows(pixel, width, height) {
var data = ''; var data = "";
for (var y = 0; y < height; y++) data += row(pixel, width, y); for (var y = 0; y < height; y++) data += row(pixel, width, y);
return data; return data;
} }
@ -95,7 +95,7 @@ Bitmap.prototype.subsample =
function deflate(data) { function deflate(data) {
var len = data.length; var len = data.length;
return '\170\1\1' + String.fromCharCode(len & 255, len >>> 8, ~len & 255, (~len >>> 8) & 255) + return "\170\1\1" + String.fromCharCode(len & 255, len >>> 8, ~len & 255, (~len >>> 8) & 255) +
data + hton(adler(data)); data + hton(adler(data));
} }
@ -110,18 +110,18 @@ Bitmap.prototype.subsample =
function chunk(type, data) { return hton(data.length) + type + data + hton(crc32(type + data)); } function chunk(type, data) { return hton(data.length) + type + data + hton(crc32(type + data)); }
function base64(data) { function base64(data) {
enc = ''; enc = "";
for (var i = 5, n = data.length * 8 + 5; i < n; i += 6) for (var i = 5, n = data.length * 8 + 5; i < n; i += 6)
enc += 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' enc += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
[(data.charCodeAt(~~(i / 8) - 1) << 8 | data.charCodeAt(~~(i / 8))) >> 7 - i % 8 & 63]; [(data.charCodeAt(~~(i / 8) - 1) << 8 | data.charCodeAt(~~(i / 8))) >> 7 - i % 8 & 63];
for (; enc.length % 4; enc += '=') for (; enc.length % 4; enc += "=")
; ;
return enc; return enc;
} }
var png = '\211PNG\r\n\32\n' + var png = "\211PNG\r\n\32\n" +
chunk('IHDR', hton(this.width) + hton(this.height) + '\10\6\0\0\0') + chunk("IHDR", hton(this.width) + hton(this.height) + "\10\6\0\0\0") +
chunk('IDAT', deflate(rows(this.pixel, this.width, this.height))) + chunk('IEND', ''); chunk("IDAT", deflate(rows(this.pixel, this.width, this.height))) + chunk("IEND", "");
return 'data:image/png;base64,' + base64(png); return "data:image/png;base64," + base64(png);
} }

View File

@ -1,15 +1,9 @@
/** importScripts("../../../vendor/core.js",
* @license "../../../vendor/zone.js",
* Copyright Google Inc. All Rights Reserved. "../../../vendor/long-stack-trace-zone.js",
* "../../../vendor/system.src.js",
* Use of this source code is governed by an MIT-style license that can be "../../../vendor/Reflect.js",
* found in the LICENSE file at https://angular.io/license "b64.js");
*/
importScripts(
'../../../vendor/core.js', '../../../vendor/zone.js',
'../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
'../../../vendor/Reflect.js', 'b64.js');
System.config({ System.config({
@ -25,13 +19,15 @@ System.config({
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}, 'rxjs': {
defaultExtension: 'js'
}
}, },
defaultJSExtensions: true defaultJSExtensions: true
}); });
System.import('playground/src/web_workers/images/background_index') System.import("playground/src/web_workers/images/background_index")
.then( .then(
function(m) { function(m) {
try { try {
@ -40,4 +36,4 @@ System.import('playground/src/web_workers/images/background_index')
console.error(e); console.error(e);
} }
}, },
function(error) { console.error('error loading background', error); }); function(error) { console.error("error loading background", error); });

View File

@ -1,15 +1,8 @@
/** importScripts("../../../vendor/core.js",
* @license "../../../vendor/zone.js",
* Copyright Google Inc. All Rights Reserved. "../../../vendor/long-stack-trace-zone.js",
* "../../../vendor/system.src.js",
* Use of this source code is governed by an MIT-style license that can be "../../../vendor/Reflect.js");
* found in the LICENSE file at https://angular.io/license
*/
importScripts(
'../../../vendor/core.js', '../../../vendor/zone.js',
'../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
'../../../vendor/Reflect.js');
System.config({ System.config({
@ -25,13 +18,15 @@ System.config({
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}, 'rxjs': {
defaultExtension: 'js'
}
}, },
defaultJSExtensions: true defaultJSExtensions: true
}); });
System.import('playground/src/web_workers/input/background_index') System.import("playground/src/web_workers/input/background_index")
.then( .then(
function(m) { function(m) {
try { try {
@ -40,4 +35,4 @@ System.import('playground/src/web_workers/input/background_index')
console.error(e); console.error(e);
} }
}, },
function(error) { console.error('error loading background', error); }); function(error) { console.error("error loading background", error); });

View File

@ -1,15 +1,8 @@
/** importScripts("../../../vendor/core.js",
* @license "../../../vendor/zone.js",
* Copyright Google Inc. All Rights Reserved. "../../../vendor/long-stack-trace-zone.js",
* "../../../vendor/system.src.js",
* Use of this source code is governed by an MIT-style license that can be "../../../vendor/Reflect.js");
* found in the LICENSE file at https://angular.io/license
*/
importScripts(
'../../../vendor/core.js', '../../../vendor/zone.js',
'../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
'../../../vendor/Reflect.js');
System.config({ System.config({
@ -26,13 +19,15 @@ System.config({
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}, 'rxjs': {
defaultExtension: 'js'
},
}, },
defaultJSExtensions: true defaultJSExtensions: true
}); });
System.import('playground/src/web_workers/kitchen_sink/background_index') System.import("playground/src/web_workers/kitchen_sink/background_index")
.then( .then(
function(m) { function(m) {
try { try {
@ -41,4 +36,4 @@ System.import('playground/src/web_workers/kitchen_sink/background_index')
console.error(e); console.error(e);
} }
}, },
function(error) { console.error('error loading background', error); }); function(error) { console.error("error loading background", error); });

View File

@ -1,15 +1,8 @@
/** importScripts("../../../vendor/core.js",
* @license "../../../vendor/zone.js",
* Copyright Google Inc. All Rights Reserved. "../../../vendor/long-stack-trace-zone.js",
* "../../../vendor/system.src.js",
* Use of this source code is governed by an MIT-style license that can be "../../../vendor/Reflect.js");
* found in the LICENSE file at https://angular.io/license
*/
importScripts(
'../../../vendor/core.js', '../../../vendor/zone.js',
'../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
'../../../vendor/Reflect.js');
System.config({ System.config({
@ -26,13 +19,15 @@ System.config({
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}, 'rxjs': {
defaultExtension: 'js'
},
}, },
defaultJSExtensions: true defaultJSExtensions: true
}); });
System.import('playground/src/web_workers/message_broker/background_index') System.import("playground/src/web_workers/message_broker/background_index")
.then( .then(
function(m) { function(m) {
try { try {
@ -41,4 +36,4 @@ System.import('playground/src/web_workers/message_broker/background_index')
console.error(e); console.error(e);
} }
}, },
function(error) { console.error('error loading background', error); }); function(error) { console.error("error loading background", error); });

View File

@ -1,15 +1,8 @@
/** importScripts("../../../vendor/core.js",
* @license "../../../vendor/zone.js",
* Copyright Google Inc. All Rights Reserved. "../../../vendor/long-stack-trace-zone.js",
* "../../../vendor/system.src.js",
* Use of this source code is governed by an MIT-style license that can be "../../../vendor/Reflect.js");
* found in the LICENSE file at https://angular.io/license
*/
importScripts(
'../../../vendor/core.js', '../../../vendor/zone.js',
'../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
'../../../vendor/Reflect.js');
System.config({ System.config({
@ -26,13 +19,15 @@ System.config({
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}, 'rxjs': {
defaultExtension: 'js'
},
}, },
defaultJSExtensions: true defaultJSExtensions: true
}); });
System.import('playground/src/web_workers/router/background_index') System.import("playground/src/web_workers/router/background_index")
.then( .then(
function(m) { function(m) {
try { try {
@ -41,4 +36,4 @@ System.import('playground/src/web_workers/router/background_index')
console.error(e); console.error(e);
} }
}, },
function(error) { console.error('error loading background', error); }); function(error) { console.error("error loading background", error); });

View File

@ -1,15 +1,8 @@
/** importScripts("../../../vendor/core.js",
* @license "../../../vendor/zone.js",
* Copyright Google Inc. All Rights Reserved. "../../../vendor/long-stack-trace-zone.js",
* "../../../vendor/system.src.js",
* Use of this source code is governed by an MIT-style license that can be "../../../vendor/Reflect.js");
* found in the LICENSE file at https://angular.io/license
*/
importScripts(
'../../../vendor/core.js', '../../../vendor/zone.js',
'../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
'../../../vendor/Reflect.js');
System.config({ System.config({
@ -27,13 +20,15 @@ System.config({
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}, 'rxjs': {
defaultExtension: 'js'
}
}, },
defaultJSExtensions: true defaultJSExtensions: true
}); });
System.import('playground/src/web_workers/todo/background_index') System.import("playground/src/web_workers/todo/background_index")
.then( .then(
function(m) { function(m) {
try { try {
@ -42,4 +37,4 @@ System.import('playground/src/web_workers/todo/background_index')
console.error(e); console.error(e);
} }
}, },
function(error) { console.error('error loading background', error); }); function(error) { console.error("error loading background", error); });

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var HelloWorldComponent = ng.core.Component({ var HelloWorldComponent = ng.core.Component({
selector: 'hello-world', selector: 'hello-world',
//template: 'hello world!!!' //template: 'hello world!!!'

View File

@ -1,11 +1,3 @@
/**
* @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
*/
// import typescript from 'rollup-plugin-typescript'; // import typescript from 'rollup-plugin-typescript';
// import tsc from 'typescript' // import tsc from 'typescript'

View File

@ -1,32 +1,30 @@
/**
* @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
*/
// Make sure that the command line is read as the first thing // Make sure that the command line is read as the first thing
// as this could exit node if the help script should be printed. // as this could exit node if the help script should be printed.
require('./dist/all/e2e_util/e2e_util').readCommandLine(); require('./dist/all/e2e_util/e2e_util').readCommandLine();
var BROWSER_OPTIONS = { var BROWSER_OPTIONS = {
LocalChrome: { LocalChrome: {
'browserName': 'chrome', 'browserName': 'chrome'
}, },
ChromeOnTravis: { ChromeOnTravis: {
browserName: 'chrome', browserName: 'chrome',
chromeOptions: { chromeOptions: {
'args': ['--no-sandbox'], 'args': ['--no-sandbox'],
'binary': process.env.CHROME_BIN, 'binary': process.env.CHROME_BIN
} }
} }
}; };
exports.config = { exports.config = {
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); }, onPrepare: function() {
beforeEach(function() {
browser.ignoreSynchronization = false;
});
},
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
specs: ['dist/all/**/e2e_test/**/*_spec.js'], specs: [
'dist/all/**/e2e_test/**/*_spec.js'
],
exclude: [ exclude: [
'dist/all/@angular/examples/**', 'dist/all/@angular/examples/**',
'**/key_events/**', // can't tell why this is failing '**/key_events/**', // can't tell why this is failing
@ -36,7 +34,12 @@ exports.config = {
directConnect: true, directConnect: true,
baseUrl: 'http://localhost:8000/', baseUrl: 'http://localhost:8000/',
framework: 'jasmine2', framework: 'jasmine2',
jasmineNodeOpts: jasmineNodeOpts: {
{showColors: true, defaultTimeoutInterval: 60000, print: function(msg) { console.log(msg) }}, showColors: true,
useAllAngular2AppRoots: true, defaultTimeoutInterval: 60000,
print: function(msg) { console.log(msg)}
},
useAllAngular2AppRoots: true
}; };

View File

@ -1,30 +1,30 @@
/**
* @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
*/
// Make sure that the command line is read as the first thing // Make sure that the command line is read as the first thing
// as this could exit node if the help script should be printed. // as this could exit node if the help script should be printed.
require('./dist/all/e2e_util/e2e_util').readCommandLine(); require('./dist/all/e2e_util/e2e_util').readCommandLine();
var BROWSER_OPTIONS = { var BROWSER_OPTIONS = {
LocalChrome: {'browserName': 'chrome'}, LocalChrome: {
'browserName': 'chrome'
},
ChromeOnTravis: { ChromeOnTravis: {
browserName: 'chrome', browserName: 'chrome',
chromeOptions: { chromeOptions: {
'args': ['--no-sandbox'], 'args': ['--no-sandbox'],
'binary': process.env.CHROME_BIN, 'binary': process.env.CHROME_BIN
}
} }
},
}; };
exports.config = { exports.config = {
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); }, onPrepare: function() {
beforeEach(function() {
browser.ignoreSynchronization = false;
});
},
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
specs: ['dist/examples/**/e2e_test/*_spec.js'], specs: [
'dist/examples/**/e2e_test/*_spec.js'
],
capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome, capabilities: process.env.TRAVIS ? BROWSER_OPTIONS.ChromeOnTravis : BROWSER_OPTIONS.LocalChrome,
directConnect: true, directConnect: true,
baseUrl: 'http://localhost:8001/', baseUrl: 'http://localhost:8001/',
@ -32,7 +32,7 @@ exports.config = {
jasmineNodeOpts: { jasmineNodeOpts: {
showColors: true, showColors: true,
defaultTimeoutInterval: 60000, defaultTimeoutInterval: 60000,
print: function(msg) { console.log(msg); }, print: function(msg) { console.log(msg)}
}, },
useAllAngular2AppRoots: true useAllAngular2AppRoots: true
}; };

View File

@ -1,11 +1,3 @@
/**
* @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
*/
// Make sure that the command line is read as the first thing // Make sure that the command line is read as the first thing
// as this could exit node if the help script should be printed. // as this could exit node if the help script should be printed.
require('./dist/all/e2e_util/perf_util').readCommandLine(); require('./dist/all/e2e_util/perf_util').readCommandLine();
@ -23,26 +15,32 @@ var BROWSER_CAPS = {
chromeOptions: CHROME_OPTIONS, chromeOptions: CHROME_OPTIONS,
loggingPrefs: { loggingPrefs: {
performance: 'ALL', performance: 'ALL',
browser: 'ALL', browser: 'ALL'
} }
}, },
ChromeOnTravis: { ChromeOnTravis: {
browserName: 'chrome', browserName: 'chrome',
chromeOptions: mergeInto(CHROME_OPTIONS, { chromeOptions: mergeInto(CHROME_OPTIONS, {
'binary': process.env.CHROME_BIN, 'binary': process.env.CHROME_BIN
}), }),
loggingPrefs: { loggingPrefs: {
performance: 'ALL', performance: 'ALL',
browser: 'ALL', browser: 'ALL'
} }
} }
}; };
exports.config = { exports.config = {
onPrepare: function() { beforeEach(function() { browser.ignoreSynchronization = false; }); }, onPrepare: function() {
beforeEach(function() {
browser.ignoreSynchronization = false;
});
},
restartBrowserBetweenTests: true, restartBrowserBetweenTests: true,
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
specs: ['dist/all/**/e2e_test/**/*_perf.js'], specs: [
'dist/all/**/e2e_test/**/*_perf.js'
],
capabilities: process.env.TRAVIS ? BROWSER_CAPS.ChromeOnTravis : BROWSER_CAPS.LocalChrome, capabilities: process.env.TRAVIS ? BROWSER_CAPS.ChromeOnTravis : BROWSER_CAPS.LocalChrome,
directConnect: true, directConnect: true,
baseUrl: 'http://localhost:8000/', baseUrl: 'http://localhost:8000/',
@ -50,7 +48,7 @@ exports.config = {
jasmineNodeOpts: { jasmineNodeOpts: {
showColors: true, showColors: true,
defaultTimeoutInterval: 60000, defaultTimeoutInterval: 60000,
print: function(msg) { console.log(msg); }, print: function(msg) { console.log(msg)}
}, },
useAllAngular2AppRoots: true useAllAngular2AppRoots: true
}; };

View File

@ -1,11 +1,3 @@
/**
* @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
*/
'use strict'; 'use strict';
var fs = require('fs'); var fs = require('fs');

View File

@ -1,12 +1,3 @@
/**
* @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
*/
// clang-format off
// This file is used for internal testing with Karma only, it should not be used in real applications. // This file is used for internal testing with Karma only, it should not be used in real applications.
// function.name (all IE) // function.name (all IE)

View File

@ -1,11 +1,3 @@
/**
* @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
*/
// Tun on full stack traces in errors to help debugging // Tun on full stack traces in errors to help debugging
Error.stackTraceLimit=Infinity; Error.stackTraceLimit=Infinity;
@ -25,32 +17,94 @@ System.config({
'parse5': 'dist/all/empty.js', 'parse5': 'dist/all/empty.js',
'@angular/platform-server/src/parse5_adapter': 'dist/all/empty.js', '@angular/platform-server/src/parse5_adapter': 'dist/all/empty.js',
'angular2/*': 'dist/all/angular2/*.js', 'angular2/*': 'dist/all/angular2/*.js',
'angular2/src/alt_router/router_testing_providers': 'angular2/src/alt_router/router_testing_providers': 'dist/all/angular2/src/alt_router/router_testing_providers.js'
'dist/all/angular2/src/alt_router/router_testing_providers.js'
}, },
packages: { packages: {
'@angular/core/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/core/testing': {
'@angular/core': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/compiler/testing': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/compiler': {main: 'index.js', defaultExtension: 'js'}, },
'@angular/common/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/core': {
'@angular/common': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/forms': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
},
'@angular/compiler/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/compiler': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/common/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/common': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/forms': {
main: 'index.js',
defaultExtension: 'js'
},
// remove after all tests imports are fixed // remove after all tests imports are fixed
'@angular/facade': {main: 'index.js', defaultExtension: 'js'}, '@angular/facade': {
'@angular/router/testing': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/router': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/http/testing': {main: 'index.js', defaultExtension: 'js'}, },
'@angular/http': {main: 'index.js', defaultExtension: 'js'}, '@angular/router/testing': {
'@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/platform-browser/testing': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'}, },
'@angular/platform-browser-dynamic/testing': {main: 'index.js', defaultExtension: 'js'}, '@angular/router': {
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
'@angular/platform-server/testing': {main: 'index.js', defaultExtension: 'js'}, defaultExtension: 'js'
'@angular/platform-server': {main: 'index.js', defaultExtension: 'js'}, },
'@angular/platform-webworker': {main: 'index.js', defaultExtension: 'js'}, '@angular/http/testing': {
'@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'}, main: 'index.js',
defaultExtension: 'js'
},
'@angular/http': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/upgrade': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser-dynamic/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-browser-dynamic': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-server/testing': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-server': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-webworker': {
main: 'index.js',
defaultExtension: 'js'
},
'@angular/platform-webworker-dynamic': {
main: 'index.js',
defaultExtension: 'js'
}
} }
}); });
@ -67,8 +121,8 @@ System.import('@angular/core/testing')
}); });
}) })
.then(function() { .then(function() {
return Promise.all(Object return Promise.all(
.keys(window.__karma__.files) // All files served by Karma. Object.keys(window.__karma__.files) // All files served by Karma.
.filter(onlySpecFiles) .filter(onlySpecFiles)
.map(window.file2moduleName) // Normalize paths to module names. .map(window.file2moduleName) // Normalize paths to module names.
.map(function(path) { .map(function(path) {
@ -76,15 +130,16 @@ System.import('@angular/core/testing')
if (module.hasOwnProperty('main')) { if (module.hasOwnProperty('main')) {
module.main(); module.main();
} else { } else {
throw new Error( throw new Error('Module ' + path + ' does not implement main() method.');
'Module ' + path + ' does not implement main() method.');
} }
}); });
})); }));
}) })
.then( .then(function() {
function() { __karma__.start(); }, __karma__.start();
function(error) { __karma__.error(error.stack || error); }); }, function(error) {
__karma__.error(error.stack || error);
});
function onlySpecFiles(path) { function onlySpecFiles(path) {

View File

@ -1,11 +1,6 @@
/**
* @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.exports = function(gulp, plugins, config) { module.exports = function(gulp, plugins, config) {
return function(done) { del(config.path, done); }; return function(done) {
del(config.path, done);
}; };
};

View File

@ -1,14 +1,5 @@
/**
* @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
*/
function file2moduleName(filePath) { function file2moduleName(filePath) {
return filePath return filePath.replace(/\\/g, '/')
.replace(/\\/g, '/')
// module name should be relative to `modules` and `tools` folder // module name should be relative to `modules` and `tools` folder
.replace(/.*\/modules\//, '') .replace(/.*\/modules\//, '')
// and 'dist' folder // and 'dist' folder

View File

@ -1,15 +1,7 @@
/**
* @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
*/
var fs = require('fs'); var fs = require('fs');
module.exports = function(licenseFile, outputFile) { module.exports = function(licenseFile, outputFile) {
var licenseText = fs.readFileSync(licenseFile); var licenseText = fs.readFileSync(licenseFile);
var license = '/**\n @license\n' + licenseText + '\n */\n'; var license = "/**\n @license\n" + licenseText + "\n */\n";
if (outputFile) { if (outputFile) {
outputFile = licenseFile + '.wrapped'; outputFile = licenseFile + '.wrapped';
fs.writeFileSync(outputFile, license, 'utf8'); fs.writeFileSync(outputFile, license, 'utf8');

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
@ -16,7 +8,8 @@ module.exports = function(gulp, plugins, config) {
console.log('creating link', linkDir, sourceDir); console.log('creating link', linkDir, sourceDir);
try { try {
fs.symlinkSync(sourceDir, linkDir, 'dir'); fs.symlinkSync(sourceDir, linkDir, 'dir');
} catch (e) { }
catch(e) {
var sourceDir = path.join(config.dir, relativeFolder); var sourceDir = path.join(config.dir, relativeFolder);
console.log('linking failed: trying to hard copy', linkDir, sourceDir); console.log('linking failed: trying to hard copy', linkDir, sourceDir);
copyRecursiveSync(sourceDir, linkDir); copyRecursiveSync(sourceDir, linkDir);
@ -48,7 +41,8 @@ function copyRecursiveSync(src, dest) {
if (stats.isDirectory()) { if (stats.isDirectory()) {
fs.mkdirSync(dest); fs.mkdirSync(dest);
fs.readdirSync(src).forEach(function(childItemName) { fs.readdirSync(src).forEach(function(childItemName) {
copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName)); copyRecursiveSync(path.join(src, childItemName),
path.join(dest, childItemName));
}); });
} else { } else {
fs.writeFileSync(dest, fs.readFileSync(src)); fs.writeFileSync(dest, fs.readFileSync(src));

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var kLogsArgument = /^--logs\s*=\s*(.+?)$/; var kLogsArgument = /^--logs\s*=\s*(.+?)$/;
var kTrimLeft = /^\s+/; var kTrimLeft = /^\s+/;
var kTrimRight = /\s+$/; var kTrimRight = /\s+$/;
@ -23,7 +15,9 @@ function findArgvLogs() {
} }
function logsToObject(logstr) { function logsToObject(logstr) {
return logstr.split(',').reduce(function(obj, key) { return logstr.
split(',').
reduce(function(obj, key) {
key = camelize(key); key = camelize(key);
if (key.length > 0) obj[key] = true; if (key.length > 0) obj[key] = true;
return obj; return obj;
@ -32,8 +26,11 @@ function logsToObject(logstr) {
} }
function camelize(str) { function camelize(str) {
return str.replace(kTrimLeft, '').replace(kTrimRight, '').replace(kCamelCase, function(match, c) { return str.
return c ? c.toUpperCase() : ''; replace(kTrimLeft, '').
replace(kTrimRight, '').
replace(kCamelCase, function(match, c) {
return c ? c.toUpperCase() : "";
}); });
} }

View File

@ -1,11 +1,3 @@
/**
* @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
*/
// helper script that will read out the url parameters // helper script that will read out the url parameters
// and store them in appropriate form fields on the page // and store them in appropriate form fields on the page
(function() { (function() {

View File

@ -1,12 +1,5 @@
/**
* @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
*/
var fs = require('fs'); var fs = require('fs');
var path = require('path');
var minimatch = require('minimatch'); var minimatch = require('minimatch');
var path = require('path'); var path = require('path');
var Q = require('q'); var Q = require('q');
@ -28,8 +21,10 @@ function subDirs(dir) {
function forEachSubDir(dir, callback) { function forEachSubDir(dir, callback) {
var dirs = subDirs(dir); var dirs = subDirs(dir);
return Q.all(dirs.map(function(subdir) { return callback(path.join(dir, subdir)); })); return Q.all(dirs.map(function(subdir) {
} return callback(path.join(dir, subdir));
}));
};
function forEachSubDirSequential(dir, callback) { function forEachSubDirSequential(dir, callback) {
var dirs = subDirs(dir); var dirs = subDirs(dir);
@ -37,7 +32,9 @@ function forEachSubDirSequential(dir, callback) {
function next(index) { function next(index) {
if (index < dirs.length) { if (index < dirs.length) {
return callback(path.join(dir, dirs[index])).then(function() { return next(index + 1); }); return callback(path.join(dir, dirs[index])).then(function() {
return next(index+1);
});
} else { } else {
return true; return true;
} }

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var chokidar = require('chokidar'); var chokidar = require('chokidar');
var runSequence = require('run-sequence'); var runSequence = require('run-sequence');
var path = require('path'); var path = require('path');
@ -24,7 +16,9 @@ function watch(globs, opts, tasks) {
if (!Array.isArray(tasks)) tasks = [tasks]; if (!Array.isArray(tasks)) tasks = [tasks];
tasks = tasks.slice(); tasks = tasks.slice();
tasks.push(tasksDone); tasks.push(tasksDone);
runTasks = function runTaskSequence() { runSequence.apply(null, tasks); }; runTasks = function runTaskSequence() {
runSequence.apply(null, tasks);
}
} else { } else {
var sync = tasks.length === 0; var sync = tasks.length === 0;
runTasks = function runCallback() { runTasks = function runCallback() {
@ -48,11 +42,13 @@ function watch(globs, opts, tasks) {
var delay = opts.delay; var delay = opts.delay;
if (delay === undefined) delay = 100; if (delay === undefined) delay = 100;
var watcher = var watcher = chokidar.watch(globs, opts).
chokidar.watch(globs, opts).on('all', handleEvent).on('error', function(err) { throw err; }); on('all', handleEvent).
on('error', function(err) {
throw err;
});
var log = var log = function watchLogger(triggerCount) {
function watchLogger(triggerCount) {
// Don't report change for initial event // Don't report change for initial event
if (!ignoreInitial && !--triggerCount) return; if (!ignoreInitial && !--triggerCount) return;
@ -66,7 +62,7 @@ function watch(globs, opts, tasks) {
function prettyTime() { function prettyTime() {
var now = new Date(); var now = new Date();
return now.toLocaleDateString() + ' at ' + now.toLocaleTimeString(); return now.toLocaleDateString() + " at " + now.toLocaleTimeString();
} }
} }

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var rewire = require('rewire'); var rewire = require('rewire');
describe('watch()', function() { describe('watch()', function() {
@ -144,13 +136,21 @@ function mockTimeout() {
var now = 0; var now = 0;
return { return {
mocks: {setTimeout: mockSetTimeout, clearTimeout: mockClearTimeout}, mocks: {
flush: flush, get pending() { return events.length; } setTimeout: mockSetTimeout,
clearTimeout: mockClearTimeout
},
flush: flush,
get pending() { return events.length; }
}; };
function mockSetTimeout(fn, delay) { function mockSetTimeout(fn, delay) {
delay = delay || 0; delay = delay || 0;
events.push({time: now + delay, fn: fn, id: id}); events.push({
time: now + delay,
fn: fn,
id: id
});
events.sort(function(a, b) { return a.time - b.time; }); events.sort(function(a, b) { return a.time - b.time; });
return id++; return id++;
} }
@ -165,12 +165,9 @@ function mockTimeout() {
} }
function flush(delay) { function flush(delay) {
if (delay !== undefined) if (delay !== undefined) now += delay;
now += delay; else if (events.length) now = events[events.length - 1].time;
else if (events.length) else throw new Error('No timer events registered');
now = events[events.length - 1].time;
else
throw new Error('No timer events registered');
while (events.length && events[0].time <= now) { while (events.length && events[0].time <= now) {
events.shift().fn(); events.shift().fn();

View File

@ -1,11 +1,3 @@
/**
* @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
*/
// this bundle is almost identical to the angular2.umd.js // this bundle is almost identical to the angular2.umd.js
// the only difference being "testing" exports // the only difference being "testing" exports
exports.core = require('angular2/core'); exports.core = require('angular2/core');
@ -16,7 +8,9 @@ exports.platform = {
common_dom: require('angular2/platform/common_dom'), common_dom: require('angular2/platform/common_dom'),
// this is included as compared to the angular2-all.umd.js bundle // this is included as compared to the angular2-all.umd.js bundle
testing: {browser: require('angular2/platform/testing/browser')} testing: {
browser: require('angular2/platform/testing/browser')
}
}; };
exports.http = require('angular2/http'); exports.http = require('angular2/http');
exports.router = require('angular2/router'); exports.router = require('angular2/router');

View File

@ -1,11 +1,3 @@
/**
* @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
*/
exports.core = require('angular2/core'); exports.core = require('angular2/core');
exports.common = require('angular2/common'); exports.common = require('angular2/common');
exports.compiler = require('angular2/compiler'); exports.compiler = require('angular2/compiler');

View File

@ -1,11 +1,3 @@
/**
* @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
*/
var webpack = require('webpack'); var webpack = require('webpack');
/** /**
@ -16,6 +8,7 @@ var webpack = require('webpack');
* @returns {Function} * @returns {Function}
*/ */
function webPackPromiseify(options) { function webPackPromiseify(options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
webpack(options, function(err, stats) { webpack(options, function(err, stats) {

View File

@ -1,11 +1,3 @@
/**
* @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
*/
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!! !!! !!! !!!
!!! This file is special in that it must be able to execute with wrong Node version !!! !!! This file is special in that it must be able to execute with wrong Node version !!!
@ -24,21 +16,20 @@ var issues = [];
// coarse Node version check // coarse Node version check
if (+process.version[1] < 5) { if (+process.version[1] < 5) {
issues.push('Angular 2 build currently requires Node 5+. Use nvm to update your node version.'); issues.push("Angular 2 build currently requires Node 5+. Use nvm to update your node version.");
} }
try { try {
semver = require('semver'); semver = require('semver');
} catch(e) { } catch(e) {
issues.push('Looks like you are missing some npm dependencies. Run: npm install'); issues.push("Looks like you are missing some npm dependencies. Run: npm install");
} }
if (issues.length) { if (issues.length) {
printWarning(issues); printWarning(issues);
console.error( console.error("Your environment doesn't provide the prerequisite dependencies.\n" +
'Your environment doesn\'t provide the prerequisite dependencies.\n' + "Please fix the issues listed above and then rerun the gulp command.\n" +
'Please fix the issues listed above and then rerun the gulp command.\n' + "Check out https://github.com/angular/angular/blob/master/DEVELOPER.md for more info.");
'Check out https://github.com/angular/angular/blob/master/DEVELOPER.md for more info.');
process.exit(1); process.exit(1);
} }
@ -46,7 +37,7 @@ if (issues.length) {
try { try {
checkNodeModules = require('./npm/check-node-modules.js'); checkNodeModules = require('./npm/check-node-modules.js');
} catch(e) { } catch(e) {
issues.push('Looks like you are missing some npm dependencies. Run: npm install'); issues.push("Looks like you are missing some npm dependencies. Run: npm install");
throw e; throw e;
} finally { } finally {
// print warnings and move on, the next steps will likely fail, but hey, we warned them. // print warnings and move on, the next steps will likely fail, but hey, we warned them.
@ -54,6 +45,7 @@ try {
} }
function checkEnvironment(reqs) { function checkEnvironment(reqs) {
exec('npm --version', function(e, stdout) { exec('npm --version', function(e, stdout) {
var foundNpmVersion = semver.clean(stdout); var foundNpmVersion = semver.clean(stdout);
var foundNodeVersion = process.version; var foundNodeVersion = process.version;
@ -61,20 +53,17 @@ function checkEnvironment(reqs) {
if (!semver.satisfies(foundNodeVersion, reqs.requiredNodeVersion)) { if (!semver.satisfies(foundNodeVersion, reqs.requiredNodeVersion)) {
issues.push( issues.push('You are running unsupported node version. Found: ' + foundNodeVersion +
'You are running unsupported node version. Found: ' + foundNodeVersion + ' Expected: ' + ' Expected: ' + reqs.requiredNodeVersion + '. Use nvm to update your node version.');
reqs.requiredNodeVersion + '. Use nvm to update your node version.');
} }
if (!semver.satisfies(foundNpmVersion, reqs.requiredNpmVersion)) { if (!semver.satisfies(foundNpmVersion, reqs.requiredNpmVersion)) {
issues.push( issues.push('You are running unsupported npm version. Found: ' + foundNpmVersion +
'You are running unsupported npm version. Found: ' + foundNpmVersion + ' Expected: ' + ' Expected: ' + reqs.requiredNpmVersion + '. Run: npm update -g npm');
reqs.requiredNpmVersion + '. Run: npm update -g npm');
} }
if (!checkNodeModules()) { if (!checkNodeModules()) {
issues.push( issues.push('Your node_modules directory is stale or out of sync with npm-shrinkwrap.json. Run: npm install');
'Your node_modules directory is stale or out of sync with npm-shrinkwrap.json. Run: npm install');
} }
printWarning(issues); printWarning(issues);

View File

@ -1,11 +1,3 @@
/**
* @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
*/
/** /**
* Patch Protractor so that it uses ChromeDriver 2.14 instead of 2.15. * Patch Protractor so that it uses ChromeDriver 2.14 instead of 2.15.
* *
@ -21,11 +13,11 @@ var path = require('path');
var protractorConfigFile = path.resolve(require.resolve('protractor'), '../../config.json'); var protractorConfigFile = path.resolve(require.resolve('protractor'), '../../config.json');
var newConfig = { var newConfig = {
'webdriverVersions': { "webdriverVersions": {
'selenium': '2.45.0', "selenium": "2.45.0",
'chromedriver': '2.14', "chromedriver": "2.14",
'iedriver': '2.45.0', "iedriver": "2.45.0"
}
} }
};
fs.writeFile(protractorConfigFile, JSON.stringify(newConfig)); fs.writeFile(protractorConfigFile, JSON.stringify(newConfig));

View File

@ -1,11 +1,4 @@
#! /usr/bin/env node #! /usr/bin/env node
/**
* @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
*/
/** /**
* TODO: remove this file when license is included in RxJS bundles. * TODO: remove this file when license is included in RxJS bundles.
@ -24,8 +17,7 @@ ${license}
**/ **/
`; `;
var bundles = var bundles = fs.readdirSync(args['build-path'])
fs.readdirSync(args['build-path'])
// Match files that begin with Rx and end with js // Match files that begin with Rx and end with js
.filter(bundle => /^Rx\.?.*\.js$/.test(bundle)) .filter(bundle => /^Rx\.?.*\.js$/.test(bundle))
// Load file contents // Load file contents
@ -36,7 +28,11 @@ var bundles =
}; };
}) })
// Concatenate license to bundle // Concatenate license to bundle
.map(bundle => { return {path: bundle.path, contents: `${license}${bundle.contents}`}; }) .map(bundle => {
return {
path: bundle.path,
contents: `${license}${bundle.contents}`
};
})
// Write file to disk // Write file to disk
.forEach( .forEach(bundle => fs.writeFileSync(`${args['build-path']}/${bundle.path}`, bundle.contents));
bundle => fs.writeFileSync(`${args['build-path']}/${bundle.path}`, bundle.contents));

View File

@ -1,28 +1,22 @@
/**
* @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
*/
var SourceMapConsumer = require('source-map').SourceMapConsumer; var SourceMapConsumer = require('source-map').SourceMapConsumer;
var DotsReporter = require('karma/lib/reporters/dots_color'); var DotsReporter = require('karma/lib/reporters/dots_color');
var createErrorFormatter = function (basePath, emitter, SourceMapConsumer) { var createErrorFormatter = function (basePath, emitter, SourceMapConsumer) {
var lastServedFiles = []; var lastServedFiles = [];
emitter.on('file_list_modified', function(files) { lastServedFiles = files.served }); emitter.on('file_list_modified', function (files) {
function findFile(path) { return lastServedFiles.filter(_ => _.path === path)[0]; } lastServedFiles = files.served
});
function findFile(path) {
return lastServedFiles.filter(_ => _.path === path)[0];
}
var URL_REGEXP = new RegExp( var URL_REGEXP = new RegExp('(?:https?:\\/\\/[^\\/]*)?\\/?' +
'(?:https?:\\/\\/[^\\/]*)?\\/?' +
'(base|absolute)' + // prefix '(base|absolute)' + // prefix
'((?:[A-z]\\:)?[^\\?\\s\\:]*)' + // path '((?:[A-z]\\:)?[^\\?\\s\\:]*)' + // path
'(\\?\\w*)?' + // sha '(\\?\\w*)?' + // sha
'(\\:(\\d+))?' + // line '(\\:(\\d+))?' + // line
'(\\:(\\d+))?' + // column '(\\:(\\d+))?' + // column
'', '', 'g')
'g');
return function (msg, indentation) { return function (msg, indentation) {
msg = (msg || '').replace(URL_REGEXP, function (_, prefix, path, __, ___, line, ____, column) { msg = (msg || '').replace(URL_REGEXP, function (_, prefix, path, __, ___, line, ____, column) {
@ -32,13 +26,14 @@ var createErrorFormatter = function(basePath, emitter, SourceMapConsumer) {
line = parseInt(line || '0', 10); line = parseInt(line || '0', 10);
column = parseInt(column || '0', 10); column = parseInt(column || '0', 10);
var file = findFile(path); var file = findFile(path)
if (file && file.sourceMap) { if (file && file.sourceMap) {
try { try {
var original = new SourceMapConsumer(file.sourceMap) var original = new SourceMapConsumer(file.sourceMap).originalPositionFor({
.originalPositionFor({line: line, column: column}); line: line,
return process.cwd() + '/modules/' + original.source + ':' + original.line + ':' + column: column
original.column; });
return process.cwd() + "/modules/" + original.source + ":" + original.line + ":" + original.column;
} catch (e) { } catch (e) {
console.warn('SourceMap position not found for trace: %s', msg); console.warn('SourceMap position not found for trace: %s', msg);
} }
@ -52,16 +47,13 @@ var createErrorFormatter = function(basePath, emitter, SourceMapConsumer) {
} }
return msg + '\n'; return msg + '\n';
} }
}; }
var InternalAngularReporter = function (config, emitter) { var InternalAngularReporter = function (config, emitter) {
var formatter = createErrorFormatter(config.basePath, emitter, SourceMapConsumer); var formatter = createErrorFormatter(config.basePath, emitter, SourceMapConsumer);
DotsReporter.call(this, formatter, false, config.colors) DotsReporter.call(this, formatter, false, config.colors)
}; }
InternalAngularReporter.$inject = ['config', 'emitter']
InternalAngularReporter.$inject = ['config', 'emitter']; module.exports = {'reporter:internal-angular': ['type', InternalAngularReporter]};
module.exports = {
'reporter:internal-angular': ['type', InternalAngularReporter]
};

View File

@ -1,12 +1,4 @@
/** "use strict";
* @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
*/
'use strict';
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
@ -56,7 +48,7 @@ function _deleteDir(path) {
if( fs.existsSync(path) ) { if( fs.existsSync(path) ) {
var subpaths = fs.readdirSync(path); var subpaths = fs.readdirSync(path);
subpaths.forEach(function(subpath) { subpaths.forEach(function(subpath) {
var curPath = path + '/' + subpath; var curPath = path + "/" + subpath;
if(fs.lstatSync(curPath).isDirectory()) { if(fs.lstatSync(curPath).isDirectory()) {
_deleteDir(curPath); _deleteDir(curPath);
} else { } else {

View File

@ -1,11 +1,4 @@
#!/usr/bin/env node #!/usr/bin/env node
/**
* @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
*/
/** /**
* this script is just a temporary solution to deal with the issue of npm outputting the npm * this script is just a temporary solution to deal with the issue of npm outputting the npm
@ -21,13 +14,16 @@ var path = require('path');
function cleanModule(moduleRecord, name) { function cleanModule(moduleRecord, name) {
// keep `resolve` properties for git dependencies, delete otherwise // keep `resolve` properties for git dependencies, delete otherwise
delete moduleRecord.from; delete moduleRecord.from;
if (!(moduleRecord.resolved && moduleRecord.resolved.match(/^git(\+[a-z]+)?:\/\//))) { if (!(moduleRecord.resolved && moduleRecord.resolved.match(/^git(\+[a-z]+)?:\/\//))) {
delete moduleRecord.resolved; delete moduleRecord.resolved;
} }
_.forEach(moduleRecord.dependencies, function(mod, name) { cleanModule(mod, name); }); _.forEach(moduleRecord.dependencies, function(mod, name) {
cleanModule(mod, name);
});
} }
@ -39,4 +35,4 @@ cleanModule(shrinkwrap, shrinkwrap.name);
var cleanShrinkwrapPath = path.join(__dirname, '..', '..', 'npm-shrinkwrap.clean.json'); var cleanShrinkwrapPath = path.join(__dirname, '..', '..', 'npm-shrinkwrap.clean.json');
console.log('writing npm-shrinkwrap.clean.json'); console.log('writing npm-shrinkwrap.clean.json');
fs.writeFileSync(cleanShrinkwrapPath, JSON.stringify(sorted(shrinkwrap), null, 2) + '\n'); fs.writeFileSync(cleanShrinkwrapPath, JSON.stringify(sorted(shrinkwrap), null, 2) + "\n");

View File

@ -1,11 +1,3 @@
/**
* @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.exports = function travisFoldStart(name) { module.exports = function travisFoldStart(name) {
if (process.env.TRAVIS) console.log('travis_fold:start:' + encode(name)); if (process.env.TRAVIS) console.log('travis_fold:start:' + encode(name));

View File

@ -1,11 +1,3 @@
/**
* @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
*/
class RollupNG2 { class RollupNG2 {
resolveId(id, from){ resolveId(id, from){
if(id.startsWith('@angular/')){ if(id.startsWith('@angular/')){
@ -18,10 +10,11 @@ class RollupNG2 {
} }
} }
export default { export default {
entry: 'test.js', entry: 'test.js',
format: 'es6', format: 'es6',
plugins: [ plugins: [
new RollupNG2(), new RollupNG2(),
] ]
}; }