Skip to content

Commit

Permalink
feat: upgrade to grumbler-scripts-8 (#61)
Browse files Browse the repository at this point in the history
* feat: upgrade to grumbler-scripts-8
  • Loading branch information
dtjones404 committed Nov 18, 2022
1 parent 178c129 commit 32dc40a
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 37 deletions.
15 changes: 13 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/* @flow */

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

globals: {
Promise: false,
Expand All @@ -20,6 +19,14 @@ module.exports = {
__HOST__: true,
__PATH__: true,
__COMPONENTS__: true,
document: true,
performance: true,
assert: true,
beforeAll: true,
afterAll: true,
test: true,
jest: true,
page: true,
},

rules: {
Expand All @@ -30,5 +37,9 @@ module.exports = {
"react/display-name": "off",
"react/require-default-props": "off",
"react/forbid-component-props": "off",
"compat/compat": "off",
"max-lines": "off",
"no-restricted-globals": "off",
"promise/no-native": "off",
},
};
1 change: 0 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
[include]
[libs]
flow-typed
node_modules/@krakenjs/grumbler-scripts/declarations.js
node_modules/@krakenjs/zoid/src/declarations.js
node_modules/@krakenjs/post-robot/src/declarations.js
node_modules/@paypal/sdk-client/src/declarations.js
Expand Down
2 changes: 1 addition & 1 deletion babel.config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "@krakenjs/grumbler-scripts/config/.babelrc-node"
"extends": "@krakenjs/babel-config-grumbler/babelrc-node"
}
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,21 @@
"license": "Apache-2.0",
"readmeFilename": "README.md",
"devDependencies": {
"@krakenjs/grumbler-scripts": "^7.0.0",
"@krakenjs/grumbler-scripts": "^8.0.4",
"@krakenjs/sync-browser-mocks": "^3.0.0",
"babel-core": "^7.0.0-bridge.0",
"conventional-changelog-cli": "^2.0.11",
"cross-env": "^7.0.3",
"flow-bin": "0.135.0",
"flow-typed": "^3.8.0",
"fs-extra": "^4.0.2",
"husky": "^8.0.1",
"imagemagick": "^0.1.3",
"imgur": "^0.2.1",
"jest": "^29.3.1",
"lint-staged": "^13.0.3",
"memory-fs": "^0.4.1",
"mocha": "^4",
"mocha": "^4.1.0",
"mocketeer": "^0.3.0",
"pixelmatch": "^4.0.2",
"pngjs": "^3.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/three-domain-secure/component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export function getThreeDomainSecureComponent(): TDSComponent {
createOrder: {
type: "function",
queryParam: "cart_id",
// $FlowFixMe
// $FlowFixMe[incompatible-call]
queryValue: ({ value }) => ZalgoPromise.try(value),
},
clientID: {
Expand Down
24 changes: 0 additions & 24 deletions test/.eslintrc.js

This file was deleted.

5 changes: 2 additions & 3 deletions test/integration/tests/overlay/happy.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,16 @@ describe(`paypal overlay component happy path`, () => {
);

const addOverlayToDOM = (child) => {
// $FlowFixMe
// $FlowFixMe[incompatible-use]
document.body.appendChild(child);
};

const getOverlayContainer = (domNode) => {
// $FlowFixMe
return domNode.querySelector("iframe").contentWindow.document;
};

beforeEach(() => {
// $FlowFixMe
// $FlowFixMe[incompatible-use]
document.body.innerHTML = "";
});

Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -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";

import { testGlobals } from "./test/globals";
import globals from "./globals";
Expand Down

0 comments on commit 32dc40a

Please sign in to comment.