Merge pull request #216 from underctrl-io/unbundled-dev

fix: operate in unbundled mode during dev

Author: twlite

packages/cache/src/use-cache-directive.ts

@@ -14,7 +14,7 @@ export class UseCacheDirectivePlugin extends CommonDirectiveTransformer {
       ...options,
       directive: 'use cache',
       importPath: '@commandkit/cache',
-      importName: '__SECRET_USE_CACHE_INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED',
+      importName: '$ckitiucw',
       asyncOnly: true,
     });
   }

packages/cache/src/use-cache.ts

@@ -16,7 +16,6 @@ const fnStore = new Map<
     memo: GenericFunction;
   }
 >();
-const DEFAULT_TTL = ms('15m');
 const CACHE_FN_ID = `__cache_fn_id_${Date.now()}__${Math.random()}__`;
 const CACHED_FN_SYMBOL = Symbol('commandkit.cache.sentinel');
 
@@ -301,5 +300,13 @@ export function isCachedFunction(fn: GenericFunction): boolean {
  * @private
  * @internal
  */
-export const __SECRET_USE_CACHE_INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: any =
-  useCache;
+export const $ckitiucw: any = useCache;
+
+if (!('$ckitiucw' in globalThis)) {
+  Object.defineProperty(globalThis, '$ckitiucw', {
+    value: useCache,
+    configurable: false,
+    enumerable: false,
+    writable: false,
+  });
+}

packages/commandkit/package.json

@@ -118,7 +118,7 @@
     "picocolors": "^1.1.1",
     "rfdc": "^1.3.1",
     "rimraf": "^6.0.0",
-    "tsdown": "^0.12.5",
+    "tsdown": "^0.12.6",
     "use-macro": "^1.1.0"
   },
   "devDependencies": {

packages/commandkit/src/cli/build.ts

@@ -16,6 +16,20 @@ export interface ApplicationBuildOptions {
   configPath?: string;
 }
 
+// emit public env variables and given env variables
+function mergeDefinitionsIfNeeded(env: Record<string, string>) {
+  const values = Object.fromEntries(
+    Object.entries(process.env).filter(
+      ([k]) => !(k in env) && k.startsWith('COMMANDKIT_PUBLIC_'),
+    ),
+  );
+
+  return {
+    ...env,
+    ...values,
+  };
+}
+
 export async function buildApplication({
   plugins,
   rolldownPlugins,
@@ -70,15 +84,15 @@ export async function buildApplication({
       sourcemap: true,
       target: 'node16',
       outDir: dest,
-      env: config.env || {},
+      env: mergeDefinitionsIfNeeded(config.env || {}),
       entry: [
         'src',
         `!${config.distDir}`,
         '!.commandkit',
         '!**/*.test.*',
         '!**/*.spec.*',
       ],
-      unbundle: false,
+      unbundle: !!isDev,
     });
 
     await copyLocaleFiles('src', dest);

packages/commandkit/vitest.config.ts

@@ -20,7 +20,7 @@ export default defineConfig({
     cacheDirectivePlugin({
       directive: 'use cache',
       importPath: 'commandkit',
-      importName: '__SECRET_USE_CACHE_INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED',
+      importName: '$ckitiucw',
       asyncOnly: true,
     }),
   ],