mirror of
https://github.com/142vip/408CSFamily.git
synced 2026-07-27 08:40:47 +08:00
feat: 支持pull流水线，升级@142vip工具依赖版本 (#152)
This commit is contained in:
142vip.cn
13
.github/pull.yml
vendored
Normal file
13
.github/pull.yml
vendored
Normal file
@@ -0,0 +1,13 @@
|
||||
# 参考：https://wei.github.io/pull/
|
||||
version: '1'
|
||||
rules:
|
||||
- base: main
|
||||
upstream: 142vip:main
|
||||
mergeMethod: hardreset
|
||||
- base: next
|
||||
upstream: 142vip:next
|
||||
mergeMethod: hardreset
|
||||
# 兼容master分支
|
||||
- base: master
|
||||
upstream: 142vip:master
|
||||
mergeMethod: hardreset
|
||||
@@ -16,11 +16,11 @@
|
||||
height: 100vh;
|
||||
}
|
||||
</style>
|
||||
<link rel="stylesheet" href="https://unpkg.com/markmap-toolbar@0.18.9/dist/style.css"><link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/default.min.css">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/markmap-toolbar@0.18.10/dist/style.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.11.1/styles/default.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<svg id="mindmap"></svg>
|
||||
<script src="https://unpkg.com/d3@7.9.0/dist/d3.min.js"></script><script src="https://unpkg.com/markmap-view@0.18.9/dist/browser/index.js"></script><script src="https://unpkg.com/markmap-toolbar@0.18.9/dist/index.js"></script><script>((r) => {
|
||||
<script src="https://cdn.jsdelivr.net/npm/d3@7.9.0/dist/d3.min.js"></script><script src="https://cdn.jsdelivr.net/npm/markmap-view@0.18.10/dist/browser/index.js"></script><script src="https://cdn.jsdelivr.net/npm/markmap-toolbar@0.18.10/dist/index.js"></script><script>((r) => {
|
||||
setTimeout(r);
|
||||
})(() => {
|
||||
const { markmap, mm } = window;
|
||||
@@ -36,6 +36,6 @@
|
||||
(getOptions || markmap.deriveOptions)(jsonOptions),
|
||||
root2
|
||||
);
|
||||
})(() => window.markmap,null,{"content":"计算机组成原理","children":[{"content":"引论","children":[],"payload":{"tag":"h2","lines":"23,24"}},{"content":"数据的表示和运算","children":[],"payload":{"tag":"h2","lines":"25,26"}},{"content":"存储系统","children":[],"payload":{"tag":"h2","lines":"27,28"}},{"content":"指令系统","children":[],"payload":{"tag":"h2","lines":"29,30"}},{"content":"中央处理器","children":[],"payload":{"tag":"h2","lines":"31,32"}},{"content":"总线","children":[],"payload":{"tag":"h2","lines":"33,34"}},{"content":"输入输出系统","children":[],"payload":{"tag":"h2","lines":"35,36"}},{"content":"一些总结","children":[],"payload":{"tag":"h2","lines":"37,38"}}],"payload":{"tag":"h1","lines":"6,7"}},null)</script>
|
||||
})(() => window.markmap,null,{"content":"计算机组成原理","children":[{"content":"引论","children":[],"payload":{"tag":"h2","lines":"23,24"}},{"content":"数据的表示和运算","children":[],"payload":{"tag":"h2","lines":"25,26"}},{"content":"存储系统","children":[],"payload":{"tag":"h2","lines":"27,28"}},{"content":"指令系统","children":[],"payload":{"tag":"h2","lines":"29,30"}},{"content":"中央处理器","children":[],"payload":{"tag":"h2","lines":"31,32"}},{"content":"总线","children":[],"payload":{"tag":"h2","lines":"33,34"}},{"content":"输入输出系统","children":[],"payload":{"tag":"h2","lines":"35,36"}},{"content":"一些总结","children":[],"payload":{"tag":"h2","lines":"37,38"}}],"payload":{"tag":"h1","lines":"6,7"}},null)</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
height: 100vh;
|
||||
}
|
||||
</style>
|
||||
<link rel="stylesheet" href="https://unpkg.com/markmap-toolbar@0.18.9/dist/style.css"><link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/default.min.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/markmap-toolbar@0.18.10/dist/style.css"><link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/default.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<svg id="mindmap"></svg>
|
||||
<script src="https://unpkg.com/d3@7.9.0/dist/d3.min.js"></script><script src="https://unpkg.com/markmap-view@0.18.9/dist/browser/index.js"></script><script src="https://unpkg.com/markmap-toolbar@0.18.9/dist/index.js"></script><script>((r) => {
|
||||
<script src="https://unpkg.com/d3@7.9.0/dist/d3.min.js"></script><script src="https://unpkg.com/markmap-view@0.18.10/dist/browser/index.js"></script><script src="https://unpkg.com/markmap-toolbar@0.18.10/dist/index.js"></script><script>((r) => {
|
||||
setTimeout(r);
|
||||
})(() => {
|
||||
const { markmap, mm } = window;
|
||||
@@ -36,6 +36,6 @@
|
||||
(getOptions || markmap.deriveOptions)(jsonOptions),
|
||||
root2
|
||||
);
|
||||
})(() => window.markmap,null,{"content":"计算机网络","children":[{"content":"<pre data-lines=\"8,32\"><code class=\"language-mindmap\">root(计算机网络)\n (体系机构)\n (物理层)\n (数据链路层)\n (网络层)\n (传输层)\n (应用层)\n\n<a href=\"../../mind-map/cn-map.html\" target=\"_blank\">在线预览</a>\n\n## 体系结构\n\n## 物理层\n\n## 数据链路层\n\n## 网络层\n\n## 传输层\n\n## 应用层\n\n## 一些总结\n</code></pre>","children":[],"payload":{"tag":"pre","lines":"8,32"}}],"payload":{"tag":"h1","lines":"6,7"}},null)</script>
|
||||
})(() => window.markmap,null,{"content":"计算机网络","children":[{"content":"<pre data-lines=\"8,32\"><code class=\"language-mindmap\">root(计算机网络)\n (体系机构)\n (物理层)\n (数据链路层)\n (网络层)\n (传输层)\n (应用层)\n\n<a href="../../mind-map/cn-map.html" target="_blank">在线预览</a>\n\n## 体系结构\n\n## 物理层\n\n## 数据链路层\n\n## 网络层\n\n## 传输层\n\n## 应用层\n\n## 一些总结\n</code></pre>","children":[],"payload":{"tag":"pre","lines":"8,32"}}],"payload":{"tag":"h1","lines":"6,7"}},null)</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -16,11 +16,11 @@
|
||||
height: 100vh;
|
||||
}
|
||||
</style>
|
||||
<link rel="stylesheet" href="https://unpkg.com/markmap-toolbar@0.18.9/dist/style.css"><link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/default.min.css">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/markmap-toolbar@0.18.10/dist/style.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@highlightjs/cdn-assets@11.11.1/styles/default.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<svg id="mindmap"></svg>
|
||||
<script src="https://unpkg.com/d3@7.9.0/dist/d3.min.js"></script><script src="https://unpkg.com/markmap-view@0.18.9/dist/browser/index.js"></script><script src="https://unpkg.com/markmap-toolbar@0.18.9/dist/index.js"></script><script>((r) => {
|
||||
<script src="https://cdn.jsdelivr.net/npm/d3@7.9.0/dist/d3.min.js"></script><script src="https://cdn.jsdelivr.net/npm/markmap-view@0.18.10/dist/browser/index.js"></script><script src="https://cdn.jsdelivr.net/npm/markmap-toolbar@0.18.10/dist/index.js"></script><script>((r) => {
|
||||
setTimeout(r);
|
||||
})(() => {
|
||||
const { markmap, mm } = window;
|
||||
@@ -36,6 +36,6 @@
|
||||
(getOptions || markmap.deriveOptions)(jsonOptions),
|
||||
root2
|
||||
);
|
||||
})(() => window.markmap,null,{"content":"操作系统","children":[{"content":"引论","children":[],"payload":{"tag":"h2","lines":"19,20"}},{"content":"进程管理","children":[],"payload":{"tag":"h2","lines":"21,22"}},{"content":"内存管理","children":[],"payload":{"tag":"h2","lines":"23,24"}},{"content":"一些总结","children":[],"payload":{"tag":"h2","lines":"25,26"}},{"content":"I/O管理","children":[],"payload":{"tag":"h2","lines":"27,28"}},{"content":"文件管理","children":[],"payload":{"tag":"h2","lines":"29,30"}}],"payload":{"tag":"h1","lines":"6,7"}},null)</script>
|
||||
})(() => window.markmap,null,{"content":"操作系统","children":[{"content":"引论","children":[],"payload":{"tag":"h2","lines":"19,20"}},{"content":"进程管理","children":[],"payload":{"tag":"h2","lines":"21,22"}},{"content":"内存管理","children":[],"payload":{"tag":"h2","lines":"23,24"}},{"content":"一些总结","children":[],"payload":{"tag":"h2","lines":"25,26"}},{"content":"I/O管理","children":[],"payload":{"tag":"h2","lines":"27,28"}},{"content":"文件管理","children":[],"payload":{"tag":"h2","lines":"29,30"}}],"payload":{"tag":"h1","lines":"6,7"}},null)</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
"devDependencies": {
|
||||
"@142vip/commit-linter": "0.0.1-alpha.2",
|
||||
"@142vip/eslint-config": "0.0.1-alpha.4",
|
||||
"@142vip/fairy-cli": "0.0.3-alpha.25",
|
||||
"@142vip/fairy-cli": "0.0.3-alpha.26",
|
||||
"@142vip/open-source": "0.0.1-alpha.3",
|
||||
"@142vip/utils": "0.0.1-alpha.37",
|
||||
"@142vip/vuepress": "0.0.1-alpha.17",
|
||||
|
||||
589
pnpm-lock.yaml
generated
589
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user