@nocobase/cli 2.1.0-beta.23 → 2.1.0-beta.25

package/dist/lib/app-runtime.js

@@ -9,7 +9,9 @@
 import path from 'node:path';
 import { resolveEnvKind } from './auth-store.js';
 import { getEnv, loadAuthConfig } from './auth-store.js';
+import { DEFAULT_DOCKER_CONTAINER_PREFIX, DEFAULT_DOCKER_NETWORK, getEffectiveCliConfigValue, } from './cli-config.js';
 import { commandOutput, commandSucceeds, run, runNocoBaseCommand } from './run-npm.js';
+import { buildRuntimeEnvVars } from './runtime-env-vars.js';
 const DOCKER_APP_WORKDIR = '/app/nocobase';
 function sanitizeDockerResourceName(value) {
     const normalized = value
@@ -23,14 +25,24 @@ function sanitizeDockerResourceName(value) {
 export function defaultWorkspaceName(cwd = process.cwd()) {
     return sanitizeDockerResourceName(`nb-${path.basename(cwd)}`);
 }
-export function buildDockerAppContainerName(envName, workspaceName) {
-    const workspace = workspaceName?.trim() || defaultWorkspaceName();
-    return sanitizeDockerResourceName(`${workspace}-${envName}-app`);
+export function defaultDockerContainerPrefix(cwd = process.cwd()) {
+    const configured = String(DEFAULT_DOCKER_CONTAINER_PREFIX ?? '').trim();
+    if (configured) {
+        return sanitizeDockerResourceName(configured);
+    }
+    return defaultWorkspaceName(cwd);
+}
+export function defaultDockerNetworkName() {
+    return sanitizeDockerResourceName(DEFAULT_DOCKER_NETWORK);
+}
+export function buildDockerAppContainerName(envName, containerPrefix) {
+    const prefix = containerPrefix?.trim() || defaultDockerContainerPrefix();
+    return sanitizeDockerResourceName(`${prefix}-${envName}-app`);
 }
-export function buildDockerDbContainerName(envName, dbDialect, workspaceName) {
-    const workspace = workspaceName?.trim() || defaultWorkspaceName();
+export function buildDockerDbContainerName(envName, dbDialect, containerPrefix) {
+    const prefix = containerPrefix?.trim() || defaultDockerContainerPrefix();
     const dialect = dbDialect.trim() || 'postgres';
-    return sanitizeDockerResourceName(`${workspace}-${envName}-${dialect}`);
+    return sanitizeDockerResourceName(`${prefix}-${envName}-${dialect}`);
 }
 function normalizeEnvSource(env) {
     const source = String(env.config.source ?? '').trim();
@@ -51,7 +63,8 @@ export async function resolveManagedAppRuntime(envName) {
     }
     const resolvedName = env.name || envName?.trim() || config.currentEnv || 'default';
     const source = normalizeEnvSource(env);
-    const workspaceName = config.name?.trim() || defaultWorkspaceName();
+    const dockerNetworkName = sanitizeDockerResourceName(getEffectiveCliConfigValue(config, 'docker.network') || defaultDockerNetworkName());
+    const dockerContainerPrefix = sanitizeDockerResourceName(getEffectiveCliConfigValue(config, 'docker.container-prefix') || defaultDockerContainerPrefix());
     const kind = env.kind ?? resolveEnvKind(env.config);
     if (kind === 'docker') {
         return {
@@ -59,8 +72,10 @@ export async function resolveManagedAppRuntime(envName) {
             env,
             envName: resolvedName,
             source: 'docker',
-            workspaceName,
-            containerName: buildDockerAppContainerName(resolvedName, workspaceName),
+            dockerNetworkName,
+            dockerContainerPrefix,
+            workspaceName: dockerNetworkName,
+            containerName: buildDockerAppContainerName(resolvedName, dockerContainerPrefix),
         };
     }
     if (kind === 'local') {
@@ -70,7 +85,9 @@ export async function resolveManagedAppRuntime(envName) {
             envName: resolvedName,
             source: source === 'git' ? 'git' : source === 'npm' ? 'npm' : 'local',
             projectRoot: env.appRootPath,
-            workspaceName,
+            dockerNetworkName,
+            dockerContainerPrefix,
+            workspaceName: dockerNetworkName,
         };
     }
     if (kind === 'ssh') {
@@ -99,9 +116,10 @@ export function formatMissingManagedAppEnvMessage(envName) {
     return 'No NocoBase env is configured yet. Run `nb init` to create one first.';
 }
 export async function runLocalNocoBaseCommand(runtime, args, options) {
+    const envVars = await buildRuntimeEnvVars(runtime);
     await runNocoBaseCommand(args, {
         cwd: runtime.projectRoot,
-        env: runtime.env.envVars,
+        env: envVars,
         stdio: options?.stdio,
     });
 }

package/dist/lib/auth-store.js

@@ -8,7 +8,7 @@
  */
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { NB_CLI_ROOT_ENV, resolveCliHomeDir, resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRelativePath, } from './cli-home.js';
+import { resolveCliHomeDir, resolveConfiguredEnvPath, resolveEnvRelativePath, } from './cli-home.js';
 function normalizeStoredEnvKind(value) {
     const kind = String(value ?? '').trim();
     if (kind === 'remote') {
@@ -68,8 +68,22 @@ function normalizeEnvConfigEntry(entry) {
     };
 }
 function normalizeAuthConfig(config) {
+    const settings = config.settings ?? {};
     return {
         name: config.name || config.dockerResourcePrefix,
+        settings: {
+            ...(settings.license?.pkgUrl ? { license: { pkgUrl: normalizeOptionalString(settings.license.pkgUrl) } } : {}),
+            ...(settings.docker?.network || settings.docker?.containerPrefix
+                ? {
+                    docker: {
+                        ...(settings.docker?.network ? { network: normalizeOptionalString(settings.docker.network) } : {}),
+                        ...(settings.docker?.containerPrefix
+                            ? { containerPrefix: normalizeOptionalString(settings.docker.containerPrefix) }
+                            : {}),
+                    },
+                }
+                : {}),
+        },
         currentEnv: config.currentEnv || 'default',
         envs: Object.fromEntries(Object.entries(config.envs || {}).map(([envName, entry]) => [envName, normalizeEnvConfigEntry(entry) ?? {}])),
     };
@@ -83,48 +97,21 @@ function createDefaultConfig() {
         envs: {},
     };
 }
-function hasConfiguredEnvs(config) {
-    return Object.keys(config.envs).length > 0;
-}
-function shouldFallbackToLegacyProjectScope(options = {}) {
-    const requestedScope = options.scope ?? resolveDefaultConfigScope();
-    if (requestedScope !== 'global') {
-        return false;
-    }
-    return !process.env[NB_CLI_ROOT_ENV];
-}
-async function loadExactAuthConfig(options = {}) {
+async function readStoredAuthConfig(filePath) {
     try {
-        const content = await fs.readFile(getConfigFile(options), 'utf8');
+        const content = await fs.readFile(filePath, 'utf8');
         const parsed = JSON.parse(content);
         return normalizeAuthConfig(parsed);
     }
     catch (_error) {
-        return createDefaultConfig();
+        return undefined;
     }
 }
-async function resolveEnvStorageScope(envName, options = {}) {
-    const requestedScope = options.scope ?? resolveDefaultConfigScope();
-    if (requestedScope !== 'global') {
-        return { ...options, scope: requestedScope };
-    }
-    const globalConfig = await loadExactAuthConfig({ scope: 'global' });
-    if (globalConfig.envs[envName]) {
-        return { ...options, scope: 'global' };
-    }
-    const projectConfig = await loadExactAuthConfig({ scope: 'project' });
-    if (projectConfig.envs[envName]) {
-        return { ...options, scope: 'project' };
-    }
-    return { ...options, scope: 'global' };
+export async function loadExactAuthConfig(options = {}) {
+    return (await readStoredAuthConfig(getConfigFile(options))) ?? createDefaultConfig();
 }
 export async function loadAuthConfig(options = {}) {
-    const config = await loadExactAuthConfig(options);
-    if (!shouldFallbackToLegacyProjectScope(options) || hasConfiguredEnvs(config)) {
-        return config;
-    }
-    const legacyProjectConfig = await loadExactAuthConfig({ scope: 'project' });
-    return hasConfiguredEnvs(legacyProjectConfig) ? legacyProjectConfig : config;
+    return await loadExactAuthConfig(options);
 }
 export async function saveAuthConfig(config, options = {}) {
     const filePath = getConfigFile(options);
@@ -143,24 +130,12 @@ export async function getCurrentEnvName(options = {}) {
     return config.currentEnv || 'default';
 }
 export async function setCurrentEnv(envName, options = {}) {
-    const writeOptions = await resolveEnvStorageScope(envName, options);
-    const config = await loadExactAuthConfig(writeOptions);
+    const config = await loadExactAuthConfig(options);
     if (!config.envs[envName]) {
         throw new Error(`Env "${envName}" is not configured`);
     }
     config.currentEnv = envName;
-    await saveAuthConfig(config, writeOptions);
-}
-export async function ensureWorkspaceName(defaultName, options = {}) {
-    const config = await loadExactAuthConfig(options);
-    const existing = config.name?.trim();
-    if (existing) {
-        return existing;
-    }
-    const next = defaultName.trim();
-    config.name = next;
     await saveAuthConfig(config, options);
-    return next;
 }
 export class Env {
     config;
@@ -220,8 +195,13 @@ export class Env {
         put('APP_KEY', this.config.appKey);
         put('TZ', this.config.timezone);
         put('DB_DIALECT', this.config.dbDialect);
-        put('DB_HOST', this.config.dbHost);
-        put('DB_PORT', this.config.dbPort);
+        if (!this.config.builtinDb) {
+            put('DB_HOST', this.config.dbHost);
+            put('DB_PORT', this.config.dbPort);
+        }
+        else if (String(this.config.source ?? '').trim() !== 'docker') {
+            put('DB_PORT', this.config.dbPort);
+        }
         put('DB_DATABASE', this.config.dbDatabase);
         put('DB_USER', this.config.dbUser);
         put('DB_PASSWORD', this.config.dbPassword);
@@ -234,16 +214,7 @@ export async function getEnv(envName, options = {}) {
     const resolved = envName?.trim() || config.currentEnv || 'default';
     const envConfig = config.envs[resolved];
     if (!envConfig) {
-        if (!shouldFallbackToLegacyProjectScope(loadOptions)) {
-            return undefined;
-        }
-        const legacyProjectConfig = await loadExactAuthConfig({ scope: 'project' });
-        const legacyResolved = envName?.trim() || legacyProjectConfig.currentEnv || 'default';
-        const legacyEnvConfig = legacyProjectConfig.envs[legacyResolved];
-        if (!legacyEnvConfig) {
-            return undefined;
-        }
-        return new Env({ ...(normalizeEnvConfigEntry(legacyEnvConfig) ?? {}), name: legacyResolved });
+        return undefined;
     }
     return new Env({ ...(normalizeEnvConfigEntry(envConfig) ?? {}), name: resolved });
 }
@@ -269,12 +240,11 @@ function areAuthConfigsEquivalent(left, right) {
     return false;
 }
 async function writeEnv(envName, updater, options = {}) {
-    const writeOptions = await resolveEnvStorageScope(envName, options);
-    const config = await loadExactAuthConfig(writeOptions);
+    const config = await loadExactAuthConfig(options);
     const previous = config.envs[envName];
     config.envs[envName] = updater(previous);
     config.currentEnv = envName;
-    await saveAuthConfig(config, writeOptions);
+    await saveAuthConfig(config, options);
 }
 export async function upsertEnv(envName, config, options = {}) {
     await writeEnv(envName, (previous) => {
@@ -330,19 +300,17 @@ export async function setEnvOauthSession(envName, auth, options = {}) {
     }), options);
 }
 export async function setEnvRuntime(envName, runtime, options = {}) {
-    const writeOptions = await resolveEnvStorageScope(envName, options);
-    const config = await loadExactAuthConfig(writeOptions);
+    const config = await loadExactAuthConfig(options);
     const current = config.envs[envName] ?? {};
     config.envs[envName] = {
         ...current,
         runtime,
     };
     config.currentEnv = envName;
-    await saveAuthConfig(config, writeOptions);
+    await saveAuthConfig(config, options);
 }
 export async function removeEnv(envName, options = {}) {
-    const writeOptions = await resolveEnvStorageScope(envName, options);
-    const config = await loadExactAuthConfig(writeOptions);
+    const config = await loadExactAuthConfig(options);
     if (!config.envs[envName]) {
         throw new Error(`Env "${envName}" is not configured`);
     }
@@ -351,7 +319,7 @@ export async function removeEnv(envName, options = {}) {
         const nextEnv = Object.keys(config.envs).sort()[0];
         config.currentEnv = nextEnv ?? 'default';
     }
-    await saveAuthConfig(config, writeOptions);
+    await saveAuthConfig(config, options);
     return {
         removed: envName,
         currentEnv: config.currentEnv || 'default',

package/dist/lib/bootstrap.js

@@ -36,14 +36,10 @@ function hasBooleanFlag(argv, name) {
     const exact = `--${name}`;
     const negated = `--no-${name}`;
     const prefix = `--${name}=`;
-    const alias = name === 'verbose' ? '-V' : undefined;
     for (const value of argv) {
         if (value === exact) {
             return true;
         }
-        if (alias && value === alias) {
-            return true;
-        }
         if (value === negated) {
             return false;
         }

package/dist/lib/build-config.js

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { promises as fs } from 'node:fs';
 export async function loadBuildConfig(filePath) {
     try {

package/dist/lib/builtin-db.js

@@ -0,0 +1,86 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { buildDockerDbContainerName } from './app-runtime.js';
+import { commandOutput } from './run-npm.js';
+function trimValue(value) {
+    return String(value ?? '').trim();
+}
+export function defaultBuiltinDbPortForDialect(value) {
+    const dialect = trimValue(value) || 'postgres';
+    switch (dialect) {
+        case 'mysql':
+        case 'mariadb':
+            return '3306';
+        case 'kingbase':
+            return '54321';
+        case 'postgres':
+        default:
+            return '5432';
+    }
+}
+export function resolveBuiltinDbContainerName(runtime, dbDialect) {
+    const dialect = trimValue(dbDialect ?? runtime.env.config.dbDialect) || 'postgres';
+    return buildDockerDbContainerName(runtime.envName, dialect, runtime.dockerContainerPrefix || runtime.workspaceName);
+}
+export function deriveBuiltinDbConnection(runtime, overrides = {}) {
+    const dbDialect = trimValue(overrides.dbDialect ?? runtime.env.config.dbDialect) || 'postgres';
+    const containerName = resolveBuiltinDbContainerName(runtime, dbDialect);
+    const networkName = trimValue(runtime.dockerNetworkName || runtime.workspaceName) || undefined;
+    if (runtime.source === 'docker') {
+        return {
+            builtinDb: true,
+            dbDialect,
+            dbHost: containerName,
+            dbPort: defaultBuiltinDbPortForDialect(dbDialect),
+            containerName,
+            networkName,
+        };
+    }
+    const dbPort = trimValue(overrides.dbPort ?? runtime.env.config.dbPort) || defaultBuiltinDbPortForDialect(dbDialect);
+    return {
+        builtinDb: true,
+        dbDialect,
+        dbHost: '127.0.0.1',
+        dbPort,
+        containerName,
+        networkName,
+    };
+}
+export async function resolveBuiltinDbConnection(runtime) {
+    const derived = deriveBuiltinDbConnection(runtime);
+    if (runtime.source === 'docker') {
+        return derived;
+    }
+    const mappedPort = await inspectBuiltinDbPublishedPort(derived.containerName, derived.dbDialect);
+    if (mappedPort) {
+        return {
+            ...derived,
+            dbPort: mappedPort,
+        };
+    }
+    return derived;
+}
+async function inspectBuiltinDbPublishedPort(containerName, dbDialect) {
+    const containerPort = defaultBuiltinDbPortForDialect(dbDialect);
+    try {
+        const output = await commandOutput('docker', [
+            'inspect',
+            '--format',
+            `{{with index .NetworkSettings.Ports "${containerPort}/tcp"}}{{(index . 0).HostPort}}{{end}}`,
+            containerName,
+        ], {
+            errorName: 'docker inspect',
+        });
+        const hostPort = trimValue(output);
+        return hostPort || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/lib/cli-config.js

@@ -0,0 +1,176 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { loadExactAuthConfig, saveAuthConfig } from './auth-store.js';
+import { resolveDefaultConfigScope } from './cli-home.js';
+export const DEFAULT_LICENSE_PKG_URL = 'https://pkg.nocobase.com/';
+export const DEFAULT_DOCKER_NETWORK = 'nocobase';
+export const DEFAULT_DOCKER_CONTAINER_PREFIX = 'nb';
+export const SUPPORTED_CLI_CONFIG_KEYS = [
+    'license.pkg-url',
+    'docker.network',
+    'docker.container-prefix',
+];
+function trimValue(value) {
+    const text = String(value ?? '').trim();
+    return text || undefined;
+}
+function resolveScope(options = {}) {
+    return {
+        scope: options.scope ?? resolveDefaultConfigScope(),
+    };
+}
+export function isSupportedCliConfigKey(value) {
+    return SUPPORTED_CLI_CONFIG_KEYS.includes(value);
+}
+export function assertSupportedCliConfigKey(value) {
+    if (!isSupportedCliConfigKey(value)) {
+        throw new Error(`Unsupported config key "${value}". Supported keys: ${SUPPORTED_CLI_CONFIG_KEYS.join(', ')}`);
+    }
+    return value;
+}
+function cloneSettings(config) {
+    return {
+        license: config.settings?.license ? { ...config.settings.license } : undefined,
+        docker: config.settings?.docker ? { ...config.settings.docker } : undefined,
+    };
+}
+function pruneSettings(config) {
+    const license = config.settings?.license;
+    if (license && !trimValue(license.pkgUrl)) {
+        delete config.settings?.license;
+    }
+    const docker = config.settings?.docker;
+    if (docker && !trimValue(docker.network) && !trimValue(docker.containerPrefix)) {
+        delete config.settings?.docker;
+    }
+    if (config.settings
+        && !config.settings.license
+        && !config.settings.docker) {
+        delete config.settings;
+    }
+}
+export function getExplicitCliConfigValue(config, key) {
+    switch (key) {
+        case 'license.pkg-url':
+            return trimValue(config.settings?.license?.pkgUrl);
+        case 'docker.network':
+            return trimValue(config.settings?.docker?.network);
+        case 'docker.container-prefix':
+            return trimValue(config.settings?.docker?.containerPrefix);
+    }
+}
+export function getEffectiveCliConfigValue(config, key) {
+    const explicit = getExplicitCliConfigValue(config, key);
+    if (explicit) {
+        return explicit;
+    }
+    switch (key) {
+        case 'license.pkg-url':
+            return DEFAULT_LICENSE_PKG_URL;
+        case 'docker.network':
+            return trimValue(config.name) || DEFAULT_DOCKER_NETWORK;
+        case 'docker.container-prefix':
+            return trimValue(config.name) || DEFAULT_DOCKER_CONTAINER_PREFIX;
+    }
+}
+export function normalizeCliConfigValue(key, value) {
+    const normalized = value.trim();
+    if (!normalized) {
+        throw new Error(`Config key "${key}" requires a non-empty value.`);
+    }
+    if (key === 'license.pkg-url') {
+        return normalized.replace(/\/+$/, '') + '/';
+    }
+    return normalized;
+}
+export async function loadCliConfig(options = {}) {
+    return await loadExactAuthConfig(resolveScope(options));
+}
+export async function getCliConfigValue(key, options = {}) {
+    const config = await loadCliConfig(options);
+    return getEffectiveCliConfigValue(config, key);
+}
+export async function listExplicitCliConfigValues(options = {}) {
+    const config = await loadCliConfig(options);
+    const out = {};
+    for (const key of SUPPORTED_CLI_CONFIG_KEYS) {
+        const value = getExplicitCliConfigValue(config, key);
+        if (value) {
+            out[key] = value;
+        }
+    }
+    return out;
+}
+export async function setCliConfigValue(key, value, options = {}) {
+    const scope = resolveScope(options);
+    const config = await loadExactAuthConfig(scope);
+    const normalized = normalizeCliConfigValue(key, value);
+    config.settings = cloneSettings(config);
+    switch (key) {
+        case 'license.pkg-url':
+            config.settings.license = {
+                ...(config.settings.license ?? {}),
+                pkgUrl: normalized,
+            };
+            break;
+        case 'docker.network':
+            config.settings.docker = {
+                ...(config.settings.docker ?? {}),
+                network: normalized,
+            };
+            break;
+        case 'docker.container-prefix':
+            config.settings.docker = {
+                ...(config.settings.docker ?? {}),
+                containerPrefix: normalized,
+            };
+            break;
+    }
+    pruneSettings(config);
+    await saveAuthConfig(config, scope);
+    return normalized;
+}
+export async function deleteCliConfigValue(key, options = {}) {
+    const scope = resolveScope(options);
+    const config = await loadExactAuthConfig(scope);
+    const hadValue = Boolean(getExplicitCliConfigValue(config, key));
+    if (!hadValue) {
+        return false;
+    }
+    config.settings = cloneSettings(config);
+    switch (key) {
+        case 'license.pkg-url':
+            if (config.settings.license) {
+                delete config.settings.license.pkgUrl;
+            }
+            break;
+        case 'docker.network':
+            if (config.settings.docker) {
+                delete config.settings.docker.network;
+            }
+            break;
+        case 'docker.container-prefix':
+            if (config.settings.docker) {
+                delete config.settings.docker.containerPrefix;
+            }
+            break;
+    }
+    pruneSettings(config);
+    await saveAuthConfig(config, scope);
+    return true;
+}
+export async function resolveDockerNetworkName(options = {}) {
+    return await getCliConfigValue('docker.network', options);
+}
+export async function resolveDockerContainerPrefix(options = {}) {
+    return await getCliConfigValue('docker.container-prefix', options);
+}
+export async function resolveLicensePkgUrlFromConfig(options = {}) {
+    return await getCliConfigValue('license.pkg-url', options);
+}

package/dist/lib/cli-home.js

@@ -6,15 +6,12 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 export const CLI_HOME_DIRNAME = '.nocobase';
-export const NB_CONFIG_SCOPE_ENV = 'NB_CONFIG_SCOPE';
 export const NB_CLI_ROOT_ENV = 'NB_CLI_ROOT';
 export function resolveDefaultConfigScope() {
-    const raw = String(process.env[NB_CONFIG_SCOPE_ENV] ?? '').trim().toLowerCase();
-    return raw === 'project' ? 'project' : 'global';
+    return 'global';
 }
 function readConfiguredPath(name) {
     const value = String(process.env[name] ?? '').trim();
@@ -24,28 +21,15 @@ function resolveGlobalCliHomeRoot() {
     return readConfiguredPath(NB_CLI_ROOT_ENV) ?? os.homedir();
 }
 export function resolveCliHomeRoot(scope = resolveDefaultConfigScope()) {
-    const cwdRoot = process.cwd();
-    if (scope === 'project') {
-        return cwdRoot;
-    }
-    if (scope === 'global') {
-        return resolveGlobalCliHomeRoot();
-    }
-    const cwdCliHome = path.join(cwdRoot, CLI_HOME_DIRNAME);
-    if (fs.existsSync(cwdCliHome)) {
-        return cwdRoot;
-    }
+    void scope;
     return resolveGlobalCliHomeRoot();
 }
 export function resolveCliHomeDir(scope = resolveDefaultConfigScope()) {
     return path.join(resolveCliHomeRoot(scope), CLI_HOME_DIRNAME);
 }
 export function resolveEnvRoot(scope = resolveDefaultConfigScope()) {
-    const envRoot = readConfiguredPath(NB_CLI_ROOT_ENV);
-    if (envRoot) {
-        return path.resolve(envRoot);
-    }
-    return resolveCliHomeRoot(scope);
+    void scope;
+    return resolveCliHomeRoot();
 }
 export function resolveEnvRelativePath(relativePath, scope = resolveDefaultConfigScope()) {
     return path.resolve(resolveEnvRoot(scope), relativePath);
@@ -58,5 +42,6 @@ export function resolveConfiguredEnvPath(value, scope = resolveDefaultConfigScop
     return path.isAbsolute(text) ? text : resolveEnvRelativePath(text, scope);
 }
 export function formatCliHomeScope(scope) {
-    return scope === 'project' ? 'project' : 'global';
+    void scope;
+    return 'global';
 }