Skip to content

Commit

Permalink
Merge branch 'refactor/develop' of github.com:opentiny/tiny-engine in…
Browse files Browse the repository at this point in the history
…to panelstyle
  • Loading branch information
ianxinnew committed Aug 24, 2024
2 parents d0f9de8 + 52d2432 commit 2052573
Show file tree
Hide file tree
Showing 126 changed files with 1,584 additions and 830 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: []
pull_request:
branches: [develop,main]
branches: [develop,main, refactor/develop]

jobs:
push-check:
Expand Down
2 changes: 1 addition & 1 deletion designer-demo/env/.env.alpha
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# alpha mode, used by the "build:alpha" script

NODE_ENV=production
VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
VITE_CDN_DOMAIN=https://unpkg.com
VITE_LOCAL_IMPORT_MAPS=false
VITE_LOCAL_BUNDLE_DEPS=false
# VITE_ORIGIN=
Expand Down
2 changes: 1 addition & 1 deletion designer-demo/env/.env.production
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# prod mode, used by the "build:prod" script

NODE_ENV=production
VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
VITE_CDN_DOMAIN=https://unpkg.com
VITE_LOCAL_IMPORT_MAPS=false
VITE_LOCAL_BUNDLE_DEPS=false
#VITE_ORIGIN=
5 changes: 3 additions & 2 deletions designer-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "module",
"scripts": {
"dev": "cross-env VITE_THEME=light vite",
"build:alpha": "cross-env VITE_THEME=light vite build --mode alpha",
"build": "cross-env VITE_THEME=light vite build --mode prod"
"build:alpha": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha",
"build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build"
},
"dependencies": {
"vue": "^3.4.21",
Expand All @@ -15,6 +15,7 @@
"@opentiny/tiny-engine-theme-light": "workspace:*",
"@opentiny/vue": "~3.14.0",
"@opentiny/vue-icon": "~3.14.0",
"@opentiny/vue-locale": "~3.14.0",
"@opentiny/vue-design-smb": "~3.14.0",
"@opentiny/vue-renderless": "~3.14.0",
"@opentiny/vue-theme": "~3.14.0"
Expand Down
Loading

0 comments on commit 2052573

Please sign in to comment.