feat: use cli-config

package.json

@@ -30,8 +30,8 @@
     "@dfinity/identity": "^0.20.2",
     "@dfinity/principal": "^0.20.2",
     "@junobuild/admin": "^0.0.45",
+    "@junobuild/cli-config": "file:../juno-js/packages/cli-config",
     "@junobuild/core-peer": "^0.0.10",
-    "@junobuild/types": "file:../juno-js/packages/types",
     "@junobuild/utils": "^0.0.18",
     "conf": "^12.0.0",
     "file-type": "^19.0.0",

src/configs/juno.config.ts

@@ -1,4 +1,5 @@
-import {existsSync, readFileSync} from 'node:fs';
+import type {JunoConfigFnOrObject} from '@junobuild/cli-config';
+import {existsSync} from 'node:fs';
 import {access, readFile, writeFile} from 'node:fs/promises';
 import {join} from 'node:path';
 import {JUNO_CONFIG_FILENAME} from '../constants/constants';
@@ -97,30 +98,14 @@ const writeJunoConfig = async (config: JunoConfig): Promise<void> => {
   await writeFile(JUNO_CONFIG_FILENAME, JSON.stringify(config, null, 2), 'utf-8');
 };
 
-// TODO: replace
-export function defineConfig(config: JunoConfig): JunoConfig;
-export function defineConfig(config: JunoConfig): JunoConfig {
-  return config;
-}
-
 const readJunoConfig = async (): Promise<JunoConfig> => {
   const {configPath, configType} = junoConfigFile();
 
   switch (configType) {
     case 'ts': {
-
-      // const module = await import(`data:text/javascript;base64,${Buffer.from(readFileSync(configPath).toString()).toString(`base64`)}`);
-      // console.log('MODUE', module)
-      //
-      // console.log(readFileSync(configPath).toString());
-      // const tmp = `data:text/javascript,${readFileSync(configPath).toString()}`;
-      // const result = await import(tmp);
-      //
-      //
-      // console.log('instance', result);
-
-      const userConfig = nodeRequire<JunoConfig | typeof defineConfig>(configPath).default;
-      const config = typeof userConfig === 'function' ? userConfig : userConfig;
+      const userConfig = nodeRequire<JunoConfigFnOrObject>(configPath).default;
+      const config =
+        typeof userConfig === 'function' ? userConfig({mode: 'production'}) : userConfig;
 
       console.log('Config', config);
 

src/utils/node.utils.ts

@@ -1,7 +1,7 @@
 import {transformFileSync} from '@babel/core';
 import * as mod from '@babel/plugin-transform-modules-commonjs';
 import * as ts from '@babel/preset-typescript';
-import * as tst from "@junobuild/types";
+import {defineConfig, type JunoConfig} from '@junobuild/cli-config';
 import {readFileSync} from 'node:fs';
 
 /**
@@ -12,6 +12,9 @@ export const nodeRequire = <T>(id: string): {default: T} => {
   // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
   delete require.cache[id];
 
+  const Module = require('module');
+  const originalLoad = Module._load;
+
   try {
     // let's override node's require for a second
     // don't worry, we'll revert this when we're done
@@ -26,9 +29,6 @@ export const nodeRequire = <T>(id: string): {default: T} => {
           presets: [ts.default],
           plugins: [mod.default]
         }).code;
-
-        console.log(sourceText)
-
       } else {
         // quick hack to turn a modern es module
         // into and old school commonjs module
@@ -45,11 +45,27 @@ export const nodeRequire = <T>(id: string): {default: T} => {
       (module as NodeModuleWithCompile)._compile(sourceText, fileName);
     };
 
+    // We override defineConfig because the library is unknown in the module we are trying to load.
+    // This need to be a function and not an arrow function because of the "arguments"
+    Module._load = function (request: string): unknown {
+      if (request === '@junobuild/cli-config') {
+        return {
+          defineConfig: (config: JunoConfig) => defineConfig(config)
+        };
+      }
+
+      // @ts-ignore arguments are passed by NodeJS
+      return originalLoad.apply(this, arguments);
+    };
+
     // let's do this!
     return require(id);
   } finally {
     // all set, let's go ahead and reset the require back to the default
     // eslint-disable-next-line n/no-deprecated-api
     require.extensions['.ts'] = undefined;
+
+    // Redo our hack
+    Module._load = originalLoad;
   }
 };