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

chore(deps): update dependency eslint to v9 #3011

Merged
merged 7 commits into from
Oct 22, 2024
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
23 changes: 0 additions & 23 deletions .eslintrc.js

This file was deleted.

25 changes: 25 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import presetsNodeTypescriptPrettier from "@cybozu/eslint-config/flat/presets/node-typescript-prettier.js";

/** @type {import("eslint").Linter.Config[]} */
export default [
...presetsNodeTypescriptPrettier,
{
rules: {
curly: ["error", "all"],
"func-style": ["error"],

"@typescript-eslint/no-empty-object-type": "off",

"@typescript-eslint/no-wrapper-object-types": "off",

"@typescript-eslint/consistent-type-imports": [
"error",
{
prefer: "type-imports",
},
],

"n/no-missing-import": "off",
},
},
];
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"@babel/core": "^7.25.8",
"@babel/preset-env": "^7.25.8",
"@babel/preset-typescript": "^7.25.7",
"@cybozu/eslint-config": "^23.0.0",
"@cybozu/eslint-config": "^24.0.0-beta.0",
"@cybozu/license-manager": "^1.2.1",
"@octokit/rest": "^20.1.1",
"@types/jest": "^29.5.13",
"@types/node": "^18.19.57",
"babel-jest": "^29.7.0",
"comment-json": "^4.2.5",
"eslint": "^8.57.1",
"eslint": "^9.13.0",
"jest": "^29.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.3.3",
Expand Down
4 changes: 4 additions & 0 deletions packages/create-plugin/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import rootConfig from "../../eslint.config.mjs";

/** @type {import("eslint").Linter.Config[]} */
export default [...rootConfig];
tasshi-me marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion packages/create-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"start": "pnpm build --watch",
"build": "pnpm clean && tsc --build --force",
"clean": "rimraf dist",
"lint": "eslint --ext .ts src --max-warnings 0",
"lint": "eslint src --max-warnings 0",
"fix": "pnpm lint --fix",
"test": "jest --testPathIgnorePatterns=/__tests__/generator\\.test\\.ts$",
"test:generator": "cross-env NODE_ENV=e2e jest --testPathPattern=/__tests__/generator\\.test\\.ts$",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-plugin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const run = (outputDir: string, lang: Lang, templateType: TemplateType) => {
printError(m("Error_cannotCreatePlugin"), error.message);
})
.finally(() => {
// eslint-disable-next-line no-process-exit
// eslint-disable-next-line n/no-process-exit
process.exit(1);
});
});
Expand Down
13 changes: 0 additions & 13 deletions packages/create-plugin/templates/minimum/.eslintrc.js

This file was deleted.

19 changes: 19 additions & 0 deletions packages/create-plugin/templates/minimum/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import kintoneGlobalConfig from "@cybozu/eslint-config/flat/globals/kintone.js";
import baseConfig from "@cybozu/eslint-config/flat/lib/base.js";
import kintoneConfig from "@cybozu/eslint-config/flat/lib/kintone.js";
import prettierConfig from "@cybozu/eslint-config/flat/lib/prettier.js";

/** @type {import("eslint").Linter.Config[]} */
export default [
...kintoneGlobalConfig,
...baseConfig,
...kintoneConfig,
...prettierConfig,
{
rules: {
"prettier/prettier": ["error", { singleQuote: true }],
"space-before-function-paren": 0,
"object-curly-spacing": 0,
},
},
];
4 changes: 2 additions & 2 deletions packages/create-plugin/templates/minimum/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"lint": "eslint src"
},
"devDependencies": {
"@cybozu/eslint-config": "^23.0.0",
"@cybozu/eslint-config": "^24.0.0-beta.0",
"@kintone/plugin-packer": "^8.1.3",
"eslint": "^8.57.1"
"eslint": "^9.13.0"
tasshi-me marked this conversation as resolved.
Show resolved Hide resolved
}
}
6 changes: 0 additions & 6 deletions packages/create-plugin/templates/modern/.eslintrc.js

This file was deleted.

4 changes: 4 additions & 0 deletions packages/create-plugin/templates/modern/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import presetsPrettier from "@cybozu/eslint-config/flat/presets/prettier.js";

/** @type {import("eslint").Linter.Config[]} */
export default [...presetsPrettier];
4 changes: 2 additions & 2 deletions packages/create-plugin/templates/modern/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"@babel/preset-env": "^7.25.8",
"@babel/preset-react": "^7.25.7",
"@babel/preset-typescript": "^7.25.7",
"@cybozu/eslint-config": "^23.0.0",
"@cybozu/eslint-config": "^24.0.0-beta.0",
"@kintone/dts-gen": "^8.0.13",
"@kintone/webpack-plugin-kintone-plugin": "^8.0.10",
"ajv": "^8.17.1",
"babel-loader": "^9.2.1",
"cross-env": "^7.0.3",
"eslint": "^8.57.1",
"eslint": "^9.13.0",
Copy link
Member

Choose a reason for hiding this comment

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

MUST: これと同じディレクトリの.eslintrc.jsも対応が必要そう

Copy link
Contributor

@nameless-mc nameless-mc Oct 22, 2024

Choose a reason for hiding this comment

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

8dbdf2cで対応

"npm-run-all": "^4.1.5",
"prettier": "^3.3.3",
"typescript": "^5.6.3",
Expand Down
4 changes: 4 additions & 0 deletions packages/customize-uploader/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import rootConfig from "../../eslint.config.mjs";

/** @type {import("eslint").Linter.Config[]} */
export default [...rootConfig];
2 changes: 1 addition & 1 deletion packages/customize-uploader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"scripts": {
"prebuild": "pnpm clean",
"build": "tsc --build --force",
"lint": "eslint --ext .ts src --max-warnings 0",
"lint": "eslint src --max-warnings 0",
"fix": "pnpm lint --fix",
"test": "jest",
"test:ci": "jest --runInBand",
Expand Down
4 changes: 4 additions & 0 deletions packages/dts-gen/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import rootConfig from "../../eslint.config.mjs";

/** @type {import("eslint").Linter.Config[]} */
export default [...rootConfig];
6 changes: 3 additions & 3 deletions packages/dts-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
},
"license": "MIT",
"dependencies": {
"@cybozu/eslint-config": "^23.0.0",
"@cybozu/eslint-config": "^24.0.0-beta.0",
"axios": "^1.7.7",
"commander": "^12.1.0",
"eslint": "^8.57.1",
"eslint": "^9.13.0",
"form-data": "^4.0.1",
"lodash": "^4.17.21",
"prettier": "^3.3.3"
},
"devDependencies": {
"@types/eslint": "^8.56.12",
"@types/eslint": "^9.6.1",
"@types/lodash": "^4.17.12",
"ts-loader": "^9.5.1",
"webpack": "^5.95.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/dts-gen/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { parse } from "./cli-parser";

process.on("uncaughtException", (e) => {
console.error(e.message);
// eslint-disable-next-line no-process-exit
// eslint-disable-next-line n/no-process-exit
process.exit(1);
});

Expand Down Expand Up @@ -36,6 +36,6 @@ const handler = async () => {

handler().catch((err) => {
console.error(err);
// eslint-disable-next-line no-process-exit
// eslint-disable-next-line n/no-process-exit
process.exit(1);
});
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment
// eslint-disable-next-line spaced-comment
/// <reference types="../../kintone" />
// eslint-disable-next-line @typescript-eslint/triple-slash-reference, spaced-comment
/// <reference path="./testfields.d.ts" />
Expand Down
9 changes: 7 additions & 2 deletions packages/dts-gen/src/templates/template.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { DemoFullWidthSymbolClient } from "../kintone/clients/demo-fullwidth-sym
import { FieldTypeConverter } from "../converters/fileldtype-converter";
import { objectValues } from "../utils/objectvalues";
import * as fs from "fs";
describe("renderAsFile", () => {

// TODO: Make it work and remove skip
Copy link
Member

Choose a reason for hiding this comment

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

👍

// Due to an internal dynamic import that stopped working after updating to ESLint v9, it was temporarily skipped.
describe.skip("renderAsFile", () => {
const TEMP_TEST_TYPEDEF = "tmp.test-renderAsFile-fields.d.ts";
test("generate type definition file", async () => {
const client = new DemoClient();
Expand Down Expand Up @@ -50,7 +53,9 @@ describe("renderAsFile", () => {
});
});

describe("fullWidthSymbol Test", () => {
// TODO: Make it work and remove skip
// Due to an internal dynamic import that stopped working after updating to ESLint v9, it was temporarily skipped.
describe.skip("fullWidthSymbol Test", () => {
const TEMP_TEST_TYPEDEF = "tmp.test-fullWidthSymbol-fields.d.ts";
test("generate type definition file", async () => {
const client = new DemoFullWidthSymbolClient();
Expand Down
9 changes: 3 additions & 6 deletions packages/dts-gen/src/templates/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as prettierPluginEstree from "prettier/plugins/estree";

import type { FieldTypeGroups } from "../converters/fileldtype-converter";
import { convertToTsExpression } from "./converter";
import tsPreset from "@cybozu/eslint-config/flat/presets/typescript";

export interface RenderInput {
typeName: string;
Expand All @@ -19,12 +20,8 @@ const renderAsFile = async (output: string, renderInput: RenderInput) => {
const eslint = new ESLint({
cwd: path.resolve(__dirname, "..", ".."),
fix: true,
useEslintrc: false,
baseConfig: {
extends: "@cybozu/eslint-config/presets/typescript",
globals: {
kintone: true,
},
baseConfig: tsPreset,
overrideConfig: {
rules: {
"@typescript-eslint/no-namespace": [
"error",
Expand Down
1 change: 0 additions & 1 deletion packages/dts-gen/src/utils/logger.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export const log = (message: string) => {
// eslint-disable-next-line no-console
console.log(message);
};
4 changes: 4 additions & 0 deletions packages/plugin-manifest-validator/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import rootConfig from "../../eslint.config.mjs";

/** @type {import("eslint").Linter.Config[]} */
export default [...rootConfig];
2 changes: 1 addition & 1 deletion packages/plugin-manifest-validator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"gen-dts": "node script/generate-dts.js",
"test": "jest",
"test:ci": "jest --runInBand",
"lint": "eslint --ext .ts src --max-warnings 0",
"lint": "eslint src --max-warnings 0",
"fix": "pnpm lint --fix",
"clean": "rimraf dist"
},
Expand Down
4 changes: 0 additions & 4 deletions packages/plugin-packer/bin/.eslintrc.js

This file was deleted.

6 changes: 6 additions & 0 deletions packages/plugin-packer/bin/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import presetsNodePrettier from "@cybozu/eslint-config/flat/presets/node-prettier.js";

/** @type {import("eslint").Linter.Config[]} */
export default [
...presetsNodePrettier
];
28 changes: 28 additions & 0 deletions packages/plugin-packer/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import rootConfig from "../../eslint.config.mjs";
import siteConfig from "./site/eslint.config.mjs";
import binConfig from "./bin/eslint.config.mjs";
import globals from "globals";

/** @type {import("eslint").Linter.Config[]} */
export default [
...siteConfig.map((configObject) => ({
files: ["site/**/*.{js,ts}"],
...configObject,
})),
...binConfig.map((configObject) => ({
files: ["bin/**/*.{js,ts}"],
...configObject,
})),
...rootConfig.map((configObject) => ({
ignores: ["site/*", "bin/*"],
...configObject,
})),
{
files: ["test/**/*.{js,ts}"],
languageOptions: {
globals: {
...globals.jest,
},
},
},
];
1 change: 1 addition & 0 deletions packages/plugin-packer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"cssnano": "^7.0.6",
"execa": "^5.1.1",
"glob": "^10.4.5",
"globals": "^15.11.0",
"jest-environment-jsdom": "^29.7.0",
"normalize.css": "^8.0.1",
"path-browserify": "^1.0.1",
Expand Down
8 changes: 0 additions & 8 deletions packages/plugin-packer/site/.eslintrc.js

This file was deleted.

15 changes: 15 additions & 0 deletions packages/plugin-packer/site/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import globals from "globals";
import presetsPrettier from "@cybozu/eslint-config/flat/presets/prettier.js";

/** @type {import("eslint").Linter.Config[]} */
export default [
...presetsPrettier,
{
languageOptions: {
globals: {
...globals.jest,
...globals.node,
},
},
},
];
1 change: 0 additions & 1 deletion packages/plugin-packer/site/test/action-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ describe("action", () => {
beforeEach(() => {
dispatch = jest.fn();
});
afterEach(() => {});
describe("uploadFailure", () => {
it("should dispatch an UPLOAD_FAILURE action with an error", () => {
const error = { message: "error" };
Expand Down
5 changes: 0 additions & 5 deletions packages/plugin-packer/test/.eslintrc.js

This file was deleted.

10 changes: 0 additions & 10 deletions packages/plugin-uploader/.eslintrc.js

This file was deleted.

Loading