Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

Commit

Permalink
feat(nuxt): add workspaceDir option and add it to modulesDir (#7439)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe committed Sep 12, 2022
1 parent ceb61ad commit 3753ea0
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions packages/nuxt/src/core/nitro.ts
Expand Up @@ -18,6 +18,7 @@ export async function initNitro (nuxt: Nuxt) {
const _nitroConfig = ((nuxt.options as any).nitro || {}) as NitroConfig
const nitroConfig: NitroConfig = defu(_nitroConfig, <NitroConfig>{
rootDir: nuxt.options.rootDir,
workspaceDir: nuxt.options.workspaceDir,
srcDir: join(nuxt.options.srcDir, 'server'),
dev: nuxt.options.dev,
preset: nuxt.options.dev ? 'nitro-dev' : undefined,
Expand Down
1 change: 1 addition & 0 deletions packages/nuxt/src/core/nuxt.ts
Expand Up @@ -211,6 +211,7 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
.map(i => new RegExp(`(^|\\/)${escapeRE(i.cwd!.split('node_modules/').pop()!)}(\\/|$)(?!node_modules\\/)`))
}
}])
options.modulesDir.push(resolve(options.workspaceDir, 'node_modules'))
options.modulesDir.push(resolve(pkgDir, 'node_modules'))
options.build.transpile.push('@nuxt/ui-templates')
options.alias['vue-demi'] = resolve(options.appDir, 'compat/vue-demi')
Expand Down
1 change: 0 additions & 1 deletion packages/schema/build.config.ts
Expand Up @@ -26,7 +26,6 @@ export default defineBuildConfig({
'hookable',
'nitropack',
'webpack',
'pkg-types',
'webpack-bundle-analyzer',
'rollup-plugin-visualizer',
'vite',
Expand Down
1 change: 1 addition & 0 deletions packages/schema/package.json
Expand Up @@ -26,6 +26,7 @@
"defu": "^6.1.0",
"jiti": "^1.15.0",
"pathe": "^0.3.7",
"pkg-types": "^0.3.5",
"postcss-import-resolver": "^2.0.0",
"scule": "^0.3.2",
"std-env": "^3.2.1",
Expand Down
16 changes: 15 additions & 1 deletion packages/schema/src/config/_common.ts
Expand Up @@ -4,6 +4,7 @@ import createRequire from 'create-require'
import { pascalCase } from 'scule'
import jiti from 'jiti'
import defu from 'defu'
import { findWorkspaceDir } from 'pkg-types'

import { RuntimeConfig } from '../types/config'

Expand Down Expand Up @@ -37,7 +38,7 @@ export default defineUntypedSchema({
theme: null,

/**
* Define the workspace directory of your application.
* Define the root directory of your application.
*
* This property can be overwritten (for example, running `nuxt ./my-app/`
* will set the `rootDir` to the absolute path of `./my-app/` from the
Expand All @@ -51,6 +52,19 @@ export default defineUntypedSchema({
$resolve: val => typeof val === 'string' ? resolve(val) : process.cwd()
},

/**
* Define the workspace directory of your application.
*
* Often this is used when in a monorepo setup. Nuxt will attempt to detect
* your workspace directory automatically, but you can override it here.
*
* It is normally not needed to configure this option.
* @version 3
*/
workspaceDir: {
$resolve: async (val, get) => val ? resolve(await get('rootDir'), val) : await findWorkspaceDir(await get('rootDir')).catch(() => get('rootDir'))
},

/**
* Define the source directory of your Nuxt application.
*
Expand Down
1 change: 1 addition & 0 deletions yarn.lock
Expand Up @@ -1819,6 +1819,7 @@ __metadata:
defu: ^6.1.0
jiti: ^1.15.0
pathe: ^0.3.7
pkg-types: ^0.3.5
postcss-import-resolver: ^2.0.0
scule: ^0.3.2
std-env: ^3.2.1
Expand Down

0 comments on commit 3753ea0

Please sign in to comment.