wip: stashing latest changes

Author: davidmyersdev

.github/workflows/ci.yml

@@ -29,7 +29,8 @@ jobs:
       - uses: ./.github/actions/install-dependencies
       - run: pnpm build:core
       - run: pnpm build:shims
-      - run: pnpm -r test
+      - run: pnpm test:unit
+      - run: pnpm test:build
   typecheck:
     runs-on: ubuntu-latest
     steps:

examples/vue/vite.config.ts

@@ -4,6 +4,14 @@ import { nodePolyfills } from 'vite-plugin-node-polyfills'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  build: {
+    lib: {
+      entry: './src/main.ts',
+      fileName: 'index',
+      formats: ['es', 'cjs'],
+    },
+    minify: false,
+  },
   plugins: [
     nodePolyfills(),
     vue(),

package.json

@@ -98,7 +98,9 @@
   "dependencies": {
     "@rollup/plugin-inject": "^5.0.5",
     "browser-resolve": "^2.0.0",
-    "node-stdlib-browser": "^1.2.0"
+    "node-stdlib-browser": "^1.2.0",
+    "pkg-dir": "^8.0.0",
+    "resolve-esm": "^2.0.3"
   },
   "devDependencies": {
     "@playwright/test": "^1.40.1",

pnpm-lock.yaml

@@ -4,8 +4,19 @@ import browserResolve from 'browser-resolve'
 import stdLibBrowser from 'node-stdlib-browser'
 import { handleCircularDependancyWarning } from 'node-stdlib-browser/helpers/rollup/plugin'
 import esbuildPlugin from 'node-stdlib-browser/helpers/esbuild/plugin'
+import { packageDirectorySync } from 'pkg-dir'
+import { importMetaResolve } from 'resolve-esm'
 import type { Plugin } from 'vite'
-import { compareModuleNames, isEnabled, isNodeProtocolImport, resolvePolyfill, toEntries, toRegExp, withoutNodeProtocol } from './utils'
+import {
+  compareModuleNames,
+  isEnabled,
+  isNodeProtocolImport,
+  resolve,
+  resolvePolyfill,
+  toEntries,
+  toRegExp,
+  withoutNodeProtocol,
+} from './utils'
 
 export type BareModuleName<T = ModuleName> = T extends `node:${infer P}` ? P : never
 export type BareModuleNameWithSubpath<T = ModuleName> = T extends `node:${infer P}` ? `${P}/${string}` : never
@@ -266,6 +277,9 @@ export const nodePolyfills = (options: PolyfillOptions = {}): Plugin => {
                     // https://esbuild.github.io/plugins/#on-resolve
                     build.onResolve({ filter: globalShimsFilter }, () => {
                       const resolved = browserResolve.sync(globalShimPath)
+                      const newResolved = importMetaResolve(globalShimPath)
+
+                      console.log(newResolved)
 
                       return {
                         // https://github.com/evanw/esbuild/blob/edede3c49ad6adddc6ea5b3c78c6ea7507e03020/internal/bundler/bundler.go#L1468
@@ -306,7 +320,18 @@ export const nodePolyfills = (options: PolyfillOptions = {}): Plugin => {
             return await resolvePolyfill(this, override)
           }
 
-          return browserResolve.sync(modulePath)
+          const newResolved = new URL(importMetaResolve(modulePath))
+
+          console.log('importMetaResolve', newResolved)
+          console.log('resolve', resolve(moduleName))
+
+          const resolved = browserResolve.sync(modulePath)
+          const pkgDir = packageDirectorySync({ cwd: resolved })
+
+          console.log('browserResolve', resolved)
+          console.log('pkgDir', pkgDir)
+
+          return resolved
         }
       }
     },

src/index.ts

@@ -1,3 +1,4 @@
+import { importMetaResolve } from 'resolve-esm'
 import type { PluginContext } from 'rollup'
 import type { BareModuleName, BooleanOrBuildTarget, ModuleName } from './index'
 
@@ -19,6 +20,20 @@ export const isNodeProtocolImport = (name: string) => {
   return name.startsWith('node:')
 }
 
+export const resolve = (name: string) => {
+  const consumerResolved = importMetaResolve(name, process.cwd())
+
+  if (consumerResolved) {
+    return consumerResolved
+  }
+
+  const providerResolved = importMetaResolve(name)
+
+  if (providerResolved) {
+    return providerResolved
+  }
+}
+
 export const resolvePolyfill = async (context: PluginContext, name: string) => {
   const consumerResolved = await context.resolve(name)