Meta: Update dependencies and simplify build (#3639)

refined-github · Oct 14, 2020 · dd60ee1 · dd60ee1
1 parent c18c22e
commit dd60ee1
Show file tree

Hide file tree

Showing 9 changed files with 13,306 additions and 11,726 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 node_modules
 yarn.lock
-distribution
+distribution/build
 test/web-ext-profile
 !test/web-ext-profile/.gitkeep
 .cache

diff --git a/source/icon.png → distribution/icon.png b/source/icon.png → distribution/icon.png
diff --git a/source/manifest.json → distribution/manifest.json b/source/manifest.json → distribution/manifest.json
@@ -34,8 +34,8 @@
 	},
 	"background": {
 		"scripts": [
-			"browser-polyfill.min.js",
-			"background.js"
+			"build/browser-polyfill.js",
+			"build/background.js"
 		]
 	},
 	"content_scripts": [
@@ -46,15 +46,15 @@
 				"https://gist.github.com/*"
 			],
 			"css": [
-				"refined-github.css"
+				"build/refined-github.css"
 			],
 			"js": [
-				"browser-polyfill.min.js",
-				"refined-github.js"
+				"build/browser-polyfill.js",
+				"build/refined-github.js"
 			]
 		}
 	],
 	"web_accessible_resources": [
-		"resolve-conflicts.js"
+		"build/resolve-conflicts.js"
 	]
 }
diff --git a/source/options.html → distribution/options.html b/source/options.html → distribution/options.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>Refined GitHub options</title>
-<link rel="stylesheet" href="options.css">
+<link rel="stylesheet" href="build/options.css">
 <form id="options-form" class="detail-view-container">
 	<p>
 		<label>
@@ -67,5 +67,5 @@
 	</div>
 
 </form>
-<script src="browser-polyfill.min.js"></script>
-<script src="options.js"></script>
+<script src="build/browser-polyfill.js"></script>
+<script src="build/options.js"></script>
diff --git a/octicon-svg-loader.ts b/octicon-svg-loader.ts
@@ -1,6 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
 
+// @ts-expect-error due to https://github.com/webpack/webpack/issues/11630
 export default function svgLoader(this: webpack.loader.LoaderContext, source: string): string {
 	const iconName = path.basename(this.resourcePath, path.extname(this.resourcePath));
 	const svgWithClass = source.replace(