Merge pull request #47 from angular/master

Update upstream

Author: GulajavaMinistudio

.eslintignore

@@ -1,4 +1,3 @@
-bower_components/**
 build/**
 docs/app/assets/js/angular-bootstrap/**
 docs/config/templates/**
@@ -8,3 +7,4 @@ src/angular.bind.js
 src/ngParseExt/ucd.js
 i18n/closure/**
 tmp/**
+vendor/**

.gitignore

@@ -10,7 +10,6 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 node_modules/
-bower_components/
 angular.xcodeproj
 .idea
 *.iml
@@ -19,7 +18,6 @@ angular.xcodeproj
 libpeerconnection.log
 npm-debug.log
 /tmp/
-/scripts/bower/bower-*
 .vscode
 *.log
-*.stackdump
+*.stackdump

.travis.yml

@@ -5,8 +5,6 @@ node_js:
 
 cache:
   yarn: true
-  directories:
-    - bower_components
 
 branches:
   except:
@@ -32,7 +30,7 @@ before_install:
   - export PATH="$HOME/.yarn/bin:$PATH"
 
 before_script:
-  - du -sh ./node_modules ./bower_components/ || true
+  - du -sh ./node_modules || true
   - "./scripts/travis/before_build.sh"
 script:
   - "./scripts/travis/build.sh"

DEVELOPERS.md

@@ -9,7 +9,7 @@
 ## <a name="setup"> Development Setup
 
 This document describes how to set up your development environment to build and test AngularJS, and
-explains the basic mechanics of using `git`, `node`, `yarn`, `grunt`, and `bower`.
+explains the basic mechanics of using `git`, `node`, `yarn` and `grunt`.
 
 ### Installing Dependencies
 
@@ -64,10 +64,10 @@ cd angular.js
 # Add the main AngularJS repository as an upstream remote to your repository:
 git remote add upstream "https://github.com/angular/angular.js.git"
 
-# Install node.js dependencies:
+# Install JavaScript dependencies:
 yarn install
 
-# Build AngularJS (which will install `bower` dependencies automatically):
+# Build AngularJS:
 yarn grunt package
 ```
 

Gruntfile.js

@@ -426,14 +426,12 @@ module.exports = function(grunt) {
     'shell:promises-aplus-tests'
   ]);
   grunt.registerTask('minify', [
-    'bower',
     'clean',
     'build',
     'minall'
   ]);
   grunt.registerTask('webserver', ['connect:devserver']);
   grunt.registerTask('package', [
-    'bower',
     'validate-angular-files',
     'clean',
     'buildall',

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2018 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

TRIAGING.md

@@ -95,7 +95,7 @@ You can mention him in the relevant thread like this: `@btford`.
 
 > Thanks for submitting this issue!
 > Unfortunately, we don't think this functionality belongs in core.
-> The good news is that you could easily implement this as a third-party module and publish it on Bower and/or to the npm repository.
+> The good news is that you could easily implement this as a third-party module and publish it to the npm registry.
 
 
 ## Assigning Work

angularFiles.js

@@ -171,7 +171,7 @@ var angularFiles = {
   ],
 
   'karma': [
-    'bower_components/jquery/dist/jquery.js',
+    'node_modules/jquery/dist/jquery.js',
     'test/jquery_remove.js',
     '@angularSrc',
     '@angularSrcModules',
@@ -202,7 +202,7 @@ var angularFiles = {
   ],
 
   'karmaJquery': [
-    'bower_components/jquery/dist/jquery.js',
+    'node_modules/jquery/dist/jquery.js',
     'test/jquery_alias.js',
     '@angularSrc',
     '@angularSrcModules',
@@ -220,8 +220,8 @@ var angularFiles = {
   angularFiles['karmaJquery' + jQueryVersion] = []
     .concat(angularFiles.karmaJquery)
     .map(function(path) {
-      if (path.startsWith('bower_components/jquery')) {
-        return path.replace(/^bower_components\/jquery/, 'bower_components/jquery-' + jQueryVersion);
+      if (path.startsWith('node_modules/jquery')) {
+        return path.replace(/^node_modules\/jquery/, 'node_modules/jquery-' + jQueryVersion);
       }
       return path;
     });

benchmarks/animation-bp/jquery-noop.js

@@ -1 +1 @@
-// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/node_modules/jquery/dist/jquery.js

benchmarks/largetable-bp/jquery-noop.js

@@ -1 +1 @@
-// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/node_modules/jquery/dist/jquery.js

benchmarks/orderby-bp/jquery-noop.js

@@ -1 +1 @@
-// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/node_modules/jquery/dist/jquery.js

bower.json

@@ -4,14 +4,13 @@ var path = require('canonical-path');
 /**
  * dgService getVersion
  * @description
- * Find the current version of the bower component (or node module)
+ * Find the current version of the node module
  */
 module.exports = function getVersion(readFilesProcessor) {
-  var basePath = readFilesProcessor.basePath;
+  var sourceFolder = path.resolve(readFilesProcessor.basePath, 'node_modules');
+  var packageFile = 'package.json';
 
-  return function(component, sourceFolder, packageFile) {
-    sourceFolder = path.resolve(basePath, sourceFolder || 'node_modules');
-    packageFile = packageFile || 'package.json';
-    return require(path.join(sourceFolder,component,packageFile)).version;
+  return function(component) {
+    return require(path.join(sourceFolder, component, packageFile)).version;
   };
 };

docs/config/services/getVersion.js

@@ -209,7 +209,7 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
         <p class="pull-right"><a back-to-top>Back to top</a></p>
 
         <p>
-          Super-powered by Google ©2010-2017
+          Super-powered by Google ©2010-2018
           (<a id="version"
                ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
                ng-bind-template="v{{version}}" title="Changelog of this version of AngularJS">

docs/config/templates/app/indexPage.template.html

@@ -13,7 +13,7 @@ var rename = require('gulp-rename');
 
 // We indicate to gulp that tasks are async by returning the stream.
 // Gulp can then wait for the stream to close before starting dependent tasks.
-// See clean and bower for async tasks, and see assets and doc-gen for dependent tasks below
+// See clean for an async task, and see assets and doc-gen for dependent tasks below.
 
 var outputFolder = '../build/docs';
 

docs/gulpfile.js

@@ -181,7 +181,6 @@ module.exports = function(config, specificOptions) {
   if (process.env.TRAVIS) {
     var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
 
-    config.logLevel = config.LOG_DEBUG;
     // Karma (with socket.io 1.x) buffers by 50 and 50 tests can take a long time on IEs;-)
     config.browserNoActivityTimeout = 120000;
 

karma-shared.conf.js

@@ -2,7 +2,6 @@
 
 /* eslint-disable no-invalid-this */
 
-var bower = require('bower');
 var util = require('./utils.js');
 var npmRun = require('npm-run');
 
@@ -63,15 +62,4 @@ module.exports = function(grunt) {
   grunt.registerTask('collect-errors', 'Combine stripped error files', function() {
     util.collectErrors();
   });
-
-  grunt.registerTask('bower', 'Install Bower packages.', function() {
-    var done = this.async();
-
-    bower.commands.install()
-      .on('log', function(result) {
-        grunt.log.ok('bower: ' + result.id + ' ' + result.data.endpoint.name);
-      })
-      .on('error', grunt.fail.warn.bind(grunt.fail))
-      .on('end', done);
-  });
 };

lib/grunt/plugins.js

@@ -187,8 +187,8 @@ module.exports = {
         'java ' +
             this.java32flags() + ' ' +
             this.memoryRequirement() + ' ' +
-            '-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
-            'bower_components/ng-closure-runner/ngcompiler.jar ' +
+            '-cp vendor/closure-compiler/compiler.jar' + classPathSep +
+            'vendor/ng-closure-runner/ngcompiler.jar ' +
             'org.angularjs.closurerunner.NgClosureRunner ' +
             '--compilation_level ' + compilationLevel + ' ' +
             '--language_in ECMASCRIPT5_STRICT ' +

lib/grunt/utils.js

@@ -23,7 +23,6 @@
     "angular-benchpress": "0.x.x",
     "benchmark": "1.x.x",
     "bootstrap": "3.1.1",
-    "bower": "~1.3.9",
     "browserstacktunnel-wrapper": "2.0.0",
     "canonical-path": "0.0.2",
     "changez": "^2.1.1",
@@ -57,11 +56,13 @@
     "gulp-sourcemaps": "^1.2.2",
     "gulp-uglify": "^1.0.1",
     "gulp-util": "^3.0.1",
-    "jasmine-core": "2.5.2",
+    "jasmine-core": "^2.8.0",
     "jasmine-node": "^2.0.0",
     "jasmine-reporters": "^2.2.0",
-    "jquery": "^3.2.1",
-    "karma": "^1.7.0",
+    "jquery": "3.2.1",
+    "jquery-2.1": "npm:jquery@2.1.4",
+    "jquery-2.2": "npm:jquery@2.2.4",
+    "karma": "^2.0.0",
     "karma-browserstack-launcher": "^1.2.0",
     "karma-chrome-launcher": "^2.1.1",
     "karma-firefox-launcher": "^1.0.1",

package.json

@@ -18,7 +18,6 @@ fi
 
 # unit runs the docs tests too which need a built version of the code
 if [[ "$JOB" = unit-* ]]; then
-  grunt bower
   grunt validate-angular-files
   grunt build
 fi
@@ -28,4 +27,4 @@ fi
 if [ "$JOB" != "ci-checks" ]; then
   echo "wait_for_browser_provider"
   ./scripts/travis/wait_for_browser_provider.sh
-fi
+fi

scripts/travis/before_build.sh

@@ -1,6 +1,6 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2017 Google, Inc. http://angularjs.org
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
 (function(window) {

src/angular.prefix

@@ -1,6 +1,6 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2017 Google, Inc. http://angularjs.org
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
 'use strict';

src/loader.prefix

@@ -1,6 +1,6 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2017 Google, Inc. http://angularjs.org
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
 (function(window, angular) {

src/module.prefix

@@ -1035,10 +1035,13 @@ describe('angular', function() {
 
     }
 
-    var originalFunction;
+    var originalPrototype = window.Function.prototype;
 
     beforeEach(function() {
       spyOn(window, 'Function');
+      // Jasmine 2.7+ doesn't support spying on Function, so we have restore the prototype
+      // as Jasmine will use Function internally
+      window.Function.prototype = originalPrototype;
     });
 
     afterEach(function() {

test/AngularSpec.js

@@ -7,7 +7,7 @@
     <script>
       var jQuery_2_1_0 = jQuery.noConflict();
     </script>
-    <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+    <script src="../../../../node_modules/jquery/dist/jquery.js"></script>
     <script src="angular.js"></script>
     <script src="script.js"></script>
   </body>

test/e2e/fixtures/ng-jq-jquery/index.html

@@ -3,7 +3,7 @@
   <body>
     <span>{{jqueryVersion}}</span>
 
-    <script src="../../../../bower_components/jquery/dist/jquery.js"></script>
+    <script src="../../../../node_modules/jquery/dist/jquery.js"></script>
     <script type="text/javascript">
       // Verify that empty ng-jq is not accessing `window['']`.
       // (See https://github.com/angular/angular.js/issues/12741 for more details)

test/e2e/fixtures/ng-jq/index.html

@@ -65,7 +65,7 @@ function generateFixture(test, query) {
       }
     }
     if (!/^\d+\.\d+.*$/.test(query.jquery)) {
-      $(jquery).attr('src', '/bower_components/jquery/dist/jquery.js');
+      $(jquery).attr('src', '/node_modules/jquery/dist/jquery.js');
     } else {
       $(jquery).attr('src', '//ajax.googleapis.com/ajax/libs/jquery/' + query.jquery + '/jquery.js');
     }

test/e2e/tools/fixture.js

@@ -246,24 +246,37 @@ describe('HTML', function() {
       .toEqual('<p>text1text2</p>');
   });
 
-  it('should throw on clobbered elements', function() {
-    inject(function($sanitize) {
-      expect(function() {
-        $sanitize('<form><input name="parentNode" /></form>');
-      }).toThrowMinErr('$sanitize', 'elclob');
+  describe('clobbered elements', function() {
 
-      expect(function() {
-        $sanitize('<form><div><div><input name="parentNode" /></div></div></form>');
-      }).toThrowMinErr('$sanitize', 'elclob');
+    it('should throw on a form with an input named "parentNode"', function() {
+      inject(function($sanitize) {
 
-      expect(function() {
-        $sanitize('<form><input name="nextSibling" /></form>');
-      }).toThrowMinErr('$sanitize', 'elclob');
+        expect(function() {
+          $sanitize('<form><input name="parentNode" /></form>');
+        }).toThrowMinErr('$sanitize', 'elclob');
 
-      expect(function() {
-        $sanitize('<form><div><div><input name="nextSibling" /></div></div></form>');
-      }).toThrowMinErr('$sanitize', 'elclob');
+        expect(function() {
+          $sanitize('<form><div><div><input name="parentNode" /></div></div></form>');
+        }).toThrowMinErr('$sanitize', 'elclob');
+      });
     });
+
+    if (!/Edge\/16/.test(window.navigator.userAgent)) {
+      // Skip test on Edge 16 due to browser bug.
+      it('should throw on a form with an input named "nextSibling"', function() {
+        inject(function($sanitize) {
+
+          expect(function() {
+            $sanitize('<form><input name="nextSibling" /></form>');
+          }).toThrowMinErr('$sanitize', 'elclob');
+
+          expect(function() {
+            $sanitize('<form><div><div><input name="nextSibling" /></div></div></form>');
+          }).toThrowMinErr('$sanitize', 'elclob');
+
+        });
+      });
+    }
   });
 
   // See https://github.com/cure53/DOMPurify/blob/a992d3a75031cb8bb032e5ea8399ba972bdf9a65/src/purify.js#L439-L449