tidying up

Author: geelen

src/index.js

@@ -27,4 +27,4 @@ export default class Core {
 Core.localByDefault = localByDefault
 Core.extractImports = extractImports
 Core.scope = scope
-Core.defaultPlugins = [wip, css => console.log(css.toResult().css), localByDefault, extractImports, scope]
+Core.defaultPlugins = [wip, localByDefault, extractImports, scope]

src/wip.js

@@ -53,7 +53,9 @@ export default css => {
     }
   })
 
-  console.log(translations)
+  /* If we have no translations, don't continue */
+  if (!Object.keys(translations).length) return
+
   /* Perform replacements */
   replaceSymbols(css, translations)
 

test/test-cases.js

@@ -18,7 +18,6 @@ Object.keys( pipelines ).forEach( dirname => {
   describe( dirname, () => {
     let testDir = path.join( __dirname, dirname )
     fs.readdirSync( testDir ).forEach( testCase => {
-      if (testCase !== 'aliases') return
       if ( fs.existsSync( path.join( testDir, testCase, "source.css" ) ) ) {
         it( "should " + testCase.replace( /-/g, " " ), done => {
           let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
@@ -35,22 +34,22 @@ Object.keys( pipelines ).forEach( dirname => {
 } )
 
 // special case for testing multiple sources
-//describe( 'multiple sources', () => {
-//  let testDir = path.join( __dirname, 'test-cases' )
-//  let testCase = 'multiple-sources';
-//  let dirname = 'test-cases';
-//  if ( fs.existsSync( path.join( testDir, testCase, "source1.css" ) ) ) {
-//    it( "should " + testCase.replace( /-/g, " " ), done => {
-//      let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
-//      let loader = new FileSystemLoader( testDir, pipelines[dirname] )
-//      let expectedTokens = JSON.parse( fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ) )
-//      loader.fetch( `${testCase}/source1.css`, "/" ).then( tokens1 => {
-//        loader.fetch( `${testCase}/source2.css`, "/" ).then( tokens2 => {
-//          assert.equal( loader.finalSource, expected )
-//          const tokens = Object.assign({}, tokens1, tokens2);
-//          assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
-//        } ).then( done, done )
-//      })
-//    } );
-//  }
-//} );
+describe( 'multiple sources', () => {
+  let testDir = path.join( __dirname, 'test-cases' )
+  let testCase = 'multiple-sources';
+  let dirname = 'test-cases';
+  if ( fs.existsSync( path.join( testDir, testCase, "source1.css" ) ) ) {
+    it( "should " + testCase.replace( /-/g, " " ), done => {
+      let expected = normalize( fs.readFileSync( path.join( testDir, testCase, "expected.css" ), "utf-8" ) )
+      let loader = new FileSystemLoader( testDir, pipelines[dirname] )
+      let expectedTokens = JSON.parse( fs.readFileSync( path.join( testDir, testCase, "expected.json" ), "utf-8" ) )
+      loader.fetch( `${testCase}/source1.css`, "/" ).then( tokens1 => {
+        loader.fetch( `${testCase}/source2.css`, "/" ).then( tokens2 => {
+          assert.equal( loader.finalSource, expected )
+          const tokens = Object.assign({}, tokens1, tokens2);
+          assert.equal( JSON.stringify( tokens ), JSON.stringify( expectedTokens ) )
+        } ).then( done, done )
+      })
+    } );
+  }
+} );

test/test-cases/aliases/borders.css renamed to test/test-cases/constants/borders.css

@@ -1,15 +1,15 @@
-._aliases_borders__dashed {
+._constants_borders__dashed {
   border: 4px dashed;
 }
 
 
-._aliases_source__foo {
+._constants_source__foo {
   background: aquamarine;
   border-color: red;
 }
 
 @media (max-width: 599px) {
-  ._aliases_source__foo {
+  ._constants_source__foo {
     background: white;
   }
 }

test/test-cases/aliases/breakpoints.css renamed to test/test-cases/constants/breakpoints.css

@@ -1,5 +1,5 @@
 {
   "borders": "\"./borders.css\"",
   "breakpoints": "\"./breakpoints.css\"",
-  "foo": "_aliases_source__foo _aliases_borders__dashed"
+  "foo": "_constants_source__foo _constants_borders__dashed"
 }

test/test-cases/aliases/colors.css renamed to test/test-cases/constants/colors.css

@@ -1,5 +1,5 @@
 @let borders: "./borders.css", breakpoints: "./breakpoints.css";
-@import small from breakpoints;
+@-import small from breakpoints;
 @import secondary, primary as blue from "./colors.css";
 
 .foo {