@next-core/build-next-bricks 1.0.2 → 1.1.1

package/index.d.ts

@@ -66,6 +66,8 @@ export interface BuildNextBricksConfig {
   mode?: "development" | "production";
   entry?: Record<string, string>;
   extractCss?: boolean;
+  svgAsAsset?: boolean;
+  imageAssetFilename?: string | ((pathData: any, assetInfo: any) => string);
   plugins?: Configuration["plugins"];
   moduleRules?: RuleSetRule[];
   exposes?: ConstructorParameters<typeof container.ModuleFederationPlugin>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "Build next bricks",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/build-next-bricks",
   "license": "GPL-3.0",
@@ -46,5 +46,5 @@
     "typescript": "^5.0.2",
     "webpack": "^5.76.2"
   },
-  "gitHead": "ffd8b31a5d99db5af3b4ec7675ff2d6541eb1338"
+  "gitHead": "f4639c59925a6f007fdf03630bcb9a9b0163cd8b"
 }

package/src/build.js

@@ -244,7 +244,7 @@ export default async function build(config) {
           test: /\.svg$/i,
           issuer(input) {
             // The issuer is null (or an empty string) for dynamic import
-            return !input || /\.[jt]sx?$/.test(input);
+            return !config.svgAsAsset && (!input || /\.[jt]sx?$/.test(input));
           },
           use: [
             {
@@ -278,6 +278,22 @@ export default async function build(config) {
             },
           ],
         },
+        {
+          // Images
+          test: /\.(png|svg|jpg|jpeg|gif)$/i,
+          type: "asset/resource",
+          generator: {
+            filename: config.imageAssetFilename ?? "images/[hash][ext][query]",
+          },
+        },
+        {
+          // Fonts
+          test: /\.(woff|woff2|eot|ttf|otf)$/i,
+          type: "asset/resource",
+          generator: {
+            filename: "fonts/[hash][ext][query]",
+          },
+        },
         ...(config.moduleRules || []),
       ],
     },

package/src/scanBricks.js

@@ -248,12 +248,14 @@ export default async function scanBricks(packageDir) {
           }
         } else if (
           callee.type === "Identifier" &&
-          callee.name === "wrapBrick" &&
+          (callee.name === "wrapBrick" || callee.name === "unwrapProvider") &&
           args.length >= 1
         ) {
           const { type, value: brickName } = args[0];
           if (type !== "StringLiteral") {
-            throw new Error("Please call `wrapBrick` only with literal string");
+            throw new Error(
+              `Please call \`${callee.name}\` only with literal string`
+            );
           }
           const bricks = usingWrappedBricks.get(filePath);
           if (bricks) {