diff --git a/.eslintrc.js b/.eslintrc.js index 48af0fc0..3c183d61 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -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, @@ -13,4 +12,14 @@ module.exports = { "react/display-name": "off", "react/prop-types": "off", }, + + overrides: [ + { + files: ["test/**/*"], + rules: { + "max-lines": "off", + "compat/compat": "off", + }, + }, + ], }; diff --git a/.flowconfig b/.flowconfig index ddcf4978..06d8382f 100644 --- a/.flowconfig +++ b/.flowconfig @@ -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\(.*\)$' -> '/src/\1' experimental.const_params=false \ No newline at end of file diff --git a/babel.config.js b/babel.config.js index 550ec732..49b09f01 100644 --- a/babel.config.js +++ b/babel.config.js @@ -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"], }; diff --git a/karma.conf.js b/karma.conf.js index 750f14cf..6ca0044a 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 3bdbfd8a..bfa1ffd5 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/declarations.js b/src/declarations.js index 2e4d92ac..c3b272ab 100644 --- a/src/declarations.js +++ b/src/declarations.js @@ -10,3 +10,5 @@ declare var __ZOID__: {| __DEFAULT_PRERENDER__: boolean, __SCRIPT_NAMESPACE__: boolean, |}; + +declare var __DEBUG__: boolean; diff --git a/test/.eslintrc.js b/test/.eslintrc.js deleted file mode 100644 index 3a6fa94f..00000000 --- a/test/.eslintrc.js +++ /dev/null @@ -1,8 +0,0 @@ -/* @flow */ - -module.exports = { - rules: { - "compat/compat": "off", - "max-lines": "off", - }, -}; diff --git a/webpack.config.js b/webpack.config.js index e4758219..63299974 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -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";