Skip to content

Fix/cli template bundle #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yy-wow wants to merge 5 commits into from
Closed

Fix/cli template bundle #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e32b9b3
v2.2.0-beta.0
chilingling Jan 16, 2025
33a42f8
fix: remove pnpm cache for release workflow
chilingling Jan 16, 2025
d2fc9b1
v2.2.0-beta.1
chilingling Jan 16, 2025
bacd299
fix: fix the error of routing bar caused by invalid pageid (#1045)
gene9831 Jan 16, 2025
5ae12e3
fix: update template bundle
yy-wow Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/Release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'pnpm'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion designer-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "designer-demo",
"private": true,
"version": "2.1.0",
"version": "2.2.0-beta.1",
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot Jan 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Align workspace dependency patterns with project convention

The codebase predominantly uses workspace:* for internal dependencies. Consider updating the following in designer-demo/package.json to match this pattern:

  • @opentiny/tiny-engine: workspace:^ → workspace:*
  • @opentiny/tiny-engine-mock: workspace:^ → workspace:*
  • @opentiny/tiny-engine-vite-config: workspace:^ → workspace:*
🔗 Analysis chain

Review workspace dependency versioning strategy.

While the version update to 2.2.0-beta.1 is consistent, consider:

  1. The use of ^ for workspace dependencies might lead to version mismatches
  2. Ensure all @opentiny/vue packages at ~3.14.0 are compatible with Vue 3.4.21
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for potential version conflicts in workspace dependencies
echo "Checking workspace dependency patterns..."
jq -r '.dependencies + .devDependencies | to_entries[] | select(.value | startswith("workspace")) | "\(.key): \(.value)"' designer-demo/package.json

Length of output: 499

Script:

#!/bin/bash
# Check for workspace dependency patterns in all package.json files
echo "Checking all package.json files for workspace dependencies..."
fd package.json --type f --exclude node_modules --exec sh -c 'echo "\n=== $1 ==="; jq -r ".dependencies + .devDependencies | to_entries[] | select(.value | startswith(\"workspace\")) | \"\(.key): \(.value)\"" "$1"' sh {}

Length of output: 13435

"type": "module",
"scripts": {
"dev": "cross-env VITE_THEME=light vite",
Expand Down
2 changes: 1 addition & 1 deletion mockServer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-mock",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/block-compiler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-block-compiler",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/blockToWebComponentTemplate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-block-build",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"description": "translate block to webcomponent template",
"main": "./dist/web-components.es.js",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/build/vite-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-vite-config",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"description": "",
"type": "module",
"main": "./index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/build/vite-plugin-meta-comments/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"description": "",
"type": "module",
"main": "dist/index.cjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/builtinComponent/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-builtin-component",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"description": "",
"main": "dist/index.mjs",
"module": "dist/index.mjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-canvas",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"publishConfig": {
"access": "public"
},
Expand Down
24 changes: 14 additions & 10 deletions packages/canvas/route-bar/src/CanvasRouteBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,20 @@ watch(
}
const ancestors = (await getAncestors(value, true)) || []

routes.value = ancestors.concat(value).map((id) => {
const { route, isPage } = pageSettingState.treeDataMapping[id]
return {
id,
route: route
.replace(/\/+/g, '/') // 替换连续的 '/' 为单个 '/'
.replace(/^\/|\/$/g, ''), // 去掉开头和结尾的 '/'
isPage
}
})
routes.value = ancestors
.concat(value)
.map((id) => pageSettingState.treeDataMapping[id])
.filter((item) => Boolean(item))
.map((pageData) => {
const { id, route, isPage } = pageData
return {
id,
route: route
.replace(/\/+/g, '/') // 替换连续的 '/' 为单个 '/'
.replace(/^\/|\/$/g, ''), // 去掉开头和结尾的 '/'
isPage
}
})
},
{ immediate: true }
)
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-common",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/configurator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-configurator",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"description": "",
"main": "dist/index.js",
"module": "dist/index.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/design-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"type": "module",
"description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.",
"homepage": "https://opentiny.design/tiny-engine",
Expand Down Expand Up @@ -76,7 +76,6 @@
"@opentiny/tiny-engine-toolbar-fullscreen": "workspace:*",
"@opentiny/tiny-engine-toolbar-generate-code": "workspace:*",
"@opentiny/tiny-engine-toolbar-lang": "workspace:*",
"@opentiny/tiny-engine-toolbar-view-setting": "workspace:*",
"@opentiny/tiny-engine-toolbar-layout": "workspace:*",
"@opentiny/tiny-engine-toolbar-lock": "workspace:*",
"@opentiny/tiny-engine-toolbar-logo": "workspace:*",
Expand All @@ -87,6 +86,7 @@
"@opentiny/tiny-engine-toolbar-refresh": "workspace:*",
"@opentiny/tiny-engine-toolbar-save": "workspace:*",
"@opentiny/tiny-engine-toolbar-setting": "workspace:*",
"@opentiny/tiny-engine-toolbar-view-setting": "workspace:*",
"@opentiny/tiny-engine-utils": "workspace:*",
"@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
"@opentiny/tiny-engine-webcomponent-core": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentiny/tiny-engine-cli",
"version": "2.1.0",
"version": "2.2.0-beta.1",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand Down
Loading