Merge pull request #340 from reduxjs/feature/v3.0-esm-build

Author: markerikson

.babelrc.js

@@ -1,7 +1,7 @@
 const { NODE_ENV, BABEL_ENV } = process.env
 const cjs = NODE_ENV === 'test' || BABEL_ENV === 'commonjs'
 
-module.exports = {
+export default {
   presets: [
     [
       '@babel/preset-env',

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: 'npm'
 
       - name: Install deps
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ts: ['3.9', '4.0', '4.1', '4.2', '4.3', '4.4', '4.5', 'next']
+        ts: ['4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9']
 
     steps:
       - name: Checkout code

jest.config.js

@@ -1,14 +1,14 @@
 /** @type {import('@ts-jest/dist/types').InitialOptionsTsJest} */
 
-module.exports = {
+export default {
   preset: 'ts-jest',
   testEnvironment: 'node',
   coverageDirectory: './coverage/',
   collectCoverage: true,
   testRegex: 'test/test.ts',
   globals: {
     'ts-jest': {
-      tsconfig: './test/tsconfig.json',
-    },
-  },
-};
+      tsconfig: './test/tsconfig.json'
+    }
+  }
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-thunk",
-  "version": "2.4.2",
+  "version": "3.0.0-alpha.1",
   "license": "MIT",
   "description": "Thunk middleware for Redux.",
   "repository": "github:reduxjs/redux-thunk",
@@ -14,9 +14,18 @@
     "flux"
   ],
   "author": "Dan Abramov <[email protected]>",
+  "type": "module",
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "es/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./es/index.d.ts",
+      "import": "./es/index.js",
+      "default": "./lib/index.js"
+    }
+  },
   "sideEffects": false,
   "files": [
     "lib",
@@ -28,9 +37,9 @@
   "scripts": {
     "clean": "rimraf lib dist es",
     "prepublishOnly": "npm run clean && npm run lint && npm run test && npm run build",
-    "format": "prettier --write {src,test,typescript_test}/**/*.{js,ts}",
-    "format:check": "prettier --check {src,test,typescript_test}/**/*.{js,ts}",
-    "lint": "eslint '{src,test,typescript_test}/**/*.{js,ts}'",
+    "format": "prettier --write \"{src,test,typescript_test}/**/*.{js,ts}\"",
+    "format:check": "prettier --check \"{src,test,typescript_test}/**/*.{js,ts}\"",
+    "lint": "eslint \"{src,test,typescript_test}/**/*.{js,ts}\"",
     "test": "jest",
     "test:cov": "jest --coverage",
     "test:typescript": "npm run test:typescript:main && npm run test:typescript:extended",

package.json

@@ -36,7 +36,7 @@ function createThunkMiddleware<
   return middleware
 }
 
-const thunk = createThunkMiddleware() as ThunkMiddleware & {
+export const thunk = createThunkMiddleware() as ThunkMiddleware & {
   withExtraArgument<
     ExtraThunkArg,
     State = any,
@@ -46,8 +46,6 @@ const thunk = createThunkMiddleware() as ThunkMiddleware & {
   ): ThunkMiddleware<State, BasicAction, ExtraThunkArg>
 }
 
-// Attach the factory function so users can create a customized version
+// Export the factory function so users can create a customized version
 // with whatever "extra arg" they want to inject into their thunks
-thunk.withExtraArgument = createThunkMiddleware
-
-export default thunk
+export const withExtraArgument = createThunkMiddleware

src/index.ts

@@ -1,4 +1,4 @@
-import thunkMiddleware from '../src/index'
+import { thunk as thunkMiddleware, withExtraArgument } from '../src/index'
 
 describe('thunk middleware', () => {
   const doDispatch = () => {}
@@ -92,7 +92,7 @@ describe('thunk middleware', () => {
     it('must pass the third argument', done => {
       const extraArg = { lol: true }
       // @ts-ignore
-      thunkMiddleware.withExtraArgument(extraArg)({
+      withExtraArgument(extraArg)({
         dispatch: doDispatch,
         getState: doGetState
       })()((dispatch: any, getState: any, arg: any) => {

test/test.ts

@@ -2,7 +2,7 @@
 import { applyMiddleware, bindActionCreators, createStore } from 'redux'
 import type { Action, AnyAction } from 'redux'
 
-import thunk from '../src/index'
+import { thunk } from '../src/index'
 import type {
   ThunkAction,
   ThunkActionDispatch,

typescript_test/typescript.ts

@@ -9,7 +9,7 @@ import {
   Dispatch
 } from 'redux'
 
-import thunk from '../../src/index'
+import { thunk } from '../../src/index'
 import type {
   ThunkAction,
   ThunkActionDispatch,