fix: 修复使用依赖 regeneratorRuntime lib 报错的问题 (remaxjs#457)

fix remaxjs#451

packages/babel-preset-remax/package.json

@@ -30,7 +30,8 @@
     "@babel/preset-env": "^7.7.4",
     "@babel/preset-react": "^7.7.4",
     "@babel/preset-typescript": "^7.7.4",
-    "@remax/babel-plugin-macros": "^2.7.1"
+    "@remax/babel-plugin-macros": "^2.7.1",
+    "babel-plugin-auto-import": "^1.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.7.4",

packages/babel-preset-remax/src/index.ts

@@ -44,6 +44,14 @@ function preset(api: any, presetOption: PresetOption) {
       require('@babel/plugin-syntax-jsx'),
       [require('@babel/plugin-proposal-decorators'), decorators],
       [require('@babel/plugin-proposal-class-properties'), classProperties],
+      [
+        require('babel-plugin-auto-import'),
+        {
+          declarations: [
+            { default: 'regeneratorRuntime', path: 'regenerator-runtime' },
+          ],
+        },
+      ],
     ],
   };
 }

packages/remax-cli/package.json

@@ -65,7 +65,6 @@
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-copy": "^3.1.0",
     "rollup-plugin-delete": "^1.1.0",
-    "rollup-plugin-inject": "^3.0.1",
     "rollup-plugin-node-resolve": "^5.0.3",
     "rollup-plugin-progress": "^1.1.1",
     "schema-utils": "^2.6.1",

packages/remax-cli/patches/rollup+1.27.7.patch → packages/remax-cli/patches/rollup+1.27.8.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/rollup/dist/rollup.js b/node_modules/rollup/dist/rollup.js
-index 31f1f48..21a0d3d 100644
+index cbe2a26..3bb350c 100644
 --- a/node_modules/rollup/dist/rollup.js
 +++ b/node_modules/rollup/dist/rollup.js
-@@ -13505,7 +13505,7 @@ function rollup(rawInputOptions) {
+@@ -13508,7 +13508,7 @@ function rollup(rawInputOptions) {
              return __awaiter(this, void 0, void 0, function* () {
                  timeStart('GENERATE', 1);
                  const assetFileNames = outputOptions.assetFileNames || 'assets/[name]-[hash][extname]';

packages/remax-cli/src/__tests__/fixtures/alipay/expected/pages/index.js

@@ -10,6 +10,7 @@ require('../npm/remax/esm/Platform.js');
 require('../npm/remax/esm/createHostComponent.js');
 var createPageConfig = require('../npm/remax/esm/createPageConfig.js');
 require('../npm/remax/esm/index.js');
+var runtime = require('../npm/regenerator-runtime/runtime.js');
 var View = require('../npm/remax/esm/adapters/alipay/components/View.js');
 require('../npm/remax/esm/adapters/alipay/components/ScrollView.js');
 require('../npm/remax/esm/adapters/alipay/components/Swiper.js');
@@ -53,7 +54,21 @@ var _page = function _page() {
   var props = {};
   var TextElement = React.cloneElement(React.createElement(Text.default, null));
 
-  function handleClick() {}
+  function handleClick() {
+    return runtime.default.async(function handleClick$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return runtime.default.awrap(Promise.resolve(1));
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    });
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/alipay/src/pages/index.js

@@ -6,7 +6,9 @@ export default () => {
   const props = {};
   const TextElement = React.cloneElement(<Text />);
 
-  function handleClick() {}
+  async function handleClick() {
+    await Promise.resolve(1);
+  }
 
   function handleTouchStart() {}
   const obj = {};

packages/remax-cli/src/__tests__/fixtures/toutiao/expected/pages/index.js

@@ -10,6 +10,7 @@ require('../npm/remax/esm/Platform.js');
 require('../npm/remax/esm/createHostComponent.js');
 var createPageConfig = require('../npm/remax/esm/createPageConfig.js');
 require('../npm/remax/esm/index.js');
+var runtime = require('../npm/regenerator-runtime/runtime.js');
 var View = require('../npm/remax/esm/adapters/toutiao/components/View.js');
 require('../npm/remax/esm/adapters/toutiao/components/Input.js');
 require('../npm/remax/esm/adapters/toutiao/components/Textarea.js');
@@ -44,7 +45,21 @@ var _page = function _page() {
   var props = {};
   var TextElement = React.cloneElement(React.createElement(Text.default, null));
 
-  function handleClick() {}
+  function handleClick() {
+    return runtime.default.async(function handleClick$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return runtime.default.awrap(Promise.resolve());
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    });
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/toutiao/src/pages/index.js

@@ -6,7 +6,9 @@ export default () => {
   const props = {};
   const TextElement = React.cloneElement(<Text />);
 
-  function handleClick() {}
+  async function handleClick() {
+    await Promise.resolve();
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/universe/expected/alipay/pages/index.js

@@ -6,14 +6,29 @@ var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.j
 var React = require('react');
 var createPageConfig = require('../npm/remax/esm/createPageConfig.js');
 require('../npm/remax/esm/index.js');
+var runtime = require('../npm/regenerator-runtime/runtime.js');
 var View = require('../components/View.js');
 var Text = require('../components/Text.js');
 
 var _page = function _page() {
   var props = {};
   var TextElement = React.cloneElement(React.createElement(Text.default, null));
 
-  function handleClick() {}
+  function handleClick() {
+    return runtime.default.async(function handleClick$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return runtime.default.awrap(Promise.resolve(1));
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    });
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/universe/expected/toutiao/pages/index.js

@@ -6,14 +6,29 @@ var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.j
 var React = require('react');
 var createPageConfig = require('../npm/remax/esm/createPageConfig.js');
 require('../npm/remax/esm/index.js');
+var runtime = require('../npm/regenerator-runtime/runtime.js');
 var View = require('../components/View.js');
 var Text = require('../components/Text.js');
 
 var _page = function _page() {
   var props = {};
   var TextElement = React.cloneElement(React.createElement(Text.default, null));
 
-  function handleClick() {}
+  function handleClick() {
+    return runtime.default.async(function handleClick$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return runtime.default.awrap(Promise.resolve(1));
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    });
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/universe/expected/wechat/pages/index.js

@@ -6,14 +6,29 @@ var _rollupPluginBabelHelpers = require('../_virtual/_rollupPluginBabelHelpers.j
 var React = require('react');
 var createPageConfig = require('../npm/remax/esm/createPageConfig.js');
 require('../npm/remax/esm/index.js');
+var runtime = require('../npm/regenerator-runtime/runtime.js');
 var View = require('../components/View.js');
 var Text = require('../components/Text.js');
 
 var _page = function _page() {
   var props = {};
   var TextElement = React.cloneElement(React.createElement(Text.default, null));
 
-  function handleClick() {}
+  function handleClick() {
+    return runtime.default.async(function handleClick$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return runtime.default.awrap(Promise.resolve(1));
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    });
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/universe/src/pages/index.js

@@ -6,7 +6,9 @@ export default () => {
   const props = {};
   const TextElement = React.cloneElement(<Text />);
 
-  function handleClick() {}
+  async function handleClick() {
+    await Promise.resolve(1);
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/wechat/expected/pages/index.js

@@ -10,6 +10,7 @@ require('../npm/remax/esm/Platform.js');
 require('../npm/remax/esm/createHostComponent.js');
 var createPageConfig = require('../npm/remax/esm/createPageConfig.js');
 require('../npm/remax/esm/index.js');
+var runtime = require('../npm/regenerator-runtime/runtime.js');
 var View = require('../npm/remax/esm/adapters/wechat/components/View.js');
 require('../npm/remax/esm/adapters/wechat/components/Input.js');
 require('../npm/remax/esm/adapters/wechat/components/Textarea.js');
@@ -57,7 +58,21 @@ var _page = function _page() {
   var props = {};
   var TextElement = React.cloneElement(React.createElement(Text.default, null));
 
-  function handleClick() {}
+  function handleClick() {
+    return runtime.default.async(function handleClick$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return runtime.default.awrap(Promise.resolve(1));
+
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }
+    });
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/__tests__/fixtures/wechat/src/pages/index.js

@@ -6,7 +6,9 @@ export default () => {
   const props = {};
   const TextElement = React.cloneElement(<Text />);
 
-  function handleClick() {}
+  async function handleClick() {
+    await Promise.resolve(1);
+  }
 
   function handleTouchStart() {}
 

packages/remax-cli/src/build/rollupConfig.ts

@@ -10,7 +10,6 @@ import postcss from '@remax/rollup-plugin-postcss';
 import postcssUrl from './plugins/postcssUrl';
 import progress from 'rollup-plugin-progress';
 import clean from 'rollup-plugin-delete';
-import inject from 'rollup-plugin-inject';
 import copy from 'rollup-plugin-copy';
 import stub from './plugins/stub';
 import pxToUnits from '@remax/postcss-px2units';
@@ -179,10 +178,6 @@ export default function rollupConfig(
         return input.replace(/\.css/, '.css.js');
       },
     }),
-    inject({
-      exclude: 'node_modules/**',
-      regeneratorRuntime: 'regenerator-runtime',
-    }),
     rename({
       matchAll: true,
       map: input => {

packages/remax-cli/typings/index.d.ts

@@ -4,9 +4,7 @@ declare module 'rollup-plugin-node-resolve';
 declare module 'rollup-plugin-progress';
 declare module 'rollup-plugin-delete';
 declare module '@rollup/plugin-alias';
-declare module 'rollup-plugin-inject';
 declare module '@remax/rollup-plugin-url';
-declare module 'rollup-plugin-typescript';
 declare module 'postcss-url';
 declare module 'mkdirp';
 declare module '@remax/postcss-px2units';