Skip to content

Commit

Permalink
[migrate] upgrade to ESLint 9 & other latest Upstream packages
Browse files Browse the repository at this point in the history
[optimize] transform Toolkit scripts from JS to TS
[fix] Language Switch bugs
  • Loading branch information
TechQuery committed Nov 9, 2024
1 parent f6b7bcb commit 602928b
Show file tree
Hide file tree
Showing 9 changed files with 2,001 additions and 1,728 deletions.
29 changes: 0 additions & 29 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ npm start
### 导入素材

```shell
node toolkit/import-assets path/to/media/folder
npx tsx toolkit/import-assets path/to/media/folder
```

[2]: https://github.com/FreeCodeCamp-Chengdu/Web-Conf/actions/workflows/main.yml
Expand Down
69 changes: 69 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { fixupPluginRules } from '@eslint/compat';
import eslint from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
import reactPlugin from 'eslint-plugin-react';
import simpleImportSortPlugin from 'eslint-plugin-simple-import-sort';
import globals from 'globals';
import tsEslint from 'typescript-eslint';
import { fileURLToPath } from 'url';

const tsconfigRootDir = fileURLToPath(new URL('.', import.meta.url));

export default tsEslint.config(
// register all of the plugins up-front
{
plugins: {
'@typescript-eslint': tsEslint.plugin,
// @ts-expect-error https://github.com/jsx-eslint/eslint-plugin-react/issues/3699
react: fixupPluginRules(reactPlugin),
'simple-import-sort': simpleImportSortPlugin
}
},
// config with just ignores is the replacement for `.eslintignore`
{ ignores: ['**/node_modules/**', '**/dist/**', '**/.parcel-cache/**'] },

// extends ...
eslint.configs.recommended,
...tsEslint.configs.recommended,

// base config
{
languageOptions: {
globals: { ...globals.es2022, ...globals.browser, ...globals.node },
parserOptions: {
projectService: true,
tsconfigRootDir,
warnOnUnsupportedTypeScriptVersion: false
}
},
rules: {
'simple-import-sort/exports': 'error',
'simple-import-sort/imports': 'error',
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-declaration-merging': 'warn',
'react/jsx-no-target-blank': 'warn',
'react/jsx-sort-props': [
'error',
{
reservedFirst: true,
callbacksLast: true,
noSortAlphabetically: true
}
]
}
},
{
files: ['**/*.js'],
extends: [tsEslint.configs.disableTypeChecked],
rules: {
// turn off other type-aware rules
'@typescript-eslint/internal/no-poorly-typed-ts-props': 'off',

// turn off rules that don't apply to JS code
'@typescript-eslint/explicit-function-return-type': 'off'
}
},
eslintConfigPrettier
);
49 changes: 30 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,62 @@
"build": "npm run clean && parcel build source/index.html --public-url . && npm run pack-sw"
},
"lint-staged": {
"*.{ts,tsx}": "eslint --fix",
"*.{html,md,css,less,js,ts,tsx,json}": "prettier --write"
"*.{js,mjs,ts,tsx}": "eslint --fix",
"*.{html,md,css,less,js,mjs,ts,tsx,json}": "prettier --write"
},
"dependencies": {
"boot-cell": "^2.0.0-beta.29",
"browser-unhandled-rejection": "^1.0.2",
"cell-router": "^3.0.0-rc.8",
"classnames": "^2.5.1",
"dom-renderer": "^2.3.0",
"dom-renderer": "^2.4.4",
"html-to-image": "^1.11.11",
"iterable-observer": "^1.1.0",
"koajax": "^3.0.1",
"koajax": "^3.0.3",
"lodash.groupby": "^4.6.0",
"marked": "^14.1.1",
"mobx": "^6.13.1",
"mobx-i18n": "^0.5.0",
"mobx-restful": "1.0.1",
"web-cell": "^3.0.0",
"web-utility": "^4.4.0"
"marked": "^14.1.4",
"mobx": "^6.13.5",
"mobx-i18n": "^0.6.0",
"mobx-restful": "2.0.0",
"web-cell": "^3.0.1",
"web-utility": "^4.4.2"
},
"devDependencies": {
"@eslint/compat": "^1.2.2",
"@eslint/js": "^9.14.0",
"@parcel/config-default": "~2.12.0",
"@parcel/packager-raw-url": "~2.12.0",
"@parcel/transformer-less": "~2.12.0",
"@parcel/transformer-typescript-tsc": "~2.12.0",
"@parcel/transformer-webmanifest": "~2.12.0",
"@softonus/prettier-plugin-duplicate-remover": "^1.0.1",
"@types/eslint-config-prettier": "^6.11.3",
"@types/lodash.groupby": "^4.6.9",
"@types/node": "^20.16.5",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.4.0",
"eslint": "^8.57.0",
"@types/node": "^20.17.6",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"husky": "^9.1.5",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^15.12.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"parcel": "~2.12.0",
"postcss": "^8.4.45",
"postcss": "^8.4.47",
"postcss-modules": "^4.3.1",
"prettier": "^3.3.3",
"prettier-plugin-css-order": "^2.1.2",
"process": "^0.11.10",
"typescript": "~5.5.4",
"workbox-cli": "^7.1.0"
"typescript": "~5.6.3",
"typescript-eslint": "^8.13.0",
"workbox-cli": "^7.3.0"
},
"prettier": {
"singleQuote": true,
"trailingComma": "none",
"arrowParens": "avoid"
"arrowParens": "avoid",
"plugins": [
"prettier-plugin-css-order",
"@softonus/prettier-plugin-duplicate-remover"
]
}
}
Loading

1 comment on commit 602928b

@github-actions
Copy link

@github-actions github-actions bot commented on 602928b Nov 9, 2024

Choose a reason for hiding this comment

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

Deploy preview for web-conf ready!

✅ Preview
https://web-conf-jtmvea01w-techquerys-projects.vercel.app

Built with commit 602928b.
This pull request is being automatically deployed with vercel-action

Please sign in to comment.