From e80e0330548eb2b3953869b3f8d3a9cafd4e07be Mon Sep 17 00:00:00 2001 From: chenshenhai Date: Sun, 9 Jun 2024 22:59:47 +0800 Subject: [PATCH 1/2] fix: fix idraw dts issue --- packages/idraw/src/idraw.ts | 5 +++-- scripts/build-module.ts | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/idraw/src/idraw.ts b/packages/idraw/src/idraw.ts index 8aab57ebb..00701042d 100644 --- a/packages/idraw/src/idraw.ts +++ b/packages/idraw/src/idraw.ts @@ -284,9 +284,10 @@ export class iDraw { store.destroy(); } - getViewCenter() { + getViewCenter(): PointSize { const { viewScaleInfo, viewSizeInfo } = this.getViewInfo(); - return calcViewCenter({ viewScaleInfo, viewSizeInfo }); + const pointSize: PointSize = calcViewCenter({ viewScaleInfo, viewSizeInfo }); + return pointSize; } $onBoardWatcherEvents() { diff --git a/scripts/build-module.ts b/scripts/build-module.ts index f6df033c0..c94b10f9b 100644 --- a/scripts/build-module.ts +++ b/scripts/build-module.ts @@ -2,6 +2,7 @@ import ts from 'typescript'; import { Project } from 'ts-morph'; import type { CompilerOptions } from 'ts-morph'; import path from 'path'; +import fs from 'fs'; import * as glob from 'glob'; import { packages } from './config'; import { joinPackagePath } from './util/project'; @@ -18,10 +19,28 @@ async function build() { console.log(`Remove packages/${dirName}/dist/`); removeFullDir(`${pkgDir}/dist`); buildPackage(dirName); + checkPackageDts(dirName); console.log(`Build ESM of ${dirName} successfully!`); } } +function checkPackageDts(dirName: string) { + console.log(`Checking dts files for ${dirName} ...`); + const pattern = '**/*.js'; + const cwd = joinPackagePath(dirName, 'dist'); + const files = glob.sync(pattern, { cwd }); + + for (let i = 0; i < files.length; i++) { + const jsFilePath = files[i]; + const dtsFilePath = jsFilePath.replace(/.js$/, '.d.ts'); + const dtsAbsolutePath = path.join(cwd, dtsFilePath); + if (!(fs.existsSync(dtsAbsolutePath) && fs.statSync(dtsAbsolutePath).isFile())) { + throw Error(`ERROR: lack ${dirName}/dist/${dtsFilePath} `); + } + } + console.log(`Check dts files of ${dirName} successfully!`); +} + function buildPackage(dirName: string) { const pattern = '**/*.ts'; const cwd = joinPackagePath(dirName, 'src'); @@ -37,7 +56,6 @@ function buildPackage(dirName: string) { // const compilerOptions = tsConfig.compilerOptions; const compilerOptions: CompilerOptions = { noUnusedLocals: true, - declaration: true, sourceMap: false, target: ts.ScriptTarget.ES2015, From ee87f3c2e62cd3cf649a980c65867e93b36150c2 Mon Sep 17 00:00:00 2001 From: chenshenhai Date: Sun, 9 Jun 2024 23:04:05 +0800 Subject: [PATCH 2/2] chore: bump version 0.4.0-beta.28 --- package.json | 2 +- packages/board/package.json | 8 ++++---- packages/core/package.json | 10 +++++----- packages/figma/package.json | 8 ++++---- packages/idraw/package.json | 12 ++++++------ packages/renderer/package.json | 6 +++--- packages/types/package.json | 2 +- packages/util/package.json | 2 +- pnpm-lock.yaml | 32 ++++++++++++++++---------------- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 508371faa..3c52fa841 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": false, - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "workspaces": [ "packages/*" ], diff --git a/packages/board/package.json b/packages/board/package.json index 9c8ee1c16..3d029802a 100644 --- a/packages/board/package.json +++ b/packages/board/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/board", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "dist/esm/index.js", "module": "dist/esm/index.js", @@ -21,12 +21,12 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "workspace:^0.4.0-beta.27" + "@idraw/types": "workspace:^0.4.0-beta.28" }, "dependencies": {}, "peerDependencies": { - "@idraw/util": "workspace:^0.4.0-beta.27", - "@idraw/renderer": "workspace:^0.4.0-beta.27" + "@idraw/util": "workspace:^0.4.0-beta.28", + "@idraw/renderer": "workspace:^0.4.0-beta.28" }, "publishConfig": { "access": "public", diff --git a/packages/core/package.json b/packages/core/package.json index 4888c3ffc..a98b398e7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/core", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "dist/esm/index.js", "module": "dist/esm/index.js", @@ -21,13 +21,13 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "workspace:^0.4.0-beta.27" + "@idraw/types": "workspace:^0.4.0-beta.28" }, "dependencies": {}, "peerDependencies": { - "@idraw/board": "workspace:^0.4.0-beta.27", - "@idraw/renderer": "workspace:^0.4.0-beta.27", - "@idraw/util": "workspace:^0.4.0-beta.27" + "@idraw/board": "workspace:^0.4.0-beta.28", + "@idraw/renderer": "workspace:^0.4.0-beta.28", + "@idraw/util": "workspace:^0.4.0-beta.28" }, "publishConfig": { "access": "public", diff --git a/packages/figma/package.json b/packages/figma/package.json index fc9568776..f2c4add21 100644 --- a/packages/figma/package.json +++ b/packages/figma/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/figma", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "dist/esm/index.js", "module": "dist/esm/index.js", @@ -11,8 +11,8 @@ "dist/**/*.js" ], "dependencies": { - "@idraw/types": "workspace:^0.4.0-beta.27", - "@idraw/util": "workspace:^0.4.0-beta.27", + "@idraw/types": "workspace:^0.4.0-beta.28", + "@idraw/util": "workspace:^0.4.0-beta.28", "kiwi-schema": "^0.5.0", "matrix-inverse": "^2.0.0", "pako": "^2.1.0", @@ -20,7 +20,7 @@ }, "devDependencies": { "@types/pako": "^2.0.3", - "@idraw/types": "workspace:^0.4.0-beta.27" + "@idraw/types": "workspace:^0.4.0-beta.28" }, "repository": { "type": "git", diff --git a/packages/idraw/package.json b/packages/idraw/package.json index 3cd8d5cf2..fe473aefa 100644 --- a/packages/idraw/package.json +++ b/packages/idraw/package.json @@ -1,6 +1,6 @@ { "name": "idraw", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "dist/esm/index.js", "module": "dist/esm/index.js", @@ -22,11 +22,11 @@ "license": "MIT", "devDependencies": {}, "dependencies": { - "@idraw/board": "workspace:^0.4.0-beta.27", - "@idraw/core": "workspace:^0.4.0-beta.27", - "@idraw/renderer": "workspace:^0.4.0-beta.27", - "@idraw/types": "workspace:^0.4.0-beta.27", - "@idraw/util": "workspace:^0.4.0-beta.27" + "@idraw/board": "workspace:^0.4.0-beta.28", + "@idraw/core": "workspace:^0.4.0-beta.28", + "@idraw/renderer": "workspace:^0.4.0-beta.28", + "@idraw/types": "workspace:^0.4.0-beta.28", + "@idraw/util": "workspace:^0.4.0-beta.28" }, "publishConfig": { "access": "public", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 8e17d5b9e..a02252447 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/renderer", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "dist/esm/index.js", "module": "dist/esm/index.js", @@ -21,11 +21,11 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "workspace:^0.4.0-beta.27" + "@idraw/types": "workspace:^0.4.0-beta.28" }, "dependencies": {}, "peerDependencies": { - "@idraw/util": "workspace:^0.4.0-beta.27" + "@idraw/util": "workspace:^0.4.0-beta.28" }, "publishConfig": { "access": "public", diff --git a/packages/types/package.json b/packages/types/package.json index c5f6ac55e..a26896e57 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/types", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "src/index.ts", "types": "src/index.ts", diff --git a/packages/util/package.json b/packages/util/package.json index cee890678..e28be15dc 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/util", - "version": "0.4.0-beta.27", + "version": "0.4.0-beta.28", "description": "", "main": "dist/esm/index.js", "module": "dist/esm/index.js", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f38807c3e..a07d11d35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -138,39 +138,39 @@ importers: packages/board: dependencies: '@idraw/renderer': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../renderer '@idraw/util': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../util devDependencies: '@idraw/types': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../types packages/core: dependencies: '@idraw/board': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../board '@idraw/renderer': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../renderer '@idraw/util': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../util devDependencies: '@idraw/types': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../types packages/figma: dependencies: '@idraw/types': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../types '@idraw/util': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../util kiwi-schema: specifier: ^0.5.0 @@ -192,29 +192,29 @@ importers: packages/idraw: dependencies: '@idraw/board': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../board '@idraw/core': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../core '@idraw/renderer': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../renderer '@idraw/types': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../types '@idraw/util': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../util packages/renderer: dependencies: '@idraw/util': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../util devDependencies: '@idraw/types': - specifier: workspace:^0.4.0-beta.27 + specifier: workspace:^0.4.0-beta.28 version: link:../types packages/types: {}