"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Gruntfile.js" between
angular.js-1.7.9.tar.gz and angular.js-1.8.0.tar.gz

About: AngularJS is a web application framework that assists with creating single-page applications that only require HTML, CSS, and JavaScript on the client side.

Gruntfile.js  (angular.js-1.7.9):Gruntfile.js  (angular.js-1.8.0)
skipping to change at line 17 skipping to change at line 17
var mergeFilesFor = require('./angularFiles').mergeFilesFor; var mergeFilesFor = require('./angularFiles').mergeFilesFor;
var util = require('./lib/grunt/utils.js'); var util = require('./lib/grunt/utils.js');
var versionInfo = require('./lib/versions/version-info'); var versionInfo = require('./lib/versions/version-info');
var path = require('path'); var path = require('path');
var e2e = require('./test/e2e/tools'); var e2e = require('./test/e2e/tools');
var semver = require('semver'); var semver = require('semver');
var exec = require('shelljs').exec; var exec = require('shelljs').exec;
var pkg = require(__dirname + '/package.json'); var pkg = require(__dirname + '/package.json');
var docsScriptFolder = 'scripts/docs.angularjs.org-firebase'; var docsScriptFolder = util.docsScriptFolder;
// Node.js version checks // Node.js version checks
if (!semver.satisfies(process.version, pkg.engines.node)) { if (!semver.satisfies(process.version, pkg.engines.node)) {
reportOrFail('Invalid node version (' + process.version + '). ' + reportOrFail('Invalid node version (' + process.version + '). ' +
'Please use a version that satisfies ' + pkg.engines.node); 'Please use a version that satisfies ' + pkg.engines.node);
} }
// Yarn version checks // Yarn version checks
var expectedYarnVersion = pkg.engines.yarn; var expectedYarnVersion = pkg.engines.yarn;
var currentYarnVersion = exec('yarn --version', {silent: true}).stdout.trim(); var currentYarnVersion = exec('yarn --version', {silent: true}).stdout.trim();
skipping to change at line 48 skipping to change at line 48
reportOrFail('Unable to compute the current grunt-cli version. We found:\n' + reportOrFail('Unable to compute the current grunt-cli version. We found:\n' +
currentGruntVersions); currentGruntVersions);
} else { } else {
if (!semver.satisfies(match[1], expectedGruntVersion)) { if (!semver.satisfies(match[1], expectedGruntVersion)) {
reportOrFail('Invalid grunt-cli version (' + match[1] + '). ' + reportOrFail('Invalid grunt-cli version (' + match[1] + '). ' +
'Please use a version that satisfies ' + expectedGruntVersion); 'Please use a version that satisfies ' + expectedGruntVersion);
} }
} }
// Ensure Node.js dependencies have been installed // Ensure Node.js dependencies have been installed
if (!process.env.TRAVIS && !process.env.JENKINS_HOME) { if (!process.env.CI) {
var yarnOutput = exec('yarn install'); var yarnOutput = exec('yarn install');
if (yarnOutput.code !== 0) { if (yarnOutput.code !== 0) {
throw new Error('Yarn install failed: ' + yarnOutput.stderr); throw new Error('Yarn install failed: ' + yarnOutput.stderr);
} }
} }
module.exports = function(grunt) { module.exports = function(grunt) {
// this loads all the node_modules that start with `grunt-` as plugins // this loads all the node_modules that start with `grunt-` as plugins
require('load-grunt-tasks')(grunt); require('load-grunt-tasks')(grunt);
skipping to change at line 112 skipping to change at line 112
e2e.middleware(), e2e.middleware(),
serveFavicon('images/favicon.ico'), serveFavicon('images/favicon.ico'),
serveStatic(base), serveStatic(base),
serveIndex(base) serveIndex(base)
]; ];
} }
} }
}, },
testserver: { testserver: {
options: { options: {
// We use end2end task (which does not start the webserver) // We start the webserver as a separate process from the E2E tests
// and start the webserver as a separate process (in travis_build.sh)
// to avoid https://github.com/joyent/libuv/issues/826
port: 8000, port: 8000,
hostname: '0.0.0.0', hostname: '0.0.0.0',
middleware: function(connect, options) { middleware: function(connect, options) {
var base = Array.isArray(options.base) ? options.base[options.base.l ength - 1] : options.base; var base = Array.isArray(options.base) ? options.base[options.base.l ength - 1] : options.base;
return [ return [
function(req, resp, next) { function(req, resp, next) {
// cache get requests to speed up tests on travis // cache GET requests to speed up tests
if (req.method === 'GET') { if (req.method === 'GET') {
resp.setHeader('Cache-control', 'public, max-age=3600'); resp.setHeader('Cache-control', 'public, max-age=3600');
} }
next(); next();
}, },
util.conditionalCsp(), util.conditionalCsp(),
e2e.middleware(), e2e.middleware(),
serveFavicon('images/favicon.ico'), serveFavicon('images/favicon.ico'),
serveStatic(base) serveStatic(base)
skipping to change at line 160 skipping to change at line 158
jqlite: 'karma-jqlite.conf.js', jqlite: 'karma-jqlite.conf.js',
jquery: 'karma-jquery.conf.js', jquery: 'karma-jquery.conf.js',
'jquery-2.2': 'karma-jquery-2.2.conf.js', 'jquery-2.2': 'karma-jquery-2.2.conf.js',
'jquery-2.1': 'karma-jquery-2.1.conf.js', 'jquery-2.1': 'karma-jquery-2.1.conf.js',
modules: 'karma-modules.conf.js', modules: 'karma-modules.conf.js',
docs: 'karma-docs.conf.js' docs: 'karma-docs.conf.js'
}, },
protractor: { protractor: {
normal: 'protractor-conf.js', normal: 'protractor-conf.js',
travis: 'protractor-travis-conf.js', circleci: 'protractor-circleci-conf.js'
jenkins: 'protractor-jenkins-conf.js'
}, },
clean: { clean: {
build: ['build'], build: ['build'],
tmp: ['tmp'], tmp: ['tmp'],
deploy: [ deploy: [
'deploy/docs', 'deploy/docs',
'deploy/code', 'deploy/code',
docsScriptFolder + '/functions/html' docsScriptFolder + '/functions/html'
] ]
skipping to change at line 369 skipping to change at line 366
{ {
src: 'src/ngLocale/**', src: 'src/ngLocale/**',
dest: 'build/i18n/', dest: 'build/i18n/',
expand: true, expand: true,
flatten: true flatten: true
} }
] ]
}, },
deployFirebaseCode: { deployFirebaseCode: {
files: [ files: [
// copy files that are not handled by compress
{ {
cwd: 'build', cwd: 'build',
src: '**/*.{zip,jpg,jpeg,png}', src: '**',
dest: 'deploy/code/' + deployVersion + '/', dest: 'deploy/code/' + deployVersion + '/',
expand: true expand: true
} }
] ]
}, },
deployFirebaseDocs: { deployFirebaseDocs: {
files: [ files: [
// The source files are needed by the embedded examples in the docs ap p. // The source files are needed by the embedded examples in the docs ap p.
{ {
src: ['build/angular*.{js,js.map,min.js}', 'build/sitemap.xml'], src: ['build/angular*.{js,js.map,min.js}', 'build/sitemap.xml'],
skipping to change at line 419 skipping to change at line 415
}, },
compress: { compress: {
build: { build: {
options: {archive: 'build/' + dist + '.zip', mode: 'zip'}, options: {archive: 'build/' + dist + '.zip', mode: 'zip'},
src: ['**'], src: ['**'],
cwd: 'build', cwd: 'build',
expand: true, expand: true,
dot: true, dot: true,
dest: dist + '/' dest: dist + '/'
},
deployFirebaseCode: {
options: {
mode: 'gzip'
},
// Already compressed files should not be compressed again
src: ['**', '!**/*.{zip,png,jpeg,jpg}'],
cwd: 'build',
expand: true,
dest: 'deploy/code/' + deployVersion + '/'
} }
}, },
shell: { shell: {
'install-node-dependencies': { 'install-node-dependencies': {
command: 'yarn' command: 'yarn'
}, },
'promises-aplus-tests': { 'promises-aplus-tests': {
options: { options: {
stdout: false, stdout: false,
skipping to change at line 493 skipping to change at line 479
'test:jquery', 'test:jquery',
'test:jquery-2.2', 'test:jquery-2.2',
'test:jquery-2.1', 'test:jquery-2.1',
'test:modules' 'test:modules'
]); ]);
grunt.registerTask('test:protractor', 'Run the end to end tests with Protracto r and keep a test server running in the background', [ grunt.registerTask('test:protractor', 'Run the end to end tests with Protracto r and keep a test server running in the background', [
'webdriver', 'webdriver',
'connect:testserver', 'connect:testserver',
'protractor:normal' 'protractor:normal'
]); ]);
grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Pr otractor for Travis CI builds', [ grunt.registerTask('test:circleci-protractor', 'Run the end to end tests with Protractor for CircleCI builds', [
'connect:testserver', 'connect:testserver',
'protractor:travis' 'protractor:circleci'
]);
grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protra
ctor for Jenkins CI builds', [
'webdriver',
'connect:testserver',
'protractor:jenkins'
]); ]);
grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor' ]); grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor' ]);
grunt.registerTask('test:promises-aplus',[ grunt.registerTask('test:promises-aplus',[
'build:promises-aplus-adapter', 'build:promises-aplus-adapter',
'shell:promises-aplus-tests' 'shell:promises-aplus-tests'
]); ]);
grunt.registerTask('minify', [ grunt.registerTask('minify', [
'clean', 'clean',
'build', 'build',
'minall' 'minall'
skipping to change at line 530 skipping to change at line 511
'docs', 'docs',
'copy:i18n', 'copy:i18n',
'compress:build' 'compress:build'
]); ]);
grunt.registerTask('ci-checks', [ grunt.registerTask('ci-checks', [
'ddescribe-iit', 'ddescribe-iit',
'merge-conflict', 'merge-conflict',
'eslint' 'eslint'
]); ]);
grunt.registerTask('prepareDeploy', [ grunt.registerTask('prepareDeploy', [
'package',
'compress:deployFirebaseCode',
'copy:deployFirebaseCode', 'copy:deployFirebaseCode',
'firebaseDocsJsonForTravis', 'firebaseDocsJsonForCI',
'copy:deployFirebaseDocs' 'copy:deployFirebaseDocs'
]); ]);
grunt.registerTask('default', ['package']); grunt.registerTask('default', ['package']);
}; };
function reportOrFail(message) { function reportOrFail(message) {
if (process.env.TRAVIS || process.env.JENKINS_HOME) { if (process.env.CI) {
throw new Error(message); throw new Error(message);
} else { } else {
console.log('=============================================================== ================'); console.log('=============================================================== ================');
console.log(message); console.log(message);
console.log('=============================================================== ================'); console.log('=============================================================== ================');
} }
} }
 End of changes. 13 change blocks. 
32 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)