Skip to content

Commit

Permalink
* Re-enabled patch-package, and fixed the dependency patch files. (ya…
Browse files Browse the repository at this point in the history
…rn 2 not yet supported for patch-creation, so used workaround here: ds300/patch-package#272 (comment))
  • Loading branch information
Venryx committed Aug 7, 2021
1 parent 6ac556e commit 6acfb7b
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 72 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"package.json"
],
"scripts": {
"#postinstall": "patch-package"
"postinstall": "patch-package"
},
"dependencyOverrideGroups": [
{
Expand Down
10 changes: 0 additions & 10 deletions patches/@apollo+client++symbol-observable+4.0.0.patch

This file was deleted.

10 changes: 0 additions & 10 deletions patches/@apollo+client++tslib+2.3.0.patch

This file was deleted.

14 changes: 7 additions & 7 deletions patches/@wry+context+0.6.1.patch
Original file line number Diff line number Diff line change
@@ -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",
14 changes: 7 additions & 7 deletions patches/@wry+equality+0.5.2.patch
Original file line number Diff line number Diff line change
@@ -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",
14 changes: 7 additions & 7 deletions patches/@wry+trie+0.3.1.patch
Original file line number Diff line number Diff line change
@@ -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",
12 changes: 7 additions & 5 deletions patches/graphql-tag+2.12.5.patch
Original file line number Diff line number Diff line change
@@ -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": {
13 changes: 9 additions & 4 deletions patches/optimism+0.16.1.patch
Original file line number Diff line number Diff line change
@@ -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",
12 changes: 12 additions & 0 deletions patches/symbol-observable+4.0.0.patch
Original file line number Diff line number Diff line change
@@ -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",
22 changes: 6 additions & 16 deletions patches/ts-invariant+0.9.1.patch
Original file line number Diff line number Diff line change
@@ -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",
12 changes: 12 additions & 0 deletions patches/tslib+2.3.0.patch
Original file line number Diff line number Diff line change
@@ -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": {
13 changes: 8 additions & 5 deletions patches/zen-observable-ts+1.1.0.patch
Original file line number Diff line number Diff line change
@@ -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",

0 comments on commit 6acfb7b

Please sign in to comment.