yakuza0 2.23.1-beta.4 → 2.23.1-beta.6

package/nuxt/build/index.js

@@ -38,8 +38,6 @@ var _babel = require('./babel');
 
 var _replace = require('./replace');
 
-var _replace2 = _interopRequireDefault(_replace);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var customExtend = function customExtend(_ref) {
@@ -106,13 +104,13 @@ exports.default = function (config) {
     // },
     extractCSS: false,
     corejs: _config2.default.resolve.babelConf.corejs,
-    transpile: [_yakuza._.regAnd(['@rdc', 'ant-design-vue']), _yakuza._.regAnd(['.cache', 'yakuza0', 'middleware']), 'nuxt', 'delay', 'node-fetch', 'data-uri-to-buffer', 'fetch-blob', 'quill-image-drop-module', '/ip'].concat((0, _toConsumableArray3.default)(nuxtConf.build && nuxtConf.build.tsl || [])),
+    transpile: [_yakuza._.regAnd(['@rdc', 'ant-design-vue']), _yakuza._.regAnd(['.cache', 'yakuza0', 'middleware']), 'nuxt', 'delay', 'node-fetch', 'data-uri-to-buffer', 'fetch-blob', 'quill-image-drop-module', '/ip', /webpack-hot-middleware/, 'ansi-regex', 'strip-ansi'].concat((0, _toConsumableArray3.default)(nuxtConf.build && nuxtConf.build.tsl || [])),
     loaders: (0, _extends3.default)({}, config.build && config.build.loaders, {
       less: (0, _extends3.default)({
         javascriptEnabled: true
       }, config.build && config.build.loaders && config.build.loaders.less)
     }),
-    plugins: [new _replace2.default([].concat((0, _toConsumableArray3.default)(replaceRules), (0, _toConsumableArray3.default)(nuxtConf.build && nuxtConf.build.replace && nuxtConf.build.replace.rules || [])))]
+    plugins: [new _replace.ReplaceInFileWebpackPlugin([].concat((0, _toConsumableArray3.default)(replaceRules), (0, _toConsumableArray3.default)(nuxtConf.build && nuxtConf.build.replace && nuxtConf.build.replace.rules || [])))]
   });
 
   // config.build.extractCSS = true;
@@ -211,6 +209,18 @@ exports.default = function (config) {
       }
     });
 
+    conf.module.rules.push({
+      // test: /toPrimitive\.js$/,
+      test: /\.js$/,
+      loader: 'string-replace-loader',
+      options: {
+        multiple: [{
+          search: 'throw new TypeError("@@toPrimitive must return a primitive value.");',
+          replace: ''
+        }]
+      }
+    });
+
     // if (!appConf.server.openHmr) {
     //   const hmrIndex = conf.plugins.findIndex(p => {
     //     return p.constructor.name === 'HotModuleReplacementPlugin';

package/nuxt/build/replace.js

@@ -1,5 +1,19 @@
 'use strict';
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require('babel-runtime/helpers/createClass');
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var path = require('path');
 var fs = require('fs');
 
@@ -90,7 +104,138 @@ ReplaceInFilePlugin.prototype.apply = function (compiler) {
   }
 };
 
-module.exports = ReplaceInFilePlugin;
+// const replacements = [
+//   { searchValue: 'throw new TypeError("@@toPrimitive must return a primitive value.");', replaceValue: '' },
+// ]
+
+exports.replaceMultipleStringsPlugin = function (_ref) {
+  var t = _ref.types;
+
+  return {
+    visitor: {
+      StringLiteral: function StringLiteral(path, state) {
+        var replacements = state.opts.replacements;
+
+
+        if (Array.isArray(replacements)) {
+          replacements.forEach(function (_ref2) {
+            var searchValue = _ref2.searchValue,
+                replaceValue = _ref2.replaceValue;
+
+            if (typeof searchValue === 'string' && typeof replaceValue === 'string') {
+              if (path.node.value.includes(searchValue)) {
+                console.log(searchValue, 222);
+                path.node.value = path.node.value.replace(new RegExp(searchValue, 'g'), replaceValue);
+              }
+            }
+          });
+        }
+      },
+      TemplateLiteral: function TemplateLiteral(path, state) {
+        var replacements = state.opts.replacements;
+
+
+        if (Array.isArray(replacements)) {
+          path.node.quasis.forEach(function (element) {
+            replacements.forEach(function (_ref3) {
+              var searchValue = _ref3.searchValue,
+                  replaceValue = _ref3.replaceValue;
+
+              if (typeof searchValue === 'string' && typeof replaceValue === 'string') {
+                if (element.value.raw.includes(searchValue)) {
+                  console.log(searchValue, 1111111111);
+                  element.value.raw = element.value.raw.replace(new RegExp(searchValue, 'g'), replaceValue);
+                  element.value.cooked = element.value.cooked.replace(new RegExp(searchValue, 'g'), replaceValue);
+                }
+              }
+            });
+          });
+        }
+      }
+    }
+  };
+};
+// exports.replaceStringPlugin = function ({ types: t }) {
+//   return {
+//     visitor: {
+//       StringLiteral(path, state) {
+//         if (Array.isArray(replacements)) {
+//           replacements.forEach(({ searchValue, replaceValue }) => {
+//             if (typeof searchValue === 'string' && typeof replaceValue === 'string') {
+//               if (path.node.value.includes(searchValue)) {
+//                 path.node.value = path.node.value.replace(new RegExp(searchValue, 'g'), replaceValue);
+//               }
+//             }
+//           });
+//         }
+//       },
+//       TemplateLiteral(path, state) {
+//         if (Array.isArray(replacements)) {
+//           path.node.quasis.forEach(element => {
+//             replacements.forEach(({ searchValue, replaceValue }) => {
+//               if (typeof searchValue === 'string' && typeof replaceValue === 'string') {
+//                 if (element.value.raw.includes(searchValue)) {
+//                   element.value.raw = element.value.raw.replace(new RegExp(searchValue, 'g'), replaceValue);
+//                   element.value.cooked = element.value.cooked.replace(new RegExp(searchValue, 'g'), replaceValue);
+//                 }
+//               }
+//             });
+//           });
+//         }
+//       }
+//     }
+//   };
+// };
+
+exports.ReplaceInFileWebpackPlugin = ReplaceInFilePlugin;
+
+var ReplaceStringsPlugin = function () {
+  function ReplaceStringsPlugin(options) {
+    (0, _classCallCheck3.default)(this, ReplaceStringsPlugin);
+
+    this.options = options || {};
+    // 从配置项中获取替换规则
+    this.replacements = this.options.replacements || [];
+  }
+
+  (0, _createClass3.default)(ReplaceStringsPlugin, [{
+    key: 'apply',
+    value: function apply(compiler) {
+      var _this2 = this;
+
+      compiler.hooks.emit.tapAsync('ReplaceStringsPlugin', function (compilation, callback) {
+        (0, _keys2.default)(compilation.assets).forEach(function (filename) {
+          if (filename.endsWith('.js')) {
+            var originalSource = compilation.assets[filename].source();
+
+            // 依次应用每个替换规则
+            _this2.replacements.forEach(function (_ref4) {
+              var target = _ref4.target,
+                  replacement = _ref4.replacement;
+
+              originalSource = originalSource.replace(new RegExp(target, 'g'), replacement);
+            });
+
+            // 更新资源
+            compilation.assets[filename] = {
+              source: function source() {
+                return originalSource;
+              },
+              size: function size() {
+                return originalSource.length;
+              }
+            };
+          }
+        });
+
+        callback();
+      });
+    }
+  }]);
+  return ReplaceStringsPlugin;
+}();
+
+exports.ReplaceStringsPlugin = ReplaceStringsPlugin;
 
 // import {minimatch} from 'yakuza1'
 //

package/nuxt/index.js

@@ -108,6 +108,8 @@ var config = exports.config = function config(_config) {
     //   ],
     // };
 
+    // config.devtool = false;
+    // console.log(config.build.transpile, 123);
     return _config;
   };
 };

package/nuxt/plugins/init_client.js

@@ -26,6 +26,8 @@ var _ws = require('yakuza1/lib/ws');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// import 'url-search-params-polyfill';
+
 exports.default = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) {
     var store, $yk, $ws, app, route, keys, cs, clientKey, q, ci;

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "yakuza0",
-  "version": "2.23.1-beta.4",
+  "version": "2.23.1-beta.6",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
-    "base": "babel --no-babelrc src -d /Users/ningfujun/work/repo/web/CLN_BASE_TEST/node_modules/yakuza0 -w --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
     "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
     "pub:beta": "npm run build && npm version prerelease --preid=beta && npm publish --tag beta",
     "pub:hotfix": "npm run build && npm version prerelease --preid=hotfix && npm publish --tag hotfix",
@@ -54,7 +53,7 @@
     "compression": "^1.7.4",
     "connection-tester": "^0.2.1",
     "consola": "^2.10.1",
-    "core-js": "2",
+    "core-js": "3.10.1",
     "css-loader": "^5.2.7",
     "download": "^7.1.0",
     "eslint": "^7.2.0",
@@ -96,6 +95,7 @@
     "sass-loader": "^10",
     "semver": "^6.3.0",
     "socket.io-client": "^2.2.0",
+    "string-replace-loader": "^3.1.0",
     "stylelint": "^14.1.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-rational-order": "^0.1.2",
@@ -113,13 +113,13 @@
     "ua-parser-js": "^0.7.20",
     "uglify-js": "^3.17.4",
     "v8-compile-cache": "^2.0.2",
-    "yakuza1": "2.6.17-beta.0"
+    "yakuza1": "^2.6.16"
   },
   "peerDependencies": {
     "@rdc/nuxt": "2.15.8",
-    "core-js": "2",
+    "core-js": "3.10.1",
     "eslint": "7.2.0",
-    "yakuza1": "2.6.17-beta.0"
+    "yakuza1": "^2.6.16"
   },
   "__npminstall_done": false
 }