From 2bfbe5f86ef08e41b569f830a6c6e5cb904e6dae Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Wed, 10 Nov 2021 17:00:02 +0800 Subject: [PATCH] chore: merge @vant/lazyload into main package --- packages/vant-lazyload/.eslintignore | 1 - packages/vant-lazyload/README.md | 27 ------------ packages/vant-lazyload/babel.config.js | 3 -- packages/vant-lazyload/package.json | 42 ------------------- packages/vant-lazyload/rollup.config.js | 22 ---------- packages/vant/package.json | 1 - packages/vant/src/lazyload/index.ts | 2 +- .../src/lazyload/vue-lazyload}/index.d.ts | 2 +- .../src/lazyload/vue-lazyload}/index.js | 4 ++ .../lazyload/vue-lazyload}/lazy-component.js | 0 .../lazyload/vue-lazyload}/lazy-container.js | 0 .../src/lazyload/vue-lazyload}/lazy-image.js | 0 .../src/lazyload/vue-lazyload}/lazy.js | 0 .../src/lazyload/vue-lazyload}/listener.js | 0 .../src/lazyload/vue-lazyload}/util.js | 0 packages/vant/tsconfig.declaration.json | 7 +++- pnpm-lock.yaml | 23 ---------- 17 files changed, 12 insertions(+), 122 deletions(-) delete mode 100644 packages/vant-lazyload/.eslintignore delete mode 100644 packages/vant-lazyload/README.md delete mode 100644 packages/vant-lazyload/babel.config.js delete mode 100644 packages/vant-lazyload/package.json delete mode 100644 packages/vant-lazyload/rollup.config.js rename packages/{vant-lazyload/types => vant/src/lazyload/vue-lazyload}/index.d.ts (97%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/index.js (90%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/lazy-component.js (100%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/lazy-container.js (100%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/lazy-image.js (100%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/lazy.js (100%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/listener.js (100%) rename packages/{vant-lazyload/src => vant/src/lazyload/vue-lazyload}/util.js (100%) diff --git a/packages/vant-lazyload/.eslintignore b/packages/vant-lazyload/.eslintignore deleted file mode 100644 index a65b41774..000000000 --- a/packages/vant-lazyload/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -lib diff --git a/packages/vant-lazyload/README.md b/packages/vant-lazyload/README.md deleted file mode 100644 index ac29c7b79..000000000 --- a/packages/vant-lazyload/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# @vant/lazyload - -This is a fork of [vue-lazyload](https://github.com/hilongjw/vue-lazyload) with Vue 3 support. - -## Install - -```shell -yarn add @vant/lazyload -``` - -## Usage - -```js -import { createApp } from 'vue'; -import { LazyLoad } from '@vant/lazyload'; - -const app = createApp(); -app.use(LazyLoad); -``` - -## API - -see: https://github.com/hilongjw/vue-lazyload - -## TODO - -support TypeScript. diff --git a/packages/vant-lazyload/babel.config.js b/packages/vant-lazyload/babel.config.js deleted file mode 100644 index 3022f59d1..000000000 --- a/packages/vant-lazyload/babel.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - presets: [['@vant/cli/preset.cjs', { loose: true }]], -}; diff --git a/packages/vant-lazyload/package.json b/packages/vant-lazyload/package.json deleted file mode 100644 index 65c1d6acd..000000000 --- a/packages/vant-lazyload/package.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "@vant/lazyload", - "version": "1.4.0", - "description": "This is a fork of vue-lazyload", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "types/index.d.ts", - "publishConfig": { - "access": "public", - "registry": "https://registry.npmjs.org/" - }, - "files": [ - "dist", - "types" - ], - "scripts": { - "dev": "rollup --config rollup.config.js --watch", - "build": "rollup --config rollup.config.js", - "release": "pnpm build && release-it", - "prepare": "pnpm build" - }, - "license": "MIT", - "repository": "https://github.com/youzan/vant/tree/dev/packages/vant-lazyload", - "dependencies": { - "@vant/use": "^1.3.2" - }, - "devDependencies": { - "vue": "3.x", - "@vue/runtime-core": "3.x", - "@vant/cli": "workspace:*", - "@rollup/plugin-babel": "^5.2.1", - "@rollup/plugin-node-resolve": "^10.0.0", - "release-it": "^14.2.2", - "rollup": "^2.33.3" - }, - "release-it": { - "git": { - "tag": false, - "commitMessage": "release: @vant/lazyload ${version}" - } - } -} diff --git a/packages/vant-lazyload/rollup.config.js b/packages/vant-lazyload/rollup.config.js deleted file mode 100644 index 3e8f5dc08..000000000 --- a/packages/vant-lazyload/rollup.config.js +++ /dev/null @@ -1,22 +0,0 @@ -import path from 'path'; -import babel from '@rollup/plugin-babel'; -import nodeResolve from '@rollup/plugin-node-resolve'; - -export default { - input: path.join(__dirname, 'src', 'index.js'), - output: [ - { - dir: 'dist/cjs', - format: 'cjs', - }, - { - dir: 'dist/esm', - format: 'esm', - }, - ], - external: ['vue', '@vant/use'], - plugins: [ - babel({ babelHelpers: 'bundled', extensions: ['.js', '.ts'] }), - nodeResolve(), - ], -}; diff --git a/packages/vant/package.json b/packages/vant/package.json index 44301ca14..1346b71a9 100644 --- a/packages/vant/package.json +++ b/packages/vant/package.json @@ -45,7 +45,6 @@ "license": "MIT", "dependencies": { "@vant/icons": "^1.7.1", - "@vant/lazyload": "^1.4.0", "@vant/popperjs": "^1.1.0", "@vant/use": "^1.3.2" }, diff --git a/packages/vant/src/lazyload/index.ts b/packages/vant/src/lazyload/index.ts index 50e60fb46..c3184109b 100644 --- a/packages/vant/src/lazyload/index.ts +++ b/packages/vant/src/lazyload/index.ts @@ -1,4 +1,4 @@ -import { Lazyload } from '@vant/lazyload'; +import { Lazyload } from './vue-lazyload'; export default Lazyload; export { Lazyload }; diff --git a/packages/vant-lazyload/types/index.d.ts b/packages/vant/src/lazyload/vue-lazyload/index.d.ts similarity index 97% rename from packages/vant-lazyload/types/index.d.ts rename to packages/vant/src/lazyload/vue-lazyload/index.d.ts index 896f17045..d607bad3a 100644 --- a/packages/vant-lazyload/types/index.d.ts +++ b/packages/vant/src/lazyload/vue-lazyload/index.d.ts @@ -1,4 +1,4 @@ -import { App } from 'vue'; +import type { App } from 'vue'; declare type ListenEvent = | 'scroll' diff --git a/packages/vant-lazyload/src/index.js b/packages/vant/src/lazyload/vue-lazyload/index.js similarity index 90% rename from packages/vant-lazyload/src/index.js rename to packages/vant/src/lazyload/vue-lazyload/index.js index 9715734a6..209186859 100644 --- a/packages/vant-lazyload/src/index.js +++ b/packages/vant/src/lazyload/vue-lazyload/index.js @@ -1,3 +1,7 @@ +/** + * This is a fork of [vue-lazyload](https://github.com/hilongjw/vue-lazyload) with Vue 3 support. + */ + import Lazy from './lazy'; import LazyComponent from './lazy-component'; import LazyContainer from './lazy-container'; diff --git a/packages/vant-lazyload/src/lazy-component.js b/packages/vant/src/lazyload/vue-lazyload/lazy-component.js similarity index 100% rename from packages/vant-lazyload/src/lazy-component.js rename to packages/vant/src/lazyload/vue-lazyload/lazy-component.js diff --git a/packages/vant-lazyload/src/lazy-container.js b/packages/vant/src/lazyload/vue-lazyload/lazy-container.js similarity index 100% rename from packages/vant-lazyload/src/lazy-container.js rename to packages/vant/src/lazyload/vue-lazyload/lazy-container.js diff --git a/packages/vant-lazyload/src/lazy-image.js b/packages/vant/src/lazyload/vue-lazyload/lazy-image.js similarity index 100% rename from packages/vant-lazyload/src/lazy-image.js rename to packages/vant/src/lazyload/vue-lazyload/lazy-image.js diff --git a/packages/vant-lazyload/src/lazy.js b/packages/vant/src/lazyload/vue-lazyload/lazy.js similarity index 100% rename from packages/vant-lazyload/src/lazy.js rename to packages/vant/src/lazyload/vue-lazyload/lazy.js diff --git a/packages/vant-lazyload/src/listener.js b/packages/vant/src/lazyload/vue-lazyload/listener.js similarity index 100% rename from packages/vant-lazyload/src/listener.js rename to packages/vant/src/lazyload/vue-lazyload/listener.js diff --git a/packages/vant-lazyload/src/util.js b/packages/vant/src/lazyload/vue-lazyload/util.js similarity index 100% rename from packages/vant-lazyload/src/util.js rename to packages/vant/src/lazyload/vue-lazyload/util.js diff --git a/packages/vant/tsconfig.declaration.json b/packages/vant/tsconfig.declaration.json index 625bb2adc..b617d2332 100644 --- a/packages/vant/tsconfig.declaration.json +++ b/packages/vant/tsconfig.declaration.json @@ -6,5 +6,10 @@ "emitDeclarationOnly": true }, "include": ["es/**/*", "lib/**/*"], - "exclude": ["node_modules", "**/test/**/*", "**/demo/**/*"] + "exclude": [ + "node_modules", + "**/test/**/*", + "**/demo/**/*", + "**/vue-lazyload/*" + ] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e31e9d03..a04714724 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,7 +48,6 @@ importers: '@vant/area-data': ^1.1.3 '@vant/cli': ^4.0.0-beta.5 '@vant/icons': ^1.7.1 - '@vant/lazyload': ^1.4.0 '@vant/popperjs': ^1.1.0 '@vant/use': ^1.3.2 '@vue/compiler-sfc': ^3.2.20 @@ -58,7 +57,6 @@ importers: vue-router: ^4.0.12 dependencies: '@vant/icons': link:../vant-icons - '@vant/lazyload': link:../vant-lazyload '@vant/popperjs': link:../vant-popperjs '@vant/use': link:../vant-use devDependencies: @@ -219,27 +217,6 @@ importers: devDependencies: release-it: 14.11.6 - packages/vant-lazyload: - specifiers: - '@rollup/plugin-babel': ^5.2.1 - '@rollup/plugin-node-resolve': ^10.0.0 - '@vant/cli': workspace:* - '@vant/use': ^1.3.2 - '@vue/runtime-core': 3.x - release-it: ^14.2.2 - rollup: ^2.33.3 - vue: 3.x - dependencies: - '@vant/use': link:../vant-use - devDependencies: - '@rollup/plugin-babel': 5.3.0_rollup@2.59.0 - '@rollup/plugin-node-resolve': 10.0.0_rollup@2.59.0 - '@vant/cli': link:../vant-cli - '@vue/runtime-core': 3.2.21 - release-it: 14.11.6 - rollup: 2.59.0 - vue: 3.2.21 - packages/vant-markdown-loader: specifiers: front-matter: ^4.0.2