From 640fd374ae3f9aeb3fe1f4a5aa3d678033e75be8 Mon Sep 17 00:00:00 2001
From: dtjones404 <dustintaylorjones@gmail.com>
Date: Wed, 9 Nov 2022 17:15:13 -0500
Subject: [PATCH 1/2] feat: upgrade to grumbler scripts 8

---
 .eslintrc.js       | 15 ++++++++++++---
 .flowconfig        |  1 -
 babel.config.json  |  2 +-
 karma.conf.js      |  2 +-
 package.json       |  5 ++++-
 test/.eslintrc.js  | 14 --------------
 test/tests/dom.jsx |  1 -
 webpack.config.js  |  4 ++--
 8 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 test/.eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 9944255..51e6a01 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,9 +1,7 @@
 /* @flow */
 
 module.exports = {
-  extends: require.resolve(
-    "@krakenjs/grumbler-scripts/config/.eslintrc-browser"
-  ),
+  extends: "@krakenjs/eslint-config-grumbler/eslintrc-browser",
 
   rules: {
     "react/display-name": "off",
@@ -11,4 +9,15 @@ module.exports = {
     "react/prop-types": "off",
     "react/require-default-props": "off",
   },
+
+  overrides: [
+    {
+      files: ["**/test/**/*"],
+      rules: {
+        "compat/compat": "off",
+        "no-restricted-globals": "off",
+        "promise/no-native": "off",
+      },
+    },
+  ],
 };
diff --git a/.flowconfig b/.flowconfig
index 8b32f85..1e49eb6 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -7,7 +7,6 @@
 .*/node_modules/resolve
 .*/dist/module
 [include]
-node_modules/@krakenjs/grumbler-scripts/declarations.js
 [libs]
 flow-typed
 [options]
diff --git a/babel.config.json b/babel.config.json
index c55c063..79c0e93 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@krakenjs/grumbler-scripts/config/.babelrc-browser"
+  "extends": "@krakenjs/babel-config-grumbler/babel-browser"
 }
diff --git a/karma.conf.js b/karma.conf.js
index dcb52b5..fd591ed 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,7 +1,7 @@
 /* @flow */
 /* eslint import/no-default-export: off */
 
-import { getKarmaConfig } from "@krakenjs/grumbler-scripts/config/karma.conf";
+import { getKarmaConfig } from "@krakenjs/karma-config-grumbler";
 
 import { WEBPACK_CONFIG_TEST } from "./webpack.config";
 
diff --git a/package.json b/package.json
index f0c87be..a0b53f6 100644
--- a/package.json
+++ b/package.json
@@ -92,9 +92,12 @@
   "devDependencies": {
     "@commitlint/cli": "^16.2.1",
     "@commitlint/config-conventional": "^16.2.1",
-    "@krakenjs/grumbler-scripts": "^7.0.0",
+    "@krakenjs/grumbler-scripts": "^8.0.3",
+    "cross-env": "^7.0.3",
     "flow-bin": "0.135.0",
+    "flow-typed": "^3.8.0",
     "husky": "^7.0.4",
+    "jest": "^29.3.1",
     "lint-staged": "^12.4.0",
     "mocha": "^4.1.0",
     "prettier": "^2.6.2",
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
deleted file mode 100644
index 9a976d8..0000000
--- a/test/.eslintrc.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* @flow */
-/* eslint import/no-commonjs: off */
-
-module.exports = {
-  extends: require.resolve(
-    "@krakenjs/grumbler-scripts/config/.eslintrc-browser-test"
-  ),
-
-  rules: {
-    "react/display-name": "off",
-    "react/button-has-type": "off",
-    "react/prop-types": "off",
-  },
-};
diff --git a/test/tests/dom.jsx b/test/tests/dom.jsx
index b9db35b..545910c 100644
--- a/test/tests/dom.jsx
+++ b/test/tests/dom.jsx
@@ -419,7 +419,6 @@ describe("dom renderer cases", () => {
 
     const domNode = jsxNode.render(dom());
 
-    // eslint-disable-next-line no-restricted-globals, promise/no-native
     const promise = new Promise((resolve, reject) => {
       domNode.addEventListener("load", () => {
         try {
diff --git a/webpack.config.js b/webpack.config.js
index 0857135..9214853 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,8 +1,8 @@
 /* @flow */
 /* eslint import/no-nodejs-modules: off, import/no-default-export: off */
 
-import type { WebpackConfig } from "@krakenjs/grumbler-scripts/config/types";
-import { getWebpackConfig } from "@krakenjs/grumbler-scripts/config/webpack.config";
+import type { WebpackConfig } from "@krakenjs/webpack-config-grumbler/index.flow";
+import { getWebpackConfig } from "@krakenjs/webpack-config-grumbler";
 
 const FILE_NAME = "jsx-pragmatic";
 const MODULE_NAME = "pragmatic";

From 2288d800d54872c6a0429a42f925b20e7c055e4e Mon Sep 17 00:00:00 2001
From: Dustin Jones <dustintaylorjones@gmail.com>
Date: Tue, 15 Nov 2022 11:05:04 -0500
Subject: [PATCH 2/2] feat: bump grumbler scripts to 8.0.4

---
 babel.config.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel.config.json b/babel.config.json
index 79c0e93..5f06501 100644
--- a/babel.config.json
+++ b/babel.config.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@krakenjs/babel-config-grumbler/babel-browser"
+  "extends": "@krakenjs/babel-config-grumbler/babelrc-browser"
 }
diff --git a/package.json b/package.json
index a0b53f6..29c2b0e 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
   "devDependencies": {
     "@commitlint/cli": "^16.2.1",
     "@commitlint/config-conventional": "^16.2.1",
-    "@krakenjs/grumbler-scripts": "^8.0.3",
+    "@krakenjs/grumbler-scripts": "^8.0.4",
     "cross-env": "^7.0.3",
     "flow-bin": "0.135.0",
     "flow-typed": "^3.8.0",