feat(nuxt3): expose /app export paths (nuxt#3323)

cexbrayat · Feb 18, 2022 · 70542a3 · 70542a3
1 parent 22c3e33
commit 70542a3
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 8 deletions.
diff --git a/packages/bridge/src/app.ts b/packages/bridge/src/app.ts
@@ -10,6 +10,8 @@ export function setupAppBridge (_options: any) {
 
   // Setup aliases
   nuxt.options.alias['#app'] = resolve(distDir, 'runtime/index.mjs')
+  nuxt.options.alias['nuxt3/app'] = nuxt.options.alias['#app']
+  nuxt.options.alias['nuxt/app'] = nuxt.options.alias['#app']
   nuxt.options.alias['#build'] = nuxt.options.buildDir
 
   // Mock `bundleBuilder.build` to support `nuxi prepare`

diff --git a/packages/nuxt3/app.d.ts b/packages/nuxt3/app.d.ts
@@ -0,0 +1 @@
+export * from './dist/app'
diff --git a/packages/nuxt3/package.json b/packages/nuxt3/package.json
@@ -10,7 +10,18 @@
     "nuxi": "./bin/nuxt.mjs",
     "nuxt": "./bin/nuxt.mjs"
   },
+  "exports": {
+    ".": "./dist/index.mjs",
+    "./app": "./dist/app/index.mjs",
+    "./package.json": "./package.json"
+  },
+  "imports": {
+    "#app": "./dist/app/index.mjs",
+    "#meta": "./dist/meta/runtime/index.mjs",
+    "#pages": "./dist/pages/runtime/index.mjs"
+  },
   "files": [
+    "app.d.ts",
     "bin",
     "types.d.ts",
     "dist"

diff --git a/packages/nuxt3/src/app/index.ts b/packages/nuxt3/src/app/index.ts
@@ -1,5 +1,12 @@
+/// <reference path="types/augments.d.ts" />
+
 export * from './nuxt'
 export * from './composables'
+// eslint-disable-next-line import/no-restricted-paths
+export type { PageMeta } from '../pages/runtime'
+// eslint-disable-next-line import/no-restricted-paths
+export type { MetaObject } from '../meta/runtime'
+export { useMeta } from '#meta'
 
 export const isVue2 = false
 export const isVue3 = true
diff --git a/packages/nuxt3/src/app/types/augments.ts → packages/nuxt3/src/app/types/augments.d.ts b/packages/nuxt3/src/app/types/augments.ts → packages/nuxt3/src/app/types/augments.d.ts
diff --git a/packages/nuxt3/src/app/types/index.ts b/packages/nuxt3/src/app/types/index.ts
diff --git a/packages/nuxt3/src/core/plugins/import-protection.ts b/packages/nuxt3/src/core/plugins/import-protection.ts
@@ -13,7 +13,7 @@ interface ImportProtectionOptions {
 }
 
 export const vueAppPatterns = (nuxt: Nuxt) => [
-  [/^(nuxt3|nuxt)/, '`nuxt3`/`nuxt` cannot be imported directly. Instead, import runtime Nuxt composables from `#app` or `#imports`.'],
+  [/^(nuxt3|nuxt)$/, '`nuxt3`/`nuxt` cannot be imported directly. Instead, import runtime Nuxt composables from `#app` or `#imports`.'],
   [/nuxt\.config/, 'Importing directly from a `nuxt.config` file is not allowed. Instead, use runtime config or a module.'],
   [/(^|node_modules\/)@vue\/composition-api/],
   ...nuxt.options.modules.filter(m => typeof m === 'string').map((m: string) =>

diff --git a/packages/nuxt3/src/meta/runtime/lib/vue-meta.plugin.ts b/packages/nuxt3/src/meta/runtime/lib/vue-meta.plugin.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import { createMetaManager } from 'vue-meta'
-import type { MetaObject } from '../types'
+import type { MetaObject } from '..'
 import { defineNuxtPlugin } from '#app'
 
 export default defineNuxtPlugin((nuxtApp) => {

diff --git a/packages/nuxt3/src/pages/runtime/index.ts b/packages/nuxt3/src/pages/runtime/index.ts
@@ -0,0 +1 @@
+export * from './composables'
diff --git a/packages/nuxt3/types.d.ts b/packages/nuxt3/types.d.ts
@@ -1,3 +1,2 @@
 import type { } from '@nuxt/nitro'
 export * from './dist/index'
-export * from './dist/app/types/index'
diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
@@ -46,8 +46,7 @@ export async function buildServer (ctx: ViteBuildContext) {
         /\.(es|esm|esm-browser|esm-bundler).js$/,
         '/__vue-jsx',
         '#app',
-        /nuxt3\/dist/,
-        /nuxt3\/src/,
+        'nuxt3',
         /@nuxt\/nitro\/dist/,
         /@nuxt\/nitro\/src/
       ]

diff --git a/packages/webpack/src/configs/server.ts b/packages/webpack/src/configs/server.ts
@@ -38,6 +38,7 @@ function serverStandalone (ctx: WebpackConfigContext) {
   const inline = [
     'src/',
     '#app',
+    'nuxt3',
     '!',
     '-!',
     '~',
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ function serverStandalone (ctx: WebpackConfigContext) { @@
       const inline = [
         'src/',
         '#app',
+        'nuxt3',
         '!',
         '-!',
         '~',
@@ Expand Down @@