@windwalker-io/core 4.1.2 → 4.1.4

package/fusionfile.mjs

@@ -15,7 +15,7 @@ import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 export async function debuggers() {
   return webpackVueBundle(
     'src/debugger/debugger.js',
-    'dist/debugger/index.js',
+    'dist/debugger/debugger.js',
     (config) => {
       config.resolve.alias = {
         '@': path.resolve(path.resolve(), './src/debugger/') // Will be overwrite when compile

package/package.json

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

package/src/asset-sync.mjs

@@ -1,9 +1,3 @@
-/**
- * Part of funclass project.
- *
- * @copyright  Copyright (C) 2021 LYRASOFT.
- * @license    __LICENSE__
- */
 
 import { babel, ts } from '@windwalker-io/fusion';
 import path from 'path';
@@ -23,8 +17,8 @@ export function syncModuleScripts(source = 'src/Module', dest = 'www/assets/js/v
 export function syncModuleJS(source = 'src/Module', dest = 'www/assets/js/view/', options = {}) {
   return babel(
     [
+      ...findModules('**/assets/*.{js,mjs}'),
       `${source}/**/*.{js,mjs}`,
-      ...findModules('**/assets/*.{js,mjs}')
     ],
     dest,
     {
@@ -40,10 +34,10 @@ export function syncModuleJS(source = 'src/Module', dest = 'www/assets/js/view/'
 export function syncModuleTS(source = 'src/Module', dest = 'www/assets/js/view/', options = {}) {
   return ts(
     [
-      `${source}/**/*.ts`,
       // Todo: Research if tsconfig.json can replace this line
       'resources/assets/src/**/*.d.ts',
-      ...findModules('**/assets/*.ts')
+      ...findModules('**/assets/*.ts'),
+      `${source}/**/*.ts`,
     ],
     dest,
     {

package/src/install-vendors.mjs

@@ -6,7 +6,7 @@ import { loadJson } from './utils.mjs';
 import path from 'path';
 import fs from 'fs';
 
-export async function installVendors(npmVendors = [], composerVendors = [], to = 'www/assets/vendor') {
+export async function installVendors(npmVendors = [], legacyComposerVendors = [], to = 'www/assets/vendor') {
   const root = to;
   let vendors = npmVendors;
   const action = process.env.INSTALL_VENDOR === 'hard' ? 'Copy' : 'Link';
@@ -25,7 +25,7 @@ export async function installVendors(npmVendors = [], composerVendors = [], to =
     deleteExists(dir);
   });
 
-  const composerJsons = getInstalledComposerVendors(composerVendors)
+  const composerJsons = getInstalledComposerVendors()
     .map((cv) => `vendor/${cv}/composer.json`)
     .map((file) => loadJson(file))
     .filter((composerJson) => composerJson?.extra?.windwalker != null);
@@ -61,6 +61,15 @@ export async function installVendors(npmVendors = [], composerVendors = [], to =
     }
   });
 
+  // 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
   console.log(`[${action} Local] resources/assets/vendor/**/* => ${root}/`);
   doInstall('resources/assets/vendor/*', `${root}/`);
@@ -90,6 +99,7 @@ function findNpmVendors(composerJsons = []) {
     .map((composerJson) => {
       return [
         ...composerJson?.extra?.windwalker?.asset_vendors || [],
+        ...composerJson?.extra?.windwalker?.assets?.exposes || [],
         ...Object.keys(composerJson?.extra?.windwalker?.assets?.vendors || {})
       ]
     })
@@ -102,7 +112,7 @@ function injectNpmPackages(composerVendors = []) {
 
 }
 
-function getInstalledComposerVendors(composerVendors = []) {
+function getInstalledComposerVendors() {
   const composerFile = path.resolve(process.cwd(), 'composer.json');
   const composerJson = loadJson(composerFile);
   
@@ -110,7 +120,6 @@ function getInstalledComposerVendors(composerVendors = []) {
     ...new Set(
       Object.keys(composerJson['require'] || {})
         .concat(Object.keys(composerJson['require-dev'] || {}))
-        .concat(composerVendors)
     )
   ];
 }

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

@@ -56,9 +56,9 @@ export function jsSync(source = 'src/Module', dest, options = {}) {
     // Legacy mode
     ts(
       [
-        `${source}/**/*.ts`,
+        ...findModules('**/assets/*.ts'),
         'node_modules/@windwalker-io/unicorn/src/types/*.d.ts',
-        ...findModules('**/assets/*.ts')
+        `${source}/**/*.ts`,
       ],
       dest,
       {