Merge pull request reduxjs#4058 from reduxjs/feature/4x-remove-legacy-deps

markerikson · web-flow · commit f2d21c50aaaf · 2021-04-02T18:40:04.000-04:00
Former-commit-id: 5bbb6a0
diff --git a/.github/workflows/size.yaml b/.github/workflows/size.yaml
@@ -14,4 +14,4 @@ jobs:
       - uses: preactjs/compressed-size-action@v1
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
-          pattern: './{dist,es,lib}/*.js'
+          pattern: './{dist,es,lib}/*.{js,mjs}'
diff --git a/index.d.ts.REMOVED.git-id b/index.d.ts.REMOVED.git-id
@@ -1 +1 @@
-b00c6f0885b9df7bf80500d9545dfb59f400a42c
+4a4d4e0ad5d994d636d2afd5192306c8dd70f596
diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
diff --git a/package.json b/package.json
@@ -49,8 +49,6 @@
     "examples:test": "cross-env CI=true babel-node examples/testAll.js"
   },
   "dependencies": {
-    "loose-envify": "^1.4.0",
-    "symbol-observable": "^2.0.3",
     "@babel/runtime": "^7.9.2"
   },
   "devDependencies": {
@@ -102,11 +100,6 @@
       ]
     }
   ],
-  "browserify": {
-    "transform": [
-      "loose-envify"
-    ]
-  },
   "jest": {
     "testRegex": "(/test/.*\\.spec\\.[tj]s)$",
     "coverageProvider": "v8"
diff --git a/src/createStore.js.REMOVED.git-id b/src/createStore.js.REMOVED.git-id
@@ -1 +1 @@
-5326a52ff8a82cca2a564d2f5b6eaf16396411f7
+5e64e323d14cc929593b4d0d8cac6d54836a1106
diff --git a/src/utils/symbol-observable.js b/src/utils/symbol-observable.js
@@ -0,0 +1,3 @@
+// Inlined version of the `symbol-observable` polyfill
+export default (() =>
+  (typeof Symbol === 'function' && Symbol.observable) || '@@observable')()
diff --git a/test/createStore.spec.js.REMOVED.git-id b/test/createStore.spec.js.REMOVED.git-id
@@ -1 +1 @@
-dcbf65cf3e5d3da0bf7bd0a1934b8951120f395c
+5ed9246bdc5adef07d260e6c68df755628555810
diff --git a/test/typescript/store.ts b/test/typescript/store.ts
@@ -9,7 +9,8 @@ import {
   Unsubscribe,
   Observer,
 } from 'redux'
-import 'symbol-observable'
+// @ts-ignore
+import $$observable from '../src/utils/symbol-observable'
 
 type BrandedString = string & { _brand: 'type' }
 const brandedString = 'a string' as BrandedString

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b00c6f0885b9df7bf80500d9545dfb59f400a42c`
	`1`	`+4a4d4e0ad5d994d636d2afd5192306c8dd70f596`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5326a52ff8a82cca2a564d2f5b6eaf16396411f7`
	`1`	`+5e64e323d14cc929593b4d0d8cac6d54836a1106`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+// Inlined version of the `symbol-observable` polyfill
	`2`	`+export default (() =>`
	`3`	`+ (typeof Symbol === 'function' && Symbol.observable) \|\| '@@observable')()`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-dcbf65cf3e5d3da0bf7bd0a1934b8951120f395c`
	`1`	`+5ed9246bdc5adef07d260e6c68df755628555810`