Merge pull request #79 from reactway/dev

v3.0.2

Author: Martynas Žilinskas

README.md

@@ -14,11 +14,15 @@ Bundles all SCSS imports into a single file recursively.
 
 ### Who uses `scss-bundle`
 
-A few of the projects who use the package:
+#### Projects
 
 -   [Angular/material2](https://github.com/angular/material2)
 -   [Grassy](https://github.com/lazarljubenovic/grassy)
 
+#### Community plugins
+
+-   [rollup-plugin-bundle-scss](https://github.com/weizhenye/rollup-plugin-bundle-scss)
+
 ## Get started
 
 If you want to use `scss-bundle` globally

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "scss-bundle",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "description": "Bundling SCSS files to one bundled file.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package.json

@@ -135,22 +135,22 @@ export class Bundler {
                     found: false,
                     ignored: imp.ignored
                 };
-            } else if (this.fileRegistry[imp.fullPath] == null) {
+            } else if (this.usedImports[imp.fullPath] == null) {
+                // Add it to used imports
+                this.usedImports[imp.fullPath] = 1;
+
                 // If file is not yet in the registry
                 // Read
-                const impContent = await fs.readFile(imp.fullPath, "utf-8");
+                const impContent = this.fileRegistry[imp.fullPath] == null
+                    ? await fs.readFile(imp.fullPath, "utf-8")
+                    : this.fileRegistry[imp.fullPath] as string;
 
                 // and bundle it
                 const bundledImport = await this._bundle(imp.fullPath, impContent, dedupeFiles, includePaths, ignoredImports);
 
                 // Then add its bundled content to the registry
                 this.fileRegistry[imp.fullPath] = bundledImport.bundledContent;
 
-                // Add it to used imports, if it's not there
-                if (this.usedImports != null && this.usedImports[imp.fullPath] == null) {
-                    this.usedImports[imp.fullPath] = 1;
-                }
-
                 // And whole BundleResult to current imports
                 currentImport = bundledImport;
             } else {
@@ -236,6 +236,11 @@ export class Bundler {
     }
 
     private async resolveImport(importData: ImportData, includePaths: string[]): Promise<ImportData> {
+        if (this.fileRegistry[importData.fullPath]) {
+            importData.found = true;
+            return importData;
+        }
+
         try {
             await fs.access(importData.fullPath);
             importData.found = true;

src/bundler.ts

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`file-registry 1`] = `
+".foo {
+    color: red;
+}
+
+"
+`;

tests/cases/__tests__/__snapshots__/file-registry.test.ts.snap

@@ -0,0 +1,25 @@
+import path from "path";
+import { Bundler } from "@src/bundler";
+
+test("{{caseName}}", async done => {
+    const projectDirectory = "{{projectDirectory}}";
+    const testConfig = {{{json testConfig}}};
+    const entryFile = path.join(projectDirectory, testConfig.entry);
+
+    const fileRegistry = Object.assign(
+      {},
+      ...testConfig.registries.map((registry) => ({
+        [path.join(projectDirectory, registry.path)]: registry.content
+      }))
+    );
+
+    try {
+        const bundleResult = await new Bundler(fileRegistry, projectDirectory)
+            .bundle(entryFile);
+
+        expect(bundleResult.bundledContent).toMatchSnapshot();
+        done();
+    } catch (error) {
+        done.fail(error);
+    }
+});

tests/cases/file-registry/case.test.tpl

@@ -0,0 +1,3 @@
+.foo {
+    color: red;
+}

tests/cases/file-registry/foo.scss

@@ -0,0 +1 @@
+@import "not-exists-in-disk.scss";

tests/cases/file-registry/main.scss

@@ -0,0 +1,9 @@
+{
+  "entry": "main.scss",
+  "registries": [
+    {
+      "path": "not-exists-in-disk.scss",
+      "content": "@import \"foo\";"
+    }
+  ]
+}