Skip to content
This repository has been archived by the owner on Dec 2, 2024. It is now read-only.

Commit

Permalink
Merge branch 'neo-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-chancetop committed Nov 1, 2024
2 parents 1356a7f + 8ba50d6 commit 9d7a6a4
Show file tree
Hide file tree
Showing 16 changed files with 3,248 additions and 3,189 deletions.
3 changes: 0 additions & 3 deletions .eslintrc.json

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "22"
check-latest: true

- uses: pnpm/action-setup@v2.2.2
- uses: pnpm/action-setup@v4
with:
version: 8
version: 9.9.0
run_install: false

- name: Get pnpm store directory
Expand Down
62 changes: 0 additions & 62 deletions config/.eslintrc.json

This file was deleted.

83 changes: 83 additions & 0 deletions config/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// @ts-check
const eslintConfigPrettier = require("eslint-config-prettier");
const eslint = require("@eslint/js");
const tsESlint = require("typescript-eslint");

module.exports = tsESlint.config(
{
files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
plugins: {
"@typescript-eslint": tsESlint.plugin,
},
extends: [eslint.configs.recommended, ...tsESlint.configs.recommended, tsESlint.configs.eslintRecommended, eslintConfigPrettier],
languageOptions: {
parser: tsESlint.parser,
parserOptions: {
ecmaVersion: 2018,
sourceType: "module",
ecmaFeatures: {jsx: true},
},
},
rules: {
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-member-accessibility": ["error", {accessibility: "no-public"}],
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/member-ordering": [
"error",
{
default: {
memberTypes: [
"public-static-field",
"protected-static-field",
"private-static-field",
"public-static-method",
"protected-static-method",
"private-static-method",
"public-instance-field",
"protected-instance-field",
"private-instance-field",
"public-abstract-field",
"protected-abstract-field",
"public-constructor",
"protected-constructor",
"private-constructor",
"public-instance-method",
"protected-instance-method",
"private-instance-method",
"public-abstract-method",
"protected-abstract-method",
],
order: "as-written",
},
},
],
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-use-before-define": ["error", "nofunc"],
"@typescript-eslint/ban-ts-comment": "off",
"no-console": ["error", {allow: ["info", "warn", "error"]}],
"no-duplicate-imports": ["error"],
"no-useless-computed-key": ["error"],
"no-useless-rename": ["error"],
"no-var": ["error"],
"object-shorthand": "error",
"prefer-const": ["error"],
"require-yield": "off",
},
},
{
files: ["**/*.config.js", "**/*.config.jsx", "**/*.config.ts", "**/*.config.tsx", "**/script/*.js"],
rules: {
"@typescript-eslint/no-require-imports": "off",
},
},
{
ignores: ["**/build/**/*", "**/dist/**/*", "**/node_modules/**/*"],
}
);
4 changes: 4 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @ts-check
const baseConfig = require("./config/eslint.config");

module.exports = baseConfig;
66 changes: 31 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wonder/core-fe",
"version": "1.7.0",
"version": "1.8.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -21,55 +21,51 @@
"deploy": "node script/publish.js"
},
"devDependencies": {
"@testing-library/dom": "9.3.1",
"@testing-library/jest-dom": "6.1.2",
"@testing-library/react": "14.0.0",
"@testing-library/dom": "9.3.1",
"@testing-library/jest-dom": "6.1.2",
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.4.3",
"@types/jest": "29.5.10",
"@types/node": "20.9.5",
"@typescript-eslint/eslint-plugin": "6.12.0",
"@typescript-eslint/parser": "6.12.0",
"eslint": "8.54.0",
"eslint-config-prettier": "9.0.0",
"fs-extra": "11.1.1",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.0",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/node": "22.5.1",
"typescript-eslint": "8.3.0",
"eslint": "9.9.1",
"eslint-config-prettier": "9.1.0",
"fs-extra": "11.2.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"prettier": "3.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"typescript": "5.3.2",
"prettier": "3.3.3",
"react": "18.3.1",
"react-dom": "18.3.1",
"ts-jest": "29.2.5",
"ts-node": "10.9.2",
"typescript": "5.5.4",
"yargs": "17.7.2"
},
"dependencies": {
"@types/history": "4.7.11",
"@types/react": "18.2.35",
"@types/react-dom": "18.2.14",
"@types/react-redux": "7.1.28",
"@types/react": "18.3.4",
"@types/react-dom": "18.3.0",
"@types/react-router": "5.1.20",
"@types/react-router-dom": "5.3.3",
"axios": "1.6.1",
"core-js": "3.33.0",
"axios": "1.7.2",
"core-js": "3.37.1",
"history": "4.10.1",
"immer": "10.0.3",
"react-redux": "7.2.8",
"immer": "10.1.1",
"react-redux": "9.1.2",
"react-router": "5.2.1",
"react-router-dom": "5.3.0",
"redux": "4.1.2",
"redux-first-history": "5.1.1",
"redux-saga": "1.1.3",
"regenerator-runtime": "0.14.0",
"tslib": "2.6.2"
"redux": "5.0.1",
"redux-first-history": "5.2.0",
"redux-saga": "1.3.0",
"regenerator-runtime": "0.14.1",
"tslib": "2.7.0"
},
"peerDependencies": {
"react": ">=18.0.0",
"react-dom": ">=18.0.0"
},
"engines": {
"node": ">=14"
}
"node": ">=20"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 9d7a6a4

Please sign in to comment.