fix test, fix #5

Applelo · Applelo · commit b03c6edc2d4d · 2020-10-07T19:18:10.000-04:00
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,5 @@
-dist/
+/test/dist/
 lib/
 node_modules/
-README.md
+README.md
+*.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,18 +33,19 @@
   "devDependencies": {
     "@types/jest": "^26.0.14",
     "@types/mini-css-extract-plugin": "^0.9.1",
-    "@types/node": "^14.11.2",
+    "@types/node": "^14.11.5",
     "@types/webpack": "^4.41.22",
-    "@typescript-eslint/parser": "^4.3.0",
+    "@typescript-eslint/parser": "^4.4.0",
     "css-loader": "^4.3.0",
     "eslint": "^7.10.0",
     "file-loader": "^6.1.0",
     "html-webpack-plugin": "^4.5.0",
-    "jest": "^26.4.2",
-    "mini-css-extract-plugin": "^0.11.2",
+    "jest": "^26.5.2",
+    "mini-css-extract-plugin": "^0.12.0",
     "prettier": "^2.1.2",
     "ts-jest": "^26.4.1",
     "typescript": "^4.0.3",
+    "url-loader": "^4.1.0",
     "webpack": "^4.44.2"
   }
 }
diff --git a/src/main.ts b/src/main.ts
@@ -98,10 +98,12 @@ class HtmlWebpackInjectPreload implements Plugin {
           href = asset;
         }
 
+        href = href[0] === '/' ? href : '/' + href;
+
         if (file.match.test(asset)) {
           const preload = {
             tagName: 'link',
-            attributes: Object.assign({rel: 'preload', href}, file.attributes),
+            attributes: Object.assign(file.attributes, {rel: 'preload', href}),
             voidTag: true,
           };
 
diff --git a/test/expected.html b/test/expected.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"><title>Webpack App</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="preload" href="test-alt.css" as="style"><link rel="preload" href="Roboto-Regular.woff2" as="font" type="font/woff2" crossorigin><link href="main.css" rel="stylesheet"></head><body><script src="main.js"></script></body></html>
+<!doctype html><html><head><meta charset="utf-8"><title>Webpack App</title><meta name="viewport" content="width=device-width,initial-scale=1"><link as="style" href="/test-alt.css" rel="preload"><link as="font" type="font/woff2" crossorigin rel="preload" href="/Roboto-Regular.woff2"><link href="main.css" rel="stylesheet"></head><body><script src="main.js"></script></body></html>
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -61,6 +61,7 @@ describe('HTMLWebpackInjectPreload', () => {
     });
     compiler.run((err, stats) => {
       if (err) expect(err).toBeNull();
+      expect(stats.compilation.errors.length).toBe(0);
 
       const result = fs.readFileSync(
         path.join(__dirname, 'dist/index.html'),
diff --git a/test/setupTest.js b/test/setupTest.js
@@ -1 +1,4 @@
-jest.setTimeout(25000);
+jest.setTimeout(25000);
+const fs = require('fs');
+if (!fs.existsSync('./test/dist'))
+  fs.mkdirSync('./test/dist');

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<!doctype html><html><head><meta charset="utf-8"><title>Webpack App</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="preload" href="test-alt.css" as="style"><link rel="preload" href="Roboto-Regular.woff2" as="font" type="font/woff2" crossorigin><link href="main.css" rel="stylesheet"></head><body><script src="main.js"></script></body></html>`
	`1`	`+<!doctype html><html><head><meta charset="utf-8"><title>Webpack App</title><meta name="viewport" content="width=device-width,initial-scale=1"><link as="style" href="/test-alt.css" rel="preload"><link as="font" type="font/woff2" crossorigin rel="preload" href="/Roboto-Regular.woff2"><link href="main.css" rel="stylesheet"></head><body><script src="main.js"></script></body></html>`