@windwalker-io/core 4.2.2 → 4.2.3

package/LICENSE

@@ -1,19 +1,19 @@
-Copyright (c) 2018 Simon Asika
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2018 Simon Asika
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/next.js

@@ -1,4 +1,4 @@
-import { getGlobBaseFromPattern, callback, css, js, shortHash, plugin, callbackAfterBuild, copyGlob, symlink } from "@windwalker-io/fusion-next";
+import { getGlobBaseFromPattern, callback, css, js, plugin, callbackAfterBuild, copyGlob, symlink } from "@windwalker-io/fusion-next";
 import isGlob from "is-glob";
 import micromatch from "micromatch";
 import path, { relative, normalize, resolve } from "node:path";
@@ -313,6 +313,9 @@ class JsModulizeProcessor {
       builder.postBuildCallbacks.push((options, bundle) => {
         fs$1.removeSync(tmpPath);
       });
+      builder.serverStopCallbacks.push((options, bundle) => {
+        fs$1.removeSync(tmpPath);
+      });
     }
     this.ignoreMainImport(task);
     builder.resolveIdCallbacks.push((id) => {
@@ -327,7 +330,6 @@ class JsModulizeProcessor {
       const scripts = {};
       if (normalize(srcFile) === inputFile) {
         const bladeScripts = parseScriptsFromBlades(bladeFiles);
-        fs$1.removeSync(tmpPath);
         for (const scriptFile of scriptFiles) {
           let fullpath = scriptFile.fullpath;
           if (fullpath.endsWith(".d.ts")) {
@@ -346,7 +348,8 @@ class JsModulizeProcessor {
         fs$1.ensureDirSync(tmpPath);
         for (const result of bladeScripts) {
           let key = result.as;
-          const tmpFile = tmpPath + "/" + result.path.replace(/\\|\//g, "_") + "-" + shortHash(result.code) + ".ts";
+          const filename = result.path.replace(/\\|\//g, "_");
+          const tmpFile = tmpPath + "/" + filename + ".ts";
           if (!fs$1.existsSync(tmpFile) || fs$1.readFileSync(tmpFile, "utf8") !== result.code) {
             fs$1.writeFileSync(tmpFile, result.code);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windwalker-io/core",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "type": "module",
   "description": "Windwalker Core JS package",
   "scripts": {

package/src/asset-bundler.mjs

@@ -1,114 +1,114 @@
-import { webpackBundle } from '@windwalker-io/fusion';
-import fs from 'fs';
-import { globSync } from 'glob';
-import path from 'path';
-import { findModules } from './asset-sync.mjs';
-
-/**
- *
- * @param {string} mainFile
- * @param {string|string[]} source
- * @param {string} dest
- * @param {any} options
- * @returns {Promise<any>}
- */
-export async function bundleJS(
-  mainFile = `./resources/assets/src/app.ts`,
-  source = 'src/Module/**/*.ts',
-  dest = 'www/assets/js/app/app.js',
-  options = {}
-) {
-  const workingDir = process.cwd();
-
-  if (typeof source === 'string') {
-    source = [source];
-  }
-
-  const files = findFilesFromGlobArray([
-    ...findModules('**/assets/*.ts'),
-    ...source,
-  ]);
-
-  let listJS = "{\n";
-
-  for (const file of files) {
-    if (file.fullpath.endsWith('.d.ts')) {
-      continue;
-    }
-
-    let key = file.relativePath.replace(/assets$/, '').toLowerCase();
-    key = key.substring(0, key.lastIndexOf('.'));
-    listJS += `'${key}': () => import('${file.fullpath}'),\n`;
-  }
-
-  listJS += "}";
-
-  let ts = `
-import loader from '@windwalker-io/core/src/loader/core-loader.ts';
-
-loader.register(${listJS});
-
-export default loader;
-  `;
-
-  // const base64 = Buffer.from(ts).toString('base64');
-  // const dataUri = `data:text/javascript;base64,${base64}`;
-  const tmpDir = workingDir + '/tmp/fusion';
-  fs.mkdirSync(tmpDir, { recursive: true });
-
-  const tmpFile = tmpDir + '/app.js';
-  fs.writeFileSync(tmpFile, ts);
-
-  const r = await webpackBundle(
-    tmpFile,
-    dest,
-    (config) => {
-      config.devtool = false;
-      // config.entry = dataUri;
-      // config.output.uniqueName = 'app';
-      config.output.libraryTarget = 'module';
-      config.experiments.outputModule = true;
-      config.resolve.modules.push(path.resolve('./'));
-      config.context = path.resolve('./');
-      config.resolve.alias = {
-        '@main': path.resolve(mainFile),
-        '@app': path.resolve(mainFile),
-      };
-    }
-  );
-
-  // fs.unlinkSync(tmpFile);
-
-  return r;
-}
-
-  function findFilesFromGlobArray(sources) {
-    let files = [];
-
-    for (const source of sources) {
-      files = [
-        ...files,
-        ...findFiles(source)
-      ];
-    }
-
-    return files;
-  }
-
-  /**
-   * @param {string} src
-   */
-  function findFiles(src) {
-    const i = src.lastIndexOf('**');
-
-    const path = src.substring(0, i);
-
-    return globSync(src).map((file) => {
-      file = file.replace(/\\/g, '/');
-
-      return {
-        fullpath: file,
-        relativePath: file.substring(path.length)
-      };
-    });
-  }
+import { webpackBundle } from '@windwalker-io/fusion';
+import fs from 'fs';
+import { globSync } from 'glob';
+import path from 'path';
+import { findModules } from './asset-sync.mjs';
+
+/**
+ *
+ * @param {string} mainFile
+ * @param {string|string[]} source
+ * @param {string} dest
+ * @param {any} options
+ * @returns {Promise<any>}
+ */
+export async function bundleJS(
+  mainFile = `./resources/assets/src/app.ts`,
+  source = 'src/Module/**/*.ts',
+  dest = 'www/assets/js/app/app.js',
+  options = {}
+) {
+  const workingDir = process.cwd();
+
+  if (typeof source === 'string') {
+    source = [source];
+  }
+
+  const files = findFilesFromGlobArray([
+    ...findModules('**/assets/*.ts'),
+    ...source,
+  ]);
+
+  let listJS = "{\n";
+
+  for (const file of files) {
+    if (file.fullpath.endsWith('.d.ts')) {
+      continue;
+    }
+
+    let key = file.relativePath.replace(/assets$/, '').toLowerCase();
+    key = key.substring(0, key.lastIndexOf('.'));
+    listJS += `'${key}': () => import('${file.fullpath}'),\n`;
+  }
+
+  listJS += "}";
+
+  let ts = `
+import loader from '@windwalker-io/core/src/loader/core-loader.ts';
+
+loader.register(${listJS});
+
+export default loader;
+  `;
+
+  // const base64 = Buffer.from(ts).toString('base64');
+  // const dataUri = `data:text/javascript;base64,${base64}`;
+  const tmpDir = workingDir + '/tmp/fusion';
+  fs.mkdirSync(tmpDir, { recursive: true });
+
+  const tmpFile = tmpDir + '/app.js';
+  fs.writeFileSync(tmpFile, ts);
+
+  const r = await webpackBundle(
+    tmpFile,
+    dest,
+    (config) => {
+      config.devtool = false;
+      // config.entry = dataUri;
+      // config.output.uniqueName = 'app';
+      config.output.libraryTarget = 'module';
+      config.experiments.outputModule = true;
+      config.resolve.modules.push(path.resolve('./'));
+      config.context = path.resolve('./');
+      config.resolve.alias = {
+        '@main': path.resolve(mainFile),
+        '@app': path.resolve(mainFile),
+      };
+    }
+  );
+
+  // fs.unlinkSync(tmpFile);
+
+  return r;
+}
+
+  function findFilesFromGlobArray(sources) {
+    let files = [];
+
+    for (const source of sources) {
+      files = [
+        ...files,
+        ...findFiles(source)
+      ];
+    }
+
+    return files;
+  }
+
+  /**
+   * @param {string} src
+   */
+  function findFiles(src) {
+    const i = src.lastIndexOf('**');
+
+    const path = src.substring(0, i);
+
+    return globSync(src).map((file) => {
+      file = file.replace(/\\/g, '/');
+
+      return {
+        fullpath: file,
+        relativePath: file.substring(path.length)
+      };
+    });
+  }

package/src/debugger/types/global.d.js

@@ -1,2 +1,2 @@
-declare module '*.jpg';
-declare module '*.svg';
+declare module '*.jpg';
+declare module '*.svg';

package/src/index.mjs

@@ -1,11 +1,11 @@
-/**
- * Part of funclass project.
- *
- * @copyright  Copyright (C) 2021 LYRASOFT.
- * @license    __LICENSE__
- */
-
-export * from './asset-sync.mjs';
-export * from './asset-bundler.mjs';
-export * from './install-vendors.mjs';
-export * from './app.ts';
+/**
+ * Part of funclass project.
+ *
+ * @copyright  Copyright (C) 2021 LYRASOFT.
+ * @license    __LICENSE__
+ */
+
+export * from './asset-sync.mjs';
+export * from './asset-bundler.mjs';
+export * from './install-vendors.mjs';
+export * from './app.ts';

package/src/legacy/4.0/js-sync.mjs

@@ -1,74 +1,74 @@
-import { findModules } from '@windwalker-io/core/src/index.mjs';
-import { dest as toDest, src, ts } from '@windwalker-io/fusion';
-import { postStream, prepareStream } from '@windwalker-io/fusion/src/lifecycles.js';
-import { extractDest } from '@windwalker-io/fusion/src/utilities/utilities.js';
-import { existsSync } from 'fs';
-import rename from 'gulp-rename';
-import path from 'path';
-
-/**
- * @deprecated
- */
-export function jsSync(source = 'src/Module', dest, options = {}) {
-  const tsOptions = options.ts || {};
-
-  if (!tsOptions.tsconfig) {
-    tsOptions.tsconfig = path.resolve('tsconfig.json');
-
-    if (!existsSync(tsOptions.tsconfig)) {
-      tsOptions.tsconfig = path.resolve('node_modules/@windwalker-io/unicorn/tsconfig.js.json');
-    }
-  }
-
-  const sourceList = [];
-
-  sourceList.push(...findModules('**/assets/*.{js,mjs}'));
-  sourceList.push(source + '**/assets/*.{js,mjs}');
-
-  let stream = prepareStream(src(sourceList));
-
-  stream = stream.pipe(rename((path) => {
-    path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
-  }));
-
-  const jsDest = extractDest(dest);
-
-  //
-  // // if (dest.merge) {
-  // //   stream = stream.pipe(rename(path.basename(dest.file)));
-  // // }
-  //
-  stream = stream.pipe(toDest(jsDest.path).on('error', e => console.error(e)));
-
-  return Promise.all([
-    new Promise((resolve) => {
-      postStream(stream).on('end', (event) => {
-        const data = {
-          event,
-          src,
-          dest: jsDest,
-          stream
-        };
-
-        resolve(data);
-      });
-    }),
-    // Legacy mode
-    ts(
-      [
-        ...findModules('**/assets/*.ts'),
-        'node_modules/@windwalker-io/unicorn/src/types/*.d.ts',
-        `${source}/**/*.ts`,
-      ],
-      dest,
-      {
-        rename: (path) => {
-          path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
-        },
-        ...tsOptions
-      }
-    )
-  ]).then((v) => {
-    return v[0];
-  });
-}
+import { findModules } from '@windwalker-io/core/src/index.mjs';
+import { dest as toDest, src, ts } from '@windwalker-io/fusion';
+import { postStream, prepareStream } from '@windwalker-io/fusion/src/lifecycles.js';
+import { extractDest } from '@windwalker-io/fusion/src/utilities/utilities.js';
+import { existsSync } from 'fs';
+import rename from 'gulp-rename';
+import path from 'path';
+
+/**
+ * @deprecated
+ */
+export function jsSync(source = 'src/Module', dest, options = {}) {
+  const tsOptions = options.ts || {};
+
+  if (!tsOptions.tsconfig) {
+    tsOptions.tsconfig = path.resolve('tsconfig.json');
+
+    if (!existsSync(tsOptions.tsconfig)) {
+      tsOptions.tsconfig = path.resolve('node_modules/@windwalker-io/unicorn/tsconfig.js.json');
+    }
+  }
+
+  const sourceList = [];
+
+  sourceList.push(...findModules('**/assets/*.{js,mjs}'));
+  sourceList.push(source + '**/assets/*.{js,mjs}');
+
+  let stream = prepareStream(src(sourceList));
+
+  stream = stream.pipe(rename((path) => {
+    path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
+  }));
+
+  const jsDest = extractDest(dest);
+
+  //
+  // // if (dest.merge) {
+  // //   stream = stream.pipe(rename(path.basename(dest.file)));
+  // // }
+  //
+  stream = stream.pipe(toDest(jsDest.path).on('error', e => console.error(e)));
+
+  return Promise.all([
+    new Promise((resolve) => {
+      postStream(stream).on('end', (event) => {
+        const data = {
+          event,
+          src,
+          dest: jsDest,
+          stream
+        };
+
+        resolve(data);
+      });
+    }),
+    // Legacy mode
+    ts(
+      [
+        ...findModules('**/assets/*.ts'),
+        'node_modules/@windwalker-io/unicorn/src/types/*.d.ts',
+        `${source}/**/*.ts`,
+      ],
+      dest,
+      {
+        rename: (path) => {
+          path.dirname = path.dirname.replace(/assets$/, '').toLowerCase();
+        },
+        ...tsOptions
+      }
+    )
+  ]).then((v) => {
+    return v[0];
+  });
+}

package/src/next/fusion/index.ts

@@ -1,2 +1,2 @@
-export * from './plugins';
-export * from './processors';
+export * from './plugins';
+export * from './processors';

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

@@ -1,29 +1,29 @@
-import { type FusionPlugin } from '@windwalker-io/fusion-next';
-import { getAvailableForReposition, handleCloneAssets, handleReposition } from '../processors/cloneAssets';
-
-export interface WindwalkerAssetsOptions {
-  clone?: Record<string, string>;
-  reposition?: Record<string, string>;
-}
-
-export function globalAssets(options: WindwalkerAssetsOptions): FusionPlugin {
-  return {
-    name: 'core:global-assets',
-    buildConfig(builder) {
-      const clone = options.clone || {};
-      let reposition = options.reposition || {};
-
-      reposition = { ...reposition, ...getAvailableForReposition(clone) };
-
-      // Handle reposition
-      handleReposition(builder, reposition);
-
-      const clonePatterns = Object.keys(clone);
-
-      // Handle clone
-      if (clonePatterns.length > 0) {
-        handleCloneAssets(builder, clonePatterns);
-      }
-    }
-  };
-}
+import { type FusionPlugin } from '@windwalker-io/fusion-next';
+import { getAvailableForReposition, handleCloneAssets, handleReposition } from '../processors/cloneAssets';
+
+export interface WindwalkerAssetsOptions {
+  clone?: Record<string, string>;
+  reposition?: Record<string, string>;
+}
+
+export function globalAssets(options: WindwalkerAssetsOptions): FusionPlugin {
+  return {
+    name: 'core:global-assets',
+    buildConfig(builder) {
+      const clone = options.clone || {};
+      let reposition = options.reposition || {};
+
+      reposition = { ...reposition, ...getAvailableForReposition(clone) };
+
+      // Handle reposition
+      handleReposition(builder, reposition);
+
+      const clonePatterns = Object.keys(clone);
+
+      // Handle clone
+      if (clonePatterns.length > 0) {
+        handleCloneAssets(builder, clonePatterns);
+      }
+    }
+  };
+}

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

@@ -1,3 +1,3 @@
-export * from './assets';
-export * from './systemjs';
-
+export * from './assets';
+export * from './systemjs';
+