chore: simplify bundler module resolution

johannschopplich · Jan 4, 2024 · 36e531f · 36e531f
1 parent fd7c078
commit 36e531f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,7 +39,6 @@ jobs:
       - name: Install
         run: pnpm install
 
-      # Required for svelte-check
       - name: Build
         run: pnpm --filter=./packages/unlazy run build
 

diff --git a/packages/nuxt/.nuxtrc b/packages/nuxt/.nuxtrc
@@ -0,0 +1 @@
+future.typescriptBundlerResolution=true
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -41,7 +41,7 @@
     "prepack": "nuxt-module-build build",
     "dev": "nuxi dev playground",
     "dev:build": "nuxi build playground",
-    "dev:prepare": "nuxt-module-build build --stub && nuxi prepare playground",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
     "test:types": "vue-tsc --noEmit"
   },
   "dependencies": {

diff --git a/packages/nuxt/playground/nuxt.config.ts b/packages/nuxt/playground/nuxt.config.ts
@@ -24,18 +24,11 @@ export default defineNuxtConfig({
     },
   },
 
+  future: {
+    typescriptBundlerResolution: true,
+  },
+
   typescript: {
     shim: false,
-    tsConfig: {
-      compilerOptions: {
-        moduleResolution: 'bundler',
-        paths: {
-          '@unlazy/core': ['../../core/src/index.ts'],
-          '@unlazy/core/*': ['../../core/src/*'],
-          'unlazy': ['../../unlazy/src/index.ts'],
-          'unlazy/*': ['../../unlazy/src/*'],
-        },
-      },
-    },
   },
 })
diff --git a/packages/nuxt/playground/tsconfig.json b/packages/nuxt/playground/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./.nuxt/tsconfig.json"
+}
diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts
@@ -42,7 +42,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     // Add module options to public runtime config
     nuxt.options.runtimeConfig.public.unlazy = defu(
-      // @ts-expect-error: Maybe not defined
+      // @ts-expect-error: Can be unknown
       nuxt.options.runtimeConfig.public.unlazy,
       options,
     )
@@ -51,7 +51,7 @@ export default defineNuxtModule<ModuleOptions>({
     nuxt.options.build.transpile.push(resolve('runtime'))
 
     extendViteConfig((config) => {
-      config.define = config.define || {}
+      config.define ||= {}
       config.define.__UNLAZY_HASH_DECODING__ = true
     })
 

diff --git a/packages/nuxt/tsconfig.json b/packages/nuxt/tsconfig.json
@@ -1,4 +1,4 @@
 {
-  "extends": "./playground/.nuxt/tsconfig.json",
-  "include": ["src", "playground"]
+  "extends": "./.nuxt/tsconfig.json",
+  "include": ["src"]
 }