Merge branch 'typescript-port' into ts-port-mdtp

Author: tony-go

.babelrc.js

@@ -1,17 +1,29 @@
 const { NODE_ENV, BABEL_ENV } = process.env
 const cjs = NODE_ENV === 'test' || BABEL_ENV === 'commonjs'
-const loose = true
 
 module.exports = {
   presets: [
-    ['@babel/env', { loose, modules: false }],
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          esmodules: true,
+        },
+        // Use the equivalent of `babel-preset-modules`
+        bugfixes: true,
+        modules: false,
+        loose: true,
+      },
+    ],
     '@babel/preset-typescript',
   ],
   plugins: [
     ['@babel/proposal-decorators', { legacy: true }],
-    ['@babel/proposal-object-rest-spread', { loose }],
     '@babel/transform-react-jsx',
-    cjs && ['@babel/transform-modules-commonjs', { loose }],
+    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ['@babel/plugin-proposal-private-methods', { loose: true }],
+    ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
+    cjs && ['@babel/transform-modules-commonjs'],
     [
       '@babel/transform-runtime',
       {
@@ -22,4 +34,7 @@ module.exports = {
       },
     ],
   ].filter(Boolean),
+  assumptions: {
+    enumerableModuleMeta: true,
+  },
 }

package.json

@@ -23,8 +23,8 @@
     "es"
   ],
   "scripts": {
-    "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --extensions \".js,.ts\" --out-dir lib",
-    "build:es": "babel src --extensions \".js,.ts\" --out-dir es",
+    "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --extensions \".js,.ts,.tsx\" --out-dir lib",
+    "build:es": "babel src --extensions \".js,.ts,.tsx\" --out-dir es",
     "build:umd": "cross-env NODE_ENV=development rollup -c -o dist/react-redux.js",
     "build:umd:min": "cross-env NODE_ENV=production rollup -c -o dist/react-redux.min.js",
     "build:types": "tsc",

rollup.config.js

@@ -33,6 +33,7 @@ const config = {
     }),
     replace({
       'process.env.NODE_ENV': JSON.stringify(env),
+      preventAssignment: true,
     }),
     commonjs(),
   ],

src/components/Context.ts

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Action, AnyAction, Store } from 'redux'
 import type { FixTypeLater } from '../types'
-import type Subscription from '../utils/Subscription'
+import type { Subscription } from '../utils/Subscription'
 
 export interface ReactReduxContextValue<
   SS = FixTypeLater,
@@ -11,9 +11,10 @@ export interface ReactReduxContextValue<
   subscription: Subscription
 }
 
-export const ReactReduxContext = /*#__PURE__*/ React.createContext<ReactReduxContextValue | null>(
-  null
-)
+export const ReactReduxContext =
+  /*#__PURE__*/ React.createContext<ReactReduxContextValue | null>(null)
+
+export type ReactReduxContextInstance = typeof ReactReduxContext
 
 if (process.env.NODE_ENV !== 'production') {
   ReactReduxContext.displayName = 'ReactRedux'

src/components/Provider.tsx

@@ -1,6 +1,6 @@
 import React, { Context, ReactNode, useMemo } from 'react'
 import { ReactReduxContext, ReactReduxContextValue } from './Context'
-import Subscription from '../utils/Subscription'
+import { createSubscription } from '../utils/Subscription'
 import { useIsomorphicLayoutEffect } from '../utils/useIsomorphicLayoutEffect'
 import type { FixTypeLater } from '../types'
 import { Action, AnyAction, Store } from 'redux'
@@ -21,7 +21,7 @@ interface ProviderProps<A extends Action = AnyAction> {
 
 function Provider({ store, context, children }: ProviderProps) {
   const contextValue = useMemo(() => {
-    const subscription = new Subscription(store)
+    const subscription = createSubscription(store)
     subscription.onStateChange = subscription.notifyNestedSubs
     return {
       store,