Skip to content

Commit 32dc40a

Browse files
authored
feat: upgrade to grumbler-scripts-8 (#61)
* feat: upgrade to grumbler-scripts-8
1 parent 178c129 commit 32dc40a

File tree

9 files changed

+25
-37
lines changed

9 files changed

+25
-37
lines changed

.eslintrc.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* @flow */
22

33
module.exports = {
4-
extends:
5-
"./node_modules/@krakenjs/grumbler-scripts/config/.eslintrc-browser.js",
4+
extends: "@krakenjs/eslint-config-grumbler/eslintrc-browser",
65

76
globals: {
87
Promise: false,
@@ -20,6 +19,14 @@ module.exports = {
2019
__HOST__: true,
2120
__PATH__: true,
2221
__COMPONENTS__: true,
22+
document: true,
23+
performance: true,
24+
assert: true,
25+
beforeAll: true,
26+
afterAll: true,
27+
test: true,
28+
jest: true,
29+
page: true,
2330
},
2431

2532
rules: {
@@ -30,5 +37,9 @@ module.exports = {
3037
"react/display-name": "off",
3138
"react/require-default-props": "off",
3239
"react/forbid-component-props": "off",
40+
"compat/compat": "off",
41+
"max-lines": "off",
42+
"no-restricted-globals": "off",
43+
"promise/no-native": "off",
3344
},
3445
};

.flowconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
[include]
1010
[libs]
1111
flow-typed
12-
node_modules/@krakenjs/grumbler-scripts/declarations.js
1312
node_modules/@krakenjs/zoid/src/declarations.js
1413
node_modules/@krakenjs/post-robot/src/declarations.js
1514
node_modules/@paypal/sdk-client/src/declarations.js

babel.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"extends": "@krakenjs/grumbler-scripts/config/.babelrc-node"
2+
"extends": "@krakenjs/babel-config-grumbler/babelrc-node"
33
}

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @flow */
22
/* eslint import/no-default-export: off */
33

4-
import { getKarmaConfig } from "@krakenjs/grumbler-scripts/config/karma.conf";
4+
import { getKarmaConfig } from "@krakenjs/karma-config-grumbler";
55

66
import { WEBPACK_CONFIG_TEST } from "./webpack.config";
77

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,21 @@
5555
"license": "Apache-2.0",
5656
"readmeFilename": "README.md",
5757
"devDependencies": {
58-
"@krakenjs/grumbler-scripts": "^7.0.0",
58+
"@krakenjs/grumbler-scripts": "^8.0.4",
5959
"@krakenjs/sync-browser-mocks": "^3.0.0",
6060
"babel-core": "^7.0.0-bridge.0",
6161
"conventional-changelog-cli": "^2.0.11",
62+
"cross-env": "^7.0.3",
6263
"flow-bin": "0.135.0",
64+
"flow-typed": "^3.8.0",
6365
"fs-extra": "^4.0.2",
6466
"husky": "^8.0.1",
6567
"imagemagick": "^0.1.3",
6668
"imgur": "^0.2.1",
69+
"jest": "^29.3.1",
6770
"lint-staged": "^13.0.3",
6871
"memory-fs": "^0.4.1",
69-
"mocha": "^4",
72+
"mocha": "^4.1.0",
7073
"mocketeer": "^0.3.0",
7174
"pixelmatch": "^4.0.2",
7275
"pngjs": "^3.3.0",

src/three-domain-secure/component.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export function getThreeDomainSecureComponent(): TDSComponent {
9292
createOrder: {
9393
type: "function",
9494
queryParam: "cart_id",
95-
// $FlowFixMe
95+
// $FlowFixMe[incompatible-call]
9696
queryValue: ({ value }) => ZalgoPromise.try(value),
9797
},
9898
clientID: {

test/.eslintrc.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

test/integration/tests/overlay/happy.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,16 @@ describe(`paypal overlay component happy path`, () => {
5252
);
5353

5454
const addOverlayToDOM = (child) => {
55-
// $FlowFixMe
55+
// $FlowFixMe[incompatible-use]
5656
document.body.appendChild(child);
5757
};
5858

5959
const getOverlayContainer = (domNode) => {
60-
// $FlowFixMe
6160
return domNode.querySelector("iframe").contentWindow.document;
6261
};
6362

6463
beforeEach(() => {
65-
// $FlowFixMe
64+
// $FlowFixMe[incompatible-use]
6665
document.body.innerHTML = "";
6766
});
6867

webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* @flow */
22
/* eslint import/no-nodejs-modules: off, import/no-default-export: off */
33

4-
import type { WebpackConfig } from "@krakenjs/grumbler-scripts/config/types";
5-
import { getWebpackConfig } from "@krakenjs/grumbler-scripts/config/webpack.config";
4+
import type { WebpackConfig } from "@krakenjs/webpack-config-grumbler/index.flow";
5+
import { getWebpackConfig } from "@krakenjs/webpack-config-grumbler";
66

77
import { testGlobals } from "./test/globals";
88
import globals from "./globals";

0 commit comments

Comments
 (0)