@modern-js/plugin-garfish 1.21.0 → 1.21.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @modern-js/plugin-garfish
 
+## 1.21.1
+
+### Patch Changes
+
+- 2baa20b: fix: remove useless mount check ref
+  移除过时的确认挂载的 ref
+  - @modern-js/runtime@1.21.1
+  - @modern-js/utils@1.21.1
+
 ## 1.21.0
 
 ### Patch Changes

package/dist/js/modern/runtime/loadable.js

@@ -11,7 +11,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 // logical reference to https://github.com/jamiebuilds/react-loadable/blob/6201c5837b212d6244c57f3748f2b1375096beeb/src/index.js
-import { useState, useRef, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { logger } from "../util";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -31,7 +31,6 @@ export function Loadable(WrapComponent) {
       } = props,
             otherProps = _objectWithoutProperties(props, _excluded);
 
-      const mountRef = useRef(false);
       let delayTimer = null;
       let timeoutTimer = null;
       const [state, setState] = useState(() => {
@@ -70,7 +69,6 @@ export function Loadable(WrapComponent) {
       });
       const LoadingComponent = (_props$loadable = props.loadable) === null || _props$loadable === void 0 ? void 0 : _props$loadable.loading;
       useEffect(() => {
-        mountRef.current = true;
         logger('Loadable render state', {
           state,
           props: otherProps,
@@ -78,7 +76,6 @@ export function Loadable(WrapComponent) {
           defaultLoadable
         });
         return () => {
-          mountRef.current = false;
           setStateWithMountCheck({
             isLoading: false,
             error: null
@@ -103,10 +100,6 @@ export function Loadable(WrapComponent) {
         }));
       }, [state]);
       const setStateWithMountCheck = useCallback(newState => {
-        if (!mountRef.current) {
-          return;
-        }
-
         setState(state => _objectSpread(_objectSpread({}, state), newState));
       }, [state]);
       const showLoading = (state.isLoading || state.error) && LoadingComponent;

package/dist/js/node/runtime/loadable.js

@@ -39,7 +39,6 @@ function Loadable(WrapComponent) {
       } = props,
             otherProps = _objectWithoutProperties(props, _excluded);
 
-      const mountRef = (0, _react.useRef)(false);
       let delayTimer = null;
       let timeoutTimer = null;
       const [state, setState] = (0, _react.useState)(() => {
@@ -78,7 +77,6 @@ function Loadable(WrapComponent) {
       });
       const LoadingComponent = (_props$loadable = props.loadable) === null || _props$loadable === void 0 ? void 0 : _props$loadable.loading;
       (0, _react.useEffect)(() => {
-        mountRef.current = true;
         (0, _util.logger)('Loadable render state', {
           state,
           props: otherProps,
@@ -86,7 +84,6 @@ function Loadable(WrapComponent) {
           defaultLoadable
         });
         return () => {
-          mountRef.current = false;
           setStateWithMountCheck({
             isLoading: false,
             error: null
@@ -111,10 +108,6 @@ function Loadable(WrapComponent) {
         }));
       }, [state]);
       const setStateWithMountCheck = (0, _react.useCallback)(newState => {
-        if (!mountRef.current) {
-          return;
-        }
-
         setState(state => _objectSpread(_objectSpread({}, state), newState));
       }, [state]);
       const showLoading = (state.isLoading || state.error) && LoadingComponent;

package/dist/js/treeshaking/runtime/loadable.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["loadable"];
 // logical reference to https://github.com/jamiebuilds/react-loadable/blob/6201c5837b212d6244c57f3748f2b1375096beeb/src/index.js
-import { useState, useRef, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { logger } from "../util";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -22,7 +22,6 @@ export function Loadable(WrapComponent) {
           loadable = _props$loadable === void 0 ? defaultLoadable !== null && defaultLoadable !== void 0 ? defaultLoadable : DEFAULT_LOADABLE : _props$loadable,
           otherProps = _objectWithoutProperties(props, _excluded);
 
-      var mountRef = useRef(false);
       var delayTimer = null;
       var timeoutTimer = null;
 
@@ -64,7 +63,6 @@ export function Loadable(WrapComponent) {
 
       var LoadingComponent = (_props$loadable2 = props.loadable) === null || _props$loadable2 === void 0 ? void 0 : _props$loadable2.loading;
       useEffect(function () {
-        mountRef.current = true;
         logger('Loadable render state', {
           state: state,
           props: otherProps,
@@ -72,7 +70,6 @@ export function Loadable(WrapComponent) {
           defaultLoadable: defaultLoadable
         });
         return function () {
-          mountRef.current = false;
           setStateWithMountCheck({
             isLoading: false,
             error: null
@@ -97,10 +94,6 @@ export function Loadable(WrapComponent) {
         }));
       }, [state]);
       var setStateWithMountCheck = useCallback(function (newState) {
-        if (!mountRef.current) {
-          return;
-        }
-
         setState(function (state) {
           return _objectSpread(_objectSpread({}, state), newState);
         });

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.0",
+  "version": "1.21.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "1.21.0",
+    "@modern-js/utils": "1.21.1",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
@@ -59,7 +59,7 @@
     "react-loadable": "^5.5.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^1.21.0"
+    "@modern-js/runtime": "^1.21.1"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -67,11 +67,11 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.21.0",
-    "@modern-js/runtime": "1.21.0",
-    "@modern-js/types": "1.21.0",
-    "@scripts/build": "1.21.0",
-    "@scripts/jest-config": "1.21.0",
+    "@modern-js/core": "1.21.1",
+    "@modern-js/runtime": "1.21.1",
+    "@modern-js/types": "1.21.1",
+    "@scripts/build": "1.21.1",
+    "@scripts/jest-config": "1.21.1",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",