@modern-js/plugin-data-loader 2.12.0 → 2.13.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/plugin-data-loader
 
+## 2.13.0
+
+### Minor Changes
+
+- 3d5086b: feat: the rspack unsupport inline loader, so we move data-loader to bundler.module.rules
+  feat: rspack 不支持 inline loader, 所以我们将 data-loader 移动到 bundler.module.rules 配置中去。
+
+### Patch Changes
+
+- @modern-js/utils@2.13.0
+
 ## 2.12.0
 
 ### Patch Changes

package/dist/cjs/cli/loader.js

@@ -31,7 +31,20 @@ async function loader(source) {
   if (target === "webworker") {
     return source;
   }
-  const options = this.getOptions();
+  const { resourceQuery } = this;
+  const options = resourceQuery.slice(1).split("&").map((item) => {
+    return item.split("=");
+  }).reduce((pre, cur) => {
+    const [key, value] = cur;
+    if (!key || !value) {
+      return pre;
+    }
+    pre[key] = value;
+    return pre;
+  }, {});
+  if (!options.mapFile) {
+    return source;
+  }
   const code = (0, import_generateClient.generateClient)({
     mapFile: options.mapFile,
     loaderId: options.loaderId

package/dist/esm/cli/loader.js

@@ -1,3 +1,11 @@
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -27,6 +35,44 @@ function _asyncToGenerator(fn) {
         });
     };
 }
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -128,7 +174,7 @@ function loader(source) {
 }
 function _loader() {
     _loader = _asyncToGenerator(function(source) {
-        var _this__compiler, target, options, code;
+        var _this__compiler, target, resourceQuery, options, code;
         return __generator(this, function(_state) {
             this.cacheable();
             target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
@@ -144,7 +190,23 @@ function _loader() {
                     source
                 ];
             }
-            options = this.getOptions();
+            resourceQuery = this.resourceQuery;
+            options = resourceQuery.slice(1).split("&").map(function(item) {
+                return item.split("=");
+            }).reduce(function(pre, cur) {
+                var _cur = _slicedToArray(cur, 2), key = _cur[0], value = _cur[1];
+                if (!key || !value) {
+                    return pre;
+                }
+                pre[key] = value;
+                return pre;
+            }, {});
+            if (!options.mapFile) {
+                return [
+                    2,
+                    source
+                ];
+            }
             code = generateClient({
                 mapFile: options.mapFile,
                 loaderId: options.loaderId

package/dist/esm-node/cli/loader.js

@@ -9,7 +9,20 @@ async function loader(source) {
   if (target === "webworker") {
     return source;
   }
-  const options = this.getOptions();
+  const { resourceQuery } = this;
+  const options = resourceQuery.slice(1).split("&").map((item) => {
+    return item.split("=");
+  }).reduce((pre, cur) => {
+    const [key, value] = cur;
+    if (!key || !value) {
+      return pre;
+    }
+    pre[key] = value;
+    return pre;
+  }, {});
+  if (!options.mapFile) {
+    return source;
+  }
   const code = generateClient({
     mapFile: options.mapFile,
     loaderId: options.loaderId

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.12.0",
+  "version": "2.13.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -55,7 +55,7 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/utils": "2.12.0"
+    "@modern-js/utils": "2.13.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -72,11 +72,11 @@
     "webpack-chain": "^6.5.1",
     "react": ">=17.0.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/core": "2.12.0",
-    "@modern-js/server-core": "2.12.0",
-    "@modern-js/types": "2.12.0",
-    "@scripts/build": "2.12.0",
-    "@scripts/jest-config": "2.12.0"
+    "@modern-js/core": "2.13.0",
+    "@modern-js/server-core": "2.13.0",
+    "@modern-js/types": "2.13.0",
+    "@scripts/build": "2.13.0",
+    "@scripts/jest-config": "2.13.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0",