Skip to content

J
jquery
Commit 67e56db3 authored by Timmy Willison's avatar Timmy Willison
Browse files
Options

Update requirejs to compatible version, remove r.js 

Conflicts:
	package.json
parent 3774ee49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 25858 deletions
build/r.js deleted 100644 → 0
View file @ 3774ee49
This diff is collapsed.
build/tasks/build.js
View file @ 67e56db3
...@@ -11,7 +11,7 @@ module.exports = function( grunt ) { ...@@ -11,7 +11,7 @@ module.exports = function( grunt ) {
srcFolder = __dirname + "/../../src/", srcFolder = __dirname + "/../../src/",
rdefineEnd = /\}\);[^}\w]*$/, rdefineEnd = /\}\);[^}\w]*$/,
// This is temporary until the skipSemiColonInsertion option makes it to NPM // This is temporary until the skipSemiColonInsertion option makes it to NPM
requirejs = require( "../r" ), requirejs = require( "requirejs" ),
config = { config = {
baseUrl: "src", baseUrl: "src",
name: "jquery", name: "jquery",
......
package.json
View file @ 67e56db3
{ {
"name": "jquery", "name": "jquery",
"title": "jQuery", "title": "jQuery",
"description": "JavaScript library for DOM operations", "description": "JavaScript library for DOM operations",
"version": "1.11.0-pre", "version": "1.11.0-pre",
"homepage": "http://jquery.com", "homepage": "http://jquery.com",
"author": { "author": {
"name": "jQuery Foundation and other contributors", "name": "jQuery Foundation and other contributors",
"url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt" "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/jquery/jquery.git" "url": "https://github.com/jquery/jquery.git"
}, },
"keywords": [ "keywords": [
"jquery", "jquery",
"javascript", "javascript",
"library" "library"
], ],
"bugs": { "bugs": {
"url": "http://bugs.jquery.com" "url": "http://bugs.jquery.com"
}, },
"licenses": [ "licenses": [
{ {
"type": "MIT", "type": "MIT",
"url": "https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt" "url": "https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt"
} }
], ],
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"archiver": "~0.4.9", "archiver": "~0.4.9",
"grunt": "~0.4.1", "grunt": "~0.4.1",
"grunt-compare-size": "~0.4.0", "grunt-compare-size": "~0.4.0",
"grunt-contrib-jshint": "~0.6.4", "grunt-contrib-jshint": "~0.6.4",
"grunt-contrib-uglify": "~0.2.4", "grunt-contrib-uglify": "~0.2.4",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.5.3",
"grunt-git-authors": "~1.2.0", "grunt-git-authors": "~1.2.0",
"grunt-jsonlint": "~1.0.0", "grunt-jsonlint": "~1.0.0",
"gzip-js": "0.3.2", "gzip-js": "0.3.2",
"testswarm": "~1.1.0", "testswarm": "~1.1.0",
"requirejs": "~2.1.8", "requirejs": "~2.1.9",
"which": "~1.0.5" "which": "~1.0.5"
}, },
"scripts": { "scripts": {
"install": "node build/bower-install", "install": "node build/bower-install",
"test": "grunt" "test": "grunt"
} }
} }
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