Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade to grumbler scripts 8 #33

Merged
merged 2 commits into from
Nov 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
/* @flow */

module.exports = {
extends: require.resolve(
"@krakenjs/grumbler-scripts/config/.eslintrc-browser"
),
extends: "@krakenjs/eslint-config-grumbler/eslintrc-browser",

rules: {
"react/display-name": "off",
"react/button-has-type": "off",
"react/prop-types": "off",
"react/require-default-props": "off",
},

overrides: [
{
files: ["**/test/**/*"],
rules: {
"compat/compat": "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 @@ -7,7 +7,6 @@
.*/node_modules/resolve
.*/dist/module
[include]
node_modules/@krakenjs/grumbler-scripts/declarations.js
[libs]
flow-typed
[options]
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-browser"
"extends": "@krakenjs/babel-config-grumbler/babelrc-browser"
}
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
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4",
"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",
Expand Down
14 changes: 0 additions & 14 deletions test/.eslintrc.js

This file was deleted.

1 change: 0 additions & 1 deletion test/tests/dom.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
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";

const FILE_NAME = "jsx-pragmatic";
const MODULE_NAME = "pragmatic";
Expand Down