* Re-enabled patch-package, and fixed the dependency patch files. (yarn 2 not yet supported for patch-creation, so used workaround here: ds300/patch-package#272 (comment))

Venryx · Venryx · commit 6acfb7b638ef · 2021-08-06T22:39:11.000-07:00
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
 		"package.json"
 	],
 	"scripts": {
-		"#postinstall": "patch-package"
+		"postinstall": "patch-package"
 	},
 	"dependencyOverrideGroups": [
 		{
diff --git a/patches/@apollo+client++symbol-observable+4.0.0.patch b/patches/@apollo+client++symbol-observable+4.0.0.patch
diff --git a/patches/@apollo+client++tslib+2.3.0.patch b/patches/@apollo+client++tslib+2.3.0.patch
diff --git a/patches/@wry+context+0.6.1.patch b/patches/@wry+context+0.6.1.patch
@@ -1,12 +1,12 @@
 diff --git a/node_modules/@wry/context/package.json b/node_modules/@wry/context/package.json
-index 6a7749a..d543d7d 100644
+index b66fd24..c2a597a 100644
 --- a/node_modules/@wry/context/package.json
 +++ b/node_modules/@wry/context/package.json
-@@ -1,5 +1,7 @@
+@@ -6,6 +6,7 @@
    "license": "MIT",
--  "main": "lib/context.js",
-+  "type": "module",
-+  "main": "lib/context.esm.js",
+   "main": "lib/context.js",
    "module": "lib/context.esm.js",
-   "name": "@wry/context",
-   "repository": {
++  "type": "module",
+   "types": "lib/context.d.ts",
+   "keywords": [],
+   "homepage": "https://github.com/benjamn/wryware",
diff --git a/patches/@wry+equality+0.5.2.patch b/patches/@wry+equality+0.5.2.patch
@@ -1,12 +1,12 @@
 diff --git a/node_modules/@wry/equality/package.json b/node_modules/@wry/equality/package.json
-index 162bf76..20f327f 100644
+index 702fd27..aefccab 100644
 --- a/node_modules/@wry/equality/package.json
 +++ b/node_modules/@wry/equality/package.json
-@@ -1,5 +1,7 @@
+@@ -6,6 +6,7 @@
    "license": "MIT",
--  "main": "lib/equality.js",
-+  "type": "module",
-+  "main": "lib/equality.esm.js",
+   "main": "lib/equality.js",
    "module": "lib/equality.esm.js",
-   "name": "@wry/equality",
-   "repository": {
++  "type": "module",
+   "types": "lib/equality.d.ts",
+   "keywords": [],
+   "homepage": "https://github.com/benjamn/wryware",
diff --git a/patches/@wry+trie+0.3.1.patch b/patches/@wry+trie+0.3.1.patch
@@ -1,12 +1,12 @@
 diff --git a/node_modules/@wry/trie/package.json b/node_modules/@wry/trie/package.json
-index 950d387..96c8851 100644
+index ee0e009..2a52395 100644
 --- a/node_modules/@wry/trie/package.json
 +++ b/node_modules/@wry/trie/package.json
-@@ -1,5 +1,7 @@
+@@ -6,6 +6,7 @@
    "license": "MIT",
--  "main": "lib/trie.js",
-+  "type": "module",
-+  "main": "lib/trie.esm.js",
+   "main": "lib/trie.js",
    "module": "lib/trie.esm.js",
-   "name": "@wry/trie",
-   "repository": {
++  "type": "module",
+   "types": "lib/trie.d.ts",
+   "keywords": [
+     "trie",
diff --git a/patches/graphql-tag+2.12.5.patch b/patches/graphql-tag+2.12.5.patch
@@ -1,10 +1,12 @@
 diff --git a/node_modules/graphql-tag/package.json b/node_modules/graphql-tag/package.json
-index 18716c1..60750ce 100644
+index 1a022a8..3f4eedf 100644
 --- a/node_modules/graphql-tag/package.json
 +++ b/node_modules/graphql-tag/package.json
-@@ -1,4 +1,5 @@
-   "license": "MIT",
-+  "type": "module",
+@@ -5,6 +5,7 @@
    "main": "./main.js",
    "module": "./lib/index.js",
-   "name": "graphql-tag",
+   "jsnext:main": "./lib/index.js",
++  "type": "module",
+   "types": "./lib/index.d.ts",
+   "sideEffects": false,
+   "scripts": {
diff --git a/patches/optimism+0.16.1.patch b/patches/optimism+0.16.1.patch
@@ -1,7 +1,12 @@
 diff --git a/node_modules/optimism/package.json b/node_modules/optimism/package.json
-index f3ff064..ecb3f6a 100644
+index b9e8ac2..91d38fb 100644
 --- a/node_modules/optimism/package.json
 +++ b/node_modules/optimism/package.json
-@@ -1,1 +1,2 @@
- {
-+  "type": "module",
+@@ -16,6 +16,7 @@
+   ],
+   "main": "lib/bundle.cjs.js",
+   "module": "lib/bundle.esm.js",
++  "type": "module",
+   "types": "lib/index.d.ts",
+   "license": "MIT",
+   "homepage": "https://github.com/benjamn/optimism#readme",
diff --git a/patches/symbol-observable+4.0.0.patch b/patches/symbol-observable+4.0.0.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/symbol-observable/package.json b/node_modules/symbol-observable/package.json
+index bd03d4f..aa0c0cf 100644
+--- a/node_modules/symbol-observable/package.json
++++ b/node_modules/symbol-observable/package.json
+@@ -26,6 +26,7 @@
+   "main": "lib/index.js",
+   "module": "es/index.js",
+   "jsnext:main": "es/index.js",
++  "type": "module",
+   "typings": "index.d.ts",
+   "keywords": [
+     "symbol",
diff --git a/patches/ts-invariant+0.9.1.patch b/patches/ts-invariant+0.9.1.patch
@@ -1,22 +1,12 @@
 diff --git a/node_modules/ts-invariant/package.json b/node_modules/ts-invariant/package.json
-index 91f4e03..df29d32 100644
+index 5c297d7..493d886 100644
 --- a/node_modules/ts-invariant/package.json
 +++ b/node_modules/ts-invariant/package.json
-@@ -1,5 +1,6 @@
-   "gitHead": "a88a6701d6a65bfd46dad7be3e07be85fc0c60f2",
-   "homepage": "https://github.com/apollographql/invariant-packages",
+@@ -6,6 +6,7 @@
+   "license": "MIT",
+   "main": "lib/invariant.js",
+   "module": "lib/invariant.esm.js",
 +  "type": "module",
+   "types": "lib/invariant.d.ts",
    "keywords": [
      "invariant",
-     "assertion",
-diff --git a/node_modules/ts-invariant/process/package.json b/node_modules/ts-invariant/process/package.json
-index 0f2cc43..6c8737b 100644
---- a/node_modules/ts-invariant/process/package.json
-+++ b/node_modules/ts-invariant/process/package.json
-@@ -1,5 +1,6 @@
- {
-   "name": "ts-invariant/process",
-+  "type": "module",
-   "main": "./main.js",
-   "module": "./index.js",
-   "types": "./index.d.ts",
diff --git a/patches/tslib+2.3.0.patch b/patches/tslib+2.3.0.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/tslib/package.json b/node_modules/tslib/package.json
+index dfeaeba..7930a23 100644
+--- a/node_modules/tslib/package.json
++++ b/node_modules/tslib/package.json
+@@ -24,6 +24,7 @@
+     "main": "tslib.js",
+     "module": "tslib.es6.js",
+     "jsnext:main": "tslib.es6.js",
++    "type": "module",
+     "typings": "tslib.d.ts",
+     "sideEffects": false,
+     "exports": {
diff --git a/patches/zen-observable-ts+1.1.0.patch b/patches/zen-observable-ts+1.1.0.patch
@@ -1,9 +1,12 @@
 diff --git a/node_modules/zen-observable-ts/package.json b/node_modules/zen-observable-ts/package.json
-index bad4f6d..8a7196c 100644
+index 8d8a6be..379b420 100644
 --- a/node_modules/zen-observable-ts/package.json
 +++ b/node_modules/zen-observable-ts/package.json
-@@ -1,3 +1,4 @@
-   "types": "index.d.ts",
+@@ -5,6 +5,7 @@
+   "license": "MIT",
+   "main": "index.js",
+   "module": "module.js",
 +  "type": "module",
-   "version": "1.1.0"
- }
+   "types": "index.d.ts",
+   "repository": {
+     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`"package.json"`
`21`	`21`	`],`
`22`	`22`	`"scripts": {`
`23`		`- "#postinstall": "patch-package"`
	`23`	`+ "postinstall": "patch-package"`
`24`	`24`	`},`
`25`	`25`	`"dependencyOverrideGroups": [`
`26`	`26`	`{`