@next-core/build-next-bricks 1.20.9 → 1.21.0
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/index.d.ts +8 -1
- package/package.json +2 -2
- package/src/build.js +13 -4
package/index.d.ts
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type {
|
|
2
|
+
Compiler,
|
|
3
|
+
Configuration,
|
|
4
|
+
ResolveOptions,
|
|
5
|
+
RuleSetRule,
|
|
6
|
+
container,
|
|
7
|
+
} from "webpack";
|
|
2
8
|
|
|
3
9
|
export declare function build(config: BuildNextBricksConfig): Compiler;
|
|
4
10
|
export declare function getSvgrLoaders(options?: {
|
|
@@ -83,6 +89,7 @@ export interface BuildNextBricksConfig {
|
|
|
83
89
|
imageAssetFilename?: string | ((pathData: any, assetInfo: any) => string);
|
|
84
90
|
plugins?: Configuration["plugins"];
|
|
85
91
|
moduleRules?: RuleSetRule[];
|
|
92
|
+
resolve?: ResolveOptions;
|
|
86
93
|
exposes?: ConstructorParameters<
|
|
87
94
|
typeof container.ModuleFederationPlugin
|
|
88
95
|
>[0]["exposes"];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@next-core/build-next-bricks",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.21.0",
|
|
4
4
|
"description": "Build next bricks",
|
|
5
5
|
"homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/build-next-bricks",
|
|
6
6
|
"license": "GPL-3.0",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@next-core/brick-manifest": "^0.7.0"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "dbaf7ff2c328eedfaeb636d2bb3dca1bd8cad1d3"
|
|
60
60
|
}
|
package/src/build.js
CHANGED
|
@@ -201,7 +201,7 @@ async function getWebpackConfig(config) {
|
|
|
201
201
|
paths: [packageDir],
|
|
202
202
|
}
|
|
203
203
|
);
|
|
204
|
-
} catch
|
|
204
|
+
} catch {
|
|
205
205
|
console.warn(`Shared package not found: "${dep}"`);
|
|
206
206
|
return;
|
|
207
207
|
}
|
|
@@ -213,15 +213,23 @@ async function getWebpackConfig(config) {
|
|
|
213
213
|
if (typeof customized === "string") {
|
|
214
214
|
return;
|
|
215
215
|
}
|
|
216
|
+
|
|
217
|
+
const getRequiredVersion = (dep) =>
|
|
218
|
+
packageJson.peerDependencies?.[dep] ??
|
|
219
|
+
packageJson.devDependencies?.[dep] ??
|
|
220
|
+
packageJson.dependencies?.[dep];
|
|
221
|
+
|
|
216
222
|
return [
|
|
217
223
|
dep,
|
|
218
224
|
{
|
|
219
225
|
singleton: sharedSingletonPackages.includes(dep),
|
|
220
226
|
version: depPackageJson.version,
|
|
221
227
|
requiredVersion:
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
228
|
+
getRequiredVersion(depPkgName) ??
|
|
229
|
+
// Use react required version for react-dom if it is not specified
|
|
230
|
+
(depPkgName === "react-dom"
|
|
231
|
+
? getRequiredVersion("react")
|
|
232
|
+
: undefined),
|
|
225
233
|
...customized,
|
|
226
234
|
},
|
|
227
235
|
];
|
|
@@ -306,6 +314,7 @@ async function getWebpackConfig(config) {
|
|
|
306
314
|
extensionAlias: {
|
|
307
315
|
".js": [".ts", ".tsx", ".js", ".jsx"],
|
|
308
316
|
},
|
|
317
|
+
...config.resolve,
|
|
309
318
|
},
|
|
310
319
|
module: {
|
|
311
320
|
rules: [
|