@blitzjs/config
Advanced tools
Comparing version 0.34.0-canary.2 to 0.34.0-danger.73bc3d68e.7
@@ -35,3 +35,3 @@ 'use strict'; | ||
function getProjectRoot() { | ||
return pkgDir__default['default'].sync() || process.cwd(); | ||
return path__default['default'].dirname(path__default['default'].resolve(process.cwd(), "blitz.config.js")) || pkgDir__default['default'].sync() || process.cwd(); | ||
} | ||
@@ -43,2 +43,4 @@ | ||
var getConfig = function getConfig(reload) { | ||
var _pkgJson; | ||
if (global.blitzConfig && Object.keys(global.blitzConfig).length > 0 && !reload) { | ||
@@ -52,6 +54,12 @@ return global.blitzConfig; | ||
var pkgJson = fsExtra.readJSONSync(path.join(getProjectRoot(), "package.json")); | ||
var pkgJson; | ||
var pkgJsonPath = path.join(getProjectRoot(), "package.json"); | ||
if (fsExtra.existsSync(pkgJsonPath)) { | ||
pkgJson = fsExtra.readJSONSync(path.join(getProjectRoot(), "package.json")); | ||
} | ||
var blitzConfig = { | ||
_meta: { | ||
packageName: pkgJson.name | ||
packageName: (_pkgJson = pkgJson) == null ? void 0 : _pkgJson.name | ||
} | ||
@@ -97,6 +105,6 @@ }; | ||
blitzConfig = _extends({}, blitzConfig, loadedNextConfig, loadedBlitzConfig); | ||
} catch (_unused) { | ||
} catch (error) { | ||
// https://github.com/blitz-js/blitz/issues/2080 | ||
if (!process.env.JEST_WORKER_ID) { | ||
console.error("Failed to load config in getConfig()"); | ||
console.error("Failed to load config in getConfig()", error); | ||
} | ||
@@ -103,0 +111,0 @@ } // Idk why, but during startup first result of loading blitz config is empty |
@@ -35,3 +35,3 @@ 'use strict'; | ||
function getProjectRoot() { | ||
return pkgDir__default['default'].sync() || process.cwd(); | ||
return path__default['default'].dirname(path__default['default'].resolve(process.cwd(), "blitz.config.js")) || pkgDir__default['default'].sync() || process.cwd(); | ||
} | ||
@@ -43,2 +43,4 @@ | ||
var getConfig = function getConfig(reload) { | ||
var _pkgJson; | ||
if (global.blitzConfig && Object.keys(global.blitzConfig).length > 0 && !reload) { | ||
@@ -52,6 +54,12 @@ return global.blitzConfig; | ||
var pkgJson = fsExtra.readJSONSync(path.join(getProjectRoot(), "package.json")); | ||
var pkgJson; | ||
var pkgJsonPath = path.join(getProjectRoot(), "package.json"); | ||
if (fsExtra.existsSync(pkgJsonPath)) { | ||
pkgJson = fsExtra.readJSONSync(path.join(getProjectRoot(), "package.json")); | ||
} | ||
var blitzConfig = { | ||
_meta: { | ||
packageName: pkgJson.name | ||
packageName: (_pkgJson = pkgJson) == null ? void 0 : _pkgJson.name | ||
} | ||
@@ -97,6 +105,6 @@ }; | ||
blitzConfig = _extends({}, blitzConfig, loadedNextConfig, loadedBlitzConfig); | ||
} catch (_unused) { | ||
} catch (error) { | ||
// https://github.com/blitz-js/blitz/issues/2080 | ||
if (!process.env.JEST_WORKER_ID) { | ||
console.error("Failed to load config in getConfig()"); | ||
console.error("Failed to load config in getConfig()", error); | ||
} | ||
@@ -103,0 +111,0 @@ } // Idk why, but during startup first result of loading blitz config is empty |
@@ -1,2 +0,2 @@ | ||
import { readJSONSync, existsSync } from 'fs-extra'; | ||
import { existsSync, readJSONSync } from 'fs-extra'; | ||
import path, { join } from 'path'; | ||
@@ -26,3 +26,3 @@ import pkgDir from 'pkg-dir'; | ||
function getProjectRoot() { | ||
return pkgDir.sync() || process.cwd(); | ||
return path.dirname(path.resolve(process.cwd(), "blitz.config.js")) || pkgDir.sync() || process.cwd(); | ||
} | ||
@@ -34,2 +34,4 @@ | ||
var getConfig = function getConfig(reload) { | ||
var _pkgJson; | ||
if (global.blitzConfig && Object.keys(global.blitzConfig).length > 0 && !reload) { | ||
@@ -43,6 +45,12 @@ return global.blitzConfig; | ||
var pkgJson = readJSONSync(join(getProjectRoot(), "package.json")); | ||
var pkgJson; | ||
var pkgJsonPath = join(getProjectRoot(), "package.json"); | ||
if (existsSync(pkgJsonPath)) { | ||
pkgJson = readJSONSync(join(getProjectRoot(), "package.json")); | ||
} | ||
var blitzConfig = { | ||
_meta: { | ||
packageName: pkgJson.name | ||
packageName: (_pkgJson = pkgJson) == null ? void 0 : _pkgJson.name | ||
} | ||
@@ -88,6 +96,6 @@ }; | ||
blitzConfig = _extends({}, blitzConfig, loadedNextConfig, loadedBlitzConfig); | ||
} catch (_unused) { | ||
} catch (error) { | ||
// https://github.com/blitz-js/blitz/issues/2080 | ||
if (!process.env.JEST_WORKER_ID) { | ||
console.error("Failed to load config in getConfig()"); | ||
console.error("Failed to load config in getConfig()", error); | ||
} | ||
@@ -94,0 +102,0 @@ } // Idk why, but during startup first result of loading blitz config is empty |
{ | ||
"name": "@blitzjs/config", | ||
"version": "0.34.0-canary.2", | ||
"version": "0.34.0-danger.73bc3d68e.7+73bc3d68e", | ||
"description": "Loads the blitz app config", | ||
@@ -26,3 +26,3 @@ "license": "MIT", | ||
}, | ||
"gitHead": "f3d0f7f79d03c661a14fc57f8c81c8368dd7f7ef", | ||
"gitHead": "73bc3d68eb12f9f2a6f923ed82bca12e8e92776a", | ||
"dependencies": { | ||
@@ -29,0 +29,0 @@ "fs-extra": "^9.1.0", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Manifest confusion
Supply chain riskThis package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
14165
299
7