Warn instead of throwing on dependency cycles. Fixes #67

Munter · Aug 2, 2020 · cbbaf6d · cbbaf6d
1 parent 015c850
commit cbbaf6d
Show file tree

Hide file tree

Showing 9 changed files with 488 additions and 201 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -1,3 +1,4 @@
+const { fileURLToPath } = require('url');
 const { resolve, relative } = require('path');
 const { outputFile } = require('fs-extra');
 const AssetGraph = require('assetgraph');
@@ -35,7 +36,7 @@ module.exports = {
     const pathMap = new Map();
 
     for (const asset of graph.findAssets({ isLoaded: true, isInline: false })) {
-      pathMap.set(asset, asset.url.replace('file://', '').split('?')[0]);
+      pathMap.set(asset, fileURLToPath(asset.url));
     }
 
     await hashfiles(graph, { trimmedStaticDir });
@@ -44,7 +45,7 @@ module.exports = {
 
     for (const asset of graph.findAssets({ isLoaded: true, isInline: false })) {
       const from = pathMap.get(asset);
-      const to = asset.url.replace('file://', '').split('?')[0];
+      const to = fileURLToPath(asset.url);
 
       if (from !== to) {
         result.push({

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "cdn"
   ],
   "dependencies": {
-    "assetgraph": "^6.0.3",
-    "assetgraph-hashfiles": "^1.0.1",
+    "assetgraph": "6.1.3",
+    "assetgraph-hashfiles": "1.1.1",
     "fs-extra": "9.0.1"
   },
   "devDependencies": {

diff --git a/test/cycles/debug.svg b/test/cycles/debug.svg
diff --git a/test/cycles/netlify.toml b/test/cycles/netlify.toml
@@ -0,0 +1,6 @@
+[build]
+publish = "dist"
+command = "npx rimraf dist && npx cpy src dist"
+
+[[plugins]]
+package = "../../"
diff --git a/test/cycles/src/dependency.css b/test/cycles/src/dependency.css
@@ -0,0 +1,5 @@
+@import 'main.css';
+
+h1 {
+  color: blue;
+}
diff --git a/test/cycles/src/index.html b/test/cycles/src/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>Hello world</title>
+
+  <link rel="stylesheet" href="main.css">
+</head>
+
+<body>
+
+  <h1>Hello World!</h1>
+
+</body>
+
+</html>
diff --git a/test/cycles/src/main.css b/test/cycles/src/main.css
@@ -0,0 +1,5 @@
+@import 'dependency.css';
+
+h1 {
+  color: red;
+}
diff --git a/test/netlify-build.js b/test/netlify-build.js
@@ -66,4 +66,26 @@ describe('netlify-build', () => {
       'main.js.map ==> static/main.js.e2c404d6d5.map',
     ]);
   });
+
+  it('should warn when encountering cyclic relations', async () => {
+    const result = await build({
+      cwd: resolve(__dirname, 'cycles'),
+      buffer: true,
+    });
+
+    expect(result, 'to satisfy', {
+      success: true,
+    });
+
+    expect(
+      unlogify(result.logs.stderr),
+      'to contain',
+      ' ⚠ WARN: moveAssetsInOrder: Cyclic dependencies detected. All files could not be moved'
+    );
+    expect(
+      unlogify(result.logs.stdout),
+      'to contain',
+      '** hashfiles moved no files **'
+    );
+  });
 });