Simplify policy override

Author: Mrtenz

packages/snaps-execution-environments/lavamoat/build-system/policy-override.json

@@ -1,5 +1,10 @@
 {
   "resources": {
+    "$root$": {
+      "packages": {
+        "ts-loader": true
+      }
+    },
     "@swc/core": {
       "packages": {
         "@swc/core>@swc/core-darwin-arm64": true,
@@ -12,99 +17,11 @@
       }
     },
     "ts-loader": {
-      "builtin": {
-        "console": true,
-        "crypto": true,
-        "fs": true,
-        "os": true,
-        "path": true
-      },
-      "globals": {
-        "console": true,
-        "process": true
-      },
-      "packages": {
-        "chalk": true,
-        "depcheck>semver": true,
-        "ts-loader>micromatch": true,
-        "ts-loader>source-map": true,
-        "typescript": true,
-        "webpack": true
-      }
-    },
-    "ts-loader>micromatch": {
-      "builtin": {
-        "util": true
-      },
-      "packages": {
-        "ts-loader>micromatch>picomatch": true,
-        "ts-loader>micromatch>braces": true
-      }
-    },
-    "ts-loader>micromatch>braces": {
-      "packages": {
-        "ts-loader>micromatch>braces>fill-range": true
-      }
-    },
-    "ts-loader>micromatch>picomatch": {
-      "builtin": {
-        "path": true
-      },
-      "globals": {
-        "process": true
-      }
-    },
-    "ts-loader>micromatch>braces>fill-range": {
-      "builtin": {
-        "util": true
-      },
-      "packages": {
-        "ts-loader>micromatch>braces>fill-range>to-regex-range": true
-      }
-    },
-    "ts-loader>micromatch>braces>fill-range>to-regex-range": {
-      "packages": {
-        "ts-loader>micromatch>braces>fill-range>to-regex-range>is-number": true
-      }
-    },
-    "ts-loader>source-map": {
-      "builtin": {
-        "fs": true,
-        "path": true
-      }
-    },
-    "typescript": {
-      "builtin": {
-        "buffer.Buffer": true,
-        "crypto": true,
-        "fs": true,
-        "inspector": true,
-        "module.findPnpApi": true,
-        "os.EOL": true,
-        "os.platform": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true,
-        "perf_hooks.PerformanceObserver": true,
-        "perf_hooks.performance": true
-      },
-      "globals": {
-        "Intl.Collator": true,
-        "PerformanceObserver": true,
-        "__dirname": true,
-        "__filename": true,
-        "clearTimeout": true,
-        "console": true,
-        "gc": true,
-        "onProfilerEvent": true,
-        "performance": true,
-        "process": true,
-        "setTimeout": true
-      },
       "packages": {
-        "jest>@jest/core>jest-runner>source-map-support": true
+        "typescript": true
       }
     },
+    "typescript": {},
     "webpack>loader-runner": {
       "packages": {
         "html-webpack-plugin": true,

packages/snaps-execution-environments/lavamoat/build-system/policy.json

@@ -1,5 +1,10 @@
 {
   "resources": {
+    "$root$": {
+      "packages": {
+        "ts-loader": true
+      }
+    },
     "lavamoat>@babel/code-frame": {
       "globals": {
         "console.warn": true,
@@ -553,7 +558,7 @@
     },
     "ts-loader>micromatch>braces>fill-range": {
       "builtin": {
-        "util": true
+        "util.inspect": true
       },
       "packages": {
         "ts-loader>micromatch>braces>fill-range>to-regex-range": true
@@ -823,7 +828,7 @@
     },
     "ts-loader>micromatch": {
       "builtin": {
-        "util": true
+        "util.inspect": true
       },
       "packages": {
         "ts-loader>micromatch>braces": true,
@@ -871,10 +876,12 @@
     },
     "ts-loader>micromatch>picomatch": {
       "builtin": {
-        "path": true
+        "path.basename": true,
+        "path.sep": true
       },
       "globals": {
-        "process": true
+        "process.platform": true,
+        "process.version.slice": true
       }
     },
     "html-webpack-plugin>pretty-error": {
@@ -1019,8 +1026,8 @@
     },
     "ts-loader>source-map": {
       "builtin": {
-        "fs": true,
-        "path": true
+        "fs.readFile": true,
+        "path.join": true
       },
       "globals": {
         "WebAssembly.instantiate": true,
@@ -1113,16 +1120,22 @@
     },
     "ts-loader": {
       "builtin": {
-        "console": true,
-        "crypto": true,
-        "fs": true,
-        "os": true,
-        "path": true
+        "console.Console": true,
+        "crypto.createHash": true,
+        "fs.readFileSync": true,
+        "os.EOL": true,
+        "path.dirname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.normalize": true,
+        "path.relative": true,
+        "path.resolve": true
       },
       "globals": {
         "__dirname": true,
-        "console": true,
-        "process": true
+        "console.log.call": true,
+        "process.stderr": true,
+        "process.stdout": true
       },
       "packages": {
         "chalk": true,

packages/snaps-execution-environments/scripts/build.js

@@ -29,6 +29,17 @@ webpack(config, (error, stats) => {
     return;
   }
 
+  if (stats.hasErrors()) {
+    console.error(
+      chalk.red(
+        'Webpack finished with errors. See the error(s) below for more details.',
+      ),
+    );
+
+    console.log(indent(chalk.red(stats.toString('errors-only')), 2));
+    return;
+  }
+
   console.log(
     stats.toString({
       all: false,

packages/snaps-execution-environments/webpack.config.js

@@ -240,7 +240,7 @@ const configs = ENTRY_POINTS.map(
           apply: (compiler) => {
             const PLUGIN_NAME = 'InlinePlugin';
 
-            compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => {
               compilation.hooks.processAssets.tap(
                 {
                   name: PLUGIN_NAME,