fix(webpack): fix global aliases in non-root compartments

packages/webpack/src/runtime/runtime.js

@@ -9,6 +9,7 @@ const {
   defineProperty,
   defineProperties,
   getOwnPropertyDescriptors,
+  fromEntries,
 } = Object
 const warn = typeof console === 'object' ? console.warn : () => {}
 // Avoid running any wrapped code or using compartment if lockdown was not called.
@@ -79,6 +80,7 @@ const enforcePolicy = (requestedResourceId, referrerResourceId) => {
 const theRealGlobalThis = globalThis
 /** @type {any} */
 let rootCompartmentGlobalThis
+const globalAliases = ['globalThis', 'window', 'self']
 /**
  * Installs globals for a specific policy resource.
  *
@@ -89,11 +91,11 @@ let rootCompartmentGlobalThis
 const installGlobalsForPolicy = (resourceId, packageCompartmentGlobal) => {
   if (resourceId === LAVAMOAT.root) {
     rootCompartmentGlobalThis = packageCompartmentGlobal
-    copyWrappedGlobals(theRealGlobalThis, rootCompartmentGlobalThis, [
-      'globalThis',
-      'window',
-      'self',
-    ])
+    copyWrappedGlobals(
+      theRealGlobalThis,
+      rootCompartmentGlobalThis,
+      globalAliases
+    )
   } else {
     // TODO: getEndowmentsForConfig doesn't implement support for "write"
     const endowments = getEndowmentsForConfig(
@@ -103,6 +105,15 @@ const installGlobalsForPolicy = (resourceId, packageCompartmentGlobal) => {
       packageCompartmentGlobal
     )
 
+    defineProperties(
+      packageCompartmentGlobal,
+      fromEntries(
+        globalAliases.map((alias) => [
+          alias,
+          { value: packageCompartmentGlobal },
+        ])
+      )
+    )
     defineProperties(
       packageCompartmentGlobal,
       getOwnPropertyDescriptors(endowments)

packages/webpack/test/e2e-manual.js

@@ -0,0 +1,35 @@
+// run this with node to produce the test build to disk
+const fs = require('fs')
+const path = require('path')
+const { scaffold, runScriptWithSES } = require('./scaffold.js')
+const webpackConfigDefault = require('./fixtures/main/webpack.config.js')
+const webpackConfig = {
+  ...webpackConfigDefault,
+  // mode: 'development',
+  // devtool: false,
+}
+
+const now = new Date().toISOString()
+
+const cache = new Set()
+function assertFolderFor(file) {
+  const folder = path.dirname(file)
+  if (cache.has(folder)) return
+  const target = folder.replace(/^\//, '')
+  fs.mkdirSync(path.join('.', 'tmp', now, target), { recursive: true })
+  cache.add(folder)
+}
+
+function writeFromSnapshot(snapshot) {
+  const files = Object.keys(snapshot)
+  for (const file of files) {
+    assertFolderFor(file)
+    fs.writeFileSync(path.join('.', 'tmp', now, file), snapshot[file])
+  }
+}
+
+scaffold(webpackConfig).then(({ stdout, snapshot }) => {
+  console.log(stdout)
+  writeFromSnapshot(snapshot)
+  runScriptWithSES(snapshot['/dist/app.js'])
+})

packages/webpack/test/fixtures/main/main.js

@@ -1,15 +1,14 @@
 import { hello as helloCommonJS } from 'commonjs-package'
 import { re } from 'commonjs-quirks'
 import { hello as helloES6 } from 'es6-module-package'
+import globals from 'globals-package'
 import 'side-effects-package/styles.css'
 import { hello as helloTypeScript } from 'typescript-package'
 import { hello as helloUMD } from 'umd-package'
-import { thing } from './src/other.mjs'
 import { what } from './src/hello.ts'
-import 'node-global-package'
+import { thing } from './src/other.mjs'
 
 // deliberately unused
-import { treeshakeable } from './src/treeshakeable.mjs'
 import './src/style.css'
 
 function run() {
@@ -20,7 +19,8 @@ function run() {
     helloTypeScript(),
     helloUMD(),
     thing(),
-    what
+    what,
+    globals
   )
 }
 

packages/webpack/test/fixtures/main/package.json

@@ -7,8 +7,8 @@
     "commonjs-quirks": "1.0.0",
     "es6-module-package": "1.0.0",
     "fetch-package": "1.0.0",
+    "globals-package": "1.0.0",
     "loader-hack": "1.0.0",
-    "node-global-package": "1.0.0",
     "prototype-poisoning-package": "1.0.0",
     "side-effects-package": "1.0.0",
     "typescript-package": "1.0.0",

packages/webpack/test/fixtures/main/policy-broken/policy.json

@@ -10,9 +10,9 @@
         "umd-package": true
       }
     },
-    "node-global-package": {
+    "globals-package": {
       "globals": {
-        "console.log": true
+        "console": true
       }
     },
     "umd-package": {

packages/webpack/test/fixtures/main/policy/policy.json

@@ -10,9 +10,9 @@
         "umd-package": true
       }
     },
-    "node-global-package": {
+    "globals-package": {
       "globals": {
-        "console.log": true
+        "console": true
       }
     },
     "umd-package": {

packages/webpack/test/snapshots/e2e-policy-gen.spec.js.md

@@ -20,9 +20,9 @@ Generated by [AVA](https://avajs.dev).
             "umd-package": true␊
           }␊
         },␊
-        "node-global-package": {␊
+        "globals-package": {␊
           "globals": {␊
-            "console.log": true␊
+            "console": true␊
           }␊
         },␊
         "umd-package": {␊