refactor: co-locate runtime files with modules (#1532)

danielroe · Jan 26, 2025 · 9aa30e8 · 9aa30e8
1 parent 987909f
commit 9aa30e8
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 6 deletions.
diff --git a/modules/invites.ts → modules/invites/module.ts b/modules/invites.ts → modules/invites/module.ts
diff --git a/modules/runtime/server/auth/github/[slug].ts → ...ites/runtime/server/auth/github/[slug].ts b/modules/runtime/server/auth/github/[slug].ts → ...ites/runtime/server/auth/github/[slug].ts
diff --git a/modules/router.ts → modules/router/module.ts b/modules/router.ts → modules/router/module.ts
@@ -81,13 +81,13 @@ export default defineNuxtModule({
     addTemplate({
       filename: 'routes.mjs',
       async getContents () {
-        const files = await readRecursive(resolver.resolve('../app/pages'))
+        const files = await readRecursive(resolver.resolve('../../app/pages'))
         const componentNames = Object.fromEntries(
           files.map(f => [f, genSafeVariableName(f)]),
         )
         const routes = files.map(f => {
           const path = withLeadingSlash(
-            relative(resolver.resolve('../app/pages'), f).replace(
+            relative(resolver.resolve('../../app/pages'), f).replace(
               /(\/?index)?\.vue$/,
               '',
             ),

diff --git a/modules/runtime/NuxtPage.vue → modules/router/runtime/NuxtPage.vue b/modules/runtime/NuxtPage.vue → modules/router/runtime/NuxtPage.vue
diff --git a/modules/runtime/nuxt-link.ts → modules/router/runtime/nuxt-link.ts b/modules/runtime/nuxt-link.ts → modules/router/runtime/nuxt-link.ts
diff --git a/modules/runtime/path.global.ts → modules/router/runtime/path.global.ts b/modules/runtime/path.global.ts → modules/router/runtime/path.global.ts
diff --git a/modules/runtime/route-composables.ts → modules/router/runtime/route-composables.ts b/modules/runtime/route-composables.ts → modules/router/runtime/route-composables.ts
diff --git a/modules/runtime/routes.ts → modules/router/runtime/routes.ts b/modules/runtime/routes.ts → modules/router/runtime/routes.ts
diff --git a/modules/runtime/server/tsconfig.json b/modules/runtime/server/tsconfig.json
diff --git a/modules/mocks/semver.ts → modules/social/mocks/semver.ts b/modules/mocks/semver.ts → modules/social/mocks/semver.ts
diff --git a/modules/mocks/sourcemap-codec.ts → modules/social/mocks/sourcemap-codec.ts b/modules/mocks/sourcemap-codec.ts → modules/social/mocks/sourcemap-codec.ts
diff --git a/modules/social.ts → modules/social/module.ts b/modules/social.ts → modules/social/module.ts
diff --git a/...les/runtime/server/_social/bluesky.get.ts → ...ial/runtime/server/_social/bluesky.get.ts b/...les/runtime/server/_social/bluesky.get.ts → ...ial/runtime/server/_social/bluesky.get.ts
diff --git a/...es/runtime/server/_social/mastodon.get.ts → ...al/runtime/server/_social/mastodon.get.ts b/...es/runtime/server/_social/mastodon.get.ts → ...al/runtime/server/_social/mastodon.get.ts
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -7,6 +7,9 @@ import type { HmrOptions } from 'vite'
 
 export default defineNuxtConfig({
   modules: [
+    '~~/modules/social',
+    '~~/modules/invites',
+    '~~/modules/router',
     '@nuxtjs/sanity',
     'nuxt-og-image',
     '@nuxt/eslint',

diff --git a/test/unit/bundle.spec.ts b/test/unit/bundle.spec.ts
@@ -84,7 +84,7 @@ describe('project sizes', () => {
     const modules = await analyzeSizes('node_modules/**/*', serverDir)
     expect
       .soft(roundToKilobytes(modules.totalBytes))
-      .toMatchInlineSnapshot(`"11162k"`)
+      .toMatchInlineSnapshot(`"11157k"`)
 
     const packages = modules.files
       .filter(m => m.endsWith('package.json'))