@next-core/build-next-bricks 1.13.0 → 1.13.2

package/index.d.ts

@@ -2,7 +2,9 @@ import type { Compiler, Configuration, RuleSetRule, container } from "webpack";
 
 export declare function build(config: BuildNextBricksConfig): Compiler;
 export declare function getSvgrLoaders(options?: {
-  /** Set it to true for font icons */
+  /** Set it to true for icon font, defaults to false. */
+  icon?: boolean | string | number;
+  /** Defaults to true when `icon` is truthy, otherwise defaults to false. */
   convertCurrentColor?: boolean;
 }): RuleSetRule["use"];
 
@@ -77,7 +79,7 @@ export interface BuildNextBricksConfig {
   svgAsReactComponent?: boolean;
   /** Customize rules for svg, this will take precedence over `svgAsReactComponent` */
   svgRules?: RuleSetRule[];
-  /** By default the image assets are named `images/[hash][ext][query]` */
+  /** By default the image assets are named `images/[hash][ext]` */
   imageAssetFilename?: string | ((pathData: any, assetInfo: any) => string);
   plugins?: Configuration["plugins"];
   moduleRules?: RuleSetRule[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/build-next-bricks",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Build next bricks",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/build-next-bricks",
   "license": "GPL-3.0",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "@next-core/brick-manifest": "^0.5.0"
   },
-  "gitHead": "06fca79a3a3b63a995d92729cfbed8e312cfdccd"
+  "gitHead": "cc0e5b06fda9e78855dfbc23357f6a0a6728fd09"
 }

package/src/build.js

@@ -241,6 +241,8 @@ async function getWebpackConfig(config) {
   const outputPath = path.join(packageDir, config.outputPath ?? "dist");
   const chunksDir = isBricks ? "chunks/" : "";
 
+  const imageAssetFilename = config.imageAssetFilename ?? "images/[hash][ext]";
+
   return {
     entry: config.entry || {
       main: "./src/index",
@@ -321,7 +323,7 @@ async function getWebpackConfig(config) {
           ),
           type: "asset/resource",
           generator: {
-            filename: config.imageAssetFilename ?? "images/[hash][ext][query]",
+            filename: imageAssetFilename,
           },
         },
         ...(config.svgRules ??
@@ -329,6 +331,29 @@ async function getWebpackConfig(config) {
             ? [
                 {
                   test: /\.svg$/i,
+                  type: "asset/resource",
+                  // Match `xxx.svg?url`
+                  resourceQuery: /url/,
+                  generator: {
+                    filename: imageAssetFilename,
+                  },
+                },
+                {
+                  test: /\.svg$/i,
+                  // Exclude issuer of js files
+                  issuer: {
+                    not: /\.[jt]sx?$/,
+                  },
+                  type: "asset/resource",
+                  generator: {
+                    filename: imageAssetFilename,
+                  },
+                },
+                {
+                  test: /\.svg$/i,
+                  issuer: /\.[jt]sx?$/,
+                  // Exclude `xxx.svg?url`
+                  resourceQuery: { not: /url/ },
                   use: getSvgrLoaders(),
                 },
               ]

package/src/getSvgrLoaders.js

@@ -10,7 +10,7 @@ export default function getSvgrLoaders(options = {}) {
       loader: "@svgr/webpack",
       options: {
         babel: false,
-        icon: true,
+        icon: options.icon ?? false,
         svgoConfig: {
           plugins: [
             {
@@ -21,7 +21,7 @@ export default function getSvgrLoaders(options = {}) {
                   removeViewBox: false,
 
                   convertColors: {
-                    currentColor: options.convertCurrentColor ?? false,
+                    currentColor: options.convertCurrentColor ?? !!options.icon,
                   },
                 },
               },

package/src/isDeprecatedV2Packages.js

@@ -0,0 +1,39 @@
+// @ts-check
+const V2_NEXT_CORE_PACKAGES = new Set([
+  "brick-dll",
+  "brick-kit",
+  "brick-utils",
+  "brick-types",
+  "brick-http",
+  "rollup-config-factory",
+  "webpack-config-factory",
+  "build-config-factory",
+  "jest-config-factory",
+  "custom-antd-styles",
+  "editor-bricks-helper",
+  "fontawesome-library",
+]);
+
+const V2_PREFIXES = new Set([
+  "@next-dll",
+  "@next-libs",
+  "@next-sdk",
+  "@dll",
+  "@libs",
+  "@sdk",
+]);
+
+/**
+ * @param {string} pkg
+ * @return {boolean}
+ */
+export default function isDeprecatedV2Packages(pkg) {
+  if (!pkg.startsWith("@")) {
+    return false;
+  }
+  const [prefix, name] = pkg.split("/");
+  if (prefix === "@next-core" || prefix === "@easyops") {
+    return V2_NEXT_CORE_PACKAGES.has(name);
+  }
+  return V2_PREFIXES.has(prefix);
+}

package/src/scanBricks.js

@@ -14,6 +14,7 @@ import {
   isImportSpecifier,
 } from "@babel/types";
 import getTypeDeclaration from "./getTypeDeclaration.js";
+import isDeprecatedV2Packages from "./isDeprecatedV2Packages.js";
 
 /**
  *
@@ -91,10 +92,6 @@ export default async function scanBricks(packageDir) {
    */
   async function scanByFile(filePath, overrideImport) {
     if (processedFiles.has(filePath)) {
-      console.warn(
-        "[scan-bricks] warn: the file has already been scanned:",
-        filePath
-      );
       return;
     }
     processedFiles.add(filePath);
@@ -534,7 +531,6 @@ export default async function scanBricks(packageDir) {
       ImportDeclaration({ node: { source, importKind } }) {
         // Match `import "..."`
         if (
-          source.type === "StringLiteral" &&
           // Ignore import from node modules.
           (source.value.startsWith("./") || source.value.startsWith("../")) &&
           // Ignore `import type {...} from "..."`
@@ -562,6 +558,12 @@ export default async function scanBricks(packageDir) {
             addImportFile(importPath, "index");
           }
         }
+
+        if (isDeprecatedV2Packages(source.value)) {
+          throw new Error(
+            `Using deprecated v2 packages is prohibited in v3: "${source.value}"`
+          );
+        }
       },
       TSInterfaceDeclaration({ node }) {
         const usedReferences = new Set();