From 253511351c23af2a0fd3cba3ce521e5ef6c6e51c Mon Sep 17 00:00:00 2001 From: * <*> Date: Fri, 28 Jul 2023 18:20:33 +0800 Subject: [PATCH] Match-id-14f5a1873f140c030bb01ac75cefe6078b830084 --- .editorconfig | 10 +++ .eslintignore | 3 + .eslintrc.js | 74 +++++++++++++++++++ .../InulaJS-antd/templates/vite/package.json | 2 +- .../vite/src/admin/models/app-model.ts | 2 +- .../vite/src/admin/pages/dashboard/model.ts | 2 +- .../vite/src/admin/pages/user/model.ts | 2 +- .../templates/vite/vite.config.js | 6 +- .../templates/webpack/babel.config.js | 2 +- .../templates/webpack/package.json | 2 +- .../templates/webpack/src/entry.tsx | 2 +- .../templates/webpack/src/models/app-model.ts | 2 +- .../webpack/src/pages/dashboard/model.ts | 2 +- .../templates/webpack/src/pages/user/model.ts | 2 +- .../webpack/webpack/webpack.basic.js | 5 +- .../Simple-app/templates/vite/package.json | 2 +- .../Simple-app/templates/vite/src/index.jsx | 2 +- .../Simple-app/templates/vite/vite.config.js | 6 +- .../Simple-app/templates/webpack/package.json | 2 +- .../Simple-app/templates/webpack/src/App.js | 2 +- .../Simple-app/templates/webpack/src/index.js | 2 +- .../templates/webpack/webpack.config.js | 2 +- 22 files changed, 111 insertions(+), 25 deletions(-) create mode 100644 .editorconfig create mode 100644 .eslintignore create mode 100644 .eslintrc.js diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..5a51806d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +indent_size = 2 +indent_style = space +trim_trailing_whitespace = true + diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 00000000..60feb237 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,3 @@ +**/node_modules +build/ +*.d.ts diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 00000000..860de8a4 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2020 Huawei Technologies Co.,Ltd. + * + * openGauss is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * + * http://license.coscl.org.cn/MulanPSL2 + * + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +module.exports = { + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/eslint-recommended', + 'plugin:@typescript-eslint/recommended', + 'prettier', + ], + root: true, + + plugins: ['jest', 'no-for-of-loops', 'no-function-declare-after-return', 'react', '@typescript-eslint'], + + parser: '@typescript-eslint/parser', + parserOptions: { + ecmaVersion: 8, + sourceType: 'module', + ecmaFeatures: { + jsx: true, + modules: true, + experimentalObjectRestSpread: true, + }, + }, + env: { + browser: true, + jest: true, + node: true, + es6: true, + }, + rules: { + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/explicit-module-boundary-types': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/no-empty-function': 'off', + semi: ['warn', 'always'], + quotes: ['warn', 'single'], + 'accessor-pairs': 'off', + 'brace-style': ['error', '1tbs'], + 'func-style': ['warn', 'declaration', { allowArrowFunctions: true }], + 'max-lines-per-function': 'off', + 'object-curly-newline': 'off', + // 尾随逗号 + 'comma-dangle': ['error', 'only-multiline'], + + 'no-constant-condition': 'off', + 'no-for-of-loops/no-for-of-loops': 'error', + 'no-function-declare-after-return/no-function-declare-after-return': 'error', + }, + globals: { + isDev: true, + isTest: true, + }, + overrides: [ + { + files: ['scripts/__tests__/**/*.js'], + globals: { + container: true, + }, + }, + ], +}; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json index 4bc6e5fe..4e025d7c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json @@ -13,7 +13,7 @@ "@babel/plugin-proposal-export-default-from": "^7.18.6", "@babel/plugin-transform-react-jsx": "^7.21.0", "@babel/runtime": "7.6.2", - "inula": "0.0.52", + "inulajs": "^0.0.3", "antd": "^4.0.0", "axios": "^0.21.0", "classnames": "^2.2.6", diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts index f7ae9c81..012ef5ca 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts @@ -8,7 +8,7 @@ import config from '../utils/config'; // @ts-ignore const { queryRouteList, queryUserInfo } = api; -import { createStore } from 'inula'; +import { createStore } from 'inulajs'; const goDashboard = history => { if (pathToRegexp(['/', '/login']).exec(window.location.pathname)) { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts index 72e5e19a..8a007500 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts @@ -2,7 +2,7 @@ import { parse } from 'qs'; import api from '../../services'; import { pathToRegexp } from 'path-to-regexp'; -import { createStore } from 'inula'; +import { createStore } from 'inulajs'; const { queryDashboard, queryWeather } = api; const avatar = '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236.jpeg'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts index 44f8ac24..fd2b883c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts @@ -1,5 +1,5 @@ import api from '../../services'; -import { createStore } from 'inula'; +import { createStore } from 'inulajs'; const { queryUserList, createUser, removeUser, updateUser, removeUserList } = api; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js index bdba1810..e8264e14 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js @@ -11,9 +11,9 @@ let alias = { config: path.resolve('src/admin/utils/config'), themes: path.resolve('src/admin/themes'), utils: path.resolve('src/admin/utils'), - react: 'inula', // 新增 - 'react-dom': 'inula', // 新增 - 'react/jsx-dev-runtime': 'inula/jsx-dev-runtime', + react: 'inulajs', // 新增 + 'react-dom': 'inulajs', // 新增 + 'react/jsx-dev-runtime': 'inulajs/jsx-dev-runtime', }; // https://vitejs.dev/config/ diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js index 5b6fd986..776576e2 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js @@ -12,7 +12,7 @@ module.exports = { '@babel/preset-react', { runtime: 'automatic', // 新增 - importSource: 'inula', // 新增 + importSource: 'inulajs', // 新增 }, ], ], diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json index b3e24546..7a35f727 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json @@ -43,7 +43,7 @@ "dependencies": { "@ant-design/icons": "^5.1.4", "@babel/plugin-proposal-export-default-from": "^7.18.6", - "inula": "0.0.38", + "inulajs": "^0.0.3", "antd": "^4.0.0", "axios": "^1.4.0", "classnames": "^2.2.6", diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx index 18f9f077..4c35449f 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx @@ -1,4 +1,4 @@ -import inula from 'inula'; +import inula from 'inulajs'; import { BrowserRouter } from 'react-router-dom'; import 'antd/dist/antd.css'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts index 35ae5e8f..12193e0c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts @@ -5,7 +5,7 @@ import api from '../services'; // @ts-ignore const { queryRouteList, logoutUser, queryUserInfo } = api; -import { createStore } from 'inula'; +import { createStore } from 'inulajs'; const goDashboard = history => { if (pathToRegexp(['/', '/login']).exec(window.location.pathname)) { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts index 4aab9e60..df35178b 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts @@ -1,6 +1,6 @@ import { parse } from 'qs'; import api from '../../services'; -import { createStore } from 'inula'; +import { createStore } from 'inulajs'; const { queryDashboard, queryWeather } = api; const avatar = '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236.jpeg'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts index 44f8ac24..fd2b883c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts @@ -1,5 +1,5 @@ import api from '../../services'; -import { createStore } from 'inula'; +import { createStore } from 'inulajs'; const { queryUserList, createUser, removeUser, updateUser, removeUserList } = api; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js index c1e6a0e2..d6f3c62f 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js +++ b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js @@ -14,9 +14,8 @@ module.exports = { themes: path.resolve('src/themes'), utils: path.resolve('src/utils'), - react: 'inula', // 新增 - 'react-dom': 'inula', // 新增 - inula: 'inula', // 新增 + react: 'inulajs', // 新增 + 'react-dom': 'inulajs', // 新增 }, }, rules: [ diff --git a/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json b/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json index 5a774e56..a7a090a1 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json +++ b/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "inula": "^0.0.44" + "inulajs": "^0.0.3" }, "devDependencies": { "@babel/core": "^7.21.4", diff --git a/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx b/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx index 63e6b877..78fa14ab 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx +++ b/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx @@ -1,4 +1,4 @@ -import inula from 'inula'; +import inula from 'inulajs'; import './index.css'; function App() { diff --git a/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js b/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js index aca9a402..f267f2a2 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js @@ -1,9 +1,9 @@ import react from '@vitejs/plugin-react'; let alias = { - react: 'inula', // 新增 - 'react-dom': 'inula', // 新增 - 'react/jsx-dev-runtime': 'inula/jsx-dev-runtime', + react: 'inulajs', // 新增 + 'react-dom': 'inulajs', // 新增 + 'react/jsx-dev-runtime': 'inulajs/jsx-dev-runtime', }; export default { diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json b/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json index 4150b290..551bca14 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "inula": "^0.0.44" + "inulajs": "^0.0.3" }, "devDependencies": { "@babel/core": "^7.21.4", diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js index afb65bca..b2b8f618 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js @@ -1,4 +1,4 @@ -import inula from 'inula'; +import inula from 'inulajs'; import './styles.css'; class App extends inula.Component { diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js index fe8b6996..ae041734 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js @@ -1,4 +1,4 @@ -import inula from 'inula'; +import inula from 'inulajs'; import App from './App'; inula.render(, document.getElementById('root')); diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js b/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js index 40bb50a8..92520053 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { '@babel/preset-react', { runtime: 'automatic', // 新增 - importSource: 'inula', // 新增 + importSource: 'inulajs', // 新增 }, ], ],