@granite-js/cli 0.1.8 → 0.1.10

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @granite-js/cli
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies [9438be5]
+  - @granite-js/plugin-core@0.1.10
+  - @granite-js/mpack@0.1.10
+  - @granite-js/utils@0.1.10
+
+## 0.1.9
+
+### Patch Changes
+
+- 935bb36: fix `BuildUtils` errors and incorrect plugin types
+- Updated dependencies [935bb36]
+  - @granite-js/plugin-core@0.1.9
+  - @granite-js/mpack@0.1.9
+  - @granite-js/utils@0.1.9
+
 ## 0.1.8
 
 ### Patch Changes

package/dist/index.cjs

@@ -30,43 +30,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  defineConfig: () => defineConfig,
-  initialize: () => initialize,
-  loadConfig: () => loadConfig
+  initialize: () => initialize
 });
 module.exports = __toCommonJS(index_exports);
 var import_clipanion4 = require("clipanion");
-var import_cosmiconfig2 = require("cosmiconfig");
 
 // src/commands/BuildCommand/BuildCommand.ts
 var import_mpack = require("@granite-js/mpack");
 var import_plugins = require("@granite-js/mpack/plugins");
+var import_plugin_core = require("@granite-js/plugin-core");
 var import_clipanion = require("clipanion");
-
-// src/config/loadConfig.ts
-var import_utils = require("@granite-js/utils");
-var import_cosmiconfig = require("cosmiconfig");
-var import_cosmiconfig_typescript_loader = require("cosmiconfig-typescript-loader");
-var MODULE_NAME = "granite";
-var loadConfig = async () => {
-  const explorer = (0, import_cosmiconfig.cosmiconfig)(MODULE_NAME, {
-    searchPlaces: [
-      `${MODULE_NAME}.config.ts`,
-      `${MODULE_NAME}.config.mts`,
-      `${MODULE_NAME}.config.js`,
-      `${MODULE_NAME}.config.cjs`
-    ],
-    loaders: {
-      ".ts": (0, import_cosmiconfig_typescript_loader.TypeScriptLoader)(),
-      ".mts": (0, import_cosmiconfig_typescript_loader.TypeScriptLoader)()
-    }
-  });
-  const result = await explorer.search((0, import_utils.getPackageRoot)());
-  const config = await result?.config;
-  return config;
-};
-
-// src/commands/BuildCommand/BuildCommand.ts
 var BuildCommand = class extends import_clipanion.Command {
   static paths = [[`build`]];
   static usage = import_clipanion.Command.Usage({
@@ -74,6 +47,9 @@ var BuildCommand = class extends import_clipanion.Command {
     description: "Build Granite App",
     examples: [["Build Granite App", "granite build"]]
   });
+  configFile = import_clipanion.Option.String("--config", {
+    description: "Path to config file"
+  });
   dev = import_clipanion.Option.Boolean("--dev", {
     description: "Build in development mode"
   });
@@ -85,8 +61,8 @@ var BuildCommand = class extends import_clipanion.Command {
   });
   async execute() {
     try {
-      const { cache = true, metafile = false, dev = false } = this;
-      const config = await loadConfig();
+      const { configFile, cache = true, metafile = false, dev = false } = this;
+      const config = await (0, import_plugin_core.loadConfig)({ configFile });
       const options = ["android", "ios"].map((platform) => ({
         dev,
         cache,
@@ -188,6 +164,7 @@ var HermesCommand = class extends import_clipanion2.Command {
 
 // src/commands/DevCommand/DevCommand.ts
 var import_mpack2 = require("@granite-js/mpack");
+var import_plugin_core2 = require("@granite-js/plugin-core");
 var import_clipanion3 = require("clipanion");
 var import_debug = __toESM(require("debug"), 1);
 var debug = (0, import_debug.default)("cli");
@@ -198,6 +175,9 @@ var DevCommand = class extends import_clipanion3.Command {
     description: "Run Granite development server",
     examples: [["Run Granite development server", "granite dev"]]
   });
+  configFile = import_clipanion3.Option.String("--config", {
+    description: "Path to config file"
+  });
   host = import_clipanion3.Option.String("--host");
   port = import_clipanion3.Option.String("--port");
   disableEmbeddedReactDevTools = import_clipanion3.Option.Boolean("--disable-embedded-react-devtools", false);
@@ -206,7 +186,7 @@ var DevCommand = class extends import_clipanion3.Command {
   async execute() {
     try {
       process.env.MPACK_DEV_SERVER = "true";
-      const config = await loadConfig();
+      const config = await (0, import_plugin_core2.loadConfig)({ configFile: this.configFile });
       const serverOptions = {
         host: this.host,
         port: this.port ? parseInt(this.port, 10) : void 0
@@ -235,83 +215,6 @@ var DevCommand = class extends import_clipanion3.Command {
   }
 };
 
-// src/config/defineConfig.ts
-var import_path4 = __toESM(require("path"), 1);
-var import_plugin_core = require("@granite-js/plugin-core");
-var import_utils3 = require("@granite-js/utils");
-var import_es_toolkit2 = require("es-toolkit");
-
-// src/config/graniteGlobals.ts
-var import_fs = __toESM(require("fs"), 1);
-var import_path3 = __toESM(require("path"), 1);
-var import_utils2 = require("@granite-js/utils");
-function prepareGraniteGlobalsScript(config) {
-  const filePath = writeGraniteGlobalsScript(config);
-  return {
-    esbuild: {
-      prelude: [filePath]
-    },
-    metro: {
-      serializer: {
-        getPolyfills: () => [filePath]
-      }
-    }
-  };
-}
-function writeGraniteGlobalsScript(config) {
-  const script = getGraniteGlobalScript(config);
-  const filePath = import_path3.default.join((0, import_utils2.getLocalTempDirectoryPath)(config.rootDir), "granite-globals.js");
-  (0, import_utils2.prepareLocalDirectory)(config.rootDir);
-  import_fs.default.writeFileSync(filePath, script, "utf-8");
-  return filePath;
-}
-function getGraniteGlobalScript({ appName, scheme }) {
-  return [
-    "global.__granite = global.__granite || {};",
-    `global.__granite.app = { name: ${JSON.stringify(appName)}, scheme: ${JSON.stringify(scheme)} };`
-  ].join("\n");
-}
-
-// src/config/defineConfig.ts
-var defineConfig = async (config) => {
-  const parsed = import_plugin_core.pluginConfigSchema.parse(config);
-  const cwd = parsed.cwd ?? (0, import_utils3.getPackageRoot)();
-  const appName = parsed.appName;
-  const scheme = parsed.scheme;
-  const entryFile = import_path4.default.resolve(cwd, parsed.entryFile);
-  const outdir = import_path4.default.join(cwd, parsed.outdir);
-  const parsedBuildConfig = parsed.build;
-  const parsedDevServerConfig = parsed.devServer;
-  const parsedMetroConfig = parsed.metro;
-  const parsedConfig = {
-    ...parsedBuildConfig,
-    devServer: parsedDevServerConfig,
-    metro: parsedMetroConfig
-  };
-  const { configs, pluginHooks } = await (0, import_plugin_core.resolvePlugins)(parsed.plugins);
-  const globalsScriptConfig = prepareGraniteGlobalsScript({ rootDir: cwd, appName, scheme });
-  const mergedConfig = (0, import_plugin_core.mergeConfig)(parsedConfig, ...[globalsScriptConfig, ...configs].filter(import_es_toolkit2.isNotNil));
-  const { metro, devServer, ...buildConfig } = mergedConfig ?? {};
-  return {
-    cwd,
-    entryFile,
-    appName,
-    scheme,
-    outdir,
-    devServer,
-    pluginHooks,
-    build: {
-      ...buildConfig,
-      entry: entryFile
-    },
-    metro: {
-      ...metro,
-      babelConfig: mergedConfig?.babel,
-      transformSync: mergedConfig?.transformer?.transformSync
-    }
-  };
-};
-
 // src/index.ts
 var cli = new import_clipanion4.Cli({
   binaryLabel: "granite",
@@ -319,20 +222,13 @@ var cli = new import_clipanion4.Cli({
   enableCapture: true
 });
 async function initialize() {
-  const explorer = await (0, import_cosmiconfig2.cosmiconfig)("mpack");
-  const result = await explorer.search(process.cwd());
   cli.register(BuildCommand);
   cli.register(HermesCommand);
   cli.register(DevCommand);
   cli.register(import_clipanion4.Builtins.HelpCommand);
-  if (Array.isArray(result?.config?.commands)) {
-    (result?.config?.commands).forEach((command) => cli.register(command));
-  }
   cli.runExit(process.argv.slice(2));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  defineConfig,
-  initialize,
-  loadConfig
+  initialize
 });

package/dist/index.d.cts

@@ -1,57 +1,3 @@
-import { GraniteConfig, CompleteGraniteConfig } from '@granite-js/plugin-core';
-
-/**
- * @public
- * @category Configuration
- * @name defineConfig
- * @description
- * Configures your Granite application by defining key settings in `granite.config.ts`.
- *
- * The configuration lets you specify:
- * - How users will access your app through a URL scheme (e.g. `granite://`)
- * - Your app's unique name that appears in the URL (e.g. `granite://my-service`)
- * - Build settings for bundlers like ESBuild and Metro
- * - Code transformation settings through Babel
- * - Additional functionality through Granite plugins
- *
- * @param config - Configuration options
- * @param config.cwd - Working directory for build process (defaults to process.cwd())
- * @param config.appName - Your app's unique identifier
- * @param config.scheme - URL scheme for launching your app (e.g. 'granite')
- * @param config.outdir - Where to output build files (defaults to 'dist')
- * @param config.entryFile - Your app's entry point (defaults to './src/_app.tsx')
- * @param config.build - Customize build settings
- * @param config.metro - Configure Metro bundler settings
- * @param config.devServer - Configure Mpack dev server settings
- * @param config.plugins - Granite plugins to enhance functionality
- * @returns The processed configuration
- *
- * @example
- * Here's a basic configuration that:
- * - Makes your app accessible via the `granite://` scheme
- * - Names your service "my-app" so it's reachable at `granite://my-app`
- * - Uses the Hermes plugin to optimize JavaScript bundles into bytecode
- *
- * ```ts
- * import { defineConfig } from '@granite-js/react-native/config';
- * import { hermes } from '@granite-js/plugin-hermes';
- *
- * export default defineConfig({
- *   // The name of your microservice
- *   appName: 'my-app',
- *   // The URL scheme for deep linking
- *   scheme: 'granite',
- *   // Entry file path
- *   entryFile: 'index.ts',
- *   // Array of plugins to use
- *   plugins: [hermes()],
- * });
- * ```
- */
-declare const defineConfig: (config: GraniteConfig) => Promise<CompleteGraniteConfig>;
-
-declare const loadConfig: () => Promise<CompleteGraniteConfig>;
-
 declare function initialize(): Promise<void>;
 
-export { defineConfig, initialize, loadConfig };
+export { initialize };

package/dist/index.d.ts

@@ -1,57 +1,3 @@
-import { GraniteConfig, CompleteGraniteConfig } from '@granite-js/plugin-core';
-
-/**
- * @public
- * @category Configuration
- * @name defineConfig
- * @description
- * Configures your Granite application by defining key settings in `granite.config.ts`.
- *
- * The configuration lets you specify:
- * - How users will access your app through a URL scheme (e.g. `granite://`)
- * - Your app's unique name that appears in the URL (e.g. `granite://my-service`)
- * - Build settings for bundlers like ESBuild and Metro
- * - Code transformation settings through Babel
- * - Additional functionality through Granite plugins
- *
- * @param config - Configuration options
- * @param config.cwd - Working directory for build process (defaults to process.cwd())
- * @param config.appName - Your app's unique identifier
- * @param config.scheme - URL scheme for launching your app (e.g. 'granite')
- * @param config.outdir - Where to output build files (defaults to 'dist')
- * @param config.entryFile - Your app's entry point (defaults to './src/_app.tsx')
- * @param config.build - Customize build settings
- * @param config.metro - Configure Metro bundler settings
- * @param config.devServer - Configure Mpack dev server settings
- * @param config.plugins - Granite plugins to enhance functionality
- * @returns The processed configuration
- *
- * @example
- * Here's a basic configuration that:
- * - Makes your app accessible via the `granite://` scheme
- * - Names your service "my-app" so it's reachable at `granite://my-app`
- * - Uses the Hermes plugin to optimize JavaScript bundles into bytecode
- *
- * ```ts
- * import { defineConfig } from '@granite-js/react-native/config';
- * import { hermes } from '@granite-js/plugin-hermes';
- *
- * export default defineConfig({
- *   // The name of your microservice
- *   appName: 'my-app',
- *   // The URL scheme for deep linking
- *   scheme: 'granite',
- *   // Entry file path
- *   entryFile: 'index.ts',
- *   // Array of plugins to use
- *   plugins: [hermes()],
- * });
- * ```
- */
-declare const defineConfig: (config: GraniteConfig) => Promise<CompleteGraniteConfig>;
-
-declare const loadConfig: () => Promise<CompleteGraniteConfig>;
-
 declare function initialize(): Promise<void>;
 
-export { defineConfig, initialize, loadConfig };
+export { initialize };

package/dist/index.js

@@ -8,37 +8,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/index.ts
 import { Builtins, Cli } from "clipanion";
-import { cosmiconfig as cosmiconfig2 } from "cosmiconfig";
 
 // src/commands/BuildCommand/BuildCommand.ts
 import { BuildUtils } from "@granite-js/mpack";
 import { statusPlugin } from "@granite-js/mpack/plugins";
+import { loadConfig } from "@granite-js/plugin-core";
 import { Command, Option } from "clipanion";
-
-// src/config/loadConfig.ts
-import { getPackageRoot } from "@granite-js/utils";
-import { cosmiconfig } from "cosmiconfig";
-import { TypeScriptLoader } from "cosmiconfig-typescript-loader";
-var MODULE_NAME = "granite";
-var loadConfig = async () => {
-  const explorer = cosmiconfig(MODULE_NAME, {
-    searchPlaces: [
-      `${MODULE_NAME}.config.ts`,
-      `${MODULE_NAME}.config.mts`,
-      `${MODULE_NAME}.config.js`,
-      `${MODULE_NAME}.config.cjs`
-    ],
-    loaders: {
-      ".ts": TypeScriptLoader(),
-      ".mts": TypeScriptLoader()
-    }
-  });
-  const result = await explorer.search(getPackageRoot());
-  const config = await result?.config;
-  return config;
-};
-
-// src/commands/BuildCommand/BuildCommand.ts
 var BuildCommand = class extends Command {
   static paths = [[`build`]];
   static usage = Command.Usage({
@@ -46,6 +21,9 @@ var BuildCommand = class extends Command {
     description: "Build Granite App",
     examples: [["Build Granite App", "granite build"]]
   });
+  configFile = Option.String("--config", {
+    description: "Path to config file"
+  });
   dev = Option.Boolean("--dev", {
     description: "Build in development mode"
   });
@@ -57,8 +35,8 @@ var BuildCommand = class extends Command {
   });
   async execute() {
     try {
-      const { cache = true, metafile = false, dev = false } = this;
-      const config = await loadConfig();
+      const { configFile, cache = true, metafile = false, dev = false } = this;
+      const config = await loadConfig({ configFile });
       const options = ["android", "ios"].map((platform) => ({
         dev,
         cache,
@@ -160,6 +138,7 @@ var HermesCommand = class extends Command2 {
 
 // src/commands/DevCommand/DevCommand.ts
 import { runServer, EXPERIMENTAL__server } from "@granite-js/mpack";
+import { loadConfig as loadConfig2 } from "@granite-js/plugin-core";
 import { Command as Command3, Option as Option3 } from "clipanion";
 import Debug from "debug";
 var debug = Debug("cli");
@@ -170,6 +149,9 @@ var DevCommand = class extends Command3 {
     description: "Run Granite development server",
     examples: [["Run Granite development server", "granite dev"]]
   });
+  configFile = Option3.String("--config", {
+    description: "Path to config file"
+  });
   host = Option3.String("--host");
   port = Option3.String("--port");
   disableEmbeddedReactDevTools = Option3.Boolean("--disable-embedded-react-devtools", false);
@@ -178,7 +160,7 @@ var DevCommand = class extends Command3 {
   async execute() {
     try {
       process.env.MPACK_DEV_SERVER = "true";
-      const config = await loadConfig();
+      const config = await loadConfig2({ configFile: this.configFile });
       const serverOptions = {
         host: this.host,
         port: this.port ? parseInt(this.port, 10) : void 0
@@ -207,87 +189,6 @@ var DevCommand = class extends Command3 {
   }
 };
 
-// src/config/defineConfig.ts
-import path4 from "path";
-import {
-  resolvePlugins,
-  mergeConfig,
-  pluginConfigSchema
-} from "@granite-js/plugin-core";
-import { getPackageRoot as getPackageRoot2 } from "@granite-js/utils";
-import { isNotNil as isNotNil2 } from "es-toolkit";
-
-// src/config/graniteGlobals.ts
-import fs from "fs";
-import path3 from "path";
-import { getLocalTempDirectoryPath, prepareLocalDirectory } from "@granite-js/utils";
-function prepareGraniteGlobalsScript(config) {
-  const filePath = writeGraniteGlobalsScript(config);
-  return {
-    esbuild: {
-      prelude: [filePath]
-    },
-    metro: {
-      serializer: {
-        getPolyfills: () => [filePath]
-      }
-    }
-  };
-}
-function writeGraniteGlobalsScript(config) {
-  const script = getGraniteGlobalScript(config);
-  const filePath = path3.join(getLocalTempDirectoryPath(config.rootDir), "granite-globals.js");
-  prepareLocalDirectory(config.rootDir);
-  fs.writeFileSync(filePath, script, "utf-8");
-  return filePath;
-}
-function getGraniteGlobalScript({ appName, scheme }) {
-  return [
-    "global.__granite = global.__granite || {};",
-    `global.__granite.app = { name: ${JSON.stringify(appName)}, scheme: ${JSON.stringify(scheme)} };`
-  ].join("\n");
-}
-
-// src/config/defineConfig.ts
-var defineConfig = async (config) => {
-  const parsed = pluginConfigSchema.parse(config);
-  const cwd = parsed.cwd ?? getPackageRoot2();
-  const appName = parsed.appName;
-  const scheme = parsed.scheme;
-  const entryFile = path4.resolve(cwd, parsed.entryFile);
-  const outdir = path4.join(cwd, parsed.outdir);
-  const parsedBuildConfig = parsed.build;
-  const parsedDevServerConfig = parsed.devServer;
-  const parsedMetroConfig = parsed.metro;
-  const parsedConfig = {
-    ...parsedBuildConfig,
-    devServer: parsedDevServerConfig,
-    metro: parsedMetroConfig
-  };
-  const { configs, pluginHooks } = await resolvePlugins(parsed.plugins);
-  const globalsScriptConfig = prepareGraniteGlobalsScript({ rootDir: cwd, appName, scheme });
-  const mergedConfig = mergeConfig(parsedConfig, ...[globalsScriptConfig, ...configs].filter(isNotNil2));
-  const { metro, devServer, ...buildConfig } = mergedConfig ?? {};
-  return {
-    cwd,
-    entryFile,
-    appName,
-    scheme,
-    outdir,
-    devServer,
-    pluginHooks,
-    build: {
-      ...buildConfig,
-      entry: entryFile
-    },
-    metro: {
-      ...metro,
-      babelConfig: mergedConfig?.babel,
-      transformSync: mergedConfig?.transformer?.transformSync
-    }
-  };
-};
-
 // src/index.ts
 var cli = new Cli({
   binaryLabel: "granite",
@@ -295,19 +196,12 @@ var cli = new Cli({
   enableCapture: true
 });
 async function initialize() {
-  const explorer = await cosmiconfig2("mpack");
-  const result = await explorer.search(process.cwd());
   cli.register(BuildCommand);
   cli.register(HermesCommand);
   cli.register(DevCommand);
   cli.register(Builtins.HelpCommand);
-  if (Array.isArray(result?.config?.commands)) {
-    (result?.config?.commands).forEach((command) => cli.register(command));
-  }
   cli.runExit(process.argv.slice(2));
 }
 export {
-  defineConfig,
-  initialize,
-  loadConfig
+  initialize
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/cli",
   "type": "module",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "The Granite CLI",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -44,19 +44,17 @@
     "vitest": "^3.0.7"
   },
   "dependencies": {
-    "@granite-js/mpack": "0.1.8",
-    "@granite-js/plugin-core": "0.1.8",
-    "@granite-js/utils": "0.1.8",
+    "@granite-js/mpack": "0.1.10",
+    "@granite-js/plugin-core": "0.1.10",
+    "@granite-js/utils": "0.1.10",
     "@inquirer/prompts": "^7.2.3",
     "@shopify/semaphore": "^3.1.0",
     "chalk": "^4",
     "clipanion": "^4.0.0-rc.4",
     "connect": "^3.7.0",
-    "cosmiconfig": "^9.0.0",
-    "cosmiconfig-typescript-loader": "^5.1.0",
     "debug": "^4.3.7",
     "enquirer": "^2.4.1",
-    "es-toolkit": "^1.32.0",
+    "es-toolkit": "^1.39.8",
     "execa": "^5",
     "ora": "^5",
     "typanion": "^3.14.0",