@nasti-toolchain/nasti 1.6.4 → 1.6.5

package/dist/cli.cjs

@@ -56,7 +56,8 @@ var init_defaults = __esm({
       sourcemap: false,
       target: "es2022",
       rolldownOptions: {},
-      emptyOutDir: true
+      emptyOutDir: true,
+      css: {}
     };
     defaultElectron = {
       main: "src/electron/main.ts",
@@ -1585,20 +1586,29 @@ var init_hmr = __esm({
 function resolvePlugin(config) {
   const { alias, extensions } = config.resolve;
   const require2 = (0, import_node_module2.createRequire)(import_node_path6.default.resolve(config.root, "package.json"));
+  const aliasEntries = Object.entries(alias).sort(
+    ([a], [b]) => b.length - a.length
+  );
   return {
     name: "nasti:resolve",
     enforce: "pre",
     resolveId(source, importer) {
-      for (const [key, value] of Object.entries(alias)) {
+      for (const [key, value] of aliasEntries) {
         if (source === key || source.startsWith(key + "/")) {
-          source = source.replace(key, value);
-          if (!import_node_path6.default.isAbsolute(source)) {
-            source = import_node_path6.default.resolve(config.root, source);
-          }
+          const aliasBase = resolveAliasTarget2(value, config.root);
+          const sub = source.slice(key.length).replace(/^\//, "");
+          const target = sub ? import_node_path6.default.join(aliasBase, sub) : aliasBase;
+          const resolved = tryResolveFile(target, extensions);
+          if (resolved) return resolved;
           break;
         }
       }
-      if (import_node_path6.default.isAbsolute(source)) {
+      if (source.startsWith("/") && !source.startsWith("//")) {
+        const rootRelative = import_node_path6.default.join(config.root, source.slice(1));
+        const resolved = tryResolveFile(rootRelative, extensions);
+        if (resolved) return resolved;
+      }
+      if (import_node_path6.default.isAbsolute(source) && import_node_fs6.default.existsSync(source)) {
         const resolved = tryResolveFile(source, extensions);
         if (resolved) return resolved;
       }
@@ -1621,6 +1631,7 @@ function resolvePlugin(config) {
       return null;
     },
     load(id) {
+      if (id.startsWith("\0")) return null;
       if (!import_node_fs6.default.existsSync(id)) return null;
       if (id.endsWith(".json")) {
         const content = import_node_fs6.default.readFileSync(id, "utf-8");
@@ -1630,6 +1641,11 @@ function resolvePlugin(config) {
     }
   };
 }
+function resolveAliasTarget2(value, root) {
+  if (import_node_path6.default.isAbsolute(value) && import_node_fs6.default.existsSync(value)) return value;
+  if (value.startsWith("/")) return import_node_path6.default.join(root, value.slice(1));
+  return import_node_path6.default.resolve(root, value);
+}
 function tryResolveFile(file, extensions) {
   if (import_node_fs6.default.existsSync(file) && import_node_fs6.default.statSync(file).isFile()) {
     return file;
@@ -1729,8 +1745,8 @@ function cssPlugin(config) {
         cssSource = compiled.css;
       }
       const rewritten = rewriteCssUrls(cssSource, id, config.root);
+      const escaped = JSON.stringify(rewritten);
       if (config.command === "serve") {
-        const escaped = JSON.stringify(rewritten);
         return {
           code: `
 const css = ${escaped};
@@ -1754,7 +1770,42 @@ export default css;
 `
         };
       }
-      return rewritten !== code ? { code: rewritten } : null;
+      const cssConfig = config.build.css || {};
+      const nonce = cssConfig.nonce;
+      const emitCssFile = cssConfig.emitCssFile;
+      if (emitCssFile) {
+        const fileName = `assets/${import_node_path8.default.basename(id, ".css")}.css`;
+        this.emitFile({
+          type: "asset",
+          fileName,
+          source: rewritten
+        });
+        return {
+          code: `
+const link = document.createElement('link');
+link.rel = 'stylesheet';
+link.href = ${JSON.stringify("/" + fileName)};
+document.head.appendChild(link);
+
+export default ${escaped};
+`,
+          moduleType: "js"
+        };
+      }
+      const nonceAttr = nonce ? `style.setAttribute('nonce', ${JSON.stringify(nonce)});` : "";
+      return {
+        code: `
+const css = ${escaped};
+const style = document.createElement('style');
+style.setAttribute('data-nasti-css', ${JSON.stringify(id)});
+${nonceAttr}
+style.textContent = css;
+document.head.appendChild(style);
+
+export default css;
+`,
+        moduleType: "js"
+      };
     }
   };
 }
@@ -1915,7 +1966,7 @@ async function createServer(inlineConfig = {}) {
           const localUrl = `http://localhost:${actualPort}`;
           const networkUrl = host === "0.0.0.0" ? `http://${getNetworkAddress()}:${actualPort}` : null;
           console.log();
-          console.log(import_picocolors.default.cyan("  nasti dev server") + import_picocolors.default.dim(` v${"1.6.4"}`));
+          console.log(import_picocolors.default.cyan("  nasti dev server") + import_picocolors.default.dim(` v${"1.6.5"}`));
           console.log();
           console.log(`  ${import_picocolors.default.green(">")} Local:   ${import_picocolors.default.cyan(localUrl)}`);
           if (networkUrl) {
@@ -2042,7 +2093,7 @@ __export(build_exports, {
 async function build(inlineConfig = {}) {
   const config = await resolveConfig(inlineConfig, "build");
   const startTime = performance.now();
-  console.log(import_picocolors2.default.cyan("\n\u{1F528} nasti build") + import_picocolors2.default.dim(` v${"1.6.4"}`));
+  console.log(import_picocolors2.default.cyan("\n\u{1F528} nasti build") + import_picocolors2.default.dim(` v${"1.6.5"}`));
   console.log(import_picocolors2.default.dim(`  root: ${config.root}`));
   console.log(import_picocolors2.default.dim(`  mode: ${config.mode}`));
   const outDir = import_node_path11.default.resolve(config.root, config.build.outDir);
@@ -2096,9 +2147,11 @@ async function build(inlineConfig = {}) {
   };
   const env = loadEnv(config.mode, config.root, config.envPrefix);
   const envDefine = buildEnvDefine(env, config.mode);
+  const existingTransform = config.build.rolldownOptions?.transform;
+  const mergedDefine = { ...existingTransform?.define ?? {}, ...envDefine };
   const bundle = await (0, import_rolldown.rolldown)({
     input: entryPoints,
-    define: envDefine,
+    transform: { ...existingTransform, define: mergedDefine },
     plugins: [
       oxcTransformPlugin,
       // 转换 Nasti 插件为 Rolldown 插件格式
@@ -2207,7 +2260,7 @@ async function buildElectron(inlineConfig = {}) {
   const config = await resolveConfig({ ...inlineConfig, target: "electron" }, "build");
   const startTime = performance.now();
   assertElectronVersion(config);
-  console.log(import_picocolors3.default.cyan("\n\u26A1 nasti build (electron)") + import_picocolors3.default.dim(` v${"1.6.4"}`));
+  console.log(import_picocolors3.default.cyan("\n\u26A1 nasti build (electron)") + import_picocolors3.default.dim(` v${"1.6.5"}`));
   console.log(import_picocolors3.default.dim(`  root: ${config.root}`));
   console.log(import_picocolors3.default.dim(`  mode: ${config.mode}`));
   console.log(import_picocolors3.default.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -2285,9 +2338,11 @@ async function bundleNode(config, entry, opts) {
       return { code: result.code, map: result.map ? JSON.parse(result.map) : void 0 };
     }
   };
+  const existingTransform = config.build.rolldownOptions?.transform;
+  const mergedDefine = { ...existingTransform?.define ?? {}, ...envDefine };
   const bundle = await (0, import_rolldown2.rolldown)({
     input: entry,
-    define: envDefine,
+    transform: { ...existingTransform, define: mergedDefine },
     platform: "node",
     plugins: [oxcTransformPlugin, electronPlugin(config), resolvePlugin(config)],
     ...config.build.rolldownOptions
@@ -2359,7 +2414,7 @@ async function startElectronDev(inlineConfig = {}) {
   const { noSpawn, ...rest } = inlineConfig;
   const config = await resolveConfig({ ...rest, target: "electron" }, "serve");
   warnElectronVersion(config);
-  console.log(import_picocolors4.default.cyan("\n\u26A1 nasti electron dev") + import_picocolors4.default.dim(` v${"1.6.4"}`));
+  console.log(import_picocolors4.default.cyan("\n\u26A1 nasti electron dev") + import_picocolors4.default.dim(` v${"1.6.5"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();
@@ -2694,6 +2749,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.6.4");
+cli.version("1.6.5");
 cli.parse();
 //# sourceMappingURL=cli.cjs.map