From 5a5288c9da3282df65dd419d74bef9e3c70c3967 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Wed, 3 Jan 2024 16:32:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build(util):=20umd=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=B0=86lodash-es=E6=89=93=E8=BF=9B=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/utils/package.json | 2 +- packages/utils/vite.config.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/utils/package.json b/packages/utils/package.json index 2acad6f0..de15cd5e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -18,7 +18,7 @@ }, "license": "Apache-2.0", "scripts": { - "build": "npm run build:type && vite build", + "build": "rimraf ./dist && npm run build:type && vite build --mode=es && vite build --mode=umd", "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json", "clear:type": "rimraf ./types" }, diff --git a/packages/utils/vite.config.ts b/packages/utils/vite.config.ts index 0a9c5660..32d4a571 100644 --- a/packages/utils/vite.config.ts +++ b/packages/utils/vite.config.ts @@ -16,30 +16,35 @@ * limitations under the License. */ -import { defineConfig } from 'vite'; +import { defineConfig, type LibraryFormats } from 'vite'; import pkg from './package.json'; const deps = Object.keys(pkg.dependencies); -export default defineConfig({ +export default defineConfig(({ mode }) => ({ build: { cssCodeSplit: false, sourcemap: true, minify: false, target: 'esnext', + emptyOutDir: false, lib: { entry: 'src/index.ts', name: 'TMagicUtils', + formats: ['es', 'umd', 'cjs'].includes(mode) ? [mode as LibraryFormats] : ['es', 'umd'], fileName: 'tmagic-utils', }, rollupOptions: { // 确保外部化处理那些你不想打包进库的依赖 external(id: string) { + if (mode === 'umd' && id === 'lodash-es') { + return false; + } return deps.some((k) => new RegExp(`^${k}`).test(id)); }, }, }, -}); +})); From acab44aaa4c80f7f046f738d63791e7a1dfd055d Mon Sep 17 00:00:00 2001 From: roymondchen Date: Thu, 4 Jan 2024 17:00:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(utils):=20<=3D=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/utils/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 7400c6ff..637e3867 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -300,7 +300,7 @@ export const compiledCond = (op: string, fieldValue: any, value: any, range: num case '<': return fieldValue < value; case '<=': - return fieldValue >= value; + return fieldValue <= value; case 'between': return range.length > 1 && fieldValue >= range[0] && fieldValue <= range[1]; case 'not_between':