Remove cssRelativeUrl test case, implement cssPrefix option (Fixes #350)

cmbuckley · cmbuckley · commit e2bb47970633 · 2013-01-16T01:25:25.000Z
diff --git a/build/jslib/build.js b/build/jslib/build.js
@@ -999,6 +999,12 @@ define(function (require) {
             if (!config.out) {
                 throw new Error('"out" option missing.');
             }
+            if (config.cssPrefix) {
+                //Make sure cssPrefix ends in a slash
+                config.cssPrefix = endsWithSlash(config.cssPrefix);
+            } else {
+                config.cssPrefix = '';
+            }
         }
         if (!config.cssIn && !config.baseUrl) {
             //Just use the current directory as the baseUrl
diff --git a/build/jslib/optimize.js b/build/jslib/optimize.js
@@ -43,9 +43,10 @@ function (lang,   logger,   envOptimize,        file,           parse,
      * @param {String} fileName the file name
      * @param {String} fileContents the file contents
      * @param {String} cssImportIgnore comma delimited string of files to ignore
+     * @param {String} cssPrefix string to be prefixed before relative URLs
      * @param {Object} included an object used to track the files already imported
      */
-    function flattenCss(fileName, fileContents, cssImportIgnore, included) {
+    function flattenCss(fileName, fileContents, cssImportIgnore, cssPrefix, included) {
         //Find the last slash in the name.
         fileName = fileName.replace(lang.backSlashRegExp, "/");
         var endIndex = fileName.lastIndexOf("/"),
@@ -96,7 +97,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
                 included[fullImportFileName] = true;
 
                 //Make sure to flatten any nested imports.
-                flat = flattenCss(fullImportFileName, importContents, cssImportIgnore, included);
+                flat = flattenCss(fullImportFileName, importContents, cssImportIgnore, cssPrefix, included);
                 importContents = flat.fileContents;
 
                 if (flat.importList.length) {
@@ -125,8 +126,9 @@ function (lang,   logger,   envOptimize,        file,           parse,
                     //a protocol.
                     colonIndex = fixedUrlMatch.indexOf(":");
                     if (fixedUrlMatch.charAt(0) !== "/" && (colonIndex === -1 || colonIndex > fixedUrlMatch.indexOf("/"))) {
-                        //It is a relative URL, tack on the path prefix
-                        urlMatch = importPath + fixedUrlMatch;
+                        //It is a relative URL, tack on the cssPrefix and path prefix
+                        urlMatch = cssPrefix + importPath + fixedUrlMatch;
+
                     } else {
                         logger.trace(importFileName + "\n  URL not a relative URL, skipping: " + urlMatch);
                     }
@@ -256,7 +258,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
 
             //Read in the file. Make sure we have a JS string.
             var originalFileContents = file.readFile(fileName),
-                flat = flattenCss(fileName, originalFileContents, config.cssImportIgnore, {}),
+                flat = flattenCss(fileName, originalFileContents, config.cssImportIgnore, config.cssPrefix, {}),
                 //Do not use the flattened CSS if there was one that was skipped.
                 fileContents = flat.skippedList.length ? originalFileContents : flat.fileContents,
                 startIndex, endIndex, buildText, comment;
diff --git a/build/tests/builds.js b/build/tests/builds.js
@@ -1000,25 +1000,6 @@ define(['build', 'env!env/file'], function (build, file) {
     );
     doh.run();
 
-    //Tests https://github.com/jrburke/r.js/issues/350 CSS optimizer makes
-    //url() relative to cssIn option
-    doh.register("cssRelativeUrl",
-        [
-            function cssPrefix(t) {
-                file.deleteFile("lib/cssRelativeUrl/output/main-built.css");
-
-                build(["lib/cssRelativeUrl/build.js"]);
-
-                t.is(nol(c("lib/cssRelativeUrl/output/expected.css")),
-                     nol(c("lib/cssRelativeUrl/output/main-built.css")));
-
-                require._buildReset();
-            }
-
-        ]
-    );
-    doh.run();
-
     //Tests https://github.com/jrburke/r.js/issues/296 removeCombined should
     //remove files that have been inlined.
     doh.register("cssRemoveCombined",
diff --git a/dist/r.js b/dist/r.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 2.1.2+ Tue, 15 Jan 2013 01:33:33 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.2+ Wed, 16 Jan 2013 01:24:27 GMT Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -21,7 +21,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode,
-        version = '2.1.2+ Tue, 15 Jan 2013 01:33:33 GMT',
+        version = '2.1.2+ Wed, 16 Jan 2013 01:24:27 GMT',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         useLibLoaded = {},
@@ -21201,9 +21201,10 @@ function (lang,   logger,   envOptimize,        file,           parse,
      * @param {String} fileName the file name
      * @param {String} fileContents the file contents
      * @param {String} cssImportIgnore comma delimited string of files to ignore
+     * @param {String} cssPrefix string to be prefixed before relative URLs
      * @param {Object} included an object used to track the files already imported
      */
-    function flattenCss(fileName, fileContents, cssImportIgnore, included) {
+    function flattenCss(fileName, fileContents, cssImportIgnore, cssPrefix, included) {
         //Find the last slash in the name.
         fileName = fileName.replace(lang.backSlashRegExp, "/");
         var endIndex = fileName.lastIndexOf("/"),
@@ -21254,7 +21255,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
                 included[fullImportFileName] = true;
 
                 //Make sure to flatten any nested imports.
-                flat = flattenCss(fullImportFileName, importContents, cssImportIgnore, included);
+                flat = flattenCss(fullImportFileName, importContents, cssImportIgnore, cssPrefix, included);
                 importContents = flat.fileContents;
 
                 if (flat.importList.length) {
@@ -21283,8 +21284,9 @@ function (lang,   logger,   envOptimize,        file,           parse,
                     //a protocol.
                     colonIndex = fixedUrlMatch.indexOf(":");
                     if (fixedUrlMatch.charAt(0) !== "/" && (colonIndex === -1 || colonIndex > fixedUrlMatch.indexOf("/"))) {
-                        //It is a relative URL, tack on the path prefix
-                        urlMatch = importPath + fixedUrlMatch;
+                        //It is a relative URL, tack on the cssPrefix and path prefix
+                        urlMatch = cssPrefix + importPath + fixedUrlMatch;
+
                     } else {
                         logger.trace(importFileName + "\n  URL not a relative URL, skipping: " + urlMatch);
                     }
@@ -21414,7 +21416,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
 
             //Read in the file. Make sure we have a JS string.
             var originalFileContents = file.readFile(fileName),
-                flat = flattenCss(fileName, originalFileContents, config.cssImportIgnore, {}),
+                flat = flattenCss(fileName, originalFileContents, config.cssImportIgnore, config.cssPrefix, {}),
                 //Do not use the flattened CSS if there was one that was skipped.
                 fileContents = flat.skippedList.length ? originalFileContents : flat.fileContents,
                 startIndex, endIndex, buildText, comment;
@@ -23170,6 +23172,12 @@ define('build', function (require) {
             if (!config.out) {
                 throw new Error('"out" option missing.');
             }
+            if (config.cssPrefix) {
+                //Make sure cssPrefix ends in a slash
+                config.cssPrefix = endsWithSlash(config.cssPrefix);
+            } else {
+                config.cssPrefix = '';
+            }
         }
         if (!config.cssIn && !config.baseUrl) {
             //Just use the current directory as the baseUrl

Original file line number	Diff line number	Diff line change
`@@ -999,6 +999,12 @@ define(function (require) {`
`999`	`999`	`if (!config.out) {`
`1000`	`1000`	`throw new Error('"out" option missing.');`
`1001`	`1001`	`}`
	`1002`	`+ if (config.cssPrefix) {`
	`1003`	`+ //Make sure cssPrefix ends in a slash`
	`1004`	`+ config.cssPrefix = endsWithSlash(config.cssPrefix);`
	`1005`	`+ } else {`
	`1006`	`+ config.cssPrefix = '';`
	`1007`	`+ }`
`1002`	`1008`	`}`
`1003`	`1009`	`if (!config.cssIn && !config.baseUrl) {`
`1004`	`1010`	`//Just use the current directory as the baseUrl`