@modern-js/app-tools 2.53.1-alpha.0 → 2.53.1-alpha.1
Sign up to get free protection for your applications and to get access to all the features.
@@ -36,7 +36,7 @@ var import_utils = require("@modern-js/utils");
|
|
36
36
|
var import_pkg_types = require("pkg-types");
|
37
37
|
var import_mlly = require("mlly");
|
38
38
|
var import_utils2 = require("./utils");
|
39
|
-
const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFilter) => {
|
39
|
+
const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFilter, modifyPackageJson) => {
|
40
40
|
const base = "/";
|
41
41
|
const entryFiles = await (0, import_utils2.findEntryFiles)(serverRootDir, entryFilter);
|
42
42
|
const fileTrace = await (0, import_utils2.traceFiles)(entryFiles.concat(includeEntries), serverRootDir, base);
|
@@ -189,7 +189,7 @@ const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFi
|
|
189
189
|
}
|
190
190
|
}
|
191
191
|
const outputPkgPath = import_node_path.default.join(serverRootDir, "package.json");
|
192
|
-
|
192
|
+
const newPkgJson = {
|
193
193
|
name: `${projectPkgJson.name || "modernjs-project"}-prod`,
|
194
194
|
version: projectPkgJson.version || "0.0.0",
|
195
195
|
private: true,
|
@@ -199,7 +199,9 @@ const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFi
|
|
199
199
|
Object.keys(pkg.versions)[0]
|
200
200
|
])
|
201
201
|
].sort(([a], [b]) => a.localeCompare(b)))
|
202
|
-
}
|
202
|
+
};
|
203
|
+
const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
|
204
|
+
await import_utils.fs.writeJSON(outputPkgPath, finalPkgJson);
|
203
205
|
};
|
204
206
|
// Annotate the CommonJS export names for ESM import in node:
|
205
207
|
0 && (module.exports = {
|
@@ -9,8 +9,8 @@ import { readPackageJSON } from "pkg-types";
|
|
9
9
|
import { parseNodeModulePath } from "mlly";
|
10
10
|
import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles, findPackageParents, resolveTracedPath } from "./utils";
|
11
11
|
var handleDependencies = function() {
|
12
|
-
var _ref = _async_to_generator(function(appDir, serverRootDir, includeEntries, entryFilter) {
|
13
|
-
var base, entryFiles, fileTrace, currentProjectModules, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath;
|
12
|
+
var _ref = _async_to_generator(function(appDir, serverRootDir, includeEntries, entryFilter, modifyPackageJson) {
|
13
|
+
var base, entryFiles, fileTrace, currentProjectModules, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath, newPkgJson, finalPkgJson;
|
14
14
|
return _ts_generator(this, function(_state) {
|
15
15
|
switch (_state.label) {
|
16
16
|
case 0:
|
@@ -536,22 +536,24 @@ var handleDependencies = function() {
|
|
536
536
|
];
|
537
537
|
case 21:
|
538
538
|
outputPkgPath = path.join(serverRootDir, "package.json");
|
539
|
+
newPkgJson = {
|
540
|
+
name: "".concat(projectPkgJson.name || "modernjs-project", "-prod"),
|
541
|
+
version: projectPkgJson.version || "0.0.0",
|
542
|
+
private: true,
|
543
|
+
dependencies: Object.fromEntries(_to_consumable_array(Object.values(tracedPackages).map(function(pkg) {
|
544
|
+
return [
|
545
|
+
pkg.name,
|
546
|
+
Object.keys(pkg.versions)[0]
|
547
|
+
];
|
548
|
+
})).sort(function(param, param1) {
|
549
|
+
var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
|
550
|
+
return a.localeCompare(b);
|
551
|
+
}))
|
552
|
+
};
|
553
|
+
finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
|
539
554
|
return [
|
540
555
|
4,
|
541
|
-
fse.writeJSON(outputPkgPath,
|
542
|
-
name: "".concat(projectPkgJson.name || "modernjs-project", "-prod"),
|
543
|
-
version: projectPkgJson.version || "0.0.0",
|
544
|
-
private: true,
|
545
|
-
dependencies: Object.fromEntries(_to_consumable_array(Object.values(tracedPackages).map(function(pkg) {
|
546
|
-
return [
|
547
|
-
pkg.name,
|
548
|
-
Object.keys(pkg.versions)[0]
|
549
|
-
];
|
550
|
-
})).sort(function(param, param1) {
|
551
|
-
var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
|
552
|
-
return a.localeCompare(b);
|
553
|
-
}))
|
554
|
-
})
|
556
|
+
fse.writeJSON(outputPkgPath, finalPkgJson)
|
555
557
|
];
|
556
558
|
case 22:
|
557
559
|
_state.sent();
|
@@ -561,7 +563,7 @@ var handleDependencies = function() {
|
|
561
563
|
}
|
562
564
|
});
|
563
565
|
});
|
564
|
-
return function handleDependencies2(appDir, serverRootDir, includeEntries, entryFilter) {
|
566
|
+
return function handleDependencies2(appDir, serverRootDir, includeEntries, entryFilter, modifyPackageJson) {
|
565
567
|
return _ref.apply(this, arguments);
|
566
568
|
};
|
567
569
|
}();
|
@@ -3,7 +3,7 @@ import { fs as fse, pkgUp, semver } from "@modern-js/utils";
|
|
3
3
|
import { readPackageJSON } from "pkg-types";
|
4
4
|
import { parseNodeModulePath } from "mlly";
|
5
5
|
import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles, findPackageParents, resolveTracedPath } from "./utils";
|
6
|
-
const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFilter) => {
|
6
|
+
const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFilter, modifyPackageJson) => {
|
7
7
|
const base = "/";
|
8
8
|
const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
|
9
9
|
const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
|
@@ -156,7 +156,7 @@ const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFi
|
|
156
156
|
}
|
157
157
|
}
|
158
158
|
const outputPkgPath = path.join(serverRootDir, "package.json");
|
159
|
-
|
159
|
+
const newPkgJson = {
|
160
160
|
name: `${projectPkgJson.name || "modernjs-project"}-prod`,
|
161
161
|
version: projectPkgJson.version || "0.0.0",
|
162
162
|
private: true,
|
@@ -166,7 +166,9 @@ const handleDependencies = async (appDir, serverRootDir, includeEntries, entryFi
|
|
166
166
|
Object.keys(pkg.versions)[0]
|
167
167
|
])
|
168
168
|
].sort(([a], [b]) => a.localeCompare(b)))
|
169
|
-
}
|
169
|
+
};
|
170
|
+
const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
|
171
|
+
await fse.writeJSON(outputPkgPath, finalPkgJson);
|
170
172
|
};
|
171
173
|
export {
|
172
174
|
handleDependencies
|
@@ -1 +1,2 @@
|
|
1
|
-
|
1
|
+
import type { PackageJson } from 'pkg-types';
|
2
|
+
export declare const handleDependencies: (appDir: string, serverRootDir: string, includeEntries: string[], entryFilter?: ((filePath: string) => boolean) | undefined, modifyPackageJson?: ((pkgJson: PackageJson) => PackageJson) | undefined) => Promise<void>;
|
package/package.json
CHANGED
@@ -15,7 +15,7 @@
|
|
15
15
|
"modern",
|
16
16
|
"modern.js"
|
17
17
|
],
|
18
|
-
"version": "2.53.1-alpha.
|
18
|
+
"version": "2.53.1-alpha.1",
|
19
19
|
"jsnext:source": "./src/index.ts",
|
20
20
|
"types": "./dist/types/index.d.ts",
|
21
21
|
"main": "./dist/cjs/index.js",
|
@@ -81,18 +81,18 @@
|
|
81
81
|
"pkg-types": "^1.1.0",
|
82
82
|
"std-env": "^3.7.0",
|
83
83
|
"@modern-js/core": "2.53.0",
|
84
|
+
"@modern-js/node-bundle-require": "2.53.0",
|
84
85
|
"@modern-js/plugin": "2.53.0",
|
85
86
|
"@modern-js/plugin-data-loader": "2.53.0",
|
86
|
-
"@modern-js/plugin-i18n": "2.53.0",
|
87
|
-
"@modern-js/plugin-lint": "2.53.0",
|
88
|
-
"@modern-js/node-bundle-require": "2.53.0",
|
89
87
|
"@modern-js/prod-server": "2.53.0",
|
90
|
-
"@modern-js/
|
88
|
+
"@modern-js/plugin-lint": "2.53.0",
|
89
|
+
"@modern-js/plugin-i18n": "2.53.0",
|
91
90
|
"@modern-js/server": "2.53.0",
|
92
91
|
"@modern-js/server-utils": "2.53.0",
|
92
|
+
"@modern-js/rsbuild-plugin-esbuild": "2.53.0",
|
93
93
|
"@modern-js/types": "2.53.0",
|
94
|
-
"@modern-js/uni-builder": "2.53.0",
|
95
94
|
"@modern-js/server-core": "2.53.0",
|
95
|
+
"@modern-js/uni-builder": "2.53.0",
|
96
96
|
"@modern-js/utils": "2.53.0"
|
97
97
|
},
|
98
98
|
"devDependencies": {
|