Commit 79c0732a authored by Timmy Willison's avatar Timmy Willison

Build: drop bower; use npm for front-end deps

Fixes #15186
Closes gh-1620

Conflicts:
	bower.json
parent e38a94a6
{
"directory": "bower_components"
}
\ No newline at end of file
...@@ -9,5 +9,4 @@ ...@@ -9,5 +9,4 @@
.sizecache.json .sizecache.json
/dist /dist
/bower_components
/node_modules /node_modules
...@@ -44,19 +44,18 @@ module.exports = function( grunt ) { ...@@ -44,19 +44,18 @@ module.exports = function( grunt ) {
} }
} }
}, },
bowercopy: { npmcopy: {
all: { all: {
options: { options: {
clean: true,
destPrefix: "external" destPrefix: "external"
}, },
files: { files: {
"sizzle/dist": "sizzle/dist", "sizzle/dist": "sizzle/dist",
"sizzle/MIT-LICENSE.txt": "sizzle/MIT-LICENSE.txt", "sizzle/MIT-LICENSE.txt": "sizzle/MIT-LICENSE.txt",
"qunit/qunit.js": "qunit/qunit/qunit.js", "qunit/qunit.js": "qunitjs/qunit/qunit.js",
"qunit/qunit.css": "qunit/qunit/qunit.css", "qunit/qunit.css": "qunitjs/qunit/qunit.css",
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt", "qunit/MIT-LICENSE.txt": "qunitjs/MIT-LICENSE.txt",
"requirejs/require.js": "requirejs/require.js", "requirejs/require.js": "requirejs/require.js",
...@@ -137,7 +136,6 @@ module.exports = function( grunt ) { ...@@ -137,7 +136,6 @@ module.exports = function( grunt ) {
// Integrate jQuery specific tasks // Integrate jQuery specific tasks
grunt.loadTasks( "build/tasks" ); grunt.loadTasks( "build/tasks" );
grunt.registerTask( "bower", "bowercopy" );
grunt.registerTask( "lint", [ "jshint", "jscs" ] ); grunt.registerTask( "lint", [ "jshint", "jscs" ] );
// Short list as a high frequency watch task // Short list as a high frequency watch task
......
...@@ -13,12 +13,6 @@ ...@@ -13,12 +13,6 @@
"Gruntfile.js", "Gruntfile.js",
"package.json" "package.json"
], ],
"devDependencies": {
"sizzle": "1.11.1",
"requirejs": "2.1.10",
"qunit": "1.14.0",
"sinon": "1.8.1"
},
"keywords": [ "keywords": [
"jquery", "jquery",
"javascript", "javascript",
......
var fs = require( "fs" ), var fs = require( "fs" ),
bower = require( "grunt-bowercopy/node_modules/bower" ), npm = require( "npm" ),
sizzleLoc = __dirname + "/../external/sizzle/dist/sizzle.js", sizzleLoc = __dirname + "/../external/sizzle/dist/sizzle.js",
rversion = /Engine v(\d+\.\d+\.\d+(?:-\w+)?)/; rversion = /Engine v(\d+\.\d+\.\d+(?:-\w+)?)/;
require( "colors" );
/** /**
* Retrieve the latest tag of Sizzle from bower * Retrieve the latest tag of Sizzle from npm
* @param {Function(string)} callback * @param {Function(string)} callback
*/ */
function getLatestSizzle( callback ) { function getLatestSizzle( callback ) {
bower.commands.info( "sizzle", "version" ) npm.load(function( err, npm ) {
.on( "end", callback ); if ( err ) {
throw err;
}
npm.commands.info( [ "sizzle", "version" ], function( err, info ) {
if ( err ) {
throw err;
}
callback( Object.keys( info )[ 0 ] );
});
});
} }
/** /**
......
...@@ -30,10 +30,9 @@ ...@@ -30,10 +30,9 @@
], ],
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"colors": "^0.6.2", "colors": "0.6.2",
"commitplease": "1.9.0", "commitplease": "1.9.0",
"grunt": "0.4.2", "grunt": "0.4.2",
"grunt-bowercopy": "1.1.0",
"grunt-cli": "0.1.13", "grunt-cli": "0.1.13",
"grunt-compare-size": "0.4.0", "grunt-compare-size": "0.4.0",
"grunt-contrib-jshint": "0.8.0", "grunt-contrib-jshint": "0.8.0",
...@@ -42,9 +41,14 @@ ...@@ -42,9 +41,14 @@
"grunt-git-authors": "1.2.0", "grunt-git-authors": "1.2.0",
"grunt-jscs-checker": "0.4.1", "grunt-jscs-checker": "0.4.1",
"grunt-jsonlint": "1.0.4", "grunt-jsonlint": "1.0.4",
"grunt-npmcopy": "0.1.0",
"gzip-js": "0.3.2", "gzip-js": "0.3.2",
"load-grunt-tasks": "0.3.0", "load-grunt-tasks": "0.3.0",
"requirejs": "2.1.10", "npm": "1.4.21",
"qunitjs": "1.14.0",
"requirejs": "2.1.14",
"sinon": "1.10.3",
"sizzle": "2.0.0",
"testswarm": "1.1.0" "testswarm": "1.1.0"
}, },
"scripts": { "scripts": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment