@windwalker-io/core 4.2.9 → 4.2.11

package/src/next/fusion/plugins/systemjs.ts

@@ -1,66 +1,66 @@
-import fs from 'fs-extra';
-import { resolve } from 'node:path';
-import type { OutputAsset, OutputChunk } from 'rollup';
-import type { PluginOption } from 'vite';
-
-export function injectSystemJS(systemPath?: string, filter?: (file: OutputAsset | OutputChunk) => any): PluginOption {
-  systemPath ??= resolve('node_modules/systemjs/dist/system.min.js');
-
-  return {
-    name: 'core:inject-systemjs',
-    async generateBundle(options, bundle) {
-      if (options.format !== 'system') {
-        return;
-      }
-
-      const systemjsCode = fs.readFileSync(
-        resolve(systemPath),
-        'utf-8'
-      );
-
-      for (const file of Object.values(bundle)) {
-        if (filter && !filter(file)) {
-          continue;
-        }
-
-        if (file.type === 'chunk' && file.isEntry && file.fileName.endsWith('.js')) {
-          file.code = systemjsCode + '\n' + file.code;
-        }
-      }
-    }
-  };
-}
-
-export function systemCSSFix(): PluginOption {
-  return {
-    name: 'core:systemjs-css-fix',
-    async generateBundle(options, bundle) {
-      if (options.format !== 'system') {
-        return;
-      }
-
-      for (const [fileName, chunk] of Object.entries(bundle)) {
-        if (fileName.endsWith('.css') && 'code' in chunk) {
-          const regex = /__vite_style__\.textContent\s*=\s*"([\s\S]*?)";/;
-          let match = chunk.code.match(regex);
-
-          // For minified
-          if (!match) {
-            const regex = /\.textContent\s*=\s*`([\s\S]*?)`/;
-            match = chunk.code.match(regex);
-          }
-
-          if (match && match[1]) {
-            chunk.code = match[1]
-              .replace(/\\"/g, '"')
-              .replace(/\\n/g, '\n')
-              .replace(/\\t/g, '\t')
-              .replace(/\\\\/g, '\\')
-              .replace(/\/\*\$vite\$:\d+\*\/$/, '')
-          }
-        }
-      }
-    }
-  };
-}
-
+import fs from 'fs-extra';
+import { resolve } from 'node:path';
+import type { OutputAsset, OutputChunk } from 'rollup';
+import type { PluginOption } from 'vite';
+
+export function injectSystemJS(systemPath?: string, filter?: (file: OutputAsset | OutputChunk) => any): PluginOption {
+  systemPath ??= resolve('node_modules/systemjs/dist/system.min.js');
+
+  return {
+    name: 'core:inject-systemjs',
+    async generateBundle(options, bundle) {
+      if (options.format !== 'system') {
+        return;
+      }
+
+      const systemjsCode = fs.readFileSync(
+        resolve(systemPath),
+        'utf-8'
+      );
+
+      for (const file of Object.values(bundle)) {
+        if (filter && !filter(file)) {
+          continue;
+        }
+
+        if (file.type === 'chunk' && file.isEntry && file.fileName.endsWith('.js')) {
+          file.code = systemjsCode + '\n' + file.code;
+        }
+      }
+    }
+  };
+}
+
+export function systemCSSFix(): PluginOption {
+  return {
+    name: 'core:systemjs-css-fix',
+    async generateBundle(options, bundle) {
+      if (options.format !== 'system') {
+        return;
+      }
+
+      for (const [fileName, chunk] of Object.entries(bundle)) {
+        if (fileName.endsWith('.css') && 'code' in chunk) {
+          const regex = /__vite_style__\.textContent\s*=\s*"([\s\S]*?)";/;
+          let match = chunk.code.match(regex);
+
+          // For minified
+          if (!match) {
+            const regex = /\.textContent\s*=\s*`([\s\S]*?)`/;
+            match = chunk.code.match(regex);
+          }
+
+          if (match && match[1]) {
+            chunk.code = match[1]
+              .replace(/\\"/g, '"')
+              .replace(/\\n/g, '\n')
+              .replace(/\\t/g, '\t')
+              .replace(/\\\\/g, '\\')
+              .replace(/\/\*\$vite\$:\d+\*\/$/, '')
+          }
+        }
+      }
+    }
+  };
+}
+

package/src/next/fusion/processors/cloneAssets.ts

@@ -1,81 +1,85 @@
-import { callback, type ConfigBuilder } from '@windwalker-io/fusion-next';
-import isGlob from 'is-glob';
-import micromatch from 'micromatch';
-import { normalize } from 'node:path';
-import { relative } from 'node:path';
-import { containsMiddleGlob, removeLastGlob, uniqId } from '../../utilities';
-
-export function cloneAssets(patterns: Record<string, string>) {
-  return callback((taskName, builder) => {
-    const reposition = getAvailableForReposition(patterns);
-
-    handleReposition(builder, reposition);
-
-    handleCloneAssets(builder, Object.keys(patterns));
-
-    return null;
-  });
-}
-
-export function getAvailableForReposition(patterns: Record<string, string>) {
-  const reposition: Record<string, string> = {};
-
-  for (const from in patterns) {
-    // If clone from contains middle glob: eg. `assets/**/files`, we cannot handle the naming
-    // Let the naming options to handle it.
-    if (!containsMiddleGlob(from)) {
-      reposition[from] = patterns[from];
-    }
-  }
-
-  return reposition;
-}
-
-export function handleCloneAssets(builder: ConfigBuilder, clonePatterns: string[]) {
-  // An module starts `hidden:` will be ignored by fusion
-  const id = uniqId('hidden:clone-asset-') + '.js';
-
-  const task = builder.addTask(id);
-
-  builder.resolveIdCallbacks.push((src) => {
-    if (src === id) {
-      return id;
-    }
-  });
-
-  builder.loadCallbacks.push((src) => {
-    if (src === id) {
-      const glob = clonePatterns
-        // Replace slash to unix style
-        .map(v => v.replace(/\\/g, '/'))
-        // Glob in virtual module should start with /
-        .map(v => v.startsWith('./') || !v.startsWith('/') ? `/${v}` : v)
-        // wrap with quotes
-        .map(v => `'${v}'`)
-        // join it to string.
-        .join(', ');
-
-      return `import.meta.glob(${glob});\n`;
-    }
-  });
-}
-
-export function handleReposition(builder: ConfigBuilder, reposition: Record<string, string>) {
-  builder.assetFileNamesCallbacks.push((assetInfo) => {
-    const fileName = assetInfo.originalFileName || assetInfo.name || assetInfo.names[0] || '';
-
-    for (const base in reposition) {
-      if (match(fileName, base)) {
-        return normalize(reposition[base] + relative(removeLastGlob(base), fileName)).replace(/\\/g, '/');
-      }
-    }
-  });
-}
-
-function match(str: string, pattern: string) {
-  if (isGlob(pattern)) {
-    return micromatch.isMatch(str, pattern);
-  }
-
-  return str.startsWith(pattern);
-}
+import { callback, type ConfigBuilder } from '@windwalker-io/fusion-next';
+import fg from 'fast-glob';
+import isGlob from 'is-glob';
+import micromatch from 'micromatch';
+import { normalize, relative } from 'node:path';
+import { containsMiddleGlob, removeLastGlob, uniqId } from '../../utilities';
+
+export function cloneAssets(patterns: Record<string, string>) {
+  return callback((taskName, builder) => {
+    const reposition = getAvailableForReposition(patterns);
+
+    handleReposition(builder, reposition);
+
+    handleCloneAssets(builder, Object.keys(patterns));
+
+    return null;
+  });
+}
+
+export function getAvailableForReposition(patterns: Record<string, string>) {
+  const reposition: Record<string, string> = {};
+
+  for (const from in patterns) {
+    // If clone from contains middle glob: eg. `assets/**/files`, we cannot handle the naming
+    // Let the naming options to handle it.
+    if (!containsMiddleGlob(from)) {
+      reposition[from] = patterns[from];
+    }
+  }
+
+  return reposition;
+}
+
+export function handleCloneAssets(builder: ConfigBuilder, clonePatterns: string[]) {
+  // An module starts `hidden:` will be ignored by fusion
+  const id = uniqId('hidden:clone-asset-') + '.js';
+
+  const task = builder.addTask(id);
+
+  builder.resolveIdCallbacks.push((src) => {
+    if (src === id) {
+      return id;
+    }
+  });
+
+  builder.loadCallbacks.push((src) => {
+    if (src === id) {
+      const glob = clonePatterns
+        // Replace slash to unix style
+        .map(v => v.replace(/\\/g, '/'));
+
+      // Find images and handle paths
+      const images = fg.globSync(glob)
+        .map(v => v.startsWith('./') || !v.startsWith('/') ? `/${v}` : v);
+
+      // Build imports
+      const lines = images.map((v, i) => `import img${i++} from '${v}';`);
+
+      // export as array to keep from treeshake
+      lines.push(`export default [${images.map((_, index) => `img${index}`).join(', ')}];`);
+
+      return lines.join('\n') + '\n';
+    }
+  });
+}
+
+export function handleReposition(builder: ConfigBuilder, reposition: Record<string, string>) {
+  builder.assetFileNamesCallbacks.push((assetInfo) => {
+    const fileName = assetInfo.originalFileName || assetInfo.name || assetInfo.names[0] || '';
+
+    for (const base in reposition) {
+      if (match(fileName, base)) {
+        return normalize(reposition[base] + relative(removeLastGlob(base), fileName)).replace(/\\/g, '/');
+      }
+    }
+  });
+}
+
+function match(str: string, pattern: string) {
+  if (isGlob(pattern)) {
+    return micromatch.isMatch(str, pattern);
+  }
+
+  return str.startsWith(pattern);
+}

package/src/next/fusion/processors/cssModulize.ts

@@ -1,128 +1,128 @@
-import { type ConfigBuilder, css, type ProcessorInterface, type ProcessorPreview } from '@windwalker-io/fusion-next';
-import { WatchTask } from '@windwalker-io/fusion-next/src/types';
-import fg from 'fast-glob';
-import fs from 'fs-extra';
-import { parse } from 'node-html-parser';
-import { normalize, resolve } from 'node:path';
-import { findModules, findPackages, stripUrlQuery } from '../../utilities';
-
-export function cssModulize(entry: string, dest: string) {
-  return new CssModulizeProcessor(css(entry, dest));
-}
-
-export interface CssModulizeDeepOptions {
-  mergeCss?: boolean;
-  parseBlades?: boolean;
-}
-
-export function cssModulizeDeep(stage: string, entry: string, dest: string, options: CssModulizeDeepOptions = {}) {
-  const processor = cssModulize(entry, dest);
-
-  if (options.mergeCss ?? true) {
-    processor.mergeCss(findModules(`${stage}/**/assets/*.scss`));
-  }
-
-  if (options.parseBlades ?? true) {
-    processor.parseBlades(
-      findModules(`${stage}/**/*.blade.php`),
-      findPackages('views/**/*.blade.php'),
-    );
-  }
-
-  return processor;
-}
-
-class CssModulizeProcessor implements ProcessorInterface {
-
-  constructor(
-    protected processor: ReturnType<typeof css>,
-    protected bladePatterns: string[] = [],
-    protected cssPatterns: string[] = []
-  ) {
-
-  }
-
-  parseBlades(...bladePatterns: (string[] | string)[]) {
-    this.bladePatterns = this.bladePatterns.concat(bladePatterns.flat());
-
-    return this;
-  }
-
-  mergeCss(...css: (string[] | string)[]) {
-    this.cssPatterns = this.cssPatterns.concat(css.flat());
-
-    return this;
-  }
-
-  config(taskName: string, builder: ConfigBuilder) {
-    const tasks = this.processor.config(taskName, builder);
-    const task = tasks[0];
-    const inputFile = resolve(task.input);
-
-    builder.loadCallbacks.push((src, options) => {
-      const file = stripUrlQuery(src);
-
-      if (normalize(file) === inputFile) {
-        // get blade styles and add watches
-        const bladeFiles = fg.globSync(this.bladePatterns);
-
-        for (const file of bladeFiles) {
-          const realpath = resolve(file).replace(/\\/g, '/');
-          builder.addWatch(realpath, {
-            file: realpath,
-            moduleFile: inputFile,
-            updateType: 'css-update',
-          } satisfies WatchTask);
-        }
-
-        const patterns = fg.globSync(
-          this.cssPatterns.map((v) => resolve(v))
-            .map(v => v.replace(/\\/g, '/'))
-        );
-
-        const imports = patterns
-          .map((pattern) => `@import "${pattern}";`)
-          .concat(this.parseStylesFromBlades(bladeFiles))
-          .join('\n');
-
-        let main = fs.readFileSync(file, 'utf-8');
-
-        main += `\n\n${imports}\n`;
-
-        return main;
-      }
-    });
-
-    return undefined;
-  }
-
-  parseStylesFromBlades(files: string[]) {
-    return files.map((file) => {
-      const bladeText = fs.readFileSync(file, 'utf8');
-
-      const html = parse(bladeText);
-
-      return html.querySelectorAll('style[type][data-macro],script[type][data-macro]')
-        .filter(
-          (el) => ['text/scss', 'text/css'].includes(el.getAttribute('type') || '')
-        )
-        .map((el) => {
-          const scope = el.getAttribute('data-scope');
-
-          if (scope) {
-            return `${scope} {
-          ${el.innerHTML}
-        }`;
-          } else {
-            return el.innerHTML;
-          }
-        });
-    })
-      .filter((c) => c.length > 0)
-      .flat();
-  }
-
-  preview(): ProcessorPreview[] {
-    return [];
-  }
-}
+import { type ConfigBuilder, css, type ProcessorInterface, type ProcessorPreview } from '@windwalker-io/fusion-next';
+import { WatchTask } from '@windwalker-io/fusion-next/src/types';
+import fg from 'fast-glob';
+import fs from 'fs-extra';
+import { parse } from 'node-html-parser';
+import { normalize, resolve } from 'node:path';
+import { findModules, findPackages, stripUrlQuery } from '../../utilities';
+
+export function cssModulize(entry: string, dest: string) {
+  return new CssModulizeProcessor(css(entry, dest));
+}
+
+export interface CssModulizeDeepOptions {
+  mergeCss?: boolean;
+  parseBlades?: boolean;
+}
+
+export function cssModulizeDeep(stage: string, entry: string, dest: string, options: CssModulizeDeepOptions = {}) {
+  const processor = cssModulize(entry, dest);
+
+  if (options.mergeCss ?? true) {
+    processor.mergeCss(findModules(`${stage}/**/assets/*.scss`));
+  }
+
+  if (options.parseBlades ?? true) {
+    processor.parseBlades(
+      findModules(`${stage}/**/*.blade.php`),
+      findPackages('views/**/*.blade.php'),
+    );
+  }
+
+  return processor;
+}
+
+class CssModulizeProcessor implements ProcessorInterface {
+
+  constructor(
+    protected processor: ReturnType<typeof css>,
+    protected bladePatterns: string[] = [],
+    protected cssPatterns: string[] = []
+  ) {
+
+  }
+
+  parseBlades(...bladePatterns: (string[] | string)[]) {
+    this.bladePatterns = this.bladePatterns.concat(bladePatterns.flat());
+
+    return this;
+  }
+
+  mergeCss(...css: (string[] | string)[]) {
+    this.cssPatterns = this.cssPatterns.concat(css.flat());
+
+    return this;
+  }
+
+  config(taskName: string, builder: ConfigBuilder) {
+    const tasks = this.processor.config(taskName, builder);
+    const task = tasks[0];
+    const inputFile = resolve(task.input);
+
+    builder.loadCallbacks.push((src, options) => {
+      const file = stripUrlQuery(src);
+
+      if (normalize(file) === inputFile) {
+        // get blade styles and add watches
+        const bladeFiles = fg.globSync(this.bladePatterns);
+
+        for (const file of bladeFiles) {
+          const realpath = resolve(file).replace(/\\/g, '/');
+          builder.addWatch(realpath, {
+            file: realpath,
+            moduleFile: inputFile,
+            updateType: 'css-update',
+          } satisfies WatchTask);
+        }
+
+        const patterns = fg.globSync(
+          this.cssPatterns.map((v) => resolve(v))
+            .map(v => v.replace(/\\/g, '/'))
+        );
+
+        const imports = patterns
+          .map((pattern) => `@import "${pattern}";`)
+          .concat(this.parseStylesFromBlades(bladeFiles))
+          .join('\n');
+
+        let main = fs.readFileSync(file, 'utf-8');
+
+        main += `\n\n${imports}\n`;
+
+        return main;
+      }
+    });
+
+    return undefined;
+  }
+
+  parseStylesFromBlades(files: string[]) {
+    return files.map((file) => {
+      const bladeText = fs.readFileSync(file, 'utf8');
+
+      const html = parse(bladeText);
+
+      return html.querySelectorAll('style[type][data-macro],script[type][data-macro]')
+        .filter(
+          (el) => ['text/scss', 'text/css'].includes(el.getAttribute('type') || '')
+        )
+        .map((el) => {
+          const scope = el.getAttribute('data-scope');
+
+          if (scope) {
+            return `${scope} {
+          ${el.innerHTML}
+        }`;
+          } else {
+            return el.innerHTML;
+          }
+        });
+    })
+      .filter((c) => c.length > 0)
+      .flat();
+  }
+
+  preview(): ProcessorPreview[] {
+    return [];
+  }
+}

package/src/next/fusion/processors/index.ts

@@ -1,4 +1,4 @@
-export { cssModulize, cssModulizeDeep, type CssModulizeDeepOptions } from './cssModulize';
-export { jsModulize, jsModulizeDeep, type JsModulizeOptions, type JsModulizeDeepOptions } from './jsModulize';
-export { installVendors } from './installVendors';
-export { cloneAssets } from './cloneAssets';
+export { cssModulize, cssModulizeDeep, type CssModulizeDeepOptions } from './cssModulize';
+export { jsModulize, jsModulizeDeep, type JsModulizeOptions, type JsModulizeDeepOptions } from './jsModulize';
+export { installVendors } from './installVendors';
+export { cloneAssets } from './cloneAssets';