@pisell/build-plugin-lowcode 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/build-plugin-lowcode",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "build plugin for component-to-lowcode",
   "main": "src/index.js",
   "keywords": [
@@ -28,7 +28,7 @@
     "@alilc/lowcode-react-renderer": "^1.0.1",
     "@alilc/lowcode-types": "^1.0.1",
     "@alilc/lowcode-utils": "^1.0.1",
-    "@svgr/webpack": "^4.3.3",
+    "@svgr/webpack": "^5.5.0",
     "axios": "^0.21.4",
     "build-scripts-config": "^3.0.3",
     "chokidar": "^3.5.3",
@@ -41,7 +41,8 @@
     "lodash": "^4.17.21",
     "rpx-loader": "^1.0.1",
     "style-loader": "^2.0.0",
-    "webpack": "^4.46.0"
+    "webpack": "^4.46.0",
+    "url-loader": "^4.1.1"
   },
   "devDependencies": {
     "np": "^7.7.0"

package/src/index.js

@@ -507,7 +507,13 @@ async function start(options, pluginOptions) {
     }
     config.externals({ ...COMMON_EXTERNALS_MAP[engineScope], ...externals });
     !disableStyleLoader && useStyleLoader(config);
-    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').before('css-loader');
+
+    // 物料中 svg 图标处理
+    config.module
+        .rules.delete('svg');
+
+    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').end().use('url-loader').loader('url-loader').end();
+
     if (baseLibrary === 'rax') {
       config.module.rule('scss').use('rpx-loader').loader('rpx-loader').before('css-loader');
     }
@@ -711,7 +717,9 @@ async function bundleMetaV2(options, pluginOptions, execCompile, metaType) {
     config.output.path(path.resolve(rootDir, `${buildTarget}/${lowcodeDir}`));
     config.externals({ ...COMMON_EXTERNALS_MAP[engineScope], ...externals });
     useStyleLoader(config);
-    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').before('css-loader');
+    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').options({
+          exportType: "named"
+        }).before('css-loader');
   });
   return metaPath;
 }
@@ -917,7 +925,9 @@ async function bundleEditorView(
     config.output.library(library).libraryTarget('umd');
     config.output.path(path.resolve(rootDir, `${buildTarget}/${lowcodeDir}`));
     config.externals({ ...COMMON_EXTERNALS_MAP[engineScope], ...externals });
-    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').before('css-loader');
+    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').options({
+          exportType: "named"
+        }).before('css-loader');
     if (baseLibrary === 'rax') {
       const scssRule = config.module.rule('scss');
       scssRule.use('rpx-loader').loader('rpx-loader').before('css-loader');
@@ -1000,7 +1010,9 @@ async function bundleRenderView(options, pluginOptions, platform, execCompile) {
     config.output.library(library).libraryTarget('umd');
     config.output.path(path.resolve(rootDir, `${buildTarget}/${lowcodeDir}/render/${platform}`));
     config.externals({ ...COMMON_EXTERNALS_MAP[engineScope], ...externals });
-    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').before('css-loader');
+    config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').options({
+          exportType: "named"
+        }).before('css-loader');
     if (baseLibrary === 'rax') {
       const scssRule = config.module.rule('scss');
       scssRule.use('rpx-loader').loader('rpx-loader').before('css-loader');
@@ -1278,7 +1290,9 @@ async function bundleComponentMeta(webPackConfig, options, pluginOptions, execCo
         config.output.path(path.resolve(rootDir, `${buildTarget}/${lowcodeDir}`));
         config.externals({ ...COMMON_EXTERNALS_MAP[engineScope], ...externals });
         useStyleLoader(config);
-        config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').before('css-loader');
+        config.module.rule('svg').test(/\.svg$/).use('svgr').loader('@svgr/webpack').options({
+          exportType: "named"
+        }).before('css-loader');
       });
     })(component, idx);
   });