WIP

Author: keik

index.js

@@ -31,7 +31,8 @@ function generateShortName (name, filename, css) {
   Appends a hash of the css source.
 */
 function generateLongName (name, filename) {
-  var sanitisedPath = filename.replace(/\.[^\.\/\\]+$/, '')
+  var relativePath = path.relative(rootDir, filename)
+  var sanitisedPath = relativePath.replace(/\.[^\.\/\\]+$/, '')
       .replace(/[\W_]+/g, '_')
       .replace(/^_|_$/g, '');
   d('@@@@sanitiedPath', sanitisedPath, filename)
@@ -67,12 +68,13 @@ var tokensByEntrypoint = {};
 
 // we need a separate loader for each entry point
 var bundledCss = ''
+var rootDir
 
 module.exports = function (browserify, options) {
   options = options || {};
 
   // if no root directory is specified, assume the cwd
-  var rootDir = options.rootDir || options.d || browserify._options.basedir;
+  rootDir = options.rootDir || options.d || browserify._options.basedir;
   if (rootDir) { rootDir = path.resolve(rootDir); }
   if (!rootDir) { rootDir = process.cwd(); }
 
@@ -104,12 +106,12 @@ module.exports = function (browserify, options) {
 
     postcss(modules({
       generateScopedName: generateLongName,
-      getJSON: (cssFilename, css) => {
-        d('======getJSON========', cssFilename)
-        self.push('module.exports = ' + JSON.stringify(css))
+      getJSON: (cssFilename, json) => {
+        d('======getJSON========', cssFilename, json)
+        self.push('module.exports = ' + JSON.stringify(json))
       },
     }))
-      .process(this._data, {from: '/' + relFilename})
+      .process(this._data, {from: relFilename})
       .then((result) => {
         d('=========result=======');
         d(result.css);

playground/test/test.js

@@ -58,17 +58,17 @@ test('aaa', (t) => {
 `)
 })
 
-// test('aaa', (t) => {
-//   t.is(child_process.execSync('$(npm bin)/browserify ./fixture/composes-from-others/1.js -p [ ../../ -o bundle.css ] | node').toString(),
-// `{ aaa: '_fixture_composes_from_others_1__aaa _fixture_composes_from_others_shared__bbb' }
-// `)
+test('aaa', (t) => {
+  t.is(child_process.execSync('$(npm bin)/browserify ./fixture/composes-from-others/1.js -p [ ../../ -o bundle.css ] | node').toString(),
+`{ aaa: '_fixture_composes_from_others_1__aaa _fixture_composes_from_others_shared__bbb' }
+`)
 
-//   t.is(fs.readFileSync('./bundle.css').toString(),
-// `._fixture_composes_from_others_shared__bbb {
-//   color: yellow;
-// }
-// ._fixture_composes_from_others_1__aaa {
-//   font-size: 10em;
-// }
-// `)
-// })
+  t.is(fs.readFileSync('./bundle.css').toString(),
+`._fixture_composes_from_others_shared__bbb {
+  color: yellow;
+}
+._fixture_composes_from_others_1__aaa {
+  font-size: 10em;
+}
+`)
+})