@next-core/build-next-bricks 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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": "286f6b5ed8f4c5dc42e6c361b994d456b1613205"
+  "gitHead": "3e4c6996c85fb0bb14330cd1d128dd8ff690bf5e"
 }

package/src/build.js

@@ -240,52 +240,54 @@ export default async function build(config) {
             rootMode: "upward",
           },
         },
-        {
-          test: /\.svg$/i,
-          issuer(input) {
-            // The issuer is null (or an empty string) for dynamic import
-            return !config.svgAsAsset && (!input || /\.[jt]sx?$/.test(input));
-          },
-          use: [
-            {
-              loader: "babel-loader",
-              options: {
-                rootMode: "upward",
+        config.svgAsAsset
+          ? {
+              // Images
+              test: /\.(png|svg|jpg|jpeg|gif)$/i,
+              type: "asset/resource",
+              generator: {
+                filename:
+                  config.imageAssetFilename ?? "images/[hash][ext][query]",
               },
-            },
-            {
-              loader: "@svgr/webpack",
-              options: {
-                babel: false,
-                icon: true,
-                svgoConfig: {
-                  plugins: [
-                    {
-                      name: "preset-default",
-                      params: {
-                        overrides: {
-                          // Keep `viewbox`
-                          removeViewBox: false,
-                          convertColors: {
-                            currentColor: true,
+            }
+          : {
+              test: /\.svg$/i,
+              issuer(input) {
+                // The issuer is null (or an empty string) for dynamic import
+                return !input || /\.[jt]sx?$/.test(input);
+              },
+              use: [
+                {
+                  loader: "babel-loader",
+                  options: {
+                    rootMode: "upward",
+                  },
+                },
+                {
+                  loader: "@svgr/webpack",
+                  options: {
+                    babel: false,
+                    icon: true,
+                    svgoConfig: {
+                      plugins: [
+                        {
+                          name: "preset-default",
+                          params: {
+                            overrides: {
+                              // Keep `viewbox`
+                              removeViewBox: false,
+                              convertColors: {
+                                currentColor: true,
+                              },
+                            },
                           },
                         },
-                      },
+                      ],
                     },
-                  ],
+                  },
                 },
-              },
+              ],
             },
-          ],
-        },
-        {
-          // 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,

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) {