From dc35633382bd41ecd2e07cb6c685be3b107b3d51 Mon Sep 17 00:00:00 2001 From: * <*> Date: Fri, 15 Sep 2023 16:20:31 +0800 Subject: [PATCH] Match-id-3d6ba1acf37deca4e2dcb46c502006880da23bd5 --- packages/create-inula/.prettierrc.js | 26 +++++------ .../Inula-antd/templates/vite/index.html | 2 +- .../Inula-antd/templates/vite/package.json | 12 ++--- .../admin/components/DropOption/DropOption.js | 2 +- .../src/admin/components/Ellipsis/index.d.ts | 2 +- .../src/admin/components/Ellipsis/index.js | 5 +-- .../admin/components/FilterItem/FilterItem.js | 2 +- .../admin/components/GlobalFooter/index.d.ts | 12 ++--- .../admin/components/GlobalFooter/index.js | 2 +- .../admin/components/GlobalFooter/index.md | 4 +- .../vite/src/admin/components/Layout/Bread.js | 6 +-- .../src/admin/components/Layout/Header.js | 2 +- .../vite/src/admin/components/Layout/Sider.js | 2 +- .../src/admin/components/Layout/SiderMenu.tsx | 6 +-- .../src/admin/components/Loader/Loader.js | 2 +- .../vite/src/admin/components/Page/Page.js | 2 +- .../vite/src/admin/layouts/BaseLayout.js | 4 +- .../vite/src/admin/layouts/PrimaryLayout.tsx | 4 +- .../templates/vite/src/admin/layouts/index.js | 6 +-- .../templates/vite/src/admin/main.jsx | 4 +- .../vite/src/admin/models/app-model.ts | 2 +- .../templates/vite/src/admin/pages/404.jsx | 2 +- .../pages/dashboard/components/numberCard.js | 2 +- .../admin/pages/dashboard/components/quote.js | 2 +- .../admin/pages/dashboard/components/sales.js | 2 +- .../pages/dashboard/components/weather.js | 2 +- .../vite/src/admin/pages/dashboard/index.tsx | 2 +- .../vite/src/admin/pages/dashboard/model.ts | 2 +- .../templates/vite/src/admin/pages/index.js | 6 +-- .../templates/vite/src/admin/pages/routes.js | 2 +- .../src/admin/pages/user/components/Filter.js | 2 +- .../src/admin/pages/user/components/List.js | 2 +- .../src/admin/pages/user/components/Modal.js | 2 +- .../vite/src/admin/pages/user/id/index.js | 2 +- .../vite/src/admin/pages/user/index.tsx | 2 +- .../vite/src/admin/pages/user/model.ts | 2 +- .../vite/src/admin/utils/iconMap.jsx | 2 +- .../templates/vite/src/admin/utils/intl.js | 4 +- .../Inula-antd/templates/vite/vite.config.js | 16 +++---- .../Inula-antd/templates/webpack/README.md | 45 ------------------- .../templates/webpack/babel.config.js | 2 +- .../Inula-antd/templates/webpack/package.json | 11 ++--- .../src/components/Ellipsis/index.d.ts | 2 +- .../webpack/src/components/Ellipsis/index.js | 2 +- .../src/components/FilterItem/FilterItem.js | 2 +- .../src/components/GlobalFooter/index.d.ts | 11 ++--- .../src/components/GlobalFooter/index.js | 2 +- .../src/components/GlobalFooter/index.md | 4 +- .../webpack/src/components/Layout/Bread.js | 6 +-- .../webpack/src/components/Layout/Header.js | 2 +- .../webpack/src/components/Layout/Sider.js | 2 +- .../src/components/Layout/SiderMenu.tsx | 6 +-- .../webpack/src/components/Loader/Loader.js | 2 +- .../webpack/src/components/Page/Page.js | 2 +- .../templates/webpack/src/entry.tsx | 4 +- .../webpack/src/layouts/BaseLayout.js | 4 +- .../webpack/src/layouts/PrimaryLayout.tsx | 4 +- .../templates/webpack/src/layouts/index.js | 6 +-- .../templates/webpack/src/models/app-model.ts | 2 +- .../templates/webpack/src/pages/404.jsx | 2 +- .../pages/dashboard/components/numberCard.js | 2 +- .../src/pages/dashboard/components/quote.js | 2 +- .../src/pages/dashboard/components/sales.js | 2 +- .../src/pages/dashboard/components/weather.js | 2 +- .../webpack/src/pages/dashboard/index.tsx | 2 +- .../webpack/src/pages/dashboard/model.ts | 2 +- .../templates/webpack/src/pages/index.js | 6 +-- .../templates/webpack/src/pages/routes.js | 2 +- .../src/pages/user/components/Filter.js | 2 +- .../webpack/src/pages/user/components/List.js | 2 +- .../src/pages/user/components/Modal.js | 2 +- .../webpack/src/pages/user/id/index.js | 2 +- .../webpack/src/pages/user/index.tsx | 2 +- .../templates/webpack/src/pages/user/model.ts | 2 +- .../templates/webpack/src/utils/iconMap.jsx | 2 +- .../templates/webpack/src/utils/intl.js | 4 +- .../webpack/webpack/webpack.basic.js | 4 +- .../Simple-app/templates/vite/package.json | 4 +- .../Simple-app/templates/vite/src/index.jsx | 4 +- .../Simple-app/templates/vite/vite.config.js | 6 +-- .../Simple-app/templates/webpack/package.json | 4 +- .../Simple-app/templates/webpack/src/App.js | 2 +- .../Simple-app/templates/webpack/src/index.js | 2 +- .../templates/webpack/webpack.config.js | 2 +- packages/create-inula/package.json | 2 +- 85 files changed, 150 insertions(+), 206 deletions(-) delete mode 100644 packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md diff --git a/packages/create-inula/.prettierrc.js b/packages/create-inula/.prettierrc.js index da8f33e7..35bab217 100644 --- a/packages/create-inula/.prettierrc.js +++ b/packages/create-inula/.prettierrc.js @@ -16,17 +16,17 @@ 'use strict'; module.exports = { - printWidth: 120, // 一行120字符数，如果超过会进行换行 - tabWidth: 2, // tab等2个空格 - useTabs: false, // 用空格缩进行 - semi: true, // 行尾使用分号 - singleQuote: true, // 字符串使用单引号 - quoteProps: 'as-needed', // 仅在需要时在对象属性添加引号 - jsxSingleQuote: false, // 在JSX中使用双引号 - trailingComma: 'es5', // 使用尾逗号(对象、数组等) - bracketSpacing: true, // 对象的括号间增加空格 - bracketSameLine: false, // 将多行JSX元素的>放在最后一行的末尾 - arrowParens: 'avoid', // 在唯一的arrow函数参数周围省略括号 - vueIndentScriptAndStyle: false, // 不缩进Vue文件中的 diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json index 246bdcf4..04876505 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json @@ -17,19 +17,17 @@ "classnames": "^2.2.6", "echarts": "^5.0.0", "history": "^5.3.0", - "@cloudsop/horizon": "^0.0.58", "lodash": "^4.17.11", "moment": "2.24.0", "nprogress": "^0.2.0", "path-to-regexp": "^6.1.0", "prop-types": "^15.7.0", "qs": "^6.10.0", - "react-dom": "17.0.2", + "inulajs": "0.0.11", "react-draft-wysiwyg": "^1.13.0", - "react-intl": "^6.3.2", + "inula-intl": "^0.0.1", "react-perfect-scrollbar": "^1.5.0", - "react-router": "^6.10.0", - "react-router-dom": "^6.10.0", + "inula-router": "^0.0.1", "recharts": "^2.0.0", "store": "^2.0.0" }, @@ -47,8 +45,6 @@ "@babel/preset-typescript": "^7.18.6", "@babel/runtime": "7.18.6", "@babel/types": "7.18.6", - "@types/react": "^18.0.27", - "@types/react-dom": "^18.0.10", "@vitejs/plugin-react": "^3.1.0", "@vitejs/plugin-react-refresh": "^1.3.5", "babel-loader": "8.2.5", @@ -63,8 +59,6 @@ "less-vars-to-js": "^1.3.0", "mockjs": "^1.1.0", "prettier": "^2.0.0", - "react-router": "5.2.0", - "react-router-dom": "5.0.1", "style-loader": "^3.2.2", "ts-loader": "^9.3.1", "tsconfig-paths-webpack-plugin": "^4.0.1", diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js index 4b6691ef..345e231a 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import { BarsOutlined, DownOutlined } from '@ant-design/icons'; import { Dropdown, Button, Menu } from 'antd'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts index c0a21953..57fc2b2d 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { TooltipProps } from 'antd/lib/tooltip'; export interface EllipsisTooltipProps extends TooltipProps { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js index aa3849a8..962cb59b 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js @@ -1,11 +1,8 @@ -import Inula, { Component } from '@cloudsop/horizon'; +import Inula, { Component } from 'inulajs'; import { Tooltip } from 'antd'; import classNames from 'classnames'; import styles from './index.module.less'; -/* eslint react/no-did-mount-set-state: 0 */ -/* eslint no-param-reassign: 0 */ - const isSupportLineClamp = document.body.style.webkitLineClamp !== undefined; const TooltipOverlayStyle = { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js index c53d5a80..03bbb0d8 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import styles from './FilterItem.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts index 6411c837..67ed183d 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts @@ -1,14 +1,16 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; +import type { InulaNode, CSSProperties, Component } from 'inulajs'; + export interface GlobalFooterProps { links?: Array<{ key?: string; - title: Inula.ReactNode; + title: InulaNode; href: string; blankTarget?: boolean; }>; - copyright?: Inula.ReactNode; - style?: Inula.CSSProperties; + copyright?: InulaNode; + style?: CSSProperties; className?: string; } -export default class GlobalFooter extends Inula.Component {} +export default class GlobalFooter extends Component {} diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js index 88bfaf9d..ee2176af 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import classNames from 'classnames'; import styles from './index.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.md b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.md index 5d6058f6..2fc6f7e5 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.md +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.md @@ -11,5 +11,5 @@ order: 7 | 参数 | 说明 | 类型 | 默认值 | | --------- | -------- | ---------------------------------------------------------------- | ------ | -| links | 链接数据 | array<{ title: ReactNode, href: string, blankTarget?: boolean }> | - | -| copyright | 版权信息 | ReactNode | - | +| links | 链接数据 | array<{ title: InulaNode, href: string, blankTarget?: boolean }> | - | +| copyright | 版权信息 | InulaNode | - | diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js index bce14abb..9fb0ebf9 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js @@ -1,13 +1,13 @@ -import Inula, { Fragment } from '@cloudsop/horizon'; +import Inula, { Fragment } from 'inulajs'; import { Breadcrumb } from 'antd'; -import { Link } from 'react-router-dom'; +import { Link } from 'inula-router'; import { t } from 'utils/intl'; import iconMap from 'utils/iconMap'; import { pathToRegexp } from 'path-to-regexp'; import { queryAncestors } from 'utils'; import styles from './Bread.module.less'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; function Bread({ routeList, history }) { const generateBreadcrumbs = paths => { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js index 81e3d4e5..41df4098 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { Menu, Layout } from 'antd'; import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; import { Trans } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js index 8ef27de0..766b52ac 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { Switch, Layout } from 'antd'; import { t } from 'utils/intl'; import { Trans } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx index 03789dda..f6bb4aa0 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx @@ -1,13 +1,11 @@ -import Inula, { useState, Fragment } from '@cloudsop/horizon'; -import PropTypes from 'prop-types'; +import Inula, { useState, Fragment } from 'inulajs'; import { Menu } from 'antd'; -import { NavLink } from 'react-router-dom'; +import { NavLink, withRouter } from 'inula-router'; import { pathToRegexp } from 'path-to-regexp'; import { arrayToTree, queryAncestors } from '../../utils'; import iconMap from '../../utils/iconMap'; import store from 'store'; import { getStore } from '../../models/app-model'; -import { withRouter } from 'react-router-dom'; const { SubMenu } = Menu; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js index 3edf71ae..cbd7ccf8 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import styles from './Loader.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js index e605c083..5c6926a1 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js @@ -1,4 +1,4 @@ -import Inula, { Component } from '@cloudsop/horizon'; +import Inula, { Component } from 'inulajs'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Loader from '../Loader'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js index 59dd1b0d..253c2da3 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js @@ -1,10 +1,10 @@ -import Inula, { Fragment } from '@cloudsop/horizon'; +import Inula, { Fragment } from 'inulajs'; import { queryLayout } from 'utils'; import config from 'utils/config'; import PublicLayout from './PublicLayout'; import PrimaryLayout from './PrimaryLayout'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; import './BaseLayout.less'; const LayoutMap = { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx index 89e4c07c..22796e4d 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect, Fragment } from '@cloudsop/horizon'; +import Inula, { useEffect, Fragment } from 'inulajs'; import PropTypes from 'prop-types'; import { MyLayout, GlobalFooter } from '../components'; import { BackTop, Layout, Drawer } from 'antd'; @@ -10,7 +10,7 @@ import Error from '../pages/404'; import styles from './PrimaryLayout.module.less'; import store from 'store'; import { getStore } from '../models/app-model'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; const { Content } = Layout; const { Header, Bread, Sider } = MyLayout; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js index f39188bc..51fa6d2e 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js @@ -1,9 +1,9 @@ -import Inula, { Suspense } from '@cloudsop/horizon'; +import Inula, { Suspense } from 'inulajs'; import { ConfigProvider } from 'antd'; -import { IntlProvider } from 'react-intl'; +import { IntlProvider } from 'inula-intl'; import { getLocale } from '../utils'; import BaseLayout from './BaseLayout'; -import { Route, withRouter } from 'react-router-dom'; +import { Route, withRouter } from 'inula-router'; import { getRoutes } from '../pages/routes'; import { getLangResource } from '../utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx index 5a3462d6..05e07a96 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx @@ -1,5 +1,5 @@ -import Inula from '@cloudsop/horizon'; -import { BrowserRouter } from 'react-router-dom'; +import Inula from 'inulajs'; +import { BrowserRouter } from 'inula-router'; import config from './utils/config'; import 'antd/dist/antd.css'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts index f58d11e6..05c5cd53 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts @@ -5,7 +5,7 @@ import api from '../services'; // @ts-ignore const { queryRouteList, queryUserInfo } = api; -import { createStore } from '@cloudsop/horizon'; +import { createStore } from 'inulajs'; const goDashboard = history => { if (pathToRegexp(['/', '/login']).exec(window.location.pathname)) { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx index e6a31acd..4c13bb00 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { FrownOutlined } from '@ant-design/icons'; import { Page } from 'components'; import styles from './404.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js index ff7b83f3..683b5da4 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import { Card } from 'antd'; import iconMap from 'utils/iconMap'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js index 6e9ad8b8..6427e999 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import styles from './quote.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js index be66ecff..fe8c7732 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Color from '../../../utils/theme'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js index 845f83a2..c674e572 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import { Spin } from 'antd'; import styles from './weather.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx index 85fc05b6..4049219f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect } from '@cloudsop/horizon'; +import Inula, { useEffect } from 'inulajs'; import { Row, Col, Card } from 'antd'; import Color from '../../utils/theme'; import { Page, ScrollBar } from '../../components'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts index 4ad463f9..df35178b 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts @@ -1,6 +1,6 @@ import { parse } from 'qs'; import api from '../../services'; -import { createStore } from '@cloudsop/horizon'; +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/Inula-antd/templates/vite/src/admin/pages/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/index.js index 9135bf8c..5d9b890f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/index.js @@ -1,8 +1,8 @@ -import Inula from '@cloudsop/horizon'; -import { Redirect } from 'react-router-dom'; +import Inula from 'inulajs'; +import { Redirect } from 'inula-router'; function Index() { - return ; + return ; } export default Index; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js index 801702ca..6be8211f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js @@ -1,4 +1,4 @@ -import Inula, { lazy } from '@cloudsop/horizon'; +import Inula, { lazy } from 'inulajs'; export function getRoutes() { const routes = [ diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js index 6c8e5015..41d34da1 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from '@cloudsop/horizon'; +import Inula, { useRef } from 'inulajs'; import moment from 'moment'; import { FilterItem } from 'components'; import { Button, Row, Col, DatePicker, Form, Input, Cascader } from 'antd'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js index a6a2743a..412774ae 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { Table, Modal } from 'antd'; import { DropOption } from 'components'; import { t } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js index d85cdcf8..e7969575 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from '@cloudsop/horizon'; +import Inula, { useRef } from 'inulajs'; import { Form, Input, InputNumber, Radio, Modal, Cascader } from 'antd'; import { t, Trans } from 'utils/intl'; import city from 'utils/city'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js index b72f59f7..9b3a862f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js @@ -1,4 +1,4 @@ -import Inula, { PureComponent } from '@cloudsop/horizon'; +import Inula, { PureComponent } from 'inulajs'; import PropTypes from 'prop-types'; import { Page } from 'components'; import styles from './index.module.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx index 8b936316..e2461885 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect } from '@cloudsop/horizon'; +import Inula, { useEffect } from 'inulajs'; import { Row, Col, Button, Popconfirm } from 'antd'; import { Page } from '../../components'; import { stringify } from 'qs'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts index 9c4552f1..fd2b883c 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts @@ -1,5 +1,5 @@ import api from '../../services'; -import { createStore } from '@cloudsop/horizon'; +import { createStore } from 'inulajs'; const { queryUserList, createUser, removeUser, updateUser, removeUserList } = api; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx index 69ab35c0..58f29731 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { PayCircleOutlined, ShoppingCartOutlined, diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js index 20eefdd9..849ac39a 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js @@ -2,8 +2,8 @@ * 国际化，支持按需加载 */ -import Inula from '@cloudsop/horizon'; -import { createIntl, createIntlCache, FormattedMessage } from 'react-intl'; +import Inula from 'inulajs'; +import { createIntl, createIntlCache, FormattedMessage } from 'inula-intl'; import zhCN from 'antd/lib/locale-provider/zh_CN'; import enUS from 'antd/lib/locale-provider/en_US'; import ptBR from 'antd/lib/locale-provider/pt_BR'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/vite.config.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/vite.config.js index 57005e78..7d0a2410 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/vite/vite.config.js +++ b/packages/create-inula/lib/generators/Inula-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: '@cloudsop/horizon', // 新增 - 'react-dom': '@cloudsop/horizon', // 新增 - 'react/jsx-dev-runtime': '@cloudsop/horizon/jsx-dev-runtime', + react: 'inulajs', // 新增 + 'react-dom': 'inulajs', // 新增 + 'react/jsx-dev-runtime': 'inulajs/jsx-dev-runtime', }; // https://vitejs.dev/config/ @@ -23,11 +23,11 @@ export default defineConfig({ babel: { plugins: [ [ - "@babel/plugin-transform-react-jsx", - { - "runtime": "automatic", // 新增 - "importSource": "@cloudsop/horizon" // 新增 - } + '@babel/plugin-transform-react-jsx', + { + runtime: 'automatic', // 新增 + importSource: 'inulajs', // 新增 + }, ], '@babel/plugin-proposal-class-properties', '@babel/plugin-syntax-dynamic-import', diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md deleted file mode 100644 index 346b1237..00000000 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md +++ /dev/null @@ -1,45 +0,0 @@ -[inula-antd](https://codehub-y.huawei.com/c00486778/horizon-antd/files?ref=master)项目是借鉴[AntD Admin](https://github.com/zuiidea/antd-admin)的一个中控台项目。主要特点是使用了[horizon](https://open.codehub.huawei.com/innersource/shanhai/wutong/horizon/horizon-core/wiki/view/doc/695491)框架，并且使用HorizonX实现状态管理。 - -界面如： - -![inula-antd1](http://image.huawei.com/tiny-lts/v1/images/5b32eb56b2162b5e02f6306bf6f6e09d_1913x903.gif@900-0-90-f.gif) - -## 代码特点： - -1、使用了`horizon`开发框架，兼容React的所有接口。 - -2、使用`函数式组件`进行开发。 - -3、使用TS语言（待完成）。 - -4、使用了`horizonX的状态管理`能力，每个page都会有一个store，这样可以保证每个store体积较小，使用方便，性能也更好一些。 - -5、使用了`React-router-dom`作为路由，利用Lazy动态加载组件。 - -6、使用`less`书写css。 - -7、封装了request请求。 - -8、使用`react-intl`实现国际化。 - -9、支持换肤能力。 - -10、使用了antd 作为组件、使用了Echart、HighCharts、ReChart绘制多种图形。 - -11、提供简单易用的`数据mock`能力，并使用mockjs进行数据mock。 - -## 工程特点： - -1、支持热部署。 - -2、支持source-map调试。 - -3、提供babel.config.js、.editorconfig、.prettierrc.js、.eslintrc.js 等常用配置。 - -## 使用方式： - -1、克隆ssh://git@codehub-dg-y.huawei.com:2222/c00486778/horizon-antd.git - -2、执行 `npm i -f` ， 如果@cloudsop/horizon无法下载，请在`.npmrc`配置 @cloudsop:registry=https://cmc.centralrepo.rnd.huawei.com/artifactory/api/npm/product_npm - -3、执行 `npm run dev:admin` diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js index 6e3cfb45..776576e2 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js @@ -12,7 +12,7 @@ module.exports = { '@babel/preset-react', { runtime: 'automatic', // 新增 - importSource: '@cloudsop/horizon', // 新增 + importSource: 'inulajs', // 新增 }, ], ], diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json index 0e920a55..7dc27284 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json @@ -1,5 +1,5 @@ { - "name": "horizon-antd-fun", + "name": "inulajs-antd-fun", "version": "1.0.0", "description": "", "main": "index.js", @@ -17,8 +17,6 @@ "@babel/preset-typescript": "^7.18.6", "@babel/runtime": "7.18.6", "@babel/types": "7.18.6", - "@types/react": "16.8.6", - "@types/react-dom": "16.9.6", "babel-loader": "^9.0.0", "clean-webpack-plugin": "4.0.0", "css-loader": "^4.3.0", @@ -42,7 +40,7 @@ "dependencies": { "@ant-design/icons": "^5.1.4", "@babel/plugin-proposal-export-default-from": "^7.18.6", - "@cloudsop/horizon": "^0.0.58", + "inulajs": "^0.0.8", "antd": "^4.0.0", "axios": "^1.4.0", "classnames": "^2.2.6", @@ -54,10 +52,9 @@ "path-to-regexp": "^6.1.0", "prop-types": "^15.7.0", "qs": "^6.10.0", - "react-intl": "^6.4.4", + "inula-intl": "^0.0.1", + "inula-router": "^0.0.1", "react-perfect-scrollbar": "^1.5.0", - "react-router": "^6.12.1", - "react-router-dom": "^5.0.0", "recharts": "^2.0.0", "redux": "^4.2.1", "redux-thunk": "^2.4.2", diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts index c0a21953..57fc2b2d 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { TooltipProps } from 'antd/lib/tooltip'; export interface EllipsisTooltipProps extends TooltipProps { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js index 1264e1a7..565adcfc 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js @@ -1,4 +1,4 @@ -import Inula, { Component } from '@cloudsop/horizon'; +import Inula, { Component } from 'inulajs'; import { Tooltip } from 'antd'; import classNames from 'classnames'; import styles from './index.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js index f5e33bef..9a21e5c8 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import styles from './FilterItem.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts index 6af035cc..af1cc27b 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts @@ -1,14 +1,15 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; +import type { InulaNode, CSSProperties, Component } from 'inulajs'; export interface GlobalFooterProps { links?: Array<{ key?: string; - title: Inula.ReactNode; + title: InulaNode; href: string; blankTarget?: boolean; }>; - copyright?: Inula.InulaNode; - style?: Inula.CSSProperties; + copyright?: InulaNode; + style?: CSSProperties; className?: string; } -export default class GlobalFooter extends Inula.Component {} +export default class GlobalFooter extends Component {} diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js index 2dec57ff..a75f1345 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import classNames from 'classnames'; import styles from './index.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.md b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.md index 5d6058f6..2fc6f7e5 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.md +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.md @@ -11,5 +11,5 @@ order: 7 | 参数 | 说明 | 类型 | 默认值 | | --------- | -------- | ---------------------------------------------------------------- | ------ | -| links | 链接数据 | array<{ title: ReactNode, href: string, blankTarget?: boolean }> | - | -| copyright | 版权信息 | ReactNode | - | +| links | 链接数据 | array<{ title: InulaNode, href: string, blankTarget?: boolean }> | - | +| copyright | 版权信息 | InulaNode | - | diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js index 01dfef74..c0cebc78 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js @@ -1,13 +1,13 @@ -import Inula, { Fragment } from '@cloudsop/horizon'; +import Inula, { Fragment } from 'inulajs'; import { Breadcrumb } from 'antd'; -import { Link } from 'react-router-dom'; +import { Link } from 'inula-router'; import { t } from 'utils/intl'; import iconMap from 'utils/iconMap'; const { pathToRegexp } = require('path-to-regexp'); import { queryAncestors } from 'utils'; import styles from './Bread.less'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; function Bread({ routeList, history }) { const generateBreadcrumbs = paths => { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js index 18995ced..36f41621 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { Menu, Layout } from 'antd'; import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; import { Trans } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js index 9bd02d0c..b46a0261 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { Switch, Layout } from 'antd'; import { t } from 'utils/intl'; import { Trans } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx index 03789dda..4720c77f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx @@ -1,13 +1,13 @@ -import Inula, { useState, Fragment } from '@cloudsop/horizon'; +import Inula, { useState, Fragment } from 'inulajs'; import PropTypes from 'prop-types'; import { Menu } from 'antd'; -import { NavLink } from 'react-router-dom'; +import { NavLink } from 'inula-router'; import { pathToRegexp } from 'path-to-regexp'; import { arrayToTree, queryAncestors } from '../../utils'; import iconMap from '../../utils/iconMap'; import store from 'store'; import { getStore } from '../../models/app-model'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; const { SubMenu } = Menu; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js index 053acd24..b52180df 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import styles from './Loader.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js index 0d704681..3680f2e5 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js @@ -1,4 +1,4 @@ -import Inula, { Component } from '@cloudsop/horizon'; +import Inula, { Component } from 'inulajs'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Loader from '../Loader'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx index 36130533..5d72c712 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx @@ -1,5 +1,5 @@ -import Inula from '@cloudsop/horizon'; -import { BrowserRouter } from 'react-router-dom'; +import Inula from 'inulajs'; +import { BrowserRouter } from 'inula-router'; import config from './utils/config'; import 'antd/dist/antd.css'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js index 59dd1b0d..253c2da3 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js @@ -1,10 +1,10 @@ -import Inula, { Fragment } from '@cloudsop/horizon'; +import Inula, { Fragment } from 'inulajs'; import { queryLayout } from 'utils'; import config from 'utils/config'; import PublicLayout from './PublicLayout'; import PrimaryLayout from './PrimaryLayout'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; import './BaseLayout.less'; const LayoutMap = { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx index 11630d08..a80fabed 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect, Fragment } from '@cloudsop/horizon'; +import Inula, { useEffect, Fragment } from 'inulajs'; import { MyLayout, GlobalFooter } from '../components'; import { BackTop, Layout } from 'antd'; import { pathToRegexp } from 'path-to-regexp'; @@ -8,7 +8,7 @@ import Error from '../pages/404'; import styles from './PrimaryLayout.less'; import store from 'store'; import { getStore } from '../models/app-model'; -import { withRouter } from 'react-router-dom'; +import { withRouter } from 'inula-router'; const { Content } = Layout; const { Header, Bread, Sider } = MyLayout; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js index 39d71f37..69f48590 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js @@ -1,9 +1,9 @@ -import Inula, { Suspense } from '@cloudsop/horizon'; +import Inula, { Suspense } from 'inulajs'; import { ConfigProvider } from 'antd'; -import { IntlProvider } from 'react-intl'; +import { IntlProvider } from 'inula-intl'; import { getLocale } from '../utils'; import BaseLayout from './BaseLayout'; -import { Route, withRouter } from 'react-router-dom'; +import { Route, withRouter } from 'inula-router'; import { getRoutes } from '../pages/routes'; import { getLangResource } from '../utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/models/app-model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/models/app-model.ts index 68d110d6..12193e0c 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/models/app-model.ts +++ b/packages/create-inula/lib/generators/Inula-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 '@cloudsop/horizon'; +import { createStore } from 'inulajs'; const goDashboard = history => { if (pathToRegexp(['/', '/login']).exec(window.location.pathname)) { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx index 2ef5f315..9022fe7d 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { FrownOutlined } from '@ant-design/icons'; import { Page } from 'components'; import styles from './404.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js index 8e523e65..277648db 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import { Card } from 'antd'; import iconMap from 'utils/iconMap'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js index 0c6ac94b..71932083 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import styles from './quote.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js index 3765308f..6bd4404d 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import { Color } from 'utils'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js index 2a257ce5..221fc30c 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import PropTypes from 'prop-types'; import { Spin } from 'antd'; import styles from './weather.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx index 3688a5b6..f1b265a5 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect } from '@cloudsop/horizon'; +import Inula, { useEffect } from 'inulajs'; import { Row, Col, Card } from 'antd'; import { Color } from '../../utils'; import { Page, ScrollBar } from '../../components'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts index 02cb7082..d1798d4c 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts @@ -1,6 +1,6 @@ import { parse } from 'qs'; import api from '../../services'; -import { createStore } from '@cloudsop/horizon'; +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/Inula-antd/templates/webpack/src/pages/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/index.js index 9135bf8c..5d9b890f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/index.js @@ -1,8 +1,8 @@ -import Inula from '@cloudsop/horizon'; -import { Redirect } from 'react-router-dom'; +import Inula from 'inulajs'; +import { Redirect } from 'inula-router'; function Index() { - return ; + return ; } export default Index; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js index 4e9d9cb1..4b2db2a1 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js @@ -1,4 +1,4 @@ -import Inula, { lazy } from '@cloudsop/horizon'; +import Inula, { lazy } from 'inulajs'; export function getRoutes() { const routes = [ diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js index 50c29c47..e0caa778 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from '@cloudsop/horizon'; +import Inula, { useRef } from 'inulajs'; import moment from 'moment'; import { FilterItem } from 'components'; import { Button, Row, Col, DatePicker, Form, Input, Cascader } from 'antd'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js index 1b0ca5f8..d0381f80 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { Table, Modal } from 'antd'; import { DropOption } from 'components'; import { t } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js index 15dfd689..3d98a86b 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from '@cloudsop/horizon'; +import Inula, { useRef } from 'inulajs'; import { Form, Input, InputNumber, Radio, Modal, Cascader } from 'antd'; import { t, Trans } from 'utils/intl'; import city from 'utils/city'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js index afdc3405..d270fbc5 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js @@ -1,4 +1,4 @@ -import Inula, { PureComponent } from '@cloudsop/horizon'; +import Inula, { PureComponent } from 'inulajs'; import PropTypes from 'prop-types'; import { Page } from 'components'; import styles from './index.less'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx index 8e6e49b9..92d5caee 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect } from '@cloudsop/horizon'; +import Inula, { useEffect } from 'inulajs'; import { Row, Col, Button, Popconfirm } from 'antd'; import { Page } from '../../components'; import { stringify } from 'qs'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts index 9c4552f1..fd2b883c 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts @@ -1,5 +1,5 @@ import api from '../../services'; -import { createStore } from '@cloudsop/horizon'; +import { createStore } from 'inulajs'; const { queryUserList, createUser, removeUser, updateUser, removeUserList } = api; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx index 69ab35c0..58f29731 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx @@ -1,4 +1,4 @@ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { PayCircleOutlined, ShoppingCartOutlined, diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js index 20eefdd9..849ac39a 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js @@ -2,8 +2,8 @@ * 国际化，支持按需加载 */ -import Inula from '@cloudsop/horizon'; -import { createIntl, createIntlCache, FormattedMessage } from 'react-intl'; +import Inula from 'inulajs'; +import { createIntl, createIntlCache, FormattedMessage } from 'inula-intl'; import zhCN from 'antd/lib/locale-provider/zh_CN'; import enUS from 'antd/lib/locale-provider/en_US'; import ptBR from 'antd/lib/locale-provider/pt_BR'; diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js index 2abcd6df..d6f3c62f 100644 --- a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js @@ -14,8 +14,8 @@ module.exports = { themes: path.resolve('src/themes'), utils: path.resolve('src/utils'), - react: '@cloudsop/horizon', // 新增 - 'react-dom': '@cloudsop/horizon', // 新增 + 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 e1802c19..e4d227e6 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 @@ -1,5 +1,5 @@ { - "name": "horizon-vite-app", + "name": "inula-vite-app", "version": "1.0.0", "description": "", "main": "index.js", @@ -11,7 +11,7 @@ "author": "", "license": "ISC", "dependencies": { - "@cloudsop/horizon": "^0.0.58" + "inulajs": "^0.0.11" }, "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 967b82db..8287bc49 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 '@cloudsop/horizon'; +import Inula from 'inulajs'; import './index.css'; function App() { @@ -19,7 +19,7 @@ function App() {

了解更多

要了解 Inula，查看{' '} - Inula 官网 + Inula 官网

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 3aeed4b2..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: '@cloudsop/horizon', // 新增 - 'react-dom': '@cloudsop/horizon', // 新增 - 'react/jsx-dev-runtime': '@cloudsop/horizon/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 2b240e77..d1dcf250 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 @@ -1,5 +1,5 @@ { - "name": "horizon-webpack-app", + "name": "inula-webpack-app", "version": "1.0.0", "description": "", "main": "index.js", @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "@cloudsop/horizon": "^0.0.58" + "inulajs": "^0.0.11" }, "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 1d3f6830..48eeaa3f 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 '@cloudsop/horizon'; +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 5a5b1787..aa84a3bf 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 '@cloudsop/horizon'; +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 fc122d86..a07f60cc 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: '@cloudsop/horizon', // 新增 + importSource: 'inulajs', // 新增 }, ], ], diff --git a/packages/create-inula/package.json b/packages/create-inula/package.json index d9991b75..152fc15b 100644 --- a/packages/create-inula/package.json +++ b/packages/create-inula/package.json @@ -1,5 +1,5 @@ { - "name": "@cloudsop/create-horizon", + "name": "create-inula", "version": "1.0.22", "description": "", "main": "index.js",