jiek 2.2.7-alpha.1 → 2.2.7-alpha.4

package/src/commands/publish.ts

@@ -7,6 +7,7 @@ import process from 'node:process'
 import { type BumperType, TAGS, bump } from '@jiek/utils/bumper'
 import { program } from 'commander'
 import detectIndent from 'detect-indent'
+import type { Config } from 'jiek'
 import type { JSONPath } from 'jsonc-parser'
 import { applyEdits, modify } from 'jsonc-parser'
 
@@ -20,6 +21,13 @@ import { getInternalModuleName } from '#~/utils/getInternalModuleName'
 import { outdirDescription } from './descriptions'
 
 declare module 'jiek' {
+  interface ConfigExperimental {
+    /**
+     * Polyfill `imports` fields in package.json to local dependencies and exports fields.
+     * @default false
+     */
+    importsDowngrade?: boolean
+  }
   export interface Config {
     publish?: {
       /**
@@ -111,12 +119,16 @@ async function prepublish({ bumper }: {
     bumperEnv ? JSON.parse(bumperEnv) as string | boolean : false
   )
 
-  const generateNewManifest = (dir: string, manifest: NonNullable<ProjectsGraph['value']>[string]) => {
+  const generateNewManifest = (
+    dir: string,
+    manifest: NonNullable<ProjectsGraph['value']>[string],
+    config: Config
+  ) => {
     const {
       name,
       type,
-      exports: entrypoints = {},
-      imports: internalEntrypoints = {}
+      exports: entrypoints,
+      imports: internalEntrypoints
     } = manifest
     if (!name) {
       throw new Error(`package.json in ${dir} must have a name field`)
@@ -127,38 +139,51 @@ async function prepublish({ bumper }: {
     const commonOptions = {
       pkgIsModule,
       pkgName: name,
-      config: loadConfig(dir),
+      config,
       dir,
       noFilter: true,
       isPublish: true
     } satisfies Partial<ResolveExportsOptions>
-    const [resolvedEntrypoints, exports, resolvedOutdir] = resolveExports({
-      entrypoints,
-      defaultOutdir: outdir,
-      ...commonOptions
-    })
-    newManifest.exports = {
-      ...resolvedEntrypoints,
-      ...exports
+    let resolvedOutdir = outdir
+    if (entrypoints) {
+      const [resolvedEntrypoints, exports, _resolvedOutdir] = resolveExports({
+        entrypoints,
+        defaultOutdir: outdir,
+        ...commonOptions
+      })
+      newManifest.exports = {
+        ...resolvedEntrypoints,
+        ...exports
+      }
+      if (resolvedOutdir === outdir) {
+        resolvedOutdir = _resolvedOutdir
+      }
     }
-    const [resolvedInternalEntrypoints, imports] = resolveExports({
-      entrypoints: internalEntrypoints,
-      defaultOutdir: `${outdir}/.internal`,
-      ...commonOptions
-    })
-    newManifest.imports = {
-      ...resolvedInternalEntrypoints,
-      ...imports
+    if (internalEntrypoints) {
+      const [resolvedInternalEntrypoints, imports, _resolvedOutdir] = resolveExports({
+        entrypoints: internalEntrypoints,
+        defaultOutdir: `${outdir}/.internal`,
+        ...commonOptions
+      })
+      newManifest.imports = {
+        ...resolvedInternalEntrypoints,
+        ...imports
+      }
+      if (resolvedOutdir === outdir) {
+        resolvedOutdir = _resolvedOutdir
+      }
     }
     return [newManifest, resolvedOutdir] as const
   }
 
   const generateNewPackageJSONString = ({
+    config,
     oldJSONString,
     oldJSON,
     manifest,
     formattingOptions
   }: {
+    config: Config
     oldJSONString: string
     oldJSON: Record<string, unknown>
     manifest: NonNullable<ProjectsGraph['value']>[string]
@@ -188,11 +213,13 @@ async function prepublish({ bumper }: {
         ]
       }
     })
-    update(['dependencies', internalModuleName], `file:./${outdir}/.internal`)
-    update(['dependenciesMeta', internalModuleName], {
-      'injected': true
-    })
-    update(['imports'], undefined)
+    if (config.experimental?.importsDowngrade) {
+      update(['dependencies', internalModuleName], `file:./${outdir}/.internal`)
+      update(['dependenciesMeta', internalModuleName], {
+        'injected': true
+      })
+      update(['imports'], undefined)
+    }
 
     for (const [key, value] of Object.entries(manifest)) {
       if (key === 'version') continue
@@ -301,7 +328,8 @@ async function prepublish({ bumper }: {
   }
 
   await forEachSelectedProjectsGraphEntries((dir, originalManifest) => {
-    const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest)
+    const config = loadConfig(dir)
+    const [manifest, resolvedOutdir] = generateNewManifest(dir, originalManifest, config)
     const resolveByDir = (...paths: string[]) => path.resolve(dir, ...paths)
 
     const oldJSONString = fs.readFileSync(resolveByDir('package.json'), 'utf-8')
@@ -326,6 +354,7 @@ async function prepublish({ bumper }: {
     )
 
     const newJSONString = generateNewPackageJSONString({
+      config,
       oldJSONString: modifyVersionPackageJSON,
       oldJSON: {
         ...oldJSON,
@@ -467,18 +496,7 @@ async function prepublish({ bumper }: {
       throw new Error(`file type of ${path} is not supported`)
     }
 
-    if ('imports' in manifest && manifest.imports) {
-      Object
-        .entries(manifest.imports)
-        .forEach(([key, value]) => {
-          if (typeof value !== 'object') return
-          const [start] = key.split('*')
-          manifest.imports![key] = JSON.parse(
-            JSON
-              .stringify(value)
-              .replaceAll(`${resolvedOutdir}/.internal/`, start)
-          )
-        })
+    if (config.experimental?.importsDowngrade && 'imports' in manifest && manifest.imports) {
       fs.writeFileSync(
         resolveByDir(resolvedOutdir, resolvedOutdir, '.internal', 'package.json'),
         JSON.stringify(
@@ -488,7 +506,7 @@ async function prepublish({ bumper }: {
               JSON
                 .stringify(manifest.imports)
                 .replaceAll('#', './')
-                .replaceAll('~', '+')
+                .replaceAll('~', '')
             ) as Record<string, unknown>
           },
           null,
@@ -496,6 +514,11 @@ async function prepublish({ bumper }: {
         )
       )
     }
+
+    const jiekProductionTag = path.resolve(resolvedOutdir, '.jiek-production-tag')
+    if (!fs.existsSync(jiekProductionTag)) {
+      fs.writeFileSync(jiekProductionTag, '')
+    }
   })
 }
 

package/src/index.ts

@@ -2,6 +2,11 @@ import type {} from './commands/base'
 import type {} from './commands/build'
 import type {} from './commands/publish'
 
-export interface Config {}
+export interface ConfigExperimental {
+}
+
+export interface Config {
+  experimental?: ConfigExperimental
+}
 
 export const defineConfig = (config: Config) => config

package/src/rollup/index.ts

@@ -105,7 +105,7 @@ const MINIFY_OPTIONS = {
 const config = loadConfig({
   root: WORKSPACE_ROOT
 }) ?? {}
-const { build = {} } = config
+const { experimental, build = {} } = config
 const { js: jsOutdir, dts: dtsOutdir } = getOutDirs({
   config,
   pkgName: JIEK_NAME
@@ -120,7 +120,7 @@ const STYLE_REGEXP = /\.(css|s[ac]ss|less|styl)$/
 
 const CWD_FILES = recursiveListFiles(process.cwd())
   .filter(p => /(?<!\.d)\.[cm]?tsx?$/.test(p))
-  .map(p => relative(process.cwd(), p))
+  .map(p => `./${relative(process.cwd(), p)}`)
 
 const resolveBuildPlugins = (context: ConfigGenerateContext, plugins: TemplateOptions['plugins']): {
   js: InputPluginOption
@@ -253,6 +253,12 @@ const withMinify = (
             : (() => {
               throw new Error('entryFileNames must be a function')
             })(),
+        chunkFileNames: chunkInfo =>
+          typeof output.chunkFileNames === 'function'
+            ? output.chunkFileNames(chunkInfo).replace(/(\.[cm]?js)$/, '.min$1')
+            : (() => {
+              throw new Error('chunkFileNames must be a function')
+            })(),
         file: output.file?.replace(/(\.[cm]?js)$/, '.min$1'),
         plugins: [
           ...notOnlyOncePlugins,
@@ -380,7 +386,7 @@ const generateConfigs = (
       'input should not include "**", please read the [documentation](https://nodejs.org/api/packages.html#subpath-patterns).'
     )
   }
-  const reg = new RegExp(`^${
+  const reg = new RegExp(`^\./${
     input
       .slice(2)
       .replace(/\./g, '\\.')
@@ -390,14 +396,14 @@ const generateConfigs = (
     ? input
     : CWD_FILES.filter(p => reg.test(p))
   const globCommonDir = input.includes('*')
-    ? input.split('*')[0].replace('./', '')
+    ? input.split('*')[0]
     : ''
-  const pathCommonDir = path.includes('*')
-    ? path.split('*')[0].replace('./', '')
+  const outputCommonDir = output.includes('*')
+    ? output.split('*')[0]
     : ''
   if (
-    (globCommonDir.length > 0 && pathCommonDir.length === 0)
-    || (globCommonDir.length === 0 && pathCommonDir.length > 0)
+    (globCommonDir.length > 0 && outputCommonDir.length === 0)
+    || (globCommonDir.length === 0 && outputCommonDir.length > 0)
   ) {
     throw new Error('input and path should both include "*" or not include "*"')
   }
@@ -429,11 +435,13 @@ const generateConfigs = (
           if (!resolved || !('id' in resolved)) {
             throw new Error('nodeResolvePluginInstance.resolveId.handler did not return a resolved object')
           }
-          internalModuleCollect?.(relative(process.cwd(), resolved.id))
+          internalModuleCollect?.(`./${relative(process.cwd(), resolved.id)}`)
           return {
-            id: source
-              .replaceAll('#', `${INTERNAL_MODULE_NAME}/`)
-              .replaceAll('~', '+'),
+            id: experimental?.importsDowngrade
+              ? source
+                .replaceAll('#', `${INTERNAL_MODULE_NAME}/`)
+                .replaceAll('~', '+')
+              : source,
             external: true
           }
         }
@@ -526,10 +534,15 @@ const generateConfigs = (
             entryFileNames: (chunkInfo) => {
               return Array.isArray(inputObj)
                 ? chunkInfo.facadeModuleId!
-                  .replace(`${process.cwd()}/`, '')
-                  .replace(globCommonDir, pathCommonDir)
+                  .replace(`${process.cwd()}/`, './')
+                  .replace(globCommonDir, outputCommonDir)
                   .replace(/(\.[cm]?)ts$/, jsOutputSuffix)
-                : output.replace(`${jsOutdir}/`, '')
+                  .replace(`${jsOutdir}/`, '')
+                : output
+                  .replace(`${jsOutdir}/`, '')
+            },
+            chunkFileNames: (chunkInfo) => {
+              return `.internal/.chunks/${chunkInfo.name}.[hash]${jsOutputSuffix}`
             },
             sourcemap,
             format,
@@ -589,12 +602,14 @@ const generateConfigs = (
           sourcemap,
           entryFileNames: (chunkInfo) => (
             Array.isArray(inputObj)
-              ? chunkInfo.facadeModuleId!.replace(`${process.cwd()}/`, '')
-                .replace(globCommonDir, pathCommonDir)
+              ? chunkInfo.facadeModuleId!
+                .replace(`${process.cwd()}/`, './')
+                .replace(globCommonDir, outputCommonDir)
                 .replace(/(\.[cm]?)ts$/, tsOutputSuffix)
-              : output
                 .replace(`${jsOutdir}/`, '')
+              : output
                 .replace(/(\.[cm]?)js$/, tsOutputSuffix)
+                .replace(`${jsOutdir}/`, '')
           ),
           strict: typeof buildOptions?.output?.strict === 'object'
             ? buildOptions.output.strict.dts
@@ -772,24 +787,12 @@ export function template(packageJSON: PackageJSON): RollupOptions[] {
               async options(inputOptions) {
                 await collected.promise
                 inputOptions.input = [...intersection(
-                  inputOptions.input as string[],
+                  Array.isArray(inputOptions.input)
+                    ? inputOptions.input
+                    : [inputOptions.input as string],
                   internalModules
                 )]
                 return inputOptions
-              },
-              outputOptions(outputOptions) {
-                outputOptions.dir = `${outputOptions.dir}/.internal`
-                const oldEntryFileNames = outputOptions.entryFileNames
-                outputOptions.entryFileNames = (chunkInfo) => {
-                  if (typeof oldEntryFileNames !== 'function') {
-                    throw new TypeError('entryFileNames must be a function')
-                  }
-                  const oldFileName = oldEntryFileNames(chunkInfo)
-                  return oldFileName
-                    .replaceAll('#', '')
-                    .replaceAll('~', '+')
-                }
-                return outputOptions
               }
             }
           ],

package/dist/.internal/+/commands/build/analyzer.cjs

@@ -1,201 +0,0 @@
-'use strict';
-
-var optionParser = require('../utils/optionParser.cjs');
-var checkDependency = require('../../utils/checkDependency.cjs');
-var fs = require('node:fs');
-var path = require('node:path');
-require('../../../jiek_create-require-CWFWNQHj.js');
-require('node:child_process');
-require('node:process');
-require('@inquirer/prompts');
-require('../../../getWD-BRJ3PK1S.js');
-require('@jiek/utils/getWorkspaceDir');
-require('commander');
-require('js-yaml');
-require('../../utils/getRoot.cjs');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var path__default = /*#__PURE__*/_interopDefault(path);
-
-function Main() {
-  const { useState, useMemo, useEffect, useCallback } = React;
-  const [path, setPath] = useState(() => location.pathname.replace(/^\/ana\/?/, ""));
-  const [pkgName, entry] = useMemo(() => {
-    const pkgName2 = /^(@[^/]+\/[^/]+|[^/]+)\/?/.exec(path)?.[1];
-    return [
-      pkgName2,
-      pkgName2 != null ? path.replace(`${pkgName2}/`, "") : void 0
-    ];
-  }, [path]);
-  const push = useCallback((newPath) => {
-    setPath(newPath);
-    document.title = `${document.title.replace(/ - \/.*/, "")} - /${newPath}`;
-    history.pushState(null, "", `/ana/${newPath}`);
-  }, []);
-  const filterModules = useCallback((startWith) => {
-    const modules = analyzeModule.filter((m) => m.filename.startsWith(startWith));
-    dispatchEvent(new CustomEvent("send:filter", { detail: { analyzeModule: modules } }));
-  }, []);
-  useEffect(() => {
-    if (path !== "") {
-      document.title = `${document.title.replace(/ - \/.*/, "")} - /${path}`;
-    } else {
-      document.title = document.title.replace(/ - \/.*/, "");
-    }
-    filterModules(path);
-  }, [path, filterModules]);
-  useEffect(() => {
-    const offGraphClick = listen("graph:click", ({ detail }) => {
-      if (!detail) return;
-      let root = detail.node;
-      while (root.parent) {
-        root = root.parent;
-      }
-      if (root.filename === path) return;
-      push(root.filename);
-    });
-    return () => {
-      offGraphClick();
-    };
-  }, [push]);
-  function listen(type, listener) {
-    window.addEventListener(type, listener);
-    return () => {
-      window.removeEventListener(type, listener);
-    };
-  }
-  return /* @__PURE__ */ React.createElement(
-    "div",
-    {
-      style: {
-        padding: "12px 55px"
-      }
-    },
-    "/",
-    /* @__PURE__ */ React.createElement(
-      "select",
-      {
-        style: {
-          appearance: "none",
-          border: "none",
-          background: "none"
-        },
-        value: pkgName,
-        onChange: (e) => push(e.target.value)
-      },
-      /* @__PURE__ */ React.createElement("option", { value: "" }, "All"),
-      analyzeModule.map((m) => /^(@[^/]+\/[^/]+|[^/]+)\/?/.exec(m.filename)?.[1]).filter((v, i, a) => a.indexOf(v) === i).map((v) => /* @__PURE__ */ React.createElement("option", { key: v, value: v }, v))
-    ),
-    pkgName != null && /* @__PURE__ */ React.createElement(React.Fragment, null, "/", /* @__PURE__ */ React.createElement(
-      "select",
-      {
-        style: {
-          appearance: "none",
-          border: "none",
-          background: "none"
-        },
-        value: entry,
-        onChange: (e) => push(`${pkgName}/${e.target.value}`)
-      },
-      /* @__PURE__ */ React.createElement("option", { value: "" }, "All"),
-      analyzeModule.filter((m) => m.filename.startsWith(`${pkgName}/`)).map((m) => m.filename.replace(`${pkgName}/`, "")).filter((v, i, a) => a.indexOf(v) === i).map((v) => /* @__PURE__ */ React.createElement("option", { key: v, value: v }, v))
-    ))
-  );
-}
-
-function render() {
-  CUSTOM_SIDE_BAR = true;
-  window.addEventListener("client:ready", () => window.dispatchEvent(
-    new CustomEvent("send:ui", {
-      detail: { type: "Main", Component: __REPLACE_INJECT__ }
-    })
-  ));
-}
-const CLIENT_CUSTOM_RENDER_SCRIPT = [
-  Main.toString(),
-  render.toString().replace("__REPLACE_INJECT__", Main.name),
-  `(${render.name})()`
-].join("\n");
-
-const registerAnalyzerCommandOptions = (command) => command.option("--ana", "Enable the bundle analyzer.", optionParser.parseBoolean).option("--ana.dir <DIR>", "The directory of the bundle analyzer.", ".jk-analyses").option(
-  "--ana.mode <MODE>",
-  'The mode of the bundle analyzer, support "static", "json" and "server".',
-  "server"
-).option("--ana.open", "Open the bundle analyzer in the browser.", optionParser.parseBoolean).option(
-  "--ana.size <SIZE>",
-  'The default size of the bundle analyzer, support "stat", "parsed" and "gzip".',
-  "parsed"
-);
-const useAnalyzer = async (options, server) => {
-  const modules = [];
-  let bundleAnalyzerModule;
-  const analyzer = options.ana ? {
-    dir: options["ana.dir"],
-    mode: options["ana.mode"],
-    open: options["ana.open"],
-    size: options["ana.size"]
-  } : void 0;
-  if (options.ana && ![
-    "stat",
-    "parsed",
-    "gzip"
-  ].includes(analyzer?.size ?? "")) {
-    throw new Error('The value of `ana.size` must be "stat", "parsed" or "gzip"');
-  }
-  if (analyzer) {
-    await checkDependency.checkDependency("vite-bundle-analyzer");
-    bundleAnalyzerModule = await import('vite-bundle-analyzer');
-  }
-  const refreshAnalyzer = async (cwd, applyModules) => {
-    if (!(analyzer && server && bundleAnalyzerModule)) return;
-    if (analyzer.mode === "json") {
-      const anaDir = path__default.default.resolve(cwd, analyzer.dir);
-      if (!fs.existsSync(anaDir)) {
-        fs.mkdirSync(anaDir, { recursive: true });
-      }
-      const gitIgnorePath = path__default.default.resolve(anaDir, ".gitignore");
-      if (!fs.existsSync(gitIgnorePath)) {
-        fs.writeFileSync(gitIgnorePath, "*\n!.gitignore\n");
-      }
-      const npmIgnorePath = path__default.default.resolve(anaDir, ".npmignore");
-      if (!fs.existsSync(npmIgnorePath)) {
-        fs.writeFileSync(npmIgnorePath, "*\n");
-      }
-      if (!fs.statSync(anaDir).isDirectory()) {
-        throw new Error(`The directory '${anaDir}' is not a directory.`);
-      }
-    }
-    const { renderView, injectHTMLTag } = bundleAnalyzerModule;
-    applyModules.forEach((m) => {
-      const index = modules.findIndex(({ filename }) => filename === m.filename);
-      if (index === -1) {
-        modules.push(m);
-      } else {
-        modules[index] = m;
-      }
-    });
-    let html = await renderView(modules, {
-      title: `Jiek Analyzer`,
-      mode: analyzer.size
-    });
-    html = injectHTMLTag({
-      html,
-      injectTo: "body",
-      descriptors: [
-        { kind: "script", text: CLIENT_CUSTOM_RENDER_SCRIPT }
-      ]
-    });
-    void server.renderTo("/ana", html);
-  };
-  return {
-    modules,
-    refreshAnalyzer,
-    ANALYZER_ENV: {
-      JIEK_ANALYZER: analyzer ? JSON.stringify(analyzer) : void 0
-    }
-  };
-};
-
-exports.registerAnalyzerCommandOptions = registerAnalyzerCommandOptions;
-exports.useAnalyzer = useAnalyzer;

package/dist/.internal/+/commands/build/analyzer.d.cts

@@ -1,30 +0,0 @@
-import * as vite_bundle_analyzer from 'vite-bundle-analyzer';
-import { Command } from 'commander';
-import { createServer } from '../../server.cjs';
-
-interface AnalyzerBuildOptions {
-    ana?: boolean;
-    /**
-     * @default '.jk-analyses'
-     */
-    'ana.dir': string;
-    /**
-     * @default 'server'
-     */
-    'ana.mode': string;
-    'ana.open'?: boolean;
-    /**
-     * @default 'parsed'
-     */
-    'ana.size': string;
-}
-declare const registerAnalyzerCommandOptions: (command: Command) => Command;
-declare const useAnalyzer: (options: AnalyzerBuildOptions, server?: ReturnType<typeof createServer>) => Promise<{
-    modules: vite_bundle_analyzer.Module[];
-    refreshAnalyzer: (cwd: string, applyModules: vite_bundle_analyzer.Module[]) => Promise<void>;
-    ANALYZER_ENV: {
-        JIEK_ANALYZER: string | undefined;
-    };
-}>;
-
-export { type AnalyzerBuildOptions, registerAnalyzerCommandOptions, useAnalyzer };

package/dist/.internal/+/commands/build/analyzer.d.ts

@@ -1,30 +0,0 @@
-import * as vite_bundle_analyzer from 'vite-bundle-analyzer';
-import { Command } from 'commander';
-import { createServer } from '../../server.js';
-
-interface AnalyzerBuildOptions {
-    ana?: boolean;
-    /**
-     * @default '.jk-analyses'
-     */
-    'ana.dir': string;
-    /**
-     * @default 'server'
-     */
-    'ana.mode': string;
-    'ana.open'?: boolean;
-    /**
-     * @default 'parsed'
-     */
-    'ana.size': string;
-}
-declare const registerAnalyzerCommandOptions: (command: Command) => Command;
-declare const useAnalyzer: (options: AnalyzerBuildOptions, server?: ReturnType<typeof createServer>) => Promise<{
-    modules: vite_bundle_analyzer.Module[];
-    refreshAnalyzer: (cwd: string, applyModules: vite_bundle_analyzer.Module[]) => Promise<void>;
-    ANALYZER_ENV: {
-        JIEK_ANALYZER: string | undefined;
-    };
-}>;
-
-export { type AnalyzerBuildOptions, registerAnalyzerCommandOptions, useAnalyzer };