From 9a576d53693ea0fdae0faa8729d9a304afa36687 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月19日 21:16:23 +0800 Subject: [PATCH 1/8] rename: litos-ui-vue --- README.md | 8 ++++++++ docs/css-util.md | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/README.md b/README.md index 087c58b..937cb3b 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,20 @@ export default defineConfig({ 在 `main.ts` 中引入全局 CSS 变量文件 ```js +<<<<<<< HEAD import 'litos-ui-vue/style/vars.css'; +======= +import '@asteres/litos-ui-vue/style/vars.css'; +>>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` ## 文档 +<<<<<<< HEAD [中文文档](https://dvshu.github.io/litos-ui-vue/) +======= +[中文 文档](https://dvshu.github.io/litos-ui-vue/) +>>>>>>> 0c57b7ee (rename: litos-ui-vue) ## [更新记录](https://github.com/DvShu/litos-ui-vue/blob/main/CHANGELOG.md) diff --git a/docs/css-util.md b/docs/css-util.md index 932b73c..f60fca4 100644 --- a/docs/css-util.md +++ b/docs/css-util.md @@ -4,10 +4,14 @@ ```ts <<<<<<< HEAD +<<<<<<< HEAD import 'litos-ui-vue/style/util/transition.css'; ======= import '@asteres/litos-ui-vue/style/util/transition.css';>>>>>>> 0c57b7ee (rename: litos-ui-vue) +======= +import '@asteres/litos-ui-vue/style/util/transition.css'; +>>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` setup> @@ -107,10 +111,14 @@ const show2 = ref(true) ```ts <<<<<<< HEAD +<<<<<<< HEAD import 'litos-ui-vue/style/util/animation.css'; ======= import '@asteres/litos-ui-vue/style/util/animation.css';>>>>>>> 0c57b7ee (rename: litos-ui-vue) +======= +import '@asteres/litos-ui-vue/style/util/animation.css'; +>>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` ### 使用 @@ -157,7 +165,11 @@ import '@asteres/litos-ui-vue/style/util/animation.css'; ### 引入滚动条样式表 ```ts +<<<<<<< HEAD import 'litos-ui-vue/style/util/scrollbar.css'; +======= +import '@asteres/litos-ui-vue/style/util/scrollbar.css'; +>>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` ### 使用 From 301a94e798293050e8de71f9f9937006a51b7480 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月20日 12:26:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?docs:=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 937cb3b..447bf3d 100644 --- a/README.md +++ b/README.md @@ -49,19 +49,27 @@ export default defineConfig({ ```js <<<<<<< HEAD +<<<<<<< HEAD import 'litos-ui-vue/style/vars.css'; ======= import '@asteres/litos-ui-vue/style/vars.css';>>>>>>> 0c57b7ee (rename: litos-ui-vue) +======= +import 'litos-ui-vue/style/vars.css'; +>>>>>>> f2e6fa2a (docs: 修复文档) ``` ## 文档 +<<<<<<< HEAD <<<<<<< HEAD [中文文档](https://dvshu.github.io/litos-ui-vue/) ======= [中文 文档](https://dvshu.github.io/litos-ui-vue/)>>>>>>> 0c57b7ee (rename: litos-ui-vue) +======= +[中文文档](https://dvshu.github.io/litos-ui-vue/) +>>>>>>> f2e6fa2a (docs: 修复文档) ## [更新记录](https://github.com/DvShu/litos-ui-vue/blob/main/CHANGELOG.md) From 64fb25c3e69a9d07d9aaec585274b24839aef4f8 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月25日 10:30:12 +0800 Subject: [PATCH 3/8] docs --- scripts/publish.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/publish.js b/scripts/publish.js index 6d3010f..c71b3ea 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -21,7 +21,7 @@ const shell = spawn('powershell.exe', { let step = 0; -const commitHistory = [] +const commitHistory = []; // 监听输出 shell.stdout.on('data', (data) => { @@ -47,10 +47,11 @@ shell.stdout.on('end', () => { console.log(commitHistory); break; } -}) +}); shell.stderr.on('data', (data) => { console.error(`stderr: ${data}`); + console.log(typeof data); shell.stdin.end(); }); From 07b6348d153b390c8fdc439d536eafc4261787d5 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月25日 10:33:57 +0800 Subject: [PATCH 4/8] docs --- scripts/publish.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/publish.js b/scripts/publish.js index c71b3ea..dc2cfb7 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -25,6 +25,7 @@ const commitHistory = []; // 监听输出 shell.stdout.on('data', (data) => { + console.log('data'); if (step === 2) { // 获取提交信息成功 commitHistory.push(data); @@ -33,6 +34,7 @@ shell.stdout.on('data', (data) => { }); shell.stdout.on('end', () => { + console.log('end'); switch (step) { case 0: // 切换到主分支// 切换到主分支成功后, 使用 rebase 合并 dev -> main @@ -50,9 +52,18 @@ shell.stdout.on('end', () => { }); shell.stderr.on('data', (data) => { - console.error(`stderr: ${data}`); - console.log(typeof data); - shell.stdin.end(); + const errmsg = data.toString(); + if (errmsg.includes('error') || errmsg.includes('Error')) { + console.error(errmsg); + shell.stdin.end(); + return; + } + if (errmsg.includes('Switched to branch')) { + // 分支切换成功 + } +}); +shell.stderr.on('end', () => { + console.log('stderr end'); }); // 1. 切换到主分支 From bb549c6c440a44df27555ba2ae1889ec6d898a47 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月25日 10:35:22 +0800 Subject: [PATCH 5/8] docs --- scripts/publish.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish.js b/scripts/publish.js index dc2cfb7..626b9cc 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -25,7 +25,7 @@ const commitHistory = []; // 监听输出 shell.stdout.on('data', (data) => { - console.log('data'); + console.log('data: ' + data); if (step === 2) { // 获取提交信息成功 commitHistory.push(data); From 474bff236b8f30e1909feeb1d3c097f6658c4df1 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月25日 10:37:08 +0800 Subject: [PATCH 6/8] docs --- scripts/publish.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/publish.js b/scripts/publish.js index 626b9cc..113af13 100644 --- a/scripts/publish.js +++ b/scripts/publish.js @@ -60,11 +60,9 @@ shell.stderr.on('data', (data) => { } if (errmsg.includes('Switched to branch')) { // 分支切换成功 + console.log('checkout success'); } }); -shell.stderr.on('end', () => { - console.log('stderr end'); -}); // 1. 切换到主分支 shell.stdin.write('git checkout main\n'); From 201ecd924bb4625cca5dd8e57b6d8a3837d4c252 Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年11月25日 10:39:40 +0800 Subject: [PATCH 7/8] docs --- scripts/publish.js | 69 ---------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 scripts/publish.js diff --git a/scripts/publish.js b/scripts/publish.js deleted file mode 100644 index 113af13..0000000 --- a/scripts/publish.js +++ /dev/null @@ -1,69 +0,0 @@ -import { spawn } from 'node:child_process'; - -/* - 步骤: - 1. 切换到主分支: gi t checkout main - 2. rebase dev -> main: git rebase dev - 3. 获取提交信息: git log --format="%H--%s" -n 10 - 4. 修改 changelog、package.json 版本号 - 5. 提交: git commit -m "chore: release v1.0.0" - 6. 上传: git push origin main - 7. 构建: pnpm lib:build - 8. 发布: npm publish --registry https://registry.npmjs.org/ - 9. 切换回 dev分支: git checkout dev -*/ - -// 启动一个持久化的 shell 进程 -const shell = spawn('powershell.exe', { - shell: true, - windowsHide: true, -}); - -let step = 0; - -const commitHistory = []; - -// 监听输出 -shell.stdout.on('data', (data) => { - console.log('data: ' + data); - if (step === 2) { - // 获取提交信息成功 - commitHistory.push(data); - } - step++; -}); - -shell.stdout.on('end', () => { - console.log('end'); - switch (step) { - case 0: - // 切换到主分支// 切换到主分支成功后, 使用 rebase 合并 dev -> main - shell.stdin.write('git rebase dev\n'); - break; - case 1: - // 合并 dev -> main 成功后, 获取历史提交信息 - shell.stdin.write('git log --format="%H--%s" -n 10\n'); - break; - case 2: - // 获取提交信息成功 - console.log(commitHistory); - break; - } -}); - -shell.stderr.on('data', (data) => { - const errmsg = data.toString(); - if (errmsg.includes('error') || errmsg.includes('Error')) { - console.error(errmsg); - shell.stdin.end(); - return; - } - if (errmsg.includes('Switched to branch')) { - // 分支切换成功 - console.log('checkout success'); - } -}); - -// 1. 切换到主分支 -shell.stdin.write('git checkout main\n'); -step++; From 724b4820f138d2197363d77c8d917c41680e62da Mon Sep 17 00:00:00 2001 From: Tenny Date: 2024年12月17日 17:27:31 +0800 Subject: [PATCH 8/8] x --- README.md | 16 ---------------- docs/css-util.md | 20 -------------------- 2 files changed, 36 deletions(-) diff --git a/README.md b/README.md index 447bf3d..087c58b 100644 --- a/README.md +++ b/README.md @@ -48,28 +48,12 @@ export default defineConfig({ 在 `main.ts` 中引入全局 CSS 变量文件 ```js -<<<<<<< HEAD -<<<<<<< HEAD import 'litos-ui-vue/style/vars.css'; -======= -import '@asteres/litos-ui-vue/style/vars.css'; ->>>>>>> 0c57b7ee (rename: litos-ui-vue) -======= -import 'litos-ui-vue/style/vars.css'; ->>>>>>> f2e6fa2a (docs: 修复文档) ``` ## 文档 -<<<<<<< HEAD -<<<<<<< HEAD -[中文文档](https://dvshu.github.io/litos-ui-vue/) -======= -[中文 文档](https://dvshu.github.io/litos-ui-vue/) ->>>>>>> 0c57b7ee (rename: litos-ui-vue) -======= [中文文档](https://dvshu.github.io/litos-ui-vue/) ->>>>>>> f2e6fa2a (docs: 修复文档) ## [更新记录](https://github.com/DvShu/litos-ui-vue/blob/main/CHANGELOG.md) diff --git a/docs/css-util.md b/docs/css-util.md index f60fca4..3fec9a4 100644 --- a/docs/css-util.md +++ b/docs/css-util.md @@ -3,15 +3,7 @@ ### 1.1 引入样式 ```ts -<<<<<<< HEAD -<<<<<<< HEAD import 'litos-ui-vue/style/util/transition.css'; -======= -import '@asteres/litos-ui-vue/style/util/transition.css'; ->>>>>>> 0c57b7ee (rename: litos-ui-vue) -======= -import '@asteres/litos-ui-vue/style/util/transition.css'; ->>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` setup> @@ -110,15 +102,7 @@ const show2 = ref(true) ### 引入样式 ```ts -<<<<<<< HEAD -<<<<<<< HEAD import 'litos-ui-vue/style/util/animation.css'; -======= -import '@asteres/litos-ui-vue/style/util/animation.css'; ->>>>>>> 0c57b7ee (rename: litos-ui-vue) -======= -import '@asteres/litos-ui-vue/style/util/animation.css'; ->>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` ### 使用 @@ -165,11 +149,7 @@ import '@asteres/litos-ui-vue/style/util/animation.css'; ### 引入滚动条样式表 ```ts -<<<<<<< HEAD import 'litos-ui-vue/style/util/scrollbar.css'; -======= -import '@asteres/litos-ui-vue/style/util/scrollbar.css'; ->>>>>>> 0c57b7ee (rename: litos-ui-vue) ``` ### 使用

AltStyle によって変換されたページ (->オリジナル) /