fix: remove __dirname CJS references

johannschopplich · Sep 10, 2023 · db37b2b · db37b2b
1 parent 923193f
commit db37b2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -187,9 +187,11 @@ Create a `kirbyup.config.js` or `kirbyup.config.ts` configuration file the root-
 import { resolve } from 'node:path'
 import { defineConfig } from 'kirbyup/config'
 
+const currentDir = new URL('.', import.meta.url).pathname
+
 export default defineConfig({
   alias: {
-    '#deep/': `${resolve(__dirname, 'src/deep')}/`
+    '#deep/': `${resolve(currentDir, 'src/deep')}/`
   },
   extendViteConfig: {
     build: {

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -3,6 +3,8 @@ import { remove } from 'fs-extra'
 import { afterAll, beforeAll, expect, it, vi } from 'vitest'
 import { cacheDir, runCli } from './utils'
 
+const currentDir = new URL('.', import.meta.url).pathname
+
 beforeAll(async () => {
   // unset so kirbyup applies its default env setting
   vi.stubEnv('NODE_ENV', '')
@@ -133,7 +135,7 @@ it('compiles vue templates', async () => {
 it('supports auto-importing components', async () => {
   const { output } = await runCli({
     'src/input.js': `
-      import { kirbyup } from '${resolve(__dirname, '../dist/plugin.mjs')}'
+      import { kirbyup } from '${resolve(currentDir, '../dist/client/plugin.mjs')}'
 
       window.panel.plugin('kirbyup/example', {
         blocks: kirbyup.import('./components/blocks/*.vue')
@@ -152,9 +154,10 @@ it('supports kirbyup.config.js with object', async () => {
     'src/foo.js': 'export default \'bar\'',
     'kirbyup.config.js': `
       import { resolve } from 'path'
+      const currentDir = new URL('.', import.meta.url).pathname
       export default {
         alias: {
-          '__ALIAS__/': resolve(__dirname, 'src') + '/'
+          '__ALIAS__/': resolve(currentDir, 'src') + '/'
         },
         extendViteConfig: {
           build: {
@@ -176,10 +179,11 @@ it('supports kirbyup.config.js with function', async () => {
     'src/foo.js': 'export default \'bar\'',
     'kirbyup.config.js': `
       import { resolve } from 'path'
-      import { defineConfig } from '${resolve(__dirname, '../dist/config.mjs')}'
+      import { defineConfig } from '${resolve(currentDir, '../dist/client/config.mjs')}'
+      const currentDir = new URL('.', import.meta.url).pathname
       export default defineConfig({
         alias: {
-          '__ALIAS__/': resolve(__dirname, 'src') + '/'
+          '__ALIAS__/': resolve(currentDir, 'src') + '/'
         },
         extendViteConfig: {
           build: {

diff --git a/test/utils.ts b/test/utils.ts
@@ -3,8 +3,8 @@ import { outputFile, readFile } from 'fs-extra'
 import fg from 'fast-glob'
 import { startCli } from '../src/node/cli-start'
 
-export const cacheDir = resolve(__dirname, '.cache')
-export const cli = resolve(__dirname, '../src/node/cli.ts')
+export const cacheDir = new URL('./.cache', import.meta.url).pathname
+export const cli = new URL('../src/node/cli.ts', import.meta.url).pathname
 
 export async function runCli(files: Record<string, string>) {
   const testDir = resolve(cacheDir, Date.now().toString())

diff --git a/tsconfig.json b/tsconfig.json
@@ -6,7 +6,7 @@
     "skipLibCheck": true,
 
     /* Bundler mode */
-    "moduleResolution": "node",
+    "moduleResolution": "Node",
     "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,