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 #414

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
13 changes: 11 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: {
__ZOID__: true,
Expand All @@ -13,4 +12,14 @@ module.exports = {
"react/display-name": "off",
"react/prop-types": "off",
},

overrides: [
{
files: ["test/**/*"],
rules: {
"max-lines": "off",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i fuckin HATE this rule

Copy link
Contributor

@westeezy westeezy Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its relaxed in v8!

"compat/compat": "off",
},
},
],
};
1 change: 0 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
flow-typed
src/declarations.js
node_modules/@krakenjs/post-robot/src/declarations.js
node_modules/@krakenjs/grumbler-scripts/declarations.js
[options]
module.name_mapper='^src\(.*\)$' -> '<PROJECT_ROOT>/src/\1'
experimental.const_params=false
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// eslint-disable-next-line import/no-commonjs
module.exports = {
extends: "@krakenjs/grumbler-scripts/config/.babelrc-node",
extends: "@krakenjs/babel-config-grumbler/babelrc-node",

ignore: ["test/lib"],
};
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 @@ -95,10 +95,13 @@
"devDependencies": {
"@commitlint/cli": "^16.2.1",
"@commitlint/config-conventional": "^16.2.1",
"@krakenjs/grumbler-scripts": "^7.0.0",
"@krakenjs/grumbler-scripts": "^8.0.4",
"@krakenjs/jsx-pragmatic": "^3.0.0",
"cross-env": "^7.0.3",
"flow-bin": "0.155.0",
"flow-typed": "^3.8.0",
"husky": "^7.0.4",
"jest": "^29.3.1",
"lint-staged": "^12.4.0",
"mocha": "^4",
"prettier": "^2.6.2",
Expand Down
2 changes: 2 additions & 0 deletions src/declarations.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ declare var __ZOID__: {|
__DEFAULT_PRERENDER__: boolean,
__SCRIPT_NAMESPACE__: boolean,
|};

declare var __DEBUG__: boolean;
8 changes: 0 additions & 8 deletions test/.eslintrc.js

This file was deleted.

4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* @flow */
/* eslint import/no-nodejs-modules: off, import/no-default-export: off */

import type { WebpackConfig } from "@krakenjs/grumbler-scripts/config/types";
import type { WebpackConfig } from "@krakenjs/webpack-config-grumbler/index.flow";
import {
getWebpackConfig,
getNextVersion,
} from "@krakenjs/grumbler-scripts/config/webpack.config";
} from "@krakenjs/webpack-config-grumbler";
import { argv } from "yargs";

import pkg from "./package.json";
Expand Down