Skip to content

Commit

Permalink
Merge pull request #165 from kmvan/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
kmvan authored Aug 14, 2021
2 parents 160e9cb + 151e2aa commit 9aeeb1c
Show file tree
Hide file tree
Showing 107 changed files with 825 additions and 761 deletions.
46 changes: 34 additions & 12 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,62 @@
"es2021": true,
"node": true
},
"parser": "@typescript-eslint/parser",
"extends": [
"standard",
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2021,
"sourceType": "module"
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": ["prettier", "@typescript-eslint"],
"settings": {
"react": {
"version": "detect"
}
},
"parser": "@typescript-eslint/parser",
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"airbnb-typescript",
"prettier",
"airbnb/hooks"
],
"plugins": ["prettier", "@typescript-eslint", "react-hooks"],
"rules": {
"prettier/prettier": "error",
"linebreak-style": ["error", "unix"],
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
"semi": ["error", "never"],
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off",
"@typescript-eslint/no-explicit-any": "off",
"no-use-before-define": "off",
"@typescript-eslint/no-shadow": "off",
"import/newline-after-import": ["error", { "count": 1 }],
"curly": "error",
"no-multiple-empty-lines": ["error", { "max": 1 }],
"eqeqeq": ["error", "always"],
"no-else-return": "error",
"no-implicit-coercion": "error"
"no-implicit-coercion": "error",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"import/prefer-default-export": "off",
"react/prop-types": "off",
"react/jsx-props-no-spreading": "off",
"react/require-default-props": "off",
"react/no-danger": "off",
"no-await-in-loop": "off",
"no-continue": "off",
"no-alert": "off",
"no-restricted-syntax": "off",
"no-param-reassign": "off",
"class-methods-use-this": "off",
"@typescript-eslint/no-unused-expressions": "off",
"no-underscore-dangle": "off",
"no-console": "off",
"import/no-extraneous-dependencies": "off",
"import/no-cycle": "off"
}
}
2 changes: 1 addition & 1 deletion AppConfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"APP_VERSION": "8.0",
"APP_VERSION": "8.1",
"APP_NAME": "X Prober",
"APP_URL": "https://github.com/kmvan/x-prober",
"AUTHOR_URL": "https://inn-studio.com/prober",
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All Notable changes to `X-Prober` will be documented in this file

## 8.1.0 - 2021-08-14

### Optimize

- Optimize page max width
- ESlint fix

## 8.0.0 - 2021-07-13

### Add
Expand Down
7 changes: 3 additions & 4 deletions build-lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const dirSrc = path.resolve(__dirname, 'src')
const dirComponents = `${dirSrc}/Components`
const langs = {}
const poEntries = {}
const JSON2 = require('JSON2')
const deepSort = require('deep-sort-object')
const parseFile = (filePath) => {
const code = fs.readFileSync(filePath).toString()
Expand All @@ -30,8 +29,8 @@ const parseFile = (filePath) => {
}

poEntries[`${msgid}${msgctxt}`] = `
${msgctxt ? `msgctxt ${JSON2.stringify(msgctxt)}` : ''}
msgid ${JSON2.stringify(msgid)}
${msgctxt ? `msgctxt ${JSON.stringify(msgctxt)}` : ''}
msgid ${JSON.stringify(msgid)}
msgstr ""
`.trim()
}
Expand Down Expand Up @@ -118,7 +117,7 @@ const writeJsData = ({ langId, items }) => {

fs.writeFileSync(
path.resolve(__dirname, 'src/Components/Language/src/lang.json'),
JSON2.stringify(deepSort(langs), null, 2),
JSON.stringify(deepSort(langs), null, 2),
(err) => {
if (err) {
throw err
Expand Down
Loading

0 comments on commit 9aeeb1c

Please sign in to comment.