@windwalker-io/core 4.1.0 → 4.1.1

package/package.json

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

package/src/asset-sync.mjs

@@ -97,7 +97,8 @@ export function syncModuleTS(source = 'src/Module', dest = 'www/assets/js/view/'
   return ts(
     [
       `${source}/**/*.ts`,
-      'node_modules/@windwalker-io/core/types/**.d.ts',
+      // Todo: Research if tsconfig.json can replace this line
+      'resources/assets/src/**/*.d.ts',
       ...findModules('**/assets/*.ts')
     ],
     dest,

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/debugger/webpack.config.js

@@ -1,9 +1,9 @@
-const path = require('path');
-
-module.exports = {
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname),
-    }
-  }
-};
+const path = require('path');
+
+module.exports = {
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname),
+    }
+  }
+};

package/src/index.mjs

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

package/src/install-vendors.mjs

@@ -87,8 +87,12 @@ function findNpmVendors(composerJsons = []) {
     .flat();
 
   const vendorsFromComposer = composerJsons
-    .map((composerJson) => composerJson?.extra?.windwalker?.assets?.vendors || {})
-    .map((vendors) => Object.keys(vendors))
+    .map((composerJson) => {
+      return [
+        ...composerJson?.extra?.windwalker?.asset_vendors || [],
+        ...Object.keys(composerJson?.extra?.windwalker?.assets?.vendors || {})
+      ]
+    })
     .flat();
 
   return [ ...new Set(vendors.concat(vendorsFromComposer)) ];

package/tsconfig.js.json

@@ -1,15 +0,0 @@
-{
-    "include": [
-        "types/index.d.ts"
-    ],
-    "exclude": [
-        "node_modules/**/*"
-    ],
-    "compilerOptions": {
-        "allowJs": true,
-        "module": "system",
-        "moduleResolution": "node",
-        "target": "es2020",
-        "skipLibCheck": true
-    }
-}

package/types/global.d.ts

@@ -1,12 +0,0 @@
-import '@windwalker-io/unicorn';
-import 'systemjs';
-import 'jquery';
-import 'axios';
-import boostrap from 'bootstrap';
-import * as vue from 'vue';
-
-declare global {
-  var S:  typeof System;
-  var bootstrap: typeof boostrap;
-  var Vue: typeof vue;
-}

package/types/index.d.ts

@@ -1,5 +0,0 @@
-
-import './global';
-import './shims-sweetalert';
-import './unicorn';
-import './vendor';

package/types/shims-sweetalert.d.ts

@@ -1,8 +0,0 @@
-import { SwalParams } from "sweetalert/typings/core";
-
-declare global {
-  const swal: (...params: SwalParams) => Promise<any>;
-}
-
-// export default swal;
-// export as namespace swal;

package/types/unicorn.d.ts

@@ -1 +0,0 @@
-declare module "@unicorn/*";

package/types/vendor.d.ts

@@ -1 +0,0 @@
-declare module "@vendor/*";

package/types/vue/global.d.ts

@@ -1,14 +0,0 @@
-/**
- * Part of cati project.
- *
- * @copyright  Copyright (C) 2023 __ORGANIZATION__.
- * @license    __LICENSE__
- */
-
-import '@windwalker-io/unicorn';
-import 'systemjs';
-import 'axios';
-
-declare global {
-  var S:  typeof System;
-}

package/types/vue/shims-vue.d.ts

@@ -1,5 +0,0 @@
-declare module '*.vue' {
-  import { defineComponent } from 'vue'
-  const component: ReturnType<typeof defineComponent>
-  export default component
-}

package/types/vue/vue-runtime.d.ts

@@ -1,16 +0,0 @@
-/**
- * Part of cati project.
- *
- * @copyright  Copyright (C) 2023 __ORGANIZATION__.
- * @license    __LICENSE__
- */
-
-import Vue from 'vue'
-
-declare module '@vue/runtime-core' {
-  interface ComponentCustomProperties {
-    $lang: Function;
-    questionProp: Function;
-    introtext: Function;
-  }
-}