Commit 67e56db3 authored by Timmy Willison's avatar Timmy Willison

Update requirejs to compatible version, remove r.js

Conflicts:
	package.json
parent 3774ee49
This diff is collapsed.
...@@ -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",
......
...@@ -38,7 +38,7 @@ ...@@ -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": {
......
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