@windwalker-io/core 4.2.4 → 4.2.6

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

@@ -1,127 +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);
-
-    // get blade styles and add watches
-    const bladeFiles = fg.globSync(this.bladePatterns);
-
-    for (const file of bladeFiles) {
-      builder.watches.push({
-        file,
-        moduleFile: inputFile,
-        updateType: 'css-update',
-      } satisfies WatchTask);
-    }
-
-    builder.loadCallbacks.push((src, options) => {
-      const file = stripUrlQuery(src);
-
-      if (normalize(file) === inputFile) {
-        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';

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

@@ -1,178 +1,184 @@
-import { callbackAfterBuild, copyGlob, symlink } from '@windwalker-io/fusion-next';
-import fs from 'fs-extra';
-import path from 'node:path';
-import { loadJson } from '../../utilities';
-
-export function installVendors(
-  npmVendors: string[] = [],
-  to: string = 'www/assets/vendor',
-) {
-  return callbackAfterBuild(() => findAndInstall(npmVendors, to));
-}
-
-enum InstallAction {
-  LINK = 'Link',
-  COPY = 'Copy',
-}
-
-export async function findAndInstall(npmVendors: string[] = [], to = 'www/assets/vendor') {
-  const root = to;
-  let vendors = npmVendors;
-  const action = process.env.INSTALL_VENDOR === 'hard' ? InstallAction.COPY : InstallAction.LINK;
-
-  console.log("");
-
-  if (!fs.existsSync(root)) {
-    fs.mkdirSync(root);
-  }
-
-  const dirs = fs.readdirSync(root, { withFileTypes: true })
-    .filter(d => d.isDirectory())
-    .map(dir => path.join(root, dir.name));
-
-  dirs.unshift(root);
-
-  dirs.forEach((dir) => {
-    deleteExists(dir);
-  });
-
-  const composerJsons = getInstalledComposerVendors()
-    .map((cv) => `vendor/${cv}/composer.json`)
-    .map((file) => loadJson(file))
-    .filter((composerJson) => composerJson?.extra?.windwalker != null);
-
-  // Install npm vendors
-  vendors = findNpmVendors(composerJsons).concat(vendors);
-  vendors = [...new Set(vendors)];
-
-  for (const vendor of vendors) {
-    const source = `node_modules/${vendor}/`;
-    if (fs.existsSync(source)) {
-      console.log(`[${action} NPM] node_modules/${vendor}/ => ${root}/${vendor}/`);
-      doInstall(source, `${root}/${vendor}/`);
-    }
-  }
-
-  // Install composer packages assets
-  for (const composerJson of composerJsons) {
-    const vendorName = composerJson.name;
-
-    let assets = composerJson?.extra?.windwalker?.assets?.link;
-
-    if (!assets) {
-      continue;
-    }
-
-    if (!assets.endsWith('/')) {
-      assets += '/';
-    }
-
-    if (fs.existsSync(`vendor/${vendorName}/${assets}`)) {
-      console.log(`[${action} Composer] vendor/${vendorName}/${assets} => ${root}/${vendorName}/`);
-      doInstall(`vendor/${vendorName}/${assets}`, `${root}/${vendorName}/`);
-    }
-  }
-
-  // Install legacy packages assets
-  // legacyComposerVendors.forEach((vendorName) => {
-  //   console.log(vendorName, fs.existsSync(`vendor/${vendorName}/assets`));
-  //   if (fs.existsSync(`vendor/${vendorName}/assets`)) {
-  //     console.log(`[${action} Composer] vendor/${vendorName}/assets/ => ${root}/${vendorName}/`);
-  //     doInstall(`vendor/${vendorName}/assets/`, `${root}/${vendorName}/`);
-  //   }
-  // });
-
-  // Install local saved vendors
-  const staticVendorDir = 'resources/assets/vendor/';
-
-  if (fs.existsSync(staticVendorDir)) {
-    const staticVendors = fs.readdirSync(staticVendorDir);
-
-    for (const staticVendor of staticVendors) {
-      if (staticVendor.startsWith('@')) {
-        const subVendors = fs.readdirSync(staticVendorDir + staticVendor);
-
-        for (const subVendor of subVendors) {
-          const subVendorName = staticVendor + '/' + subVendor;
-          const source = staticVendorDir + subVendorName + '/';
-
-          if (fs.existsSync(source)) {
-            console.log(`[${action} Local] resources/assets/vendor/${subVendorName}/ => ${root}/${subVendorName}/`);
-            doInstall(source, `${root}/${subVendorName}/`);
-          }
-        }
-      } else {
-        let source = staticVendorDir + staticVendor;
-
-        if (fs.existsSync(source)) {
-          console.log(`[${action} Local] resources/assets/vendor/${staticVendor}/ => ${root}/${staticVendor}/`);
-          doInstall(source, `${root}/${staticVendor}/`);
-        }
-      }
-    }
-  }
-}
-
-async function doInstall(source: string, dest: string) {
-  if (process.env.INSTALL_VENDOR === 'hard') {
-    await copyGlob(source + '/**/*', dest);
-  } else {
-    await symlink(source, dest);
-  }
-}
-
-function findNpmVendors(composerJsons: any[] = []) {
-  const pkg = path.resolve(process.cwd(), 'package.json');
-  const pkgJson = loadJson(pkg);
-
-  let vendors = Object.keys(pkgJson.devDependencies || {})
-    .concat(Object.keys(pkgJson.dependencies || {}))
-    .map(id => `node_modules/${id}/package.json`)
-    .map((file) => loadJson(file))
-    .filter(pkgJson => pkgJson?.windwalker != null)
-    .map(pkgJson => pkgJson?.windwalker.vendors || [])
-    .flat();
-
-  const vendorsFromComposer = composerJsons
-    .map((composerJson) => {
-      return [
-        ...composerJson?.extra?.windwalker?.asset_vendors || [],
-        ...composerJson?.extra?.windwalker?.assets?.exposes || [],
-        ...Object.keys(composerJson?.extra?.windwalker?.assets?.vendors || {})
-      ];
-    })
-    .flat();
-
-  return [...new Set(vendors.concat(vendorsFromComposer))];
-}
-
-function getInstalledComposerVendors() {
-  const composerFile = path.resolve(process.cwd(), 'composer.json');
-  const composerJson = loadJson(composerFile);
-
-  return [
-    ...new Set(
-      Object.keys(composerJson['require'] || {})
-        .concat(Object.keys(composerJson['require-dev'] || {}))
-    )
-  ];
-}
-
-function deleteExists(dir: string) {
-  if (!fs.existsSync(dir)) {
-    return;
-  }
-
-  const subDirs = fs.readdirSync(dir, { withFileTypes: true });
-
-  for (const subDir of subDirs) {
-    if (subDir.isSymbolicLink() || subDir.isFile()) {
-      fs.unlinkSync(path.join(dir, subDir.name));
-    } else if (subDir.isDirectory()) {
-      deleteExists(path.join(dir, subDir.name));
-    }
-  }
-
-  fs.rmdirSync(dir);
-}
-
+import fusion, { callbackAfterBuild, copyGlob, symlink, builder } from '@windwalker-io/fusion-next';
+import fs from 'fs-extra';
+import path from 'node:path';
+import { loadJson } from '../../utilities';
+
+export function installVendors(
+  npmVendors: string[] = [],
+  to: string = 'www/assets/vendor',
+) {
+  builder.merge({
+    build: {
+      manifest: false
+    }
+  });
+
+  return callbackAfterBuild(() => findAndInstall(npmVendors, to));
+}
+
+enum InstallAction {
+  LINK = 'Link',
+  COPY = 'Copy',
+}
+
+export async function findAndInstall(npmVendors: string[] = [], to = 'www/assets/vendor') {
+  const root = to;
+  let vendors = npmVendors;
+  const action = process.env.INSTALL_VENDOR === 'hard' ? InstallAction.COPY : InstallAction.LINK;
+
+  console.log("");
+
+  if (!fs.existsSync(root)) {
+    fs.mkdirSync(root);
+  }
+
+  const dirs = fs.readdirSync(root, { withFileTypes: true })
+    .filter(d => d.isDirectory())
+    .map(dir => path.join(root, dir.name));
+
+  dirs.unshift(root);
+
+  dirs.forEach((dir) => {
+    deleteExists(dir);
+  });
+
+  const composerJsons = getInstalledComposerVendors()
+    .map((cv) => `vendor/${cv}/composer.json`)
+    .map((file) => loadJson(file))
+    .filter((composerJson) => composerJson?.extra?.windwalker != null);
+
+  // Install npm vendors
+  vendors = findNpmVendors(composerJsons).concat(vendors);
+  vendors = [...new Set(vendors)];
+
+  for (const vendor of vendors) {
+    const source = `node_modules/${vendor}/`;
+    if (fs.existsSync(source)) {
+      console.log(`[${action} NPM] node_modules/${vendor}/ => ${root}/${vendor}/`);
+      doInstall(source, `${root}/${vendor}/`);
+    }
+  }
+
+  // Install composer packages assets
+  for (const composerJson of composerJsons) {
+    const vendorName = composerJson.name;
+
+    let assets = composerJson?.extra?.windwalker?.assets?.link;
+
+    if (!assets) {
+      continue;
+    }
+
+    if (!assets.endsWith('/')) {
+      assets += '/';
+    }
+
+    if (fs.existsSync(`vendor/${vendorName}/${assets}`)) {
+      console.log(`[${action} Composer] vendor/${vendorName}/${assets} => ${root}/${vendorName}/`);
+      doInstall(`vendor/${vendorName}/${assets}`, `${root}/${vendorName}/`);
+    }
+  }
+
+  // Install legacy packages assets
+  // legacyComposerVendors.forEach((vendorName) => {
+  //   console.log(vendorName, fs.existsSync(`vendor/${vendorName}/assets`));
+  //   if (fs.existsSync(`vendor/${vendorName}/assets`)) {
+  //     console.log(`[${action} Composer] vendor/${vendorName}/assets/ => ${root}/${vendorName}/`);
+  //     doInstall(`vendor/${vendorName}/assets/`, `${root}/${vendorName}/`);
+  //   }
+  // });
+
+  // Install local saved vendors
+  const staticVendorDir = 'resources/assets/vendor/';
+
+  if (fs.existsSync(staticVendorDir)) {
+    const staticVendors = fs.readdirSync(staticVendorDir);
+
+    for (const staticVendor of staticVendors) {
+      if (staticVendor.startsWith('@')) {
+        const subVendors = fs.readdirSync(staticVendorDir + staticVendor);
+
+        for (const subVendor of subVendors) {
+          const subVendorName = staticVendor + '/' + subVendor;
+          const source = staticVendorDir + subVendorName + '/';
+
+          if (fs.existsSync(source)) {
+            console.log(`[${action} Local] resources/assets/vendor/${subVendorName}/ => ${root}/${subVendorName}/`);
+            doInstall(source, `${root}/${subVendorName}/`);
+          }
+        }
+      } else {
+        let source = staticVendorDir + staticVendor;
+
+        if (fs.existsSync(source)) {
+          console.log(`[${action} Local] resources/assets/vendor/${staticVendor}/ => ${root}/${staticVendor}/`);
+          doInstall(source, `${root}/${staticVendor}/`);
+        }
+      }
+    }
+  }
+}
+
+async function doInstall(source: string, dest: string) {
+  if (process.env.INSTALL_VENDOR === 'hard') {
+    await copyGlob(source + '/**/*', dest);
+  } else {
+    await symlink(source, dest);
+  }
+}
+
+function findNpmVendors(composerJsons: any[] = []) {
+  const pkg = path.resolve(process.cwd(), 'package.json');
+  const pkgJson = loadJson(pkg);
+
+  let vendors = Object.keys(pkgJson.devDependencies || {})
+    .concat(Object.keys(pkgJson.dependencies || {}))
+    .map(id => `node_modules/${id}/package.json`)
+    .map((file) => loadJson(file))
+    .filter(pkgJson => pkgJson?.windwalker != null)
+    .map(pkgJson => pkgJson?.windwalker.vendors || [])
+    .flat();
+
+  const vendorsFromComposer = composerJsons
+    .map((composerJson) => {
+      return [
+        ...composerJson?.extra?.windwalker?.asset_vendors || [],
+        ...composerJson?.extra?.windwalker?.assets?.exposes || [],
+        ...Object.keys(composerJson?.extra?.windwalker?.assets?.vendors || {})
+      ];
+    })
+    .flat();
+
+  return [...new Set(vendors.concat(vendorsFromComposer))];
+}
+
+function getInstalledComposerVendors() {
+  const composerFile = path.resolve(process.cwd(), 'composer.json');
+  const composerJson = loadJson(composerFile);
+
+  return [
+    ...new Set(
+      Object.keys(composerJson['require'] || {})
+        .concat(Object.keys(composerJson['require-dev'] || {}))
+    )
+  ];
+}
+
+function deleteExists(dir: string) {
+  if (!fs.existsSync(dir)) {
+    return;
+  }
+
+  const subDirs = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const subDir of subDirs) {
+    if (subDir.isSymbolicLink() || subDir.isFile()) {
+      fs.unlinkSync(path.join(dir, subDir.name));
+    } else if (subDir.isDirectory()) {
+      deleteExists(path.join(dir, subDir.name));
+    }
+  }
+
+  fs.rmdirSync(dir);
+}
+