@blitzjs/config - npm Package Compare versions

Comparing version 0.35.0-canary.2 to 0.35.0-canary.3

dist/blitzjs-config.cjs.dev.js

@@ -5,2 +5,3 @@ 'use strict';
 
+var esbuild = require('esbuild');
 var fsExtra = require('fs-extra');
@@ -36,5 +37,54 @@ var path = require('path');
 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 pkg = fsExtra.readJSONSync(path__default['default'].join(pkgDir__default['default'].sync(), "package.json"));
+  debug("src", getConfigSrcPath());
+  debug("build", getConfigBuildPath());
+  var esbuildOptions = {
+    entryPoints: [getConfigSrcPath()],
+    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);
+}
+
 /**
@@ -68,3 +118,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);
@@ -118,3 +176,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,3 @@ 'use strict';
 
+var esbuild = require('esbuild');
 var fsExtra = require('fs-extra');
@@ -36,5 +37,54 @@ var path = require('path');
 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 pkg = fsExtra.readJSONSync(path__default['default'].join(pkgDir__default['default'].sync(), "package.json"));
+  debug("src", getConfigSrcPath());
+  debug("build", getConfigBuildPath());
+  var esbuildOptions = {
+    entryPoints: [getConfigSrcPath()],
+    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);
+}
+
 /**
@@ -68,3 +118,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);
@@ -118,3 +176,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,2 @@
+import { build } from 'esbuild';
 import { existsSync, readJSONSync } from 'fs-extra';
@@ -26,5 +27,54 @@ 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 pkg = readJSONSync(path.join(pkgDir.sync(), "package.json"));
+  debug("src", getConfigSrcPath());
+  debug("build", getConfigBuildPath());
+  var esbuildOptions = {
+    entryPoints: [getConfigSrcPath()],
+    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 +108,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 +166,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> {
@@ -29,1 +35,2 @@ target?: string;
 export declare const getConfig: (reload?: boolean | undefined) => BlitzConfig;
+export {};

package.json

 {
   "name": "@blitzjs/config",
-  "version": "0.35.0-canary.2",
+  "version": "0.35.0-canary.3",
   "description": "Loads the blitz app config",
@@ -26,4 +26,5 @@ "license": "MIT",
   },
-  "gitHead": "b6b27166fb256b169650b3d0641c7ba94fcaad7a",
+  "gitHead": "ea2137b928bff7288208c4a36d712f09954a8c8d",
   "dependencies": {
+    "esbuild": "^0.11.12",
     "fs-extra": "^9.1.0",
@@ -30,0 +31,0 @@ "pkg-dir": "^5.0.0"

No alert changes

Improved metrics

Total package byte prevSize

20311

increased by46.05%

Lines of code

462

increased by57.68%

Worsened metrics

Dependency count

3

increased by50%

Dependency changes

• + Addedesbuild@^0.11.12

• + Addedesbuild@0.11.23(transitive)