diff --git a/packages/cli/package.json b/packages/cli/package.json index 94585d1e..786f99c1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -14,7 +14,8 @@ }, "files": [ "bin", - "lib" + "lib", + "src" ], "engines": { "node": ">=18" diff --git a/packages/core/package.json b/packages/core/package.json index 7ca64aa9..a9519372 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/core", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-core.umd.cjs", "module": "dist/tmagic-core.js", "types": "types/index.d.ts", @@ -22,7 +19,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/data-source/package.json b/packages/data-source/package.json index e945703f..56e30005 100644 --- a/packages/data-source/package.json +++ b/packages/data-source/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/data-source", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-data-source.umd.cjs", "module": "dist/tmagic-data-source.js", "types": "types/index.d.ts", @@ -18,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/dep/package.json b/packages/dep/package.json index 21a56c37..65087029 100644 --- a/packages/dep/package.json +++ b/packages/dep/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/dep", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-dep.umd.cjs", "module": "dist/tmagic-dep.js", "types": "types/index.d.ts", @@ -18,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/design/package.json b/packages/design/package.json index 602f0f12..53e1d1e5 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/design", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-design.umd.cjs", "module": "dist/tmagic-design.js", "types": "types/index.d.ts", @@ -18,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/editor/package.json b/packages/editor/package.json index 09b8c221..df9596a4 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -3,7 +3,6 @@ "name": "@tmagic/editor", "type": "module", "sideEffects": [ - "dist/*", "src/theme/*" ], "main": "dist/tmagic-editor.umd.cjs", @@ -24,7 +23,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/element-plus-adapter/package.json b/packages/element-plus-adapter/package.json index 6dad9092..84f80179 100644 --- a/packages/element-plus-adapter/package.json +++ b/packages/element-plus-adapter/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/element-plus-adapter", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-element-plus-adapter.umd.cjs", "module": "dist/tmagic-element-plus-adapter.js", "types": "types/index.d.ts", @@ -18,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/form/package.json b/packages/form/package.json index 7a0c8c56..dc3fa2e9 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -3,7 +3,6 @@ "name": "@tmagic/form", "type": "module", "sideEffects": [ - "dist/*", "src/theme/*" ], "main": "dist/tmagic-form.umd.cjs", @@ -24,7 +23,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/schema/package.json b/packages/schema/package.json index 363ca6e2..f1a151d8 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -2,7 +2,6 @@ "version": "1.4.8", "name": "@tmagic/schema", "type": "module", - "sideEffects": false, "main": "dist/tmagic-schema.umd.cjs", "module": "dist/tmagic-schema.js", "types": "types/index.d.ts", @@ -16,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "scripts": { "build": "npm run build:type && vite build", diff --git a/packages/stage/package.json b/packages/stage/package.json index dbde6ad2..ff14f6af 100644 --- a/packages/stage/package.json +++ b/packages/stage/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/stage", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-stage.umd.cjs", "module": "dist/tmagic-stage.js", "types": "types/index.d.ts", @@ -18,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/table/package.json b/packages/table/package.json index 130b85f2..a48a2392 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/table", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-table.umd.cjs", "module": "dist/tmagic-table.js", "types": "types/index.d.ts", @@ -22,7 +19,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/tdesign-vue-next-adapter/package.json b/packages/tdesign-vue-next-adapter/package.json index 31bf3206..88f2f2ba 100644 --- a/packages/tdesign-vue-next-adapter/package.json +++ b/packages/tdesign-vue-next-adapter/package.json @@ -2,9 +2,6 @@ "version": "1.4.8", "name": "@tmagic/tdesign-vue-next-adapter", "type": "module", - "sideEffects": [ - "dist/*" - ], "main": "dist/tmagic-tdesign-vue-next-adapter.umd.cjs", "module": "dist/tmagic-tdesign-vue-next-adapter.js", "types": "types/index.d.ts", @@ -18,7 +15,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 5d2303dd..d34a4369 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -18,7 +18,8 @@ }, "files": [ "dist", - "types" + "types", + "src" ], "license": "Apache-2.0", "scripts": { diff --git a/runtime/tmagic-form/package.json b/runtime/tmagic-form/package.json index 7bb379f9..a3239d3f 100644 --- a/runtime/tmagic-form/package.json +++ b/runtime/tmagic-form/package.json @@ -32,14 +32,14 @@ "url": "https://github.com/Tencent/tmagic-editor.git" }, "peerDependencies": { - "@tmagic/core": "workspace:*", - "@tmagic/editor": "workspace:*", - "@tmagic/form": "workspace:*", - "@tmagic/utils": "workspace:*", - "@tmagic/schema": "workspace:*", - "@tmagic/stage": "workspace:*", - "element-plus": "^2.7.5", - "vue": "^3.4.27" + "@tmagic/core": ">=1.4.8", + "@tmagic/editor": ">=1.4.8", + "@tmagic/form": ">=1.4.8", + "@tmagic/utils": ">=1.4.8", + "@tmagic/schema": ">=1.4.8", + "@tmagic/stage": ">=1.4.8", + "element-plus": ">=2.7.5", + "vue": ">=3.4.27" }, "devDependencies": { "@types/node": "^18.19.0", diff --git a/runtime/vue-runtime-help/package.json b/runtime/vue-runtime-help/package.json index 96096063..e7b7e32d 100644 --- a/runtime/vue-runtime-help/package.json +++ b/runtime/vue-runtime-help/package.json @@ -32,11 +32,11 @@ "vue-demi": "^0.14.7" }, "peerDependencies": { - "@tmagic/core": "workspace:*", - "@tmagic/data-source": "workspace:*", - "@tmagic/schema": "workspace:*", - "@tmagic/stage": "workspace:*", - "@tmagic/utils": "workspace:*", + "@tmagic/core": ">=1.4.8", + "@tmagic/data-source": ">=1.4.8", + "@tmagic/schema": ">=1.4.8", + "@tmagic/stage": ">=1.4.8", + "@tmagic/utils": ">=1.4.8", "@vue/composition-api": ">=1.7.2", "typescript": "*", "vue": ">=2.0.0 || >=3.0.0" diff --git a/scripts/release.mjs b/scripts/release.mjs index 0319700f..459db3c9 100644 --- a/scripts/release.mjs +++ b/scripts/release.mjs @@ -187,6 +187,17 @@ async function main() { } } + if (!skipGit) { + const { stdout } = await run('git', ['diff'], { stdio: 'pipe' }); + if (stdout) { + step('\nCommitting changes...'); + await runIfNotDry('git', ['add', '-A']); + await runIfNotDry('git', ['commit', '-m', `chore: release v${targetVersion}`, '--verify']); + } else { + console.log('No changes to commit.'); + } + } + // publish packages step('\nPublishing packages...'); @@ -194,7 +205,9 @@ async function main() { if (isDryRun) { additionalPublishFlags.push('--dry-run'); } - + if (isDryRun || skipGit) { + additionalPublishFlags.push('--no-git-checks'); + } // bypass the pnpm --publish-branch restriction which isn't too useful to us // otherwise it leads to a prompt and blocks the release script const branch = await getBranch(); @@ -215,7 +228,7 @@ async function main() { if (stdout) { step('\nCommitting changes...'); await runIfNotDry('git', ['add', '-A']); - await runIfNotDry('git', ['commit', '-m', `chore: release v${targetVersion}`, '--verify']); + await runIfNotDry('git', ['commit', '-m', `chore: update lockfile v${targetVersion}`, '--verify']); } else { console.log('No changes to commit.'); } @@ -362,14 +375,7 @@ async function publishPackage(pkgName, version, additionalFlags) { // workspace:* deps await run( 'pnpm', - [ - 'publish', - ...(releaseTag ? ['--tag', releaseTag] : []), - '--access', - 'public', - '--no-git-checks', - ...additionalFlags, - ], + ['publish', ...(releaseTag ? ['--tag', releaseTag] : []), '--access', 'public', ...additionalFlags], { cwd: getPkgRoot(pkgName), stdio: 'pipe',