library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update requirejs to compatible version, remove r.js

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Timmy Willison 2013-10-15 09:51:09 -04:00
parent 3774ee49e0
commit 67e56db39e
3 changed files with 47 additions and 25858 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25811
build/r.js
View File

File diff suppressed because one or more lines are too long

2
build/tasks/build.js
View File

@ -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",

2
package.json
View File

@ -38,7 +38,7 @@
"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": {