From 9aa30e889597b1dbaf09e2dc7c5c267200e744a2 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sun, 26 Jan 2025 22:19:51 +0100 Subject: [PATCH] refactor: co-locate runtime files with modules (#1532) --- modules/{invites.ts => invites/module.ts} | 0 modules/{ => invites}/runtime/server/auth/github/[slug].ts | 0 modules/{router.ts => router/module.ts} | 4 ++-- modules/{ => router}/runtime/NuxtPage.vue | 0 modules/{ => router}/runtime/nuxt-link.ts | 0 modules/{ => router}/runtime/path.global.ts | 0 modules/{ => router}/runtime/route-composables.ts | 0 modules/{ => router}/runtime/routes.ts | 0 modules/runtime/server/tsconfig.json | 3 --- modules/{ => social}/mocks/semver.ts | 0 modules/{ => social}/mocks/sourcemap-codec.ts | 0 modules/{social.ts => social/module.ts} | 0 modules/{ => social}/runtime/server/_social/bluesky.get.ts | 0 modules/{ => social}/runtime/server/_social/mastodon.get.ts | 0 nuxt.config.ts | 3 +++ test/unit/bundle.spec.ts | 2 +- 16 files changed, 6 insertions(+), 6 deletions(-) rename modules/{invites.ts => invites/module.ts} (100%) rename modules/{ => invites}/runtime/server/auth/github/[slug].ts (100%) rename modules/{router.ts => router/module.ts} (95%) rename modules/{ => router}/runtime/NuxtPage.vue (100%) rename modules/{ => router}/runtime/nuxt-link.ts (100%) rename modules/{ => router}/runtime/path.global.ts (100%) rename modules/{ => router}/runtime/route-composables.ts (100%) rename modules/{ => router}/runtime/routes.ts (100%) delete mode 100644 modules/runtime/server/tsconfig.json rename modules/{ => social}/mocks/semver.ts (100%) rename modules/{ => social}/mocks/sourcemap-codec.ts (100%) rename modules/{social.ts => social/module.ts} (100%) rename modules/{ => social}/runtime/server/_social/bluesky.get.ts (100%) rename modules/{ => social}/runtime/server/_social/mastodon.get.ts (100%) diff --git a/modules/invites.ts b/modules/invites/module.ts similarity index 100% rename from modules/invites.ts rename to modules/invites/module.ts diff --git a/modules/runtime/server/auth/github/[slug].ts b/modules/invites/runtime/server/auth/github/[slug].ts similarity index 100% rename from modules/runtime/server/auth/github/[slug].ts rename to modules/invites/runtime/server/auth/github/[slug].ts diff --git a/modules/router.ts b/modules/router/module.ts similarity index 95% rename from modules/router.ts rename to modules/router/module.ts index 468f770d..d8c50b42 100644 --- a/modules/router.ts +++ b/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 b/modules/router/runtime/NuxtPage.vue similarity index 100% rename from modules/runtime/NuxtPage.vue rename to modules/router/runtime/NuxtPage.vue diff --git a/modules/runtime/nuxt-link.ts b/modules/router/runtime/nuxt-link.ts similarity index 100% rename from modules/runtime/nuxt-link.ts rename to modules/router/runtime/nuxt-link.ts diff --git a/modules/runtime/path.global.ts b/modules/router/runtime/path.global.ts similarity index 100% rename from modules/runtime/path.global.ts rename to modules/router/runtime/path.global.ts diff --git a/modules/runtime/route-composables.ts b/modules/router/runtime/route-composables.ts similarity index 100% rename from modules/runtime/route-composables.ts rename to modules/router/runtime/route-composables.ts diff --git a/modules/runtime/routes.ts b/modules/router/runtime/routes.ts similarity index 100% rename from modules/runtime/routes.ts rename to modules/router/runtime/routes.ts diff --git a/modules/runtime/server/tsconfig.json b/modules/runtime/server/tsconfig.json deleted file mode 100644 index e95a7766..00000000 --- a/modules/runtime/server/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../../.nuxt/tsconfig.server.json", -} diff --git a/modules/mocks/semver.ts b/modules/social/mocks/semver.ts similarity index 100% rename from modules/mocks/semver.ts rename to modules/social/mocks/semver.ts diff --git a/modules/mocks/sourcemap-codec.ts b/modules/social/mocks/sourcemap-codec.ts similarity index 100% rename from modules/mocks/sourcemap-codec.ts rename to modules/social/mocks/sourcemap-codec.ts diff --git a/modules/social.ts b/modules/social/module.ts similarity index 100% rename from modules/social.ts rename to modules/social/module.ts diff --git a/modules/runtime/server/_social/bluesky.get.ts b/modules/social/runtime/server/_social/bluesky.get.ts similarity index 100% rename from modules/runtime/server/_social/bluesky.get.ts rename to modules/social/runtime/server/_social/bluesky.get.ts diff --git a/modules/runtime/server/_social/mastodon.get.ts b/modules/social/runtime/server/_social/mastodon.get.ts similarity index 100% rename from modules/runtime/server/_social/mastodon.get.ts rename to modules/social/runtime/server/_social/mastodon.get.ts diff --git a/nuxt.config.ts b/nuxt.config.ts index 9f2ebb91..25ef2373 100644 --- 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 index c325c6ef..1ebdaac4 100644 --- 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')) -- 2.51.2