Skip to content

fix: support --dotenv for analyze #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2024
Merged

fix: support --dotenv for analyze #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/commands/_shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ export const envNameArgs = {
},
} as const

export const dotEnvArgs = {
dotenv: {
type: 'string',
description: 'Path to .env file',
},
} as const

export const legacyRootDirArgs = {
rootDir: {
type: 'positional',
Expand Down
7 changes: 6 additions & 1 deletion src/commands/analyze.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { defineCommand } from 'citty'
import { loadKit } from '../utils/kit'
import { clearDir } from '../utils/fs'
import { overrideEnv } from '../utils/env'
import { sharedArgs, legacyRootDirArgs } from './_shared'
import { sharedArgs, legacyRootDirArgs, dotEnvArgs } from './_shared'

export default defineCommand({
meta: {
Expand All @@ -18,6 +18,7 @@ export default defineCommand({
args: {
...sharedArgs,
...legacyRootDirArgs,
...dotEnvArgs,
name: {
type: 'string',
description: 'Name of the analysis',
Expand All @@ -42,6 +43,10 @@ export default defineCommand({

const nuxt = await loadNuxt({
cwd,
dotenv: {
cwd,
fileName: ctx.args.dotenv,
},
overrides: defu(ctx.data?.overrides, {
build: {
analyze: {
Expand Down
7 changes: 2 additions & 5 deletions src/commands/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { loadKit } from '../utils/kit'
import { clearBuildDir } from '../utils/fs'
import { overrideEnv } from '../utils/env'
import { showVersions } from '../utils/banner'
import { sharedArgs, envNameArgs, legacyRootDirArgs } from './_shared'
import { sharedArgs, envNameArgs, legacyRootDirArgs, dotEnvArgs } from './_shared'

export default defineCommand({
meta: {
Expand All @@ -23,10 +23,7 @@ export default defineCommand({
type: 'string',
description: 'Nitro server preset',
},
dotenv: {
type: 'string',
description: 'Path to .env file',
},
...dotEnvArgs,
...envNameArgs,
...legacyRootDirArgs,
},
Expand Down
7 changes: 2 additions & 5 deletions src/commands/dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { loadKit } from '../utils/kit'
import { importModule } from '../utils/esm'
import { overrideEnv } from '../utils/env'
import type { NuxtDevContext, NuxtDevIPCMessage } from '../utils/dev'
import { sharedArgs, envNameArgs, legacyRootDirArgs } from './_shared'
import { sharedArgs, envNameArgs, legacyRootDirArgs, dotEnvArgs } from './_shared'

const forkSupported = !isBun && !isTest

Expand All @@ -31,10 +31,7 @@ const command = defineCommand({
...envNameArgs,
...legacyRootDirArgs,
...getListhenArgs(),
dotenv: {
type: 'string',
description: 'Path to .env file',
},
...dotEnvArgs,
clear: {
type: 'boolean',
description: 'Clear console on restart',
Expand Down
7 changes: 2 additions & 5 deletions src/commands/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineCommand } from 'citty'
import buildCommand from './build'

import { sharedArgs, envNameArgs, legacyRootDirArgs } from './_shared'
import { sharedArgs, envNameArgs, legacyRootDirArgs, dotEnvArgs } from './_shared'

export default defineCommand({
meta: {
Expand All @@ -12,10 +12,7 @@ export default defineCommand({
...sharedArgs,
...envNameArgs,
...legacyRootDirArgs,
dotenv: {
type: 'string',
description: 'Path to .env file',
},
...dotEnvArgs,
},
async run(ctx) {
ctx.args.prerender = true
Expand Down
7 changes: 2 additions & 5 deletions src/commands/prepare.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,15 @@ import { defineCommand } from 'citty'
import { clearBuildDir } from '../utils/fs'
import { loadKit } from '../utils/kit'

import { sharedArgs, envNameArgs, legacyRootDirArgs } from './_shared'
import { sharedArgs, envNameArgs, legacyRootDirArgs, dotEnvArgs } from './_shared'

export default defineCommand({
meta: {
name: 'prepare',
description: 'Prepare Nuxt for development/build',
},
args: {
dotenv: {
type: 'string',
description: 'Path to .env file',
},
...dotEnvArgs,
...sharedArgs,
...envNameArgs,
...legacyRootDirArgs,
Expand Down
7 changes: 2 additions & 5 deletions src/commands/preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { box, colors } from 'consola/utils'
import { defineCommand } from 'citty'
import { loadKit } from '../utils/kit'

import { sharedArgs, envNameArgs, legacyRootDirArgs } from './_shared'
import { sharedArgs, envNameArgs, legacyRootDirArgs, dotEnvArgs } from './_shared'

export default defineCommand({
meta: {
Expand All @@ -19,10 +19,7 @@ export default defineCommand({
...sharedArgs,
...envNameArgs,
...legacyRootDirArgs,
dotenv: {
type: 'string',
description: 'Path to .env file',
},
...dotEnvArgs,
},
async run(ctx) {
process.env.NODE_ENV = process.env.NODE_ENV || 'production'
Expand Down
Loading