Skip to content

Housekeeping #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 31, 2018
Merged
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/bower_components
/dist
/node_modules
/package-lock.json
24 changes: 0 additions & 24 deletions .npmignore

This file was deleted.

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: node_js
node_js:
- "6"
- "8"
cache:
directories:
- node_modules
Expand All @@ -20,7 +20,7 @@ env:
matrix:
fast_finish: true
include:
- node_js: "6"
- node_js: "8"
env: NPM_SCRIPT=browserstack
script:
- npm run-script $NPM_SCRIPT
35 changes: 7 additions & 28 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,13 @@ grunt.initConfig( {
"jquery-3.0.0/LICENSE.txt": "jquery-3.0.0/LICENSE.txt",

"jquery-3.1.1/jquery.js": "jquery-3.1.1/dist/jquery.js",
"jquery-3.1.1/LICENSE.txt": "jquery-3.1.1/LICENSE.txt"
"jquery-3.1.1/LICENSE.txt": "jquery-3.1.1/LICENSE.txt",

"jquery-3.2.1/jquery.js": "jquery-3.2.1/dist/jquery.js",
"jquery-3.2.1/LICENSE.txt": "jquery-3.2.1/LICENSE.txt",

"jquery-3.3.1/jquery.js": "jquery-3.3.1/dist/jquery.js",
"jquery-3.3.1/LICENSE.txt": "jquery-3.3.1/LICENSE.txt"
}
}
},
Expand Down Expand Up @@ -193,33 +199,6 @@ grunt.registerTask( "testswarm", function( commit, configFile ) {
);
} );

grunt.registerTask( "manifest", function() {
var pkg = grunt.config( "pkg" );
grunt.file.write( "color.jquery.json", JSON.stringify( {
name: "color",
title: pkg.title,
description: pkg.description,
keywords: pkg.keywords,
version: pkg.version,
author: {
name: pkg.author.name,
url: pkg.author.url.replace( "master", pkg.version )
},
maintainers: pkg.maintainers,
licenses: pkg.licenses.map( function( license ) {
license.url = license.url.replace( "master", pkg.version );
return license;
} ),
bugs: pkg.bugs,
homepage: pkg.homepage,
docs: pkg.homepage,
download: "http://code.jquery.com/#color",
dependencies: {
jquery: ">=1.5"
}
}, null, "\t" ) );
} );

grunt.registerTask( "default", [ "eslint", "qunit", "build", "compare_size" ] );
grunt.registerTask( "build", [ "max", "concat", "uglify" ] );
grunt.registerTask( "ci", [ "eslint", "qunit" ] );
Expand Down
6 changes: 4 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"test"
],
"devDependencies": {
"qunit": "1.22.0",
"qunit": "2.5.0",
"jquery-1.5.2": "jquery#1.5.2",
"jquery-1.6.4": "jquery#1.6.4",
"jquery-1.7.2": "jquery#1.7.2",
Expand All @@ -29,6 +29,8 @@
"jquery-2.1.4": "jquery#2.1.4",
"jquery-2.2.4": "jquery#2.2.4",
"jquery-3.0.0": "jquery#3.0.0",
"jquery-3.1.1": "jquery#3.1.1"
"jquery-3.1.1": "jquery#3.1.1",
"jquery-3.2.1": "jquery#3.2.1",
"jquery-3.3.1": "jquery#3.3.1"
}
}
2 changes: 1 addition & 1 deletion build/browserstack-current.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"edge_latest",
{
"os": "iOS",
"os_version": "10.0",
"os_version": "11.0",
"real_mobile": false
}
]
Expand Down
6 changes: 6 additions & 0 deletions build/browserstack-legacy.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"chrome_previous",
"firefox_previous",
"safari_previous",
"edge_previous",
"ie_9",
"ie_10",
{
Expand All @@ -25,6 +26,11 @@
"os": "iOS",
"os_version": "9.3",
"real_mobile": false
},
{
"os": "iOS",
"os_version": "10.3",
"real_mobile": false
}
]
}
36 changes: 36 additions & 0 deletions external/jquery-3.2.1/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
Copyright JS Foundation and other contributors, https://js.foundation/

This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/jquery

The following license applies to all parts of this software except as
documented below:

====

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

====

All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.
Loading