Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/config provider export #773

Merged
merged 3 commits into from
Apr 20, 2022
Merged

Fix/config provider export #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c63931
fix: configProvider export error
xiaosansiji Apr 20, 2022
feba029
feat: correct language pack path
xiaosansiji Apr 20, 2022
b332023
test: update snapshot
xiaosansiji Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/config-provider/demos/calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script>
import merge from 'lodash/merge';
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';

const MONTHS = [
'January',
Expand Down
2 changes: 1 addition & 1 deletion examples/config-provider/demos/date-picker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<script>
import merge from 'lodash/merge';
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';
// import dayjs from 'dayjs';

// 全局特性配置，可以引入英文默认配置 enConfig，还可以在默认配置的基础上进行自定义配置
Expand Down
6 changes: 3 additions & 3 deletions examples/config-provider/demos/global.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<t-config-provider :global-config="globalConfig">
<div>使用<code>t-config-provider</code>包裹业务功能的最外层组件，点击下方图标查看示例代码</div>
<br />
<div>英文语言包引入路径：<code>import enConfig from 'tdesign-vue/locale/en_US';</code></div>
<div>英文语言包引入路径：<code>import enConfig from 'tdesign-vue/es/locale/en_US';</code></div>
<br />
<div>中文语言包引入路径：<code>import enConfig from 'tdesign-vue/locale/zh_CN';</code></div>
<div>中文语言包引入路径：<code>import enConfig from 'tdesign-vue/es/locale/zh_CN';</code></div>
</t-config-provider>
</template>

<script>
import merge from 'lodash/merge';
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';

export default {
data() {
Expand Down
2 changes: 1 addition & 1 deletion examples/config-provider/demos/others.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ import {
ErrorIcon, ChevronRightIcon, CloseIcon, CloseCircleIcon,
} from 'tdesign-icons-vue';
import merge from 'lodash/merge';
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';

const transferList = [];
for (let i = 0; i < 20; i++) {
Expand Down
2 changes: 1 addition & 1 deletion examples/config-provider/demos/pagination.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script>
import merge from 'lodash/merge';
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';

export default {
data() {
Expand Down
2 changes: 1 addition & 1 deletion examples/config-provider/demos/table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script lang="jsx">
import { ChevronRightIcon, CaretDownSmallIcon } from 'tdesign-icons-vue';
import merge from 'lodash/merge';
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';

const columns = [
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"build:tsc-esm": "tsc --emitDeclarationOnly -d --outDir esm/",
"build:tsc-lib": " tsc --emitDeclarationOnly -d --outDir lib/",
"postbuild": "node script/postbuild.js",
"lint:fix": "eslint --ext .vue,.js,.ts,.tsx ./ --max-warnings 0 --fix",
"lint:fix": "eslint --fix",
"lint": "npm run lint:tsc && eslint --ext .vue,.js,.ts,.tsx ./ --max-warnings 0",
"lint:tsc": "tsc --emitDeclarationOnly",
"test": "npm run test:demo && npm run test:unit && npm run test:node",
Expand Down
1 change: 1 addition & 0 deletions script/test/jest.base.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = {
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/$1',
'^tdesign-vue/lib/(.*)$': '<rootDir>/src/$1',
'^tdesign-vue/es': '<rootDir>/src',
'^tdesign-vue$': '<rootDir>/src/index.ts',
'^tdesign-vue(.*)': '<rootDir>/src/$1',
'^vue$': '<rootDir>/node_modules/vue/dist/vue.js',
Expand Down
6 changes: 3 additions & 3 deletions site/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ const publicPathMap = {
};

// https://vitejs.dev/config/
export default ({ mode }) => {
return defineConfig({
export default ({ mode }) =>
defineConfig({
base: publicPathMap[mode],
resolve: {
alias: {
'@': path.resolve(__dirname, '../'),
'@docs': path.resolve(__dirname, './docs'),
'@components': path.resolve(__dirname, './src/components'),
'@common': path.resolve(__dirname, '../src/_common'),
'tdesign-vue/es': path.resolve(__dirname, '../src'),
'tdesign-vue': path.resolve(__dirname, '../src'),
},
},
Expand All @@ -45,4 +46,3 @@ export default ({ mode }) => {
VitePWA(pwaConfig),
],
});
}
6 changes: 3 additions & 3 deletions src/config-provider/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import withInstall from '../utils/withInstall';
import _ConnfigProvider from './config-provider';
import _ConfigProvider from './config-provider';

export * from './type';
export * from './useConfig';

export type { Locale } from './context';

export const ConnfigProvider = withInstall(_ConnfigProvider);
export default ConnfigProvider;
uyarn marked this conversation as resolved.
Show resolved Hide resolved
export const ConfigProvider = withInstall(_ConfigProvider);
export default ConfigProvider;
4 changes: 2 additions & 2 deletions test/ssr/__snapshots__/ssr.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3380,8 +3380,8 @@ exports[`ssr snapshot test renders ./examples/config-provider/demos/dialog.vue c
exports[`ssr snapshot test renders ./examples/config-provider/demos/global.vue correctly 1`] = `
<div>
<div>使用<code>t-config-provider</code>包裹业务功能的最外层组件，点击下方图标查看示例代码</div> <br>
<div>英文语言包引入路径：<code>import enConfig from 'tdesign-vue/locale/en_US';</code></div> <br>
<div>中文语言包引入路径：<code>import enConfig from 'tdesign-vue/locale/zh_CN';</code></div>
<div>英文语言包引入路径：<code>import enConfig from 'tdesign-vue/es/locale/en_US';</code></div> <br>
<div>中文语言包引入路径：<code>import enConfig from 'tdesign-vue/es/locale/zh_CN';</code></div>
</div>
`;

Expand Down
4 changes: 2 additions & 2 deletions test/unit/config-provider/__snapshots__/demo.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,7 @@ exports[`ConfigProvider ConfigProvider globalVue demo works fine 1`] = `
<div>
英文语言包引入路径：
<code>
import enConfig from 'tdesign-vue/locale/en_US';
import enConfig from 'tdesign-vue/es/locale/en_US';
</code>
</div>

Expand All @@ -1455,7 +1455,7 @@ exports[`ConfigProvider ConfigProvider globalVue demo works fine 1`] = `
<div>
中文语言包引入路径：
<code>
import enConfig from 'tdesign-vue/locale/zh_CN';
import enConfig from 'tdesign-vue/es/locale/zh_CN';
</code>
</div>
</div>
Expand Down