Skip to content

Commit ac79321

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # public/cn.widgetjs.widgets.hotspot.json # public/widget.json
2 parents 727d83d + f110de7 commit ac79321

File tree

9 files changed

+108
-79
lines changed

9 files changed

+108
-79
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"build": "vite build",
1010
"build:local": "vite build --mode offline",
1111
"preview": "vite preview",
12-
"remote": "widget dependencies -t remote",
13-
"local": "widget dependencies -t local",
12+
"remote": "widget dependencies -t remote && pnpm install",
13+
"local": "widget dependencies -t local && pnpm install",
1414
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
1515
"format": "prettier --write src/ "
1616
},
@@ -63,7 +63,7 @@
6363
"sass-loader": "^12.0.0",
6464
"style-loader": "^3.3.1",
6565
"tsconfig-paths-webpack-plugin": "^4.0.0",
66-
"typescript": "^4.8.4",
66+
"typescript": "^5.2.2",
6767
"unplugin-auto-import": "^0.11.5",
6868
"unplugin-vue-components": "^0.22.11",
6969
"vite": "^4.4.2",

public/cn.widgetjs.widgets.hotspot.json

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
"entry": "index.html",
1313
"remoteEntry": "https://rtugeek.gitee.io/hotspot",
1414
"remotePackage": "https://rtugeek.gitee.io/hotspot/widget.json",
15-
"remote": {
16-
"entry": "https://rtugeek.gitee.io/hotspot",
17-
"hash": true,
18-
"base": "/hotspot"
19-
},
2015
"hash": true,
2116
"url": "",
2217
"widgets": [
@@ -31,6 +26,7 @@
3126
"keywords": [
3227
"recommend"
3328
],
29+
"security": false,
3430
"lang": "zh-CN",
3531
"width": 4,
3632
"height": 3,
@@ -39,79 +35,87 @@
3935
"minWidth": 4,
4036
"minHeight": 3,
4137
"movable": true,
38+
"singleton": false,
39+
"resizable": true,
40+
"path": "/widget/zhihu",
4241
"meta": {},
4342
"backgroundThrottling": true,
4443
"previewImage": "/images/preview_zhihu.png",
45-
"supportHostedMode": 17,
44+
"supportDeployMode": 17,
4645
"routes": [
4746
{
4847
"url": "/widget/zhihu",
4948
"name": "index"
5049
}
51-
],
52-
"permissions": []
50+
]
5351
},
5452
{
55-
"name": "cn.widgetjs.widgets.hotspot.douyin",
53+
"name": "ccn.widgetjs.widgets.hotspot.weibo",
5654
"title": {
57-
"zh-CN": "抖音热榜"
55+
"zh-CN": "微博热搜"
5856
},
5957
"description": {
60-
"zh-CN": "抖音热榜"
58+
"zh-CN": "微博热搜"
6159
},
6260
"keywords": [
6361
"recommend"
6462
],
63+
"security": false,
6564
"lang": "zh-CN",
6665
"width": 4,
6766
"height": 3,
68-
"maxWidth": 6,
67+
"maxWidth": 4,
6968
"maxHeight": 6,
7069
"minWidth": 4,
7170
"minHeight": 3,
7271
"movable": true,
72+
"singleton": false,
73+
"resizable": true,
74+
"path": "/widget/weibo",
7375
"meta": {},
7476
"backgroundThrottling": true,
75-
"previewImage": "/images/preview_douyin.png",
76-
"supportHostedMode": 17,
77+
"previewImage": "/images/weibo_hot_search.png",
78+
"supportDeployMode": 17,
7779
"routes": [
7880
{
79-
"url": "/widget/douyin",
81+
"url": "/widget/weibo",
8082
"name": "index"
8183
}
82-
],
83-
"permissions": []
84+
]
8485
},
8586
{
86-
"name": "ccn.widgetjs.widgets.hotspot.weibo",
87+
"name": "cn.widgetjs.widgets.hotspot.douyin",
8788
"title": {
88-
"zh-CN": "微博热搜"
89+
"zh-CN": "抖音热榜"
8990
},
9091
"description": {
91-
"zh-CN": "微博热搜"
92+
"zh-CN": "抖音热榜"
9293
},
9394
"keywords": [
9495
"recommend"
9596
],
97+
"security": false,
9698
"lang": "zh-CN",
9799
"width": 4,
98100
"height": 3,
99-
"maxWidth": 4,
101+
"maxWidth": 6,
100102
"maxHeight": 6,
101103
"minWidth": 4,
102104
"minHeight": 3,
103105
"movable": true,
106+
"singleton": false,
107+
"resizable": true,
108+
"path": "/widget/douyin",
104109
"meta": {},
105110
"backgroundThrottling": true,
106-
"previewImage": "/images/weibo_hot_search.png",
107-
"supportHostedMode": 17,
111+
"previewImage": "/images/preview_douyin.png",
112+
"supportDeployMode": 17,
108113
"routes": [
109114
{
110-
"url": "/widget/weibo",
115+
"url": "/widget/douyin",
111116
"name": "index"
112117
}
113-
],
114-
"permissions": []
118+
]
115119
},
116120
{
117121
"name": "cn.widgetjs.widgets.hotspot.bilibili",
@@ -124,6 +128,7 @@
124128
"keywords": [
125129
"recommend"
126130
],
131+
"security": false,
127132
"lang": "zh-CN",
128133
"width": 4,
129134
"height": 3,
@@ -132,17 +137,19 @@
132137
"minWidth": 4,
133138
"minHeight": 3,
134139
"movable": true,
140+
"singleton": false,
141+
"resizable": true,
142+
"path": "/widget/bilibili",
135143
"meta": {},
136144
"backgroundThrottling": true,
137145
"previewImage": "/images/bilibili_hot_search.png",
138-
"supportHostedMode": 17,
146+
"supportDeployMode": 17,
139147
"routes": [
140148
{
141149
"url": "/widget/bilibili",
142150
"name": "index"
143151
}
144-
],
145-
"permissions": []
152+
]
146153
},
147154
{
148155
"name": "cn.widgetjs.widgets.hotspot.bangumi",
@@ -155,6 +162,7 @@
155162
"keywords": [
156163
"recommend"
157164
],
165+
"security": false,
158166
"lang": "zh-CN",
159167
"width": 4,
160168
"height": 4,
@@ -163,17 +171,20 @@
163171
"minWidth": 4,
164172
"minHeight": 4,
165173
"movable": true,
174+
"singleton": false,
175+
"resizable": true,
176+
"path": "/widget/bangumi",
166177
"meta": {},
167178
"backgroundThrottling": true,
168179
"previewImage": "/images/preview_bangumi.png",
169-
"supportHostedMode": 17,
180+
"supportDeployMode": 17,
170181
"routes": [
171182
{
172183
"url": "/widget/bangumi",
173184
"name": "index"
174185
}
175-
],
176-
"permissions": []
186+
]
177187
}
178-
]
188+
],
189+
"pages": []
179190
}

0 commit comments

Comments
 (0)