@blitzjs/config
Advanced tools
Comparing version 0.38.3-canary.0 to 0.38.3-danger.2a111094b.12
@@ -5,13 +5,8 @@ 'use strict'; | ||
var esbuild = require('esbuild'); | ||
var fs = require('fs'); | ||
var fsExtra = require('fs-extra'); | ||
var path = require('path'); | ||
var pkgDir = require('pkg-dir'); | ||
function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } | ||
var fs__default = /*#__PURE__*/_interopDefault(fs); | ||
var path__default = /*#__PURE__*/_interopDefault(path); | ||
var pkgDir__default = /*#__PURE__*/_interopDefault(pkgDir); | ||
@@ -39,9 +34,5 @@ function _extends() { | ||
function getProjectRoot() { | ||
// TODO consolidate with nextjs/packages/next/server/lib/utils.ts | ||
// IF THIS IS UPDATED, so does the one inside nextjs | ||
return path__default['default'].dirname(getConfigSrcPath()); | ||
} | ||
function getConfigSrcPath() { | ||
// TODO consolidate with nextjs/packages/next/server/lib/utils.ts | ||
// IF THIS IS UPDATED, so does the one inside nextjs | ||
var tsPath = path__default['default'].resolve(path__default['default'].join(process.cwd(), "blitz.config.ts")); | ||
@@ -56,56 +47,3 @@ | ||
} | ||
function getConfigBuildPath() { | ||
return path__default['default'].join(getProjectRoot(), ".blitz", "blitz.config.js"); | ||
} | ||
async function buildConfig(_temp) { | ||
var _pkg$dependencies, _pkg$devDependencies; | ||
var _ref = _temp === void 0 ? {} : _temp, | ||
watch = _ref.watch; | ||
debug("Starting buildConfig..."); | ||
var dir = pkgDir__default['default'].sync(); | ||
if (!dir) { | ||
// This will happen when running blitz no inside a blitz app | ||
debug("Unable to find package directory"); | ||
return; | ||
} | ||
var pkg = fsExtra.readJSONSync(path__default['default'].join(dir, "package.json")); | ||
var srcPath = getConfigSrcPath(); | ||
if (fs__default['default'].readFileSync(srcPath, "utf8").includes("tsconfig-paths/register")) { | ||
// User is manually handling their own typescript stuff | ||
debug("Config contains 'tsconfig-paths/register', so skipping build"); | ||
return; | ||
} | ||
var esbuildOptions = { | ||
entryPoints: [srcPath], | ||
outfile: getConfigBuildPath(), | ||
format: "cjs", | ||
bundle: true, | ||
platform: "node", | ||
external: ["blitz", "next"].concat(Object.keys(require("blitz/package").dependencies), Object.keys((_pkg$dependencies = pkg == null ? void 0 : pkg.dependencies) != null ? _pkg$dependencies : {}), Object.keys((_pkg$devDependencies = pkg == null ? void 0 : pkg.devDependencies) != null ? _pkg$devDependencies : {})) | ||
}; | ||
if (watch) { | ||
esbuildOptions.watch = { | ||
onRebuild: function onRebuild(error) { | ||
if (error) { | ||
console.error("Failed to re-build blitz config"); | ||
} else { | ||
console.log("\n> Blitz config changed - restart for changes to take effect\n"); | ||
} | ||
} | ||
}; | ||
} | ||
debug("Building config..."); | ||
debug("Src: ", getConfigSrcPath()); | ||
debug("Build: ", getConfigBuildPath()); | ||
await esbuild.build(esbuildOptions); | ||
} | ||
/** | ||
@@ -125,2 +63,3 @@ * @param {boolean | undefined} reload - reimport config files to reset global cache | ||
var projectRoot = getProjectRoot(); | ||
var pkgJson; | ||
@@ -130,3 +69,3 @@ var pkgJsonPath = path.join(getProjectRoot(), "package.json"); | ||
if (fsExtra.existsSync(pkgJsonPath)) { | ||
pkgJson = fsExtra.readJSONSync(path.join(getProjectRoot(), "package.json")); | ||
pkgJson = fsExtra.readJSONSync(pkgJsonPath); | ||
} | ||
@@ -139,13 +78,4 @@ | ||
}; | ||
var projectRoot = getProjectRoot(); | ||
var nextConfigPath = path__default['default'].join(projectRoot, "next.config.js"); | ||
var blitzConfigPath; | ||
if (fsExtra.existsSync(path__default['default'].join(projectRoot, ".blitz"))) { | ||
blitzConfigPath = path__default['default'].join(projectRoot, ".blitz", "blitz.config.js"); | ||
} else { | ||
// projectRoot is inside .blitz/build/ | ||
blitzConfigPath = path__default['default'].join(projectRoot, "..", "blitz.config.js"); | ||
} | ||
var blitzConfigPath = path__default['default'].join(projectRoot, ".blitz.config.compiled.js"); | ||
debug("nextConfigPath: " + nextConfigPath); | ||
@@ -199,6 +129,4 @@ debug("blitzConfigPath: " + blitzConfigPath); | ||
exports.buildConfig = buildConfig; | ||
exports.getConfig = getConfig; | ||
exports.getConfigBuildPath = getConfigBuildPath; | ||
exports.getConfigSrcPath = getConfigSrcPath; | ||
exports.getProjectRoot = getProjectRoot; |
@@ -5,13 +5,8 @@ 'use strict'; | ||
var esbuild = require('esbuild'); | ||
var fs = require('fs'); | ||
var fsExtra = require('fs-extra'); | ||
var path = require('path'); | ||
var pkgDir = require('pkg-dir'); | ||
function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } | ||
var fs__default = /*#__PURE__*/_interopDefault(fs); | ||
var path__default = /*#__PURE__*/_interopDefault(path); | ||
var pkgDir__default = /*#__PURE__*/_interopDefault(pkgDir); | ||
@@ -39,9 +34,5 @@ function _extends() { | ||
function getProjectRoot() { | ||
// TODO consolidate with nextjs/packages/next/server/lib/utils.ts | ||
// IF THIS IS UPDATED, so does the one inside nextjs | ||
return path__default['default'].dirname(getConfigSrcPath()); | ||
} | ||
function getConfigSrcPath() { | ||
// TODO consolidate with nextjs/packages/next/server/lib/utils.ts | ||
// IF THIS IS UPDATED, so does the one inside nextjs | ||
var tsPath = path__default['default'].resolve(path__default['default'].join(process.cwd(), "blitz.config.ts")); | ||
@@ -56,56 +47,3 @@ | ||
} | ||
function getConfigBuildPath() { | ||
return path__default['default'].join(getProjectRoot(), ".blitz", "blitz.config.js"); | ||
} | ||
async function buildConfig(_temp) { | ||
var _pkg$dependencies, _pkg$devDependencies; | ||
var _ref = _temp === void 0 ? {} : _temp, | ||
watch = _ref.watch; | ||
debug("Starting buildConfig..."); | ||
var dir = pkgDir__default['default'].sync(); | ||
if (!dir) { | ||
// This will happen when running blitz no inside a blitz app | ||
debug("Unable to find package directory"); | ||
return; | ||
} | ||
var pkg = fsExtra.readJSONSync(path__default['default'].join(dir, "package.json")); | ||
var srcPath = getConfigSrcPath(); | ||
if (fs__default['default'].readFileSync(srcPath, "utf8").includes("tsconfig-paths/register")) { | ||
// User is manually handling their own typescript stuff | ||
debug("Config contains 'tsconfig-paths/register', so skipping build"); | ||
return; | ||
} | ||
var esbuildOptions = { | ||
entryPoints: [srcPath], | ||
outfile: getConfigBuildPath(), | ||
format: "cjs", | ||
bundle: true, | ||
platform: "node", | ||
external: ["blitz", "next"].concat(Object.keys(require("blitz/package").dependencies), Object.keys((_pkg$dependencies = pkg == null ? void 0 : pkg.dependencies) != null ? _pkg$dependencies : {}), Object.keys((_pkg$devDependencies = pkg == null ? void 0 : pkg.devDependencies) != null ? _pkg$devDependencies : {})) | ||
}; | ||
if (watch) { | ||
esbuildOptions.watch = { | ||
onRebuild: function onRebuild(error) { | ||
if (error) { | ||
console.error("Failed to re-build blitz config"); | ||
} else { | ||
console.log("\n> Blitz config changed - restart for changes to take effect\n"); | ||
} | ||
} | ||
}; | ||
} | ||
debug("Building config..."); | ||
debug("Src: ", getConfigSrcPath()); | ||
debug("Build: ", getConfigBuildPath()); | ||
await esbuild.build(esbuildOptions); | ||
} | ||
/** | ||
@@ -125,2 +63,3 @@ * @param {boolean | undefined} reload - reimport config files to reset global cache | ||
var projectRoot = getProjectRoot(); | ||
var pkgJson; | ||
@@ -130,3 +69,3 @@ var pkgJsonPath = path.join(getProjectRoot(), "package.json"); | ||
if (fsExtra.existsSync(pkgJsonPath)) { | ||
pkgJson = fsExtra.readJSONSync(path.join(getProjectRoot(), "package.json")); | ||
pkgJson = fsExtra.readJSONSync(pkgJsonPath); | ||
} | ||
@@ -139,13 +78,4 @@ | ||
}; | ||
var projectRoot = getProjectRoot(); | ||
var nextConfigPath = path__default['default'].join(projectRoot, "next.config.js"); | ||
var blitzConfigPath; | ||
if (fsExtra.existsSync(path__default['default'].join(projectRoot, ".blitz"))) { | ||
blitzConfigPath = path__default['default'].join(projectRoot, ".blitz", "blitz.config.js"); | ||
} else { | ||
// projectRoot is inside .blitz/build/ | ||
blitzConfigPath = path__default['default'].join(projectRoot, "..", "blitz.config.js"); | ||
} | ||
var blitzConfigPath = path__default['default'].join(projectRoot, ".blitz.config.compiled.js"); | ||
debug("nextConfigPath: " + nextConfigPath); | ||
@@ -199,6 +129,4 @@ debug("blitzConfigPath: " + blitzConfigPath); | ||
exports.buildConfig = buildConfig; | ||
exports.getConfig = getConfig; | ||
exports.getConfigBuildPath = getConfigBuildPath; | ||
exports.getConfigSrcPath = getConfigSrcPath; | ||
exports.getProjectRoot = getProjectRoot; |
@@ -1,6 +0,3 @@ | ||
import { build } from 'esbuild'; | ||
import fs from 'fs'; | ||
import { existsSync, readJSONSync } from 'fs-extra'; | ||
import path, { join } from 'path'; | ||
import pkgDir from 'pkg-dir'; | ||
@@ -28,9 +25,5 @@ function _extends() { | ||
function getProjectRoot() { | ||
// TODO consolidate with nextjs/packages/next/server/lib/utils.ts | ||
// IF THIS IS UPDATED, so does the one inside nextjs | ||
return path.dirname(getConfigSrcPath()); | ||
} | ||
function getConfigSrcPath() { | ||
// TODO consolidate with nextjs/packages/next/server/lib/utils.ts | ||
// IF THIS IS UPDATED, so does the one inside nextjs | ||
var tsPath = path.resolve(path.join(process.cwd(), "blitz.config.ts")); | ||
@@ -45,56 +38,3 @@ | ||
} | ||
function getConfigBuildPath() { | ||
return path.join(getProjectRoot(), ".blitz", "blitz.config.js"); | ||
} | ||
async function buildConfig(_temp) { | ||
var _pkg$dependencies, _pkg$devDependencies; | ||
var _ref = _temp === void 0 ? {} : _temp, | ||
watch = _ref.watch; | ||
debug("Starting buildConfig..."); | ||
var dir = pkgDir.sync(); | ||
if (!dir) { | ||
// This will happen when running blitz no inside a blitz app | ||
debug("Unable to find package directory"); | ||
return; | ||
} | ||
var pkg = readJSONSync(path.join(dir, "package.json")); | ||
var srcPath = getConfigSrcPath(); | ||
if (fs.readFileSync(srcPath, "utf8").includes("tsconfig-paths/register")) { | ||
// User is manually handling their own typescript stuff | ||
debug("Config contains 'tsconfig-paths/register', so skipping build"); | ||
return; | ||
} | ||
var esbuildOptions = { | ||
entryPoints: [srcPath], | ||
outfile: getConfigBuildPath(), | ||
format: "cjs", | ||
bundle: true, | ||
platform: "node", | ||
external: ["blitz", "next"].concat(Object.keys(require("blitz/package").dependencies), Object.keys((_pkg$dependencies = pkg == null ? void 0 : pkg.dependencies) != null ? _pkg$dependencies : {}), Object.keys((_pkg$devDependencies = pkg == null ? void 0 : pkg.devDependencies) != null ? _pkg$devDependencies : {})) | ||
}; | ||
if (watch) { | ||
esbuildOptions.watch = { | ||
onRebuild: function onRebuild(error) { | ||
if (error) { | ||
console.error("Failed to re-build blitz config"); | ||
} else { | ||
console.log("\n> Blitz config changed - restart for changes to take effect\n"); | ||
} | ||
} | ||
}; | ||
} | ||
debug("Building config..."); | ||
debug("Src: ", getConfigSrcPath()); | ||
debug("Build: ", getConfigBuildPath()); | ||
await build(esbuildOptions); | ||
} | ||
/** | ||
@@ -114,2 +54,3 @@ * @param {boolean | undefined} reload - reimport config files to reset global cache | ||
var projectRoot = getProjectRoot(); | ||
var pkgJson; | ||
@@ -119,3 +60,3 @@ var pkgJsonPath = join(getProjectRoot(), "package.json"); | ||
if (existsSync(pkgJsonPath)) { | ||
pkgJson = readJSONSync(join(getProjectRoot(), "package.json")); | ||
pkgJson = readJSONSync(pkgJsonPath); | ||
} | ||
@@ -128,13 +69,4 @@ | ||
}; | ||
var projectRoot = getProjectRoot(); | ||
var nextConfigPath = path.join(projectRoot, "next.config.js"); | ||
var blitzConfigPath; | ||
if (existsSync(path.join(projectRoot, ".blitz"))) { | ||
blitzConfigPath = path.join(projectRoot, ".blitz", "blitz.config.js"); | ||
} else { | ||
// projectRoot is inside .blitz/build/ | ||
blitzConfigPath = path.join(projectRoot, "..", "blitz.config.js"); | ||
} | ||
var blitzConfigPath = path.join(projectRoot, ".blitz.config.compiled.js"); | ||
debug("nextConfigPath: " + nextConfigPath); | ||
@@ -188,2 +120,2 @@ debug("blitzConfigPath: " + blitzConfigPath); | ||
export { buildConfig, getConfig, getConfigBuildPath, getConfigSrcPath, getProjectRoot }; | ||
export { getConfig, getConfigSrcPath, getProjectRoot }; |
@@ -37,7 +37,2 @@ import { NextConfig } from "next/dist/next-server/server/config"; | ||
export declare function getConfigSrcPath(): string; | ||
export declare function getConfigBuildPath(): string; | ||
interface BuildConfigOptions { | ||
watch?: boolean; | ||
} | ||
export declare function buildConfig({ watch }?: BuildConfigOptions): Promise<void>; | ||
declare global { | ||
@@ -44,0 +39,0 @@ namespace NodeJS { |
{ | ||
"name": "@blitzjs/config", | ||
"version": "0.38.3-canary.0", | ||
"version": "0.38.3-danger.2a111094b.12+2a111094b", | ||
"description": "Loads the blitz app config", | ||
@@ -28,3 +28,3 @@ "license": "MIT", | ||
}, | ||
"gitHead": "8df18f24ad7244b5bff1c5d5a3fe3f8e75a370f0", | ||
"gitHead": "2a111094b07df45127827f2737bfbbc0e247ea66", | ||
"dependencies": { | ||
@@ -31,0 +31,0 @@ "esbuild": "^0.11.12", |
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
Filesystem access
Supply chain riskAccesses the file system, and could potentially read sensitive data.
Found 1 instance in 1 package
8
15286
338
7