Skip to content

Commit

Permalink
[fix] fix build error by echarts & install error by parcel, remove pa…
Browse files Browse the repository at this point in the history
…rcel
  • Loading branch information
QJAutumn committed Sep 19, 2022
1 parent 25bf3bf commit f8765ea
Show file tree
Hide file tree
Showing 66 changed files with 3,218 additions and 4,580 deletions.
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
registry=https://registry.npmmirror.com
# registry=https://registry.npmmirror.com
17 changes: 5 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"name": "xgen",
"version": "1.0.0",
"author": "Wendao",
"description": "Next-generation low-code dashboard.",
"description": "10x productive management system lib for Yao",
"private": false,
"license": "Apache-2.0",
"homepage": "https://yaoapps.com",
"packageManager": "[email protected]",
"repository": {
"type": "git",
"url": "https://github.com/YaoApp/xgen"
Expand All @@ -18,11 +17,7 @@
"dev": "turbo run dev",
"build": "turbo run build",
"dev:app": "turbo run dev --scope=xgen",
"dev:com": "turbo run dev --scope=@yaoapp/components",
"dev:utils": "turbo run dev --scope=@yaoapp/utils",
"build:app": "turbo run build --scope=@yaoapp/app",
"build:com": "turbo run build --scope=@yaoapp/components",
"build:utils": "turbo run build --scope=@yaoapp/utils"
"build:app": "turbo run build --scope=@yaoapp/app"
},
"gitHooks": {
"pre-commit": "lint-staged --allow-empty"
Expand All @@ -36,11 +31,9 @@
]
},
"devDependencies": {
"@parcel/packager-ts": "^2.5.0",
"@parcel/transformer-typescript-types": "^2.5.0",
"lint-staged": "^12.3.4",
"prettier": "^2.6.2",
"turbo": "^1.2.8",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"turbo": "^1.4.7",
"yorkie": "^2.0.0"
}
}
3 changes: 2 additions & 1 deletion packages/app/.umirc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export default defineConfig({
antd: { import: false },
locale: { default: 'zh-CN', antd: true, baseNavigator: true },
polyfill: { imports: ['core-js/features/promise/try'] },
extraBabelPlugins,
extraBabelPlugins,
// @ts-ignore
chainWebpack,
conventionRoutes,
define: { $runtime: { BASE: process.env.BASE } }
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/Chart/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { injectable } from 'tsyringe'
import { GlobalModel } from '@/context/app'
import { Namespace } from '@/models'
import { ColumnUtils, Common } from '@/services'
import { filterEmpty } from '@yaoapp/utils'
import { filterEmpty } from '@/knife'

import Service from './services'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/Chart/services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from 'axios'
import { injectable } from 'tsyringe'

import { catchError } from '@yaoapp/utils'
import { catchError } from '@/knife'

import type { Response } from '@/types'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/Form/services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from 'axios'
import { injectable } from 'tsyringe'

import { catchError } from '@yaoapp/utils'
import { catchError } from '@/knife'

import type { Response } from '@/types'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { toJS } from 'mobx'

import { X } from '@/components'
import { CheckOutlined } from '@ant-design/icons'
import { hidePopover } from '@yaoapp/utils'
import { hidePopover } from '@/knife'

import ViewContent from '../ViewContent'
import getPlacement from './getPlacement'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/PureTable/utils/getRender.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import EditPopover from '../components/EditPopover'
import ViewContent from '../components/ViewContent'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/PureTable/utils/getText.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import type { Common } from '@/types'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deepEqual, getDeepValue } from '@yaoapp/utils'
import { deepEqual, getDeepValue } from '@/knife'

import type { Common } from '@/types'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deepEqual, getDeepValue } from '@yaoapp/utils'
import { deepEqual, getDeepValue } from '@/knife'

import type { Common } from '@/types'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/Table/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { injectable } from 'tsyringe'
import { GlobalModel } from '@/context/app'
import { Namespace } from '@/models'
import { ColumnUtils, Common, Table } from '@/services'
import { filterEmpty } from '@yaoapp/utils'
import { filterEmpty } from '@/knife'

import Service from './services'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/base/Table/services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from 'axios'
import { injectable } from 'tsyringe'

import { catchError } from '@yaoapp/utils'
import { catchError } from '@/knife'

import type { Response } from '@/types'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/Bar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BarChart } from 'echarts/charts'
import { AriaComponent, GridComponent, TitleComponent, TooltipComponent } from 'echarts/components'
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { observer } from 'mobx-react-lite'
import { useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/Funnel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FunnelChart } from 'echarts/charts'
import {
AriaComponent, LegendComponent, TitleComponent, TooltipComponent
} from 'echarts/components'
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { observer } from 'mobx-react-lite'
import { useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/Funnel/useChart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { useLayoutEffect } from 'react'

import { dark, light } from '@/components/chart/theme'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/Line/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LineChart } from 'echarts/charts'
import { AriaComponent, GridComponent, TitleComponent, TooltipComponent } from 'echarts/components'
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { observer } from 'mobx-react-lite'
import { useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/LineBar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BarChart, LineChart } from 'echarts/charts'
import { AriaComponent, GridComponent, TitleComponent, TooltipComponent } from 'echarts/components'
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { observer } from 'mobx-react-lite'
import { useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/NumberChart/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import clsx from 'clsx'
import { BarChart, LineChart } from 'echarts/charts'
import { AriaComponent, GridComponent, TitleComponent, TooltipComponent } from 'echarts/components'
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { observer } from 'mobx-react-lite'
import { useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/Pie/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PieChart } from 'echarts/charts'
import {
AriaComponent, LegendComponent, TitleComponent, TooltipComponent
} from 'echarts/components'
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { observer } from 'mobx-react-lite'
import { useRef } from 'react'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/chart/Pie/useChart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { useLayoutEffect } from 'react'

import { dark, light } from '@/components/chart/theme'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import clsx from 'clsx'
import { Fragment, useEffect, useState } from 'react'

import { Icon } from '@/widgets'
import { hidePopover } from '@yaoapp/utils'
import { hidePopover } from '@/knife'

import { useColumns } from '../hooks'
import Children from './Children'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/edit/Table/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import clsx from 'clsx'

import Table from '@/components/base/Table'
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import styles from './index.less'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/edit/Upload/components/Video.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DeleteOutlined } from '@ant-design/icons'
import { getFileSrc } from '@yaoapp/utils'
import { getFileSrc } from '@/knife'

import type { IPropsVideo } from '../types'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/edit/Upload/hooks/useList.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react'

import { getFileSrc } from '@yaoapp/utils'
import { getFileSrc } from '@/knife'

import type { IProps } from '../types'
import type { UploadFile } from 'antd/lib/upload/interface'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/edit/Upload/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Upload } from 'antd'
import clsx from 'clsx'

import { Item } from '@/components'
import { getToken } from '@yaoapp/utils'
import { getToken } from '@/knife'

import UploadBtn from './components/UploadBtn'
import filemap from './filemap'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/view/A/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Tooltip } from 'antd'

import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import styles from './index.less'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/view/Image/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Image } from 'antd'

import { getFileSrc } from '@yaoapp/utils'
import { getFileSrc } from '@/knife'

import styles from './index.less'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/view/Tag/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import qs from 'query-string'
import store from 'store2'
import { injectable } from 'tsyringe'

import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import Service from './services'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/view/Tag/services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from 'axios'
import { injectable } from 'tsyringe'

import { catchError } from '@yaoapp/utils'
import { catchError } from '@/knife'

import type { Response } from '@/types'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/view/Tooltip/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Tooltip } from 'antd'

import { Icon } from '@/widgets'
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import type { Component } from '@/types'
import type { TooltipProps } from 'antd'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/hooks/chart/useAxisChart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import echarts from 'echarts/core'
import * as echarts from 'echarts/core'
import { useLayoutEffect } from 'react'

import { dark, light } from '@/components/chart/theme'
Expand Down
2 changes: 1 addition & 1 deletion packages/app/hooks/useAction/actions/Common/historyPush.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UrlPattern from 'url-pattern'

import { history } from '@umijs/max'
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import type { Component, Action } from '@/types'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/hooks/useAction/actions/Table/save.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import { showConfirm } from '../../utils'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/hooks/useActionDisabled.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useFn } from '@/hooks'
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import type { Action } from '@/types'

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/app/layouts/components/Menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useEffect, useState } from 'react'

import { Icon } from '@/widgets'
import { history, Link } from '@umijs/max'
import { fuzzyQuery } from '@yaoapp/utils'
import { fuzzyQuery } from '@/knife'

import styles from './index.less'

Expand Down
2 changes: 1 addition & 1 deletion packages/app/models/remote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import store from 'store2'
import { injectable } from 'tsyringe'

import { Remote } from '@/services'
import { getDeepValue } from '@yaoapp/utils'
import { getDeepValue } from '@/knife'

import type { Component, Global } from '@/types'

Expand Down
Loading

0 comments on commit f8765ea

Please sign in to comment.