修复一大波 watch 问题 (#909)

* fix: 修正 watch 时修改配置不生效的问题 * fix(web): 修正配置 rootDir 不生效的问题 * fix: 修复 watch 时新增生命周期回调不生效的问题 close #913 * test: 修复 windows 平台错误 * test: 修复 runtime 测试 Co-authored-by: Caihuanyu <eterlf41@gmail.com>
remaxjs · May 10, 2020 · ca00d37 · ca00d37 · vercel · May 10, 2020
1 parent f0e6242
commit ca00d37
Show file tree

Hide file tree

Showing 45 changed files with 2,298 additions and 675 deletions.
diff --git a/packages/remax-cli/package.json b/packages/remax-cli/package.json
@@ -40,6 +40,7 @@
     "address": "^1.1.2",
     "babel-loader": "^8.1.0",
     "babel-preset-remax": "2.0.3",
+    "chokidar": "^3.4.0",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "css-loader": "^3.4.2",

diff --git a/packages/remax-cli/src/__tests__/config.test.ts b/packages/remax-cli/src/__tests__/config.test.ts
@@ -22,18 +22,22 @@ describe('remax config', () => {
 
 describe('manifest', () => {
   it('throw error when file not exists with strict mode enabled', () => {
-    expect(readManifest('', 'ali')).toEqual({});
+    expect(readManifest('', Platform.ali)).toEqual({});
     expect(() => {
-      readManifest('', 'ali', true);
+      readManifest('', Platform.ali, true);
     }).toThrow();
   });
 
   it('return empty object when javascript manifest file contains no config', () => {
-    expect(readManifest(path.join(__dirname, './fixtures/exception/manifest.js/app.config'), 'ali')).toMatchObject({});
+    expect(
+      readManifest(path.join(__dirname, './fixtures/exception/manifest.js/app.config'), Platform.ali)
+    ).toMatchObject({});
   });
 
   it('return empty object when typescript manifest file contains no config', () => {
-    expect(readManifest(path.join(__dirname, './fixtures/exception/manifest.ts/app.config'), 'ali')).toMatchObject({});
+    expect(
+      readManifest(path.join(__dirname, './fixtures/exception/manifest.ts/app.config'), Platform.ali)
+    ).toMatchObject({});
   });
 
   it('throw error when missing pages config in app.config', async () => {

diff --git a/packages/remax-cli/src/__tests__/fixtures/define/expected/pages/index.js b/packages/remax-cli/src/__tests__/fixtures/define/expected/pages/index.js
@@ -598,9 +598,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v3", function() { return v3; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v5", function() { return v5; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v6", function() { return v6; });
-var v3 = [];
+var v3 = __REMAX_ENTRY_INFO__;
 var v5 = [];
-var v6 = {};
+var v6 = {
+  "pages/index": []
+};
 
 /***/ }),
 /* 9 */

diff --git a/packages/remax-cli/src/__tests__/fixtures/hook-config-babel/expected/app.js b/packages/remax-cli/src/__tests__/fixtures/hook-config-babel/expected/app.js
@@ -1,10 +1,9 @@
 require('./runtime.js');
-(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[2],[
+(my["webpackJsonp"] = my["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(1);
-module.exports = __webpack_require__(3);
+module.exports = __webpack_require__(1);
 
 
 /***/ }),
@@ -13,187 +12,9 @@ module.exports = __webpack_require__(3);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return _App; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-function _typeof(obj) {
-  "@babel/helpers - typeof";
-
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function _typeof(obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function _typeof(obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
-}
-
-function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-
-    if ("value" in descriptor) {
-      descriptor.writable = true;
-    }
-
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) {
-    _defineProperties(Constructor.prototype, protoProps);
-  }
-
-  if (staticProps) {
-    _defineProperties(Constructor, staticProps);
-  }
-
-  return Constructor;
-}
-
-function _inherits(subClass, superClass) {
-  if (typeof superClass !== "function" && superClass !== null) {
-    throw new TypeError("Super expression must either be null or a function");
-  }
-
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
-  });
-
-  if (superClass) {
-    _setPrototypeOf(subClass, superClass);
-  }
-}
-
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-
-  return _setPrototypeOf(o, p);
-}
-
-function _createSuper(Derived) {
-  var hasNativeReflectConstruct = _isNativeReflectConstruct();
-
-  return function () {
-    var Super = _getPrototypeOf(Derived),
-        result;
-
-    if (hasNativeReflectConstruct) {
-      var NewTarget = _getPrototypeOf(this).constructor;
-
-      result = Reflect.construct(Super, arguments, NewTarget);
-    } else {
-      result = Super.apply(this, arguments);
-    }
-
-    return _possibleConstructorReturn(this, result);
-  };
-}
-
-function _possibleConstructorReturn(self, call) {
-  if (call && (_typeof(call) === "object" || typeof call === "function")) {
-    return call;
-  }
-
-  return _assertThisInitialized(self);
-}
-
-function _assertThisInitialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-
-  return self;
-}
-
-function _isNativeReflectConstruct() {
-  if (typeof Reflect === "undefined" || !Reflect.construct) {
-    return false;
-  }
-
-  if (Reflect.construct.sham) {
-    return false;
-  }
-
-  if (typeof Proxy === "function") {
-    return true;
-  }
-
-  try {
-    Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-    return o.__proto__ || Object.getPrototypeOf(o);
-  };
-  return _getPrototypeOf(o);
-}
-
-
-
-var _App = /*#__PURE__*/function (_React$Component) {
-  _inherits(_App, _React$Component);
-
-  var _super = _createSuper(_App);
-
-  function _App() {
-    _classCallCheck(this, _App);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(_App, [{
-    key: "render",
-    value: function render() {
-      return this.props.children;
-    }
-  }]);
-
-  return _App;
-}(react__WEBPACK_IMPORTED_MODULE_0__["Component"]);
-
-
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
-
-module.exports = react;
-
-/***/ }),
-/* 3 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _remax_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
+/* harmony import */ var _remax_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var _remax_runtime__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_remax_runtime__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
@@ -244,10 +65,16 @@ var _App = /*#__PURE__*/function (_React$Component) {
 /* harmony default export */ __webpack_exports__["default"] = (App(Object(_remax_runtime__WEBPACK_IMPORTED_MODULE_0__["createAppConfig"])(_App)));
 
 /***/ }),
-/* 4 */
+/* 2 */
 /***/ (function(module, exports) {
 
 module.exports = @remax/runtime;
 
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
+
+module.exports = react;
+
 /***/ })
 ],[[0,0]]]);
diff --git a/packages/remax-cli/src/__tests__/fixtures/hook-config-babel/expected/app.json b/packages/remax-cli/src/__tests__/fixtures/hook-config-babel/expected/app.json
@@ -0,0 +1,5 @@
+{
+  "pages": [
+    "pages/index"
+  ]
+}
diff --git a/packages/remax-cli/src/__tests__/fixtures/hook-config-babel/expected/pages/index.acss b/packages/remax-cli/src/__tests__/fixtures/hook-config-babel/expected/pages/index.acss
@@ -1,8 +1,4 @@
-.hello___3VaWs {
-  color: red;
-}
-
-.hello___BqWu5 {
+.hello___3skto {
   color: red;
 }