Merge branch 'master' into sirtimid/cli-parse-number

endojs · Sep 19, 2024 · 38c2a57 · 38c2a57
2 parents 26a8fd4 + f61b771
commit 38c2a57
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,9 +39,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
-      - name: Echo node version
-        run: node --version
-
       - name: Install dependencies
         run: yarn install --immutable
 
@@ -89,9 +86,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
-      - name: Echo node version
-        run: node --version
-
       - name: Install dependencies
         run: yarn install --immutable
 
@@ -138,9 +132,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
-      - name: Echo node version
-        run: node --version
-
       # end macro
 
       - name: Install dependencies
@@ -178,9 +169,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
-      - name: Echo node version
-        run: node --version
-
       - name: Install dependencies
         run: yarn install --immutable
 
@@ -217,9 +205,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
-      - name: Echo node version
-        run: node --version
-
       - name: Install dependencies
         run: yarn install --immutable
 
@@ -256,9 +241,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
 
-      - name: Echo node version
-        run: node --version
-
       - name: Install dependencies
         run: yarn install --immutable
 

diff --git a/packages/ses/NEWS.md b/packages/ses/NEWS.md
@@ -12,6 +12,7 @@ User-visible changes in `ses`:
   - XS and Node >= 22 already have `Array.prototype.transfer`.
   - Node 18, Node 20, and all browsers have `structuredClone`
   - Node <= 16 have neither, but are also no longer supported by Endo.
+- Now exports separate layer for console shim: `ses/console-shim.js`.
 
 # v1.8.0 (2024-08-27)
 

diff --git a/packages/ses/console-shim.js b/packages/ses/console-shim.js
@@ -0,0 +1 @@
+import './src/console-shim.js';
diff --git a/packages/ses/package.json b/packages/ses/package.json
@@ -59,6 +59,7 @@
     "./assert-shim.js": "./assert-shim.js",
     "./lockdown-shim.js": "./lockdown-shim.js",
     "./compartment-shim.js": "./compartment-shim.js",
+    "./console-shim.js": "./console-shim.js",
     "./package.json": "./package.json"
   },
   "scripts": {
@@ -118,13 +119,15 @@
     "rules": {
       "no-restricted-globals": [
         "error",
+        "AggregateError",
         "Array",
         "ArrayBuffer",
         "Atomics",
         "BigInt",
         "BigInt64Array",
         "BigUint64Array",
         "Boolean",
+        "Compartment",
         "DataView",
         "Date",
         "Error",
@@ -160,6 +163,7 @@
         "Uint8ClampedArray",
         "WeakMap",
         "WeakSet",
+        "assert",
         "decodeURI",
         "decodeURIComponent",
         "encodeURI",
@@ -169,10 +173,10 @@
         "globalThis",
         "isFinite",
         "isNaN",
+        "lockdown",
         "parseFloat",
         "parseInt",
-        "unescape",
-        "AggregateError"
+        "unescape"
       ],
       "@endo/no-polymorphic-call": "error"
     },

diff --git a/packages/ses/src/compartment.js b/packages/ses/src/compartment.js
@@ -19,7 +19,7 @@ import {
   setGlobalObjectMutableProperties,
   setGlobalObjectEvaluators,
 } from './global-object.js';
-import { assertEqual } from './error/assert.js';
+import { assert, assertEqual } from './error/assert.js';
 import { sharedGlobalPropertyNames } from './permits.js';
 import { load, loadNow } from './module-load.js';
 import { link } from './module-link.js';