Improve ES build comaptibility (#386)

* chore: upgrade build tooling * chore: move tests to vitest * chore: improve code linting * chore: add pnpm to travis config * chore: remove system file * chore: only support ESM targets * chore: fix package version * fix: merge conflicts
redux-utilities · Jan 22, 2023 · f9d655c · f9d655c
1 parent 3f43258
commit f9d655c
Show file tree

Hide file tree

Showing 46 changed files with 4,140 additions and 7,127 deletions.
diff --git a/.babelrc.js b/.babelrc.js
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,7 @@ dist
 .idea
 *.log
 package-lock.json
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,17 @@
 language: node_js
-node_js: 11
+node_js: 18
+cache:
+  npm: false
+  directories:
+    - "~/.pnpm-store"
+before_install:
+  - curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7
+  - pnpm config set store-dir ~/.pnpm-store
+install:
+  - pnpm install
 script:
-  - yarn format:check
-  - yarn lint
-  - yarn test
+  - pnpm format:check
+  - pnpm lint
+  - pnpm test
 after_success:
   - npx codecov
-cache:
-  directories:
-  - "$HOME/.npm"
diff --git a/docs/api/combineActions.md b/docs/api/combineActions.md
@@ -45,8 +45,8 @@ Below is how you would use `combineActions` and `handleActions` together
 
 ```js
 const { increment, decrement } = createActions({
-  INCREMENT: amount => ({ amount }),
-  DECREMENT: amount => ({ amount: -amount })
+  INCREMENT: (amount) => ({ amount }),
+  DECREMENT: (amount) => ({ amount: -amount })
 });
 
 const reducer = handleActions(

diff --git a/docs/api/createAction.md b/docs/api/createAction.md
@@ -100,7 +100,7 @@ createAction('ADD_TODO')('Use Redux');
 ###### EXAMPLE
 
 ```js
-let noop = createAction('NOOP', amount => amount);
+let noop = createAction('NOOP', (amount) => amount);
 // same as
 noop = createAction('NOOP');
 
@@ -119,7 +119,7 @@ expect(noop(42)).to.deep.equal({
 ```js
 const updateAdminUser = createAction(
   'UPDATE_ADMIN_USER',
-  updates => updates,
+  (updates) => updates,
   () => ({ admin: true })
 );
 
@@ -160,9 +160,9 @@ import { createActions } from 'redux-actions';
 
 ```js
 createActions({
-  ADD_TODO: todo => ({ todo }), // payload creator
+  ADD_TODO: (todo) => ({ todo }), // payload creator
   REMOVE_TODO: [
-    todo => ({ todo }), // payload creator
+    (todo) => ({ todo }), // payload creator
     (todo, warn) => ({ todo, warn }) // meta
   ]
 });
@@ -176,8 +176,11 @@ If `actionMap` has a recursive structure, its leaves are used as payload and met
 const actionCreators = createActions({
   APP: {
     COUNTER: {
-      INCREMENT: [amount => ({ amount }), amount => ({ key: 'value', amount })],
-      DECREMENT: amount => ({ amount: -amount }),
+      INCREMENT: [
+        (amount) => ({ amount }),
+        (amount) => ({ key: 'value', amount })
+      ],
+      DECREMENT: (amount) => ({ amount: -amount }),
       SET: undefined // given undefined, the identity function will be used
     },
     NOTIFY: [
@@ -221,7 +224,7 @@ const { actionOne, actionTwo, actionThree } = createActions(
 
     // array form
     ACTION_TWO: [
-      first => [first], // payload
+      (first) => [first], // payload
       (first, second) => ({ second }) // meta
     ]
 

diff --git a/docs/introduction/Tutorial.md b/docs/introduction/Tutorial.md
@@ -25,10 +25,10 @@ We are going to be building a simple counter, I recommend using something like [
 To begin we are going to need some scaffolding so here is some HTML to get started with. You may need to create a new file called main.js depending on where you are trying to set this tutorial up.
 
 ```html
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <script src="https://unpkg.com/redux@latest/dist/redux.js"></script>
     <script src="https://unpkg.com/redux-actions@latest/dist/redux-actions.js"></script>
   </head>
@@ -131,8 +131,8 @@ const { createAction, handleActions } = window.ReduxActions;
 
 const reducer = handleActions(
   {
-    [increment]: state => ({ ...state, counter: state.counter + 1 }),
-    [decrement]: state => ({ ...state, counter: state.counter - 1 })
+    [increment]: (state) => ({ ...state, counter: state.counter + 1 }),
+    [decrement]: (state) => ({ ...state, counter: state.counter - 1 })
   },
   defaultState
 );

diff --git a/package.json b/package.json
@@ -1,29 +1,26 @@
 {
   "name": "redux-actions",
-  "version": "2.6.5",
+  "version": "2.7.0",
   "description": "Flux Standard Action utlities for Redux",
-  "main": "lib/index.js",
-  "unpkg": "dist/redux-actions.js",
-  "module": "es/index.js",
-  "sideEffects": false,
+  "type": "module",
   "scripts": {
     "format": "prettier --write \"**/*.{js,md}\"",
     "format:check": "prettier --list-different \"**/*.{js,md}\"",
-    "build:esm": "cross-env BABEL_ENV=esm babel src --out-dir es",
-    "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
-    "build:umd": "rollup -c && es-check es5 dist/redux-actions.min.js",
-    "build": "run-s clean && run-p build:**",
+    "build": "vite build",
     "clean": "rimraf coverage dist es lib",
-    "lint": "xo",
     "prepublishOnly": "run-s build",
-    "test": "jest"
+    "test": "vitest run --coverage",
+    "lint": "xo"
   },
   "files": [
-    "es",
-    "lib",
-    "dist",
-    "src"
+    "dist"
   ],
+  "module": "./dist/redux-actions.js",
+  "exports": {
+    ".": {
+      "import": "./dist/redux-actions.js"
+    }
+  },
   "keywords": [
     "flux",
     "redux",
@@ -41,74 +38,59 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/cli": "^7.1.2",
-    "@babel/core": "^7.1.2",
-    "@babel/node": "^7.0.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.6.0",
-    "cross-env": "^5.2.0",
-    "es-check": "^4.0.0",
-    "eslint": "^5.7.0",
-    "eslint-config-jest-files": "^0.1.3",
-    "eslint-config-unicorn-camelcase": "^0.1.1",
-    "eslint-plugin-prettier": "^3.0.0",
-    "flux-standard-action": "^2.0.3",
-    "husky": "^1.1.2",
-    "jest": "^23.6.0",
-    "lint-staged": "^7.3.0",
-    "npm-run-all": "^4.1.3",
-    "prettier": "^1.14.3",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.66.6",
-    "rollup-plugin-babel": "^4.0.3",
-    "rollup-plugin-commonjs": "^9.2.0",
-    "rollup-plugin-node-resolve": "^3.4.0",
-    "rollup-plugin-replace": "^2.1.0",
-    "rollup-plugin-terser": "^3.0.0",
-    "xo": "^0.23.0"
+    "@vitest/coverage-c8": "0.26.2",
+    "eslint-config-unicorn-camelcase": "0.1.1",
+    "flux-standard-action": "2.1.2",
+    "husky": "8.0.2",
+    "lint-staged": "13.1.0",
+    "npm-run-all": "4.1.5",
+    "prettier": "2.8.1",
+    "vite": "4.0.3",
+    "vitest": "0.26.2",
+    "xo": "0.53.1"
   },
   "dependencies": {
-    "invariant": "^2.2.4",
-    "just-curry-it": "^3.1.0",
-    "loose-envify": "^1.4.0",
-    "reduce-reducers": "^0.4.3",
-    "to-camel-case": "^1.0.0"
+    "just-curry-it": "5.3.0",
+    "reduce-reducers": "1.0.4"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
-  "browserify": {
-    "transform": [
-      "loose-envify"
+  "lint-staged": {
+    "*.{js,md}": [
+      "prettier --write",
+      "git add"
     ]
   },
   "xo": {
     "prettier": true,
     "space": true,
     "extends": [
-      "unicorn-camelcase",
-      "jest-files"
+      "unicorn-camelcase"
     ],
     "ignores": [
-      "rollup.config.js"
-    ]
+      "vite.config.js"
+    ],
+    "rules": {
+      "import/no-anonymous-default-export": "off",
+      "unicorn/no-array-reduce": "off",
+      "n/file-extension-in-import": "off",
+      "import/extensions": "off",
+      "unicorn/prevent-abbreviations": "off",
+      "unicorn/no-array-for-each": "off",
+      "unicorn/no-for-loop": "off",
+      "padding-line-between-statements": "off",
+      "unicorn/no-array-callback-reference": "off",
+      "n/prefer-global/process": "off",
+      "unicorn/prefer-export-from": "off",
+      "unicorn/prefer-array-flat": "off"
+    }
   },
   "prettier": {
     "singleQuote": true,
     "bracketSpacing": true,
     "trailingComma": "none"
-  },
-  "jest": {
-    "collectCoverage": true
-  },
-  "lint-staged": {
-    "*.{js,md}": [
-      "prettier --write",
-      "git add"
-    ]
   }
 }