Merge pull request #148 from CobyPear/dependency-management

Clean up peer dependency warnings and latest audit
pantheon-systems · Jun 27, 2022 · 8e2da74 · 8e2da74
2 parents 6057bda + 7956842
commit 8e2da74
Show file tree

Hide file tree

Showing 9 changed files with 4,368 additions and 5,014 deletions.
diff --git a/package.json b/package.json
@@ -73,7 +73,19 @@
       "@pantheon-systems/drupal-kit": "workspace:^1.0.0",
       "moment@<2.29.2": ">=2.29.2",
       "async@<3.2.2": ">=3.2.2",
-      "cross-fetch@<3.1.5": ">=3.1.5"
+      "cross-fetch@<3.1.5": ">=3.1.5",
+      "sharp@<0.30.5": ">=0.30.5",
+      "dicer@<=0.3.1": "<=0.2.5",
+      "devcert@<1.2.1": ">=1.2.1",
+      "jpeg-js@<0.4.4": ">=0.4.4",
+      "got@<11.8.5": ">=11.8.5"
+    },
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "typescript",
+        "eslint",
+        "babel-eslint"
+      ]
     }
   }
 }
diff --git a/packages/drupal-kit/package.json b/packages/drupal-kit/package.json
@@ -53,16 +53,15 @@
     "@apollo/client": "^3.5.10",
     "@types/humps": "^2.0.1",
     "@types/isomorphic-fetch": "^0.0.35",
+    "graphql": ">=14.0.0 <15.0.0 || >=15.0.0 <16.0.0 || >=16.0.0 <17.0.0",
     "humps": "^2.0.1",
     "isomorphic-fetch": "^3.0.0",
-    "jsona": "^1.9.7"
+    "jsona": "^1.9.7",
+    "react": ">=16.8.0 <17.0.0",
+    "react-dom": "^16.8.0",
+    "typescript": ">=3.8 <5.0"
   },
   "dependencies": {
     "@gdwc/drupal-state": "^2.7.0"
-  },
-  "peerDependencies": {
-    "graphql": ">=14.0.0 <15.0.0 || >=15.0.0 <16.0.0 || >=16.0.0 <17.0.0",
-    "tslib": "*",
-    "typescript": ">=4.0.0 <4.1.0 || >=4.1.0 <4.2.0 || >=4.2.0 <4.3.0 || >=4.3.0 <4.4.0 || >=4.4.0 <4.5.0 || >=4.5.0 <4.6.0"
   }
 }
diff --git a/packages/drupal-kit/rollup.config.js b/packages/drupal-kit/rollup.config.js
@@ -1,20 +1,37 @@
 import typescript from '@rollup/plugin-typescript';
 
+const globals = {
+  humps: 'humps',
+  'isomorphic-fetch': 'isomorphicFetch',
+  '@apollo/client/core': 'apolloCore',
+  '@gdwc/drupal-state': 'DrupalState',
+};
+const external = [
+  'humps',
+  'isomorphic-fetch',
+  '@apollo/client/core',
+  '@gdwc/drupal-state',
+];
+
 export default [
   {
     input: 'index.ts',
+    external,
     output: {
       file: 'dist/drupal-kit.es.js',
       format: 'es',
+      globals,
     },
     plugins: [typescript()],
   },
   {
     input: 'index.ts',
+    external,
     output: {
       file: 'dist/drupal-kit.umd.js',
       format: 'umd',
       name: 'DrupalKit',
+      globals,
     },
     plugins: [typescript()],
   },

diff --git a/packages/wordpress-kit/package.json b/packages/wordpress-kit/package.json
@@ -53,12 +53,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.5.10",
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
     "isomorphic-fetch": "^3.0.0"
-  },
-  "peerDependencies": {
-    "react": ">=16.8.0 <17.0.0",
-    "tslib": "*",
-    "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x || 4.4.x || 4.5.x",
-    "graphql": ">=14.0.0 <15.0.0 || >=15.0.0 <16.0.0 || >=16.0.0 <17.0.0"
   }
 }
diff --git a/packages/wordpress-kit/rollup.config.js b/packages/wordpress-kit/rollup.config.js
@@ -1,20 +1,31 @@
 import typescript from '@rollup/plugin-typescript';
 
+const globals = {
+  '@apollo/client': 'apolloClient',
+  'isomorphic-fetch': 'isomorphicFetch',
+};
+
+const external = ['@apollo/client', 'isomorphic-fetch'];
+
 export default [
   {
     input: 'index.ts',
+    external,
     output: {
       file: 'dist/wordpress-kit.es.js',
       format: 'es',
+      globals,
     },
     plugins: [typescript()],
   },
   {
     input: 'index.ts',
+    external,
     output: {
       file: 'dist/wordpress-kit.umd.js',
       format: 'umd',
       name: 'WordpressKit',
+      globals,
     },
     plugins: [typescript()],
   },