Use package self-reference to reduce clunk of conditonal exports

endojs · Mar 17, 2022 · 4b73064 · 4b73064
1 parent f431f1d
commit 4b73064
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 42 deletions.
diff --git a/packages/init/debug-node.js b/packages/init/debug-node.js
diff --git a/packages/init/index-node.js b/packages/init/index-node.js
diff --git a/packages/init/package.json b/packages/init/package.json
@@ -5,26 +5,14 @@
   "type": "module",
   "main": "index.js",
   "exports": {
-    ".": {
-      "node": "./index-node.js",
-      "default": "./index.js"
-    },
-    "./debug.js": {
-      "node": "./debug-node.js",
-      "default": "./debug.js"
-    },
+    ".": "./index.js",
+    "./debug.js": "./debug.js",
     "./pre.js": {
       "node": "./pre-node.js",
       "default": "./pre.js"
     },
-    "./pre-remoting.js": {
-      "node": "./pre-remoting-node.js",
-      "default": "./pre-remoting.js"
-    },
-    "./pre-bundle-source.js": {
-      "node": "./pre-bundle-source-node.js",
-      "default": "./pre-bundle-source.js"
-    },
+    "./pre-remoting.js": "./pre-remoting.js",
+    "./pre-bundle-source.js": "./pre-bundle-source.js",
     "./package.json": "./package.json"
   },
   "scripts": {

diff --git a/packages/init/pre-bundle-source-node.js b/packages/init/pre-bundle-source-node.js
diff --git a/packages/init/pre-bundle-source.js b/packages/init/pre-bundle-source.js
@@ -4,4 +4,6 @@
 // or if further vetted shim initialization is needed:
 //   import '@endo/init/pre.js';
 
-import './pre.js';
+// Use a package self-reference to go through the "exports" resolution
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@endo/init/pre.js';
diff --git a/packages/init/pre-remoting-node.js b/packages/init/pre-remoting-node.js
diff --git a/packages/init/pre-remoting.js b/packages/init/pre-remoting.js
@@ -1,5 +1,7 @@
 // pre-remoting.js - shims necessary to use @endo/far
 
-import './pre.js';
+// Use a package self-reference to go through the "exports" resolution
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@endo/init/pre.js';
 
 export * from '@endo/eventual-send/shim.js';
diff --git a/packages/init/test/test-async_hooks.js b/packages/init/test/test-async_hooks.js
@@ -1,5 +1,7 @@
 /* global globalThis, $262 */
 
+// Use a package self-reference to go through the "exports" resolution
+// eslint-disable-next-line import/no-extraneous-dependencies
 import '@endo/init';
 import test from 'ava';
 import { createHook } from 'async_hooks';