@nasti-toolchain/nasti 1.6.4 → 1.6.5

package/dist/index.d.cts

@@ -89,6 +89,13 @@ interface BuildConfig {
     target?: string | string[];
     rolldownOptions?: Record<string, unknown>;
     emptyOutDir?: boolean;
+    css?: CssConfig;
+}
+interface CssConfig {
+    /** CSP nonce to add to inline <style> tags */
+    nonce?: string;
+    /** Emit CSS as separate files instead of inline injection (CSP-friendly) */
+    emitCssFile?: boolean;
 }
 interface NastiPlugin {
     name: string;
@@ -143,6 +150,7 @@ type LoadResult = string | null | undefined | {
 type TransformResult = string | null | undefined | {
     code: string;
     map?: unknown;
+    moduleType?: string;
 };
 interface EmittedFile {
     type: 'asset' | 'chunk';

package/dist/index.d.ts

@@ -89,6 +89,13 @@ interface BuildConfig {
     target?: string | string[];
     rolldownOptions?: Record<string, unknown>;
     emptyOutDir?: boolean;
+    css?: CssConfig;
+}
+interface CssConfig {
+    /** CSP nonce to add to inline <style> tags */
+    nonce?: string;
+    /** Emit CSS as separate files instead of inline injection (CSP-friendly) */
+    emitCssFile?: boolean;
 }
 interface NastiPlugin {
     name: string;
@@ -143,6 +150,7 @@ type LoadResult = string | null | undefined | {
 type TransformResult = string | null | undefined | {
     code: string;
     map?: unknown;
+    moduleType?: string;
 };
 interface EmittedFile {
     type: 'asset' | 'chunk';

package/dist/index.js

@@ -35,7 +35,8 @@ var init_defaults = __esm({
       sourcemap: false,
       target: "es2022",
       rolldownOptions: {},
-      emptyOutDir: true
+      emptyOutDir: true,
+      css: {}
     };
     defaultElectron = {
       main: "src/electron/main.ts",
@@ -282,20 +283,29 @@ import { createRequire } from "module";
 function resolvePlugin(config) {
   const { alias, extensions } = config.resolve;
   const require2 = createRequire(path2.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 (!path2.isAbsolute(source)) {
-            source = path2.resolve(config.root, source);
-          }
+          const aliasBase = resolveAliasTarget(value, config.root);
+          const sub = source.slice(key.length).replace(/^\//, "");
+          const target = sub ? path2.join(aliasBase, sub) : aliasBase;
+          const resolved = tryResolveFile(target, extensions);
+          if (resolved) return resolved;
           break;
         }
       }
-      if (path2.isAbsolute(source)) {
+      if (source.startsWith("/") && !source.startsWith("//")) {
+        const rootRelative = path2.join(config.root, source.slice(1));
+        const resolved = tryResolveFile(rootRelative, extensions);
+        if (resolved) return resolved;
+      }
+      if (path2.isAbsolute(source) && fs2.existsSync(source)) {
         const resolved = tryResolveFile(source, extensions);
         if (resolved) return resolved;
       }
@@ -318,6 +328,7 @@ function resolvePlugin(config) {
       return null;
     },
     load(id) {
+      if (id.startsWith("\0")) return null;
       if (!fs2.existsSync(id)) return null;
       if (id.endsWith(".json")) {
         const content = fs2.readFileSync(id, "utf-8");
@@ -327,6 +338,11 @@ function resolvePlugin(config) {
     }
   };
 }
+function resolveAliasTarget(value, root) {
+  if (path2.isAbsolute(value) && fs2.existsSync(value)) return value;
+  if (value.startsWith("/")) return path2.join(root, value.slice(1));
+  return path2.resolve(root, value);
+}
 function tryResolveFile(file, extensions) {
   if (fs2.existsSync(file) && fs2.statSync(file).isFile()) {
     return file;
@@ -423,8 +439,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};
@@ -448,7 +464,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/${path4.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"
+      };
     }
   };
 }
@@ -852,7 +903,7 @@ import pc from "picocolors";
 async function build(inlineConfig = {}) {
   const config = await resolveConfig(inlineConfig, "build");
   const startTime = performance.now();
-  console.log(pc.cyan("\n\u{1F528} nasti build") + pc.dim(` v${"1.6.4"}`));
+  console.log(pc.cyan("\n\u{1F528} nasti build") + pc.dim(` v${"1.6.5"}`));
   console.log(pc.dim(`  root: ${config.root}`));
   console.log(pc.dim(`  mode: ${config.mode}`));
   const outDir = path8.resolve(config.root, config.build.outDir);
@@ -906,9 +957,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 rolldown({
     input: entryPoints,
-    define: envDefine,
+    transform: { ...existingTransform, define: mergedDefine },
     plugins: [
       oxcTransformPlugin,
       // 转换 Nasti 插件为 Rolldown 插件格式
@@ -1603,7 +1656,7 @@ function rewriteImports(code, config, filePath) {
     const baseSpec = suffix ? spec.slice(0, -suffix.length) : spec;
     for (const [key, value] of aliasEntries) {
       if (baseSpec === key || baseSpec.startsWith(key + "/")) {
-        const aliasBase = resolveAliasTarget(value, root);
+        const aliasBase = resolveAliasTarget2(value, root);
         const sub = baseSpec.slice(key.length).replace(/^\//, "");
         const target = sub ? path10.join(aliasBase, sub) : aliasBase;
         const resolved = tryResolveDiskPath(target);
@@ -1634,7 +1687,7 @@ function rewriteImports(code, config, filePath) {
     (_m, q, s) => `import(${q}${transformSpec(s)}${q})`
   );
 }
-function resolveAliasTarget(value, root) {
+function resolveAliasTarget2(value, root) {
   if (path10.isAbsolute(value) && fs8.existsSync(value)) return value;
   if (value.startsWith("/")) return path10.join(root, value.slice(1));
   return path10.resolve(root, value);
@@ -2059,7 +2112,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(pc3.cyan("  nasti dev server") + pc3.dim(` v${"1.6.4"}`));
+          console.log(pc3.cyan("  nasti dev server") + pc3.dim(` v${"1.6.5"}`));
           console.log();
           console.log(`  ${pc3.green(">")} Local:   ${pc3.cyan(localUrl)}`);
           if (networkUrl) {
@@ -2183,7 +2236,7 @@ async function buildElectron(inlineConfig = {}) {
   const config = await resolveConfig({ ...inlineConfig, target: "electron" }, "build");
   const startTime = performance.now();
   assertElectronVersion(config);
-  console.log(pc2.cyan("\n\u26A1 nasti build (electron)") + pc2.dim(` v${"1.6.4"}`));
+  console.log(pc2.cyan("\n\u26A1 nasti build (electron)") + pc2.dim(` v${"1.6.5"}`));
   console.log(pc2.dim(`  root: ${config.root}`));
   console.log(pc2.dim(`  mode: ${config.mode}`));
   console.log(pc2.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -2261,9 +2314,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 rolldown2({
     input: entry,
-    define: envDefine,
+    transform: { ...existingTransform, define: mergedDefine },
     platform: "node",
     plugins: [oxcTransformPlugin, electronPlugin(config), resolvePlugin(config)],
     ...config.build.rolldownOptions
@@ -2330,7 +2385,7 @@ async function startElectronDev(inlineConfig = {}) {
   const { noSpawn, ...rest } = inlineConfig;
   const config = await resolveConfig({ ...rest, target: "electron" }, "serve");
   warnElectronVersion(config);
-  console.log(pc4.cyan("\n\u26A1 nasti electron dev") + pc4.dim(` v${"1.6.4"}`));
+  console.log(pc4.cyan("\n\u26A1 nasti electron dev") + pc4.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();