migrate to webpack

nazarpunk · Aug 11, 2023 · 24f6a9d · 24f6a9d
1 parent 3e8f96c
commit 24f6a9d
Show file tree

Hide file tree

Showing 18 changed files with 353 additions and 323 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -12,10 +12,10 @@
     "ecmaVersion": "latest",
     "sourceType": "module",
     "project": [
-      "src/tsconfig.json",
-      "docs/tsconfig.json"
+      "tsconfig.json"
     ]
   },
+  "ignorePatterns": ["webpack.config.js"],
   "rules": {
     "curly": "off",
     "semi": ["error", "never"],

diff --git a/docs/_gen/gen.js b/docs/_gen/gen.js
diff --git a/docs/_gen/gen.js.map b/docs/_gen/gen.js.map
diff --git a/docs/main.js b/docs/main.js
diff --git a/docs/main.js.map b/docs/main.js.map
diff --git a/docs/tsconfig.json b/docs/tsconfig.json
diff --git a/docs/wts/main.js b/docs/wts/main.js
diff --git a/docs/wts/main.js.map b/docs/wts/main.js.map
diff --git a/docs/zinc/main.js b/docs/zinc/main.js
diff --git a/docs/zinc/main.js.map b/docs/zinc/main.js.map
diff --git a/package.json b/package.json
@@ -33,10 +33,8 @@
     "esbuild-base": "esbuild extension=src/extension.ts slkGrid=src/slk/js/main.ts BinaryEditor=src/binary/js/main.ts --outdir=out --tsconfig=src/tsconfig.json --target=es2020 --bundle --external:vscode --external:fs --format=cjs --platform=node --tree-shaking=true --sourcemap",
     "esbuild": "npm run esbuild-base",
     "publish": "vsce publish patch",
-    "vscode:prepublish": "npm run package",
-    "compile": "node ./esbuild.js",
-    "package": "NODE_ENV=production node ./esbuild.js",
-    "tsc": "tsc -p ./"
+    "vscode:prepublish": "webpack --mode production",
+    "compile": "webpack --mode development"
   },
   "devDependencies": {
     "@types/node": "^20.4.9",
@@ -49,7 +47,11 @@
     "esbuild": "^0.19.0",
     "eslint": "^8.46.0",
     "i18next": "^23.4.4",
-    "typescript": "^5.1.6"
+    "rollup": "^3.28.0",
+    "ts-loader": "^9.4.4",
+    "typescript": "^5.1.6",
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4"
   },
   "configurationDefaults": {
     "jass": {

diff --git a/src/binary/binary-editor-provider.ts b/src/binary/binary-editor-provider.ts
@@ -82,11 +82,13 @@ export class BinaryEditorProvider implements CustomEditorProvider<BinaryDocument
 
         const exturi = this._context.extensionUri
         const nonce = nonceGen()
+        const fix = 'window.module = {};'
         webviewPanel.webview.html = `<!DOCTYPE html><html lang="en"><head>
 				<meta charset="UTF-8">
 				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src ${webviewPanel.webview.cspSource} blob:; style-src ${webviewPanel.webview.cspSource}; script-src 'nonce-${nonce}';">
 				<meta name="viewport" content="width=device-width, initial-scale=1.0">
 				<link rel="stylesheet" href="${webviewPanel.webview.asWebviewUri(Uri.joinPath(exturi, 'src', 'binary', 'css', 'main.css'))}">
+				<script nonce="${nonce}">${fix}</script>
 				<script nonce="${nonce}" defer src="${webviewPanel.webview.asWebviewUri(Uri.joinPath(exturi, 'out', 'BinaryEditor.js'))}" ></script>
 				<title>Binary</title>
 			</head><body></body></html>`