Revert "refactor: add license header to JS files & format files (angu…

…lar#12035)" This reverts commit 8310c91.
alxhub · Oct 4, 2016 · 43d3a84 · 43d3a84
1 parent 8310c91
commit 43d3a84
Show file tree

Hide file tree

Showing 73 changed files with 947 additions and 1,173 deletions.
diff --git a/browser-providers.conf.js b/browser-providers.conf.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -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';
 
 // THIS CHECK SHOULD BE THE FIRST THING IN THIS FILE
@@ -21,30 +13,28 @@ const os = require('os');
 
 // clang-format entry points
 const srcsToFmt = [
-  'modules/@angular/**/*.{js,ts}',
-  'modules/benchmarks/**/*.{js,ts}',
-  'modules/e2e_util/**/*.{js,ts}',
-  'modules/playground/**/*.{js,ts}',
-  'tools/**/*.{js,ts}',
+  'modules/@angular/**/*.ts',
+  'modules/benchmarks/**/*.ts',
+  'modules/e2e_util/**/*.ts',
+  'modules/playground/**/*.ts',
+  'tools/**/*.ts',
   '!tools/public_api_guard/**/*.d.ts',
-  './*.{js,ts}',
 ];
 
 // Check source code for formatting errors (clang-format)
 gulp.task('format:enforce', () => {
   const format = require('gulp-clang-format');
   const clangFormat = require('clang-format');
   return gulp.src(srcsToFmt).pipe(
-      format.checkFormat('file', clangFormat, {verbose: true, fail: true}));
+    format.checkFormat('file', clangFormat, {verbose: true, fail: true}));
 });
 
 // Format the source code with clang-format (see .clang-format)
 gulp.task('format', () => {
   const format = require('gulp-clang-format');
   const clangFormat = require('clang-format');
-  return gulp.src(srcsToFmt, {base: '.'})
-      .pipe(format.format('file', clangFormat))
-      .pipe(gulp.dest('.'));
+  return gulp.src(srcsToFmt, { base: '.' }).pipe(
+    format.format('file', clangFormat)).pipe(gulp.dest('.'));
 });
 
 const entrypoints = [
@@ -72,18 +62,12 @@ const entrypoints = [
 ];
 const publicApiDir = path.normalize('tools/public_api_guard');
 const publicApiArgs = [
-  '--rootDir',
-  'dist/packages-dist',
-  '--stripExportPattern',
-  '^__',
-  '--allowModuleIdentifiers',
-  'jasmine',
-  '--allowModuleIdentifiers',
-  'protractor',
-  '--allowModuleIdentifiers',
-  'angular',
-  '--onStabilityMissing',
-  'error',
+  '--rootDir', 'dist/packages-dist',
+  '--stripExportPattern', '^__',
+  '--allowModuleIdentifiers', 'jasmine',
+  '--allowModuleIdentifiers', 'protractor',
+  '--allowModuleIdentifiers', 'angular',
+  '--onStabilityMissing', 'error',
 ].concat(entrypoints);
 
 // Build angular
@@ -99,42 +83,38 @@ gulp.task('public-api:enforce', (done) => {
   const childProcess = require('child_process');
 
   childProcess
-      .spawn(
-          path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
-          ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-      .on('close', (errorCode) => {
-        if (errorCode !== 0) {
-          done(new Error(
-              'Public API differs from golden file. Please run `gulp public-api:update`.'));
-        } else {
-          done();
-        }
-      });
+    .spawn(
+      path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
+      ['--verifyDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+    .on('close', (errorCode) => {
+      if (errorCode !== 0) {
+        done(new Error(
+          'Public API differs from golden file. Please run `gulp public-api:update`.'));
+      } else {
+        done();
+      }
+    });
 });
 
 // Generate the public API golden files
 gulp.task('public-api:update', ['build.sh'], (done) => {
   const childProcess = require('child_process');
 
   childProcess
-      .spawn(
-          path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
-          ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
-      .on('close', done);
+    .spawn(
+      path.join(__dirname, platformScriptPath(`/node_modules/.bin/ts-api-guardian`)),
+      ['--outDir', publicApiDir].concat(publicApiArgs), {stdio: 'inherit'})
+    .on('close', done);
 });
 
-// Checks tests for presence of ddescribe, fdescribe, fit, iit and fails the build if one of the
-// 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.
+// Checks tests for presence of ddescribe, fdescribe, fit, iit and fails the build if one of the 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.
 gulp.task('check-tests', function() {
   const ddescribeIit = require('gulp-ddescribe-iit');
-  return gulp
-      .src([
-        'modules/**/*.spec.ts',
-        'modules/**/*_spec.ts',
-      ])
-      .pipe(ddescribeIit({allowDisabledTests: true}));
+  return gulp.src([
+    'modules/**/*.spec.ts',
+    'modules/**/*_spec.ts',
+  ]).pipe(ddescribeIit({allowDisabledTests: true}));
 });
 
 // Check the coding standards and programming errors
@@ -143,21 +123,14 @@ gulp.task('lint', ['check-tests', 'format:enforce', 'tools:build'], () => {
   // Built-in rules are at
   // https://github.com/palantir/tslint#supported-rules
   const tslintConfig = require('./tslint.json');
-  return gulp
-      .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({
-        tslint: require('tslint').default,
-        configuration: tslintConfig,
-        rulesDirectory: 'dist/tools/tslint',
-        formatter: 'prose',
-      }))
-      .pipe(tslint.report({emitError: true}));
+  return gulp.src(['modules/@angular/**/*.ts', 'modules/benchpress/**/*.ts'])
+    .pipe(tslint({
+      tslint: require('tslint').default,
+      configuration: tslintConfig,
+      rulesDirectory: 'dist/tools/tslint',
+      formatter: 'prose',
+    }))
+    .pipe(tslint.report({emitError: true}));
 });
 
 gulp.task('tools:build', (done) => { tsc('tools/', done); });
@@ -169,7 +142,7 @@ gulp.task('check-cycle', (done) => {
   const dependencyObject = madge(['dist/all/'], {
     format: 'cjs',
     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();
   if (circularDependencies.length > 0) {
@@ -200,11 +173,11 @@ gulp.task('serve-examples', () => {
   const cors = require('cors');
 
   connect.server({
-    root: `${__dirname}/dist/examples`,
-    port: 8001,
-    livereload: false,
-    open: false,
-    middleware: (connect, opt) => [cors()],
+      root: `${__dirname}/dist/examples`,
+      port: 8001,
+      livereload: false,
+      open: false,
+      middleware: (connect, opt) => [cors()],
   });
 });
 
@@ -214,13 +187,16 @@ gulp.task('changelog', () => {
   const conventionalChangelog = require('gulp-conventional-changelog');
 
   return gulp.src('CHANGELOG.md')
-      .pipe(conventionalChangelog({preset: 'angular', releaseCount: 1}, {
-        // Conventional Changelog Context
-        // 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
-        currentTag: require('./package.json').version
-      }))
-      .pipe(gulp.dest('./'));
+    .pipe(conventionalChangelog({
+      preset: 'angular',
+      releaseCount: 1
+    }, {
+      // Conventional Changelog Context
+      // 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
+      currentTag: require('./package.json').version
+    }))
+    .pipe(gulp.dest('./'));
 });
 
 function tsc(projectPath, done) {
@@ -229,7 +205,8 @@ function tsc(projectPath, done) {
   childProcess
       .spawn(
           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);
 }
 

diff --git a/karma-js.conf.js b/karma-js.conf.js
@@ -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 internalAngularReporter = require('./tools/karma/reporter.js');
 
@@ -25,25 +17,24 @@ module.exports = function(config) {
       // include Angular v1 for upgrade module testing
       '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/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/zone.js',
+      'node_modules/zone.js/dist/long-stack-trace-zone.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',
 
       // 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},
-      'node_modules/reflect-metadata/Reflect.js', 'tools/build/file2modulename.js', 'test-main.js',
-      {pattern: 'dist/all/empty.*', included: 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,
-      }
+      'node_modules/reflect-metadata/Reflect.js',
+      'tools/build/file2modulename.js',
+      'test-main.js',
+      {pattern: 'dist/all/empty.*', included: 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}
     ],
 
     exclude: [
@@ -53,7 +44,7 @@ module.exports = function(config) {
       'dist/all/@angular/benchpress/**',
       'dist/all/angular1_router.js',
       'dist/all/@angular/platform-browser/testing/e2e_util.js',
-      'dist/examples/**/e2e_test/**',
+      'dist/examples/**/e2e_test/**'
     ],
 
     customLaunchers: browserProvidersConf.customLaunchers,
@@ -64,11 +55,11 @@ module.exports = function(config) {
       'karma-sauce-launcher',
       'karma-chrome-launcher',
       'karma-sourcemap-loader',
-      internalAngularReporter,
+      internalAngularReporter
     ],
 
     preprocessors: {
-      '**/*.js': ['sourcemap'],
+      '**/*.js': ['sourcemap']
     },
 
     reporters: ['internal-angular'],
@@ -82,7 +73,7 @@ module.exports = function(config) {
         'selenium-version': '2.53.0',
         'command-timeout': 600,
         'idle-timeout': 600,
-        'max-duration': 5400,
+        'max-duration': 5400
       }
     },
 
@@ -91,21 +82,20 @@ module.exports = function(config) {
       startTunnel: false,
       retryLimit: 3,
       timeout: 600,
-      pollingTimeout: 10000,
+      pollingTimeout: 10000
     },
 
     browsers: ['Chrome'],
 
     port: 9876,
     captureTimeout: 60000,
-    browserDisconnectTimeout: 60000,
-    browserDisconnectTolerance: 3,
-    browserNoActivityTimeout: 60000,
+    browserDisconnectTimeout : 60000,
+    browserDisconnectTolerance : 3,
+    browserNoActivityTimeout : 60000,
   });
 
   if (process.env.TRAVIS) {
-    var buildId =
-        'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
+    var buildId = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
     if (process.env.CI_MODE.startsWith('saucelabs')) {
       config.sauceLabs.build = buildId;
       config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;

diff --git a/modules/@angular/common/rollup-testing.config.js b/modules/@angular/common/rollup-testing.config.js
@@ -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 {
   entry: '../../../dist/packages-dist/common/testing/index.js',
@@ -17,4 +10,4 @@ export default {
     'rxjs/Observable': 'Rx',
     'rxjs/Subject': 'Rx'
   }
-};
+}
diff --git a/modules/@angular/common/rollup.config.js b/modules/@angular/common/rollup.config.js
@@ -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 {
   entry: '../../../dist/packages-dist/common/index.js',
@@ -14,6 +7,6 @@ export default {
   globals: {
     '@angular/core': 'ng.core',
     'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
+    'rxjs/Subject': 'Rx'
   }
-};
+}
diff --git a/modules/@angular/compiler-cli/integrationtest/webpack.config.js b/modules/@angular/compiler-cli/integrationtest/webpack.config.js
@@ -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 = {
   target: 'node',
   entry: './test/all_spec.js',
-  output: {filename: './all_spec.js'},
-  resolve: {extensions: ['.js']},
+  output: {
+    filename: './all_spec.js'
+  },
+  resolve: {
+    extensions: ['.js']
+  },
 };