@blitzjs/config - npm Package Compare versions

Comparing version 0.35.0-danger.fa264b8d8.4 to 0.35.0

dist/blitzjs-config.cjs.dev.js

@@ -5,2 +5,4 @@ 'use strict';
 
+var esbuild = require('esbuild');
+var fs = require('fs');
 var fsExtra = require('fs-extra');
@@ -12,2 +14,3 @@ var path = require('path');
 
+var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
@@ -37,5 +40,68 @@ var pkgDir__default = /*#__PURE__*/_interopDefault(pkgDir);
 function getProjectRoot() {
-  return path__default['default'].dirname(path__default['default'].resolve(process.cwd(), "blitz.config.js")) || pkgDir__default['default'].sync() || process.cwd();
+  return path__default['default'].dirname(getConfigSrcPath());
 }
+function getConfigSrcPath() {
+  var tsPath = path__default['default'].resolve(path__default['default'].join(process.cwd(), "blitz.config.ts"));
 
+  if (fsExtra.existsSync(tsPath)) {
+    return tsPath;
+  } else {
+    var jsPath = path__default['default'].resolve(path__default['default'].join(process.cwd(), "blitz.config.js"));
+    return jsPath;
+  }
+}
+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);
+}
+
 /**
@@ -69,3 +135,11 @@ * @param {boolean | undefined} reload - reimport config files to reset global cache
   var nextConfigPath = path__default['default'].join(projectRoot, "next.config.js");
-  var blitzConfigPath = path__default['default'].join(projectRoot, "blitz.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");
+  }
+
   debug("nextConfigPath: " + nextConfigPath);
@@ -119,3 +193,6 @@ debug("blitzConfigPath: " + blitzConfigPath);
 
+exports.buildConfig = buildConfig;
 exports.getConfig = getConfig;
+exports.getConfigBuildPath = getConfigBuildPath;
+exports.getConfigSrcPath = getConfigSrcPath;
 exports.getProjectRoot = getProjectRoot;

dist/blitzjs-config.cjs.prod.js

@@ -5,2 +5,4 @@ 'use strict';
 
+var esbuild = require('esbuild');
+var fs = require('fs');
 var fsExtra = require('fs-extra');
@@ -12,2 +14,3 @@ var path = require('path');
 
+var fs__default = /*#__PURE__*/_interopDefault(fs);
 var path__default = /*#__PURE__*/_interopDefault(path);
@@ -37,5 +40,68 @@ var pkgDir__default = /*#__PURE__*/_interopDefault(pkgDir);
 function getProjectRoot() {
-  return path__default['default'].dirname(path__default['default'].resolve(process.cwd(), "blitz.config.js")) || pkgDir__default['default'].sync() || process.cwd();
+  return path__default['default'].dirname(getConfigSrcPath());
 }
+function getConfigSrcPath() {
+  var tsPath = path__default['default'].resolve(path__default['default'].join(process.cwd(), "blitz.config.ts"));
 
+  if (fsExtra.existsSync(tsPath)) {
+    return tsPath;
+  } else {
+    var jsPath = path__default['default'].resolve(path__default['default'].join(process.cwd(), "blitz.config.js"));
+    return jsPath;
+  }
+}
+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);
+}
+
 /**
@@ -69,3 +135,11 @@ * @param {boolean | undefined} reload - reimport config files to reset global cache
   var nextConfigPath = path__default['default'].join(projectRoot, "next.config.js");
-  var blitzConfigPath = path__default['default'].join(projectRoot, "blitz.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");
+  }
+
   debug("nextConfigPath: " + nextConfigPath);
@@ -119,3 +193,6 @@ debug("blitzConfigPath: " + blitzConfigPath);
 
+exports.buildConfig = buildConfig;
 exports.getConfig = getConfig;
+exports.getConfigBuildPath = getConfigBuildPath;
+exports.getConfigSrcPath = getConfigSrcPath;
 exports.getProjectRoot = getProjectRoot;

dist/blitzjs-config.esm.js

@@ -0,1 +1,3 @@
+import { build } from 'esbuild';
+import fs from 'fs';
 import { existsSync, readJSONSync } from 'fs-extra';
@@ -26,5 +28,68 @@ import path, { join } from 'path';
 function getProjectRoot() {
-  return path.dirname(path.resolve(process.cwd(), "blitz.config.js")) || pkgDir.sync() || process.cwd();
+  return path.dirname(getConfigSrcPath());
 }
+function getConfigSrcPath() {
+  var tsPath = path.resolve(path.join(process.cwd(), "blitz.config.ts"));
 
+  if (existsSync(tsPath)) {
+    return tsPath;
+  } else {
+    var jsPath = path.resolve(path.join(process.cwd(), "blitz.config.js"));
+    return jsPath;
+  }
+}
+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);
+}
+
 /**
@@ -58,3 +123,11 @@ * @param {boolean | undefined} reload - reimport config files to reset global cache
   var nextConfigPath = path.join(projectRoot, "next.config.js");
-  var blitzConfigPath = path.join(projectRoot, "blitz.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");
+  }
+
   debug("nextConfigPath: " + nextConfigPath);
@@ -108,2 +181,2 @@ debug("blitzConfigPath: " + blitzConfigPath);
 
-export { getConfig, getProjectRoot };
+export { buildConfig, getConfig, getConfigBuildPath, getConfigSrcPath, getProjectRoot };

dist/declarations/src/index.d.ts

 export declare function getProjectRoot(): string;
+export declare function getConfigSrcPath(): string;
+export declare function getConfigBuildPath(): string;
+interface BuildConfigOptions {
+    watch?: boolean;
+}
+export declare function buildConfig({ watch }?: BuildConfigOptions): Promise<void>;
 export interface BlitzConfig extends Record<string, unknown> {
@@ -6,3 +12,3 @@ target?: string;
         isomorphicResolverImports?: boolean;
-        reactMode?: string;
+        reactRoot?: boolean;
     };
@@ -18,2 +24,9 @@ cli?: {
     };
+    middleware?: Record<string, any> & {
+        (req: any, res: any, next: any): Promise<void> | void;
+        type?: string;
+        config?: {
+            cookiePrefix?: string;
+        };
+    }[];
 }
@@ -31,1 +44,2 @@ declare global {
 export declare const getConfig: (reload?: boolean | undefined) => BlitzConfig;
+export {};

package.json

 {
   "name": "@blitzjs/config",
-  "version": "0.35.0-danger.fa264b8d8.4+fa264b8d8",
+  "version": "0.35.0",
   "description": "Loads the blitz app config",
@@ -26,4 +26,5 @@ "license": "MIT",
   },
-  "gitHead": "fa264b8d8cb2a39faa68188c3ba8cfe1866a7300",
+  "gitHead": "782a71026ec2183219f1b1359d67c87c631a9f8b",
   "dependencies": {
+    "esbuild": "^0.11.12",
     "fs-extra": "^9.1.0",
@@ -30,0 +31,0 @@ "pkg-dir": "^5.0.0"

New alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

Manifest confusion

Supply chain risk

This package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

21747

increased by56.15%

Lines of code

504

increased by72.01%

Number of medium supply chain risk alerts

6

decreased by-14.29%

Worsened metrics

Dependency count

3

increased by50%

Number of low supply chain risk alerts

11

increased by37.5%

Dependency changes

• + Addedesbuild@^0.11.12

• + Addedesbuild@0.11.23(transitive)