@windwalker-io/core 4.1.3 → 4.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/install-vendors.mjs +12 -4
package/package.json
CHANGED
package/src/install-vendors.mjs
CHANGED
|
@@ -6,7 +6,7 @@ import { loadJson } from './utils.mjs';
|
|
|
6
6
|
import path from 'path';
|
|
7
7
|
import fs from 'fs';
|
|
8
8
|
|
|
9
|
-
export async function installVendors(npmVendors = [],
|
|
9
|
+
export async function installVendors(npmVendors = [], legacyComposerVendors = [], to = 'www/assets/vendor') {
|
|
10
10
|
const root = to;
|
|
11
11
|
let vendors = npmVendors;
|
|
12
12
|
const action = process.env.INSTALL_VENDOR === 'hard' ? 'Copy' : 'Link';
|
|
@@ -25,7 +25,7 @@ export async function installVendors(npmVendors = [], composerVendors = [], to =
|
|
|
25
25
|
deleteExists(dir);
|
|
26
26
|
});
|
|
27
27
|
|
|
28
|
-
const composerJsons = getInstalledComposerVendors(
|
|
28
|
+
const composerJsons = getInstalledComposerVendors()
|
|
29
29
|
.map((cv) => `vendor/${cv}/composer.json`)
|
|
30
30
|
.map((file) => loadJson(file))
|
|
31
31
|
.filter((composerJson) => composerJson?.extra?.windwalker != null);
|
|
@@ -61,6 +61,15 @@ export async function installVendors(npmVendors = [], composerVendors = [], to =
|
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
63
|
|
|
64
|
+
// Install legacy packages assets
|
|
65
|
+
legacyComposerVendors.forEach((vendorName) => {
|
|
66
|
+
console.log(vendorName, fs.existsSync(`vendor/${vendorName}/assets`));
|
|
67
|
+
if (fs.existsSync(`vendor/${vendorName}/assets`)) {
|
|
68
|
+
console.log(`[${action} Composer] vendor/${vendorName}/assets/ => ${root}/${vendorName}/`);
|
|
69
|
+
doInstall(`vendor/${vendorName}/assets/`, `${root}/${vendorName}/`);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
|
|
64
73
|
// Install local saved vendors
|
|
65
74
|
console.log(`[${action} Local] resources/assets/vendor/**/* => ${root}/`);
|
|
66
75
|
doInstall('resources/assets/vendor/*', `${root}/`);
|
|
@@ -103,7 +112,7 @@ function injectNpmPackages(composerVendors = []) {
|
|
|
103
112
|
|
|
104
113
|
}
|
|
105
114
|
|
|
106
|
-
function getInstalledComposerVendors(
|
|
115
|
+
function getInstalledComposerVendors() {
|
|
107
116
|
const composerFile = path.resolve(process.cwd(), 'composer.json');
|
|
108
117
|
const composerJson = loadJson(composerFile);
|
|
109
118
|
|
|
@@ -111,7 +120,6 @@ function getInstalledComposerVendors(composerVendors = []) {
|
|
|
111
120
|
...new Set(
|
|
112
121
|
Object.keys(composerJson['require'] || {})
|
|
113
122
|
.concat(Object.keys(composerJson['require-dev'] || {}))
|
|
114
|
-
.concat(composerVendors)
|
|
115
123
|
)
|
|
116
124
|
];
|
|
117
125
|
}
|