From 89c80e818cb56325eba2624839d07c66a1c046b2 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 2 Feb 2019 10:08:21 +0800 Subject: [PATCH] [improvement] Remove create & i18 mixin (#2670) --- docs/src/demo-common.js | 2 +- {packages/mixins => docs/src/utils}/i18n.js | 2 +- packages/utils/create-basic.js | 18 ------------------ packages/utils/create.js | 18 ------------------ 4 files changed, 2 insertions(+), 38 deletions(-) rename {packages/mixins => docs/src/utils}/i18n.js (91%) delete mode 100644 packages/utils/create-basic.js delete mode 100644 packages/utils/create.js diff --git a/docs/src/demo-common.js b/docs/src/demo-common.js index ad9528273..73a2380df 100644 --- a/docs/src/demo-common.js +++ b/docs/src/demo-common.js @@ -5,7 +5,7 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import VantDoc, { DemoBlock, DemoSection } from '@vant/doc'; -import i18n from '../../packages/mixins/i18n'; +import i18n from './utils/i18n'; import Vant, { Lazyload, Locale } from '../../packages'; import { camelize } from '../../packages/utils'; diff --git a/packages/mixins/i18n.js b/docs/src/utils/i18n.js similarity index 91% rename from packages/mixins/i18n.js rename to docs/src/utils/i18n.js index b4ed84aa2..b595c4678 100644 --- a/packages/mixins/i18n.js +++ b/docs/src/utils/i18n.js @@ -1,5 +1,5 @@ // component mixin -import { get, camelize } from '../utils'; +import { get, camelize } from '../../../packages/utils'; export default { computed: { diff --git a/packages/utils/create-basic.js b/packages/utils/create-basic.js deleted file mode 100644 index 286e0aabc..000000000 --- a/packages/utils/create-basic.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Create a basic component with common options - */ -import useSfc from './use/sfc'; -import useBem from './use/bem'; -import i18n from '../mixins/i18n'; -import { isDef } from '.'; - -export default function (sfc) { - sfc = useSfc('van-' + sfc.name)(sfc); - sfc.mixins = sfc.mixins || []; - sfc.mixins.push(i18n); - sfc.methods = sfc.methods || {}; - sfc.methods.isDef = isDef; - sfc.methods.b = useBem(sfc.name); - - return sfc; -} diff --git a/packages/utils/create.js b/packages/utils/create.js deleted file mode 100644 index ff6e3a0b6..000000000 --- a/packages/utils/create.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Create a component with common options - */ -import createBasic from './create-basic'; -import Icon from '../icon'; -import Loading from '../loading'; -import Cell from '../cell'; -import CellGroup from '../cell-group'; - -export default function (sfc) { - sfc.components = Object.assign(sfc.components || {}, { - Icon, - Loading, - Cell, - CellGroup - }); - return createBasic(sfc); -}