Skip to content

Commit

Permalink
1. 添加备用更新源;
Browse files Browse the repository at this point in the history
2. 添加更新日志;
3. 一些优化
  • Loading branch information
HCLonely committed Jan 3, 2022
1 parent 2e8d6b6 commit adb20d1
Show file tree
Hide file tree
Showing 17 changed files with 271 additions and 132 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@

## Todo

- [ ] 添加更新源
- [x] 添加更新源
- [x] 添加更新日志
- [x] 添加giveaway.su专版

## 感谢以下开源项目
Expand Down
15 changes: 15 additions & 0 deletions copy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* @Author : HCLonely
* @Date : 2022-01-03 14:18:53
* @LastEditTime : 2022-01-03 14:23:30
* @LastEditors : HCLonely
* @FilePath : /auto-task-new/copy.js
* @Description : 复制文件到备用源网站
*/
/* eslint-disable @typescript-eslint/no-var-requires */
const fs = require('fs-extra');

fs.copySync('./dist', './page/dist');
fs.copySync('./package.json', './page/package.json');

console.log('Copying files is complete!');
4 changes: 2 additions & 2 deletions dist/auto-task-v4-for-giveawaysu.user.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/auto-task-v4.compatibility.user.js

Large diffs are not rendered by default.

76 changes: 43 additions & 33 deletions dist/auto-task-v4.user.js

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "auto-task-new",
"version": "4.1.2-Beta",
"version": "4.1.3-Beta",
"change": [
"添加备用更新源",
"添加更新日志"
"添加更新日志",
"一些优化"
],
"description": "赠Key站自动任务脚本",
"main": "package.json",
Expand All @@ -12,7 +13,7 @@
"tsc": "tsc",
"gs": "webpack --config webpack.giveawaysu.config.js",
"pack": "webpack --config webpack.config.js",
"build": "webpack --config webpack.config.js && webpack --config webpack.compatibility.config.js && webpack --config webpack.giveawaysu.config.js && cp ./dist/* ./page/dist && cp ./package.json ./page/"
"build": "webpack --config webpack.config.js && webpack --config webpack.compatibility.config.js && webpack --config webpack.giveawaysu.config.js && node copy.js"
},
"author": "HCLonely",
"license": "MIT",
Expand All @@ -30,6 +31,7 @@
"dayjs": "^1.10.7",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.24.2",
"fs-extra": "^10.0.0",
"js-cookie": "^3.0.1",
"postcss": "^8.4.5",
"postcss-loader": "^6.2.1",
Expand Down
4 changes: 2 additions & 2 deletions page/dist/auto-task-v4-for-giveawaysu.user.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions page/dist/auto-task-v4.compatibility.user.js

Large diffs are not rendered by default.

76 changes: 43 additions & 33 deletions page/dist/auto-task-v4.user.js

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions page/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"name": "auto-task-new",
"version": "4.1.3-Beta",
"change": [
"添加备用更新源",
"添加更新日志"
],
"description": "赠Key站自动任务脚本",
"main": "package.json",
"scripts": {
"test": "eslint",
"tsc": "tsc",
"gs": "webpack --config webpack.giveawaysu.config.js",
"pack": "webpack --config webpack.config.js",
"build": "webpack --config webpack.config.js && webpack --config webpack.compatibility.config.js && webpack --config webpack.giveawaysu.config.js && node copy.js"
},
"author": "HCLonely",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@types/jquery": "^3.5.7",
"@types/js-cookie": "^3.0.0",
"@types/keyboardjs": "^2.5.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"@xuanmo/javascript-utils": "^0.0.31",
"babel-loader": "^8.2.3",
"css-loader": "^6.5.1",
"dayjs": "^1.10.7",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.24.2",
"fs-extra": "^10.0.0",
"js-cookie": "^3.0.1",
"postcss": "^8.4.5",
"postcss-loader": "^6.2.1",
"postcss-preset-env": "^7.1.0",
"sass": "^1.45.1",
"sass-loader": "^12.4.0",
"sweetalert2": "^11.1.9",
"ts-loader": "^9.2.6",
"typescript": "^4.4.4",
"uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^5.60.0",
"webpack-cli": "^4.9.1"
}
}
46 changes: 41 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions src/locales/en-US.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : HCLonely
* @Date : 2021-12-30 17:08:27
* @LastEditTime : 2021-12-31 14:50:51
* @LastEditTime : 2022-01-03 14:06:40
* @LastEditors : HCLonely
* @FilePath : /auto-task-new/src/locales/en-US.js
* @Description : i18n英文
Expand Down Expand Up @@ -79,9 +79,9 @@ const data = {
twitterVerifyId: 'Verify Twitter token by trying to follow the account.</br>The default is the official Twitter account 783214.',
youtubeVerifyChannel: 'Verify YouTube token by trying to subscribe to the channel.</br>' +
'The default is the official YouTube channel UCrXUsMBcfTVqwAS7DKg9C0Q.',
autoUpdateSource: 'The source to update</br>github: Fast update.</br>' +
'jsdelivr: Update is delayed</br>auto: First use github source to update, after failure, try to update with jsdelivr source.',
saveGlobalOptions: 'Save global settings',
autoUpdateSource: 'The source to update</br>github: Fast update.</br>jsdelivr: Update is delayed.</br>' +
'standby: Standby source.</br>auto: Try to update using github, jsdelivr, standby sources in turn.',
saveGlobalOptions: 'SaveSettings',
settingPage: 'Setting Page',
name: 'Name',
version: 'Version',
Expand Down Expand Up @@ -122,7 +122,7 @@ const data = {
doTaskKey: 'DoTask shortcut keys</br> (real-time preview function is only available on the settings page).',
undoTaskKey: 'UndoTask shortcut keys</br> (real-time preview function is only available on the settings page).',
toggleLogKey: 'ShowLog/HideLog shortcut keys</br> (real-time preview function is only available on the settings page).',
tasksHistory: 'Tasks history',
tasksHistory: 'TasksHistory',
clearHistory: 'Clear history',
clearHistoryFinished: 'The mission history has been cleared!',
deleteTask: 'Delete task',
Expand Down Expand Up @@ -161,6 +161,7 @@ const data = {
toKeylol: 'Feedback(Keylol)',
copySuccess: 'The error message has been copied to the clipboard. Do you want to go to the Keylol forum to give feedback?',
copyFailed: 'Please copy the error information below and report back to the Keylol forum!',
updateText: 'Updates in version %0:',

// Steam
groups: 'Group',
Expand Down
5 changes: 3 additions & 2 deletions src/locales/zh-CN.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : HCLonely
* @Date : 2021-11-20 19:38:41
* @LastEditTime : 2021-12-31 14:50:33
* @LastEditTime : 2022-01-03 14:02:28
* @LastEditors : HCLonely
* @FilePath : /auto-task-new/src/locales/zh-CN.js
* @Description : i18n中文
Expand Down Expand Up @@ -77,7 +77,7 @@ const data = {
checkLeftKey: '剩余Key检测</br>赠Key活动结束提示是否关闭,部分本网站支持',
twitterVerifyId: '通过尝试关注该账号验证Twitter凭证</br>默认为Twitter官方帐号 783214',
youtubeVerifyChannel: '通过尝试订阅该频道验证YouTube凭证</br>默认为YouTube官方频道 UCrXUsMBcfTVqwAS7DKg9C0Q',
autoUpdateSource: '更新源</br>github: 需代理,实时更新</br>jsdelivr: 可不用代理,更新有延迟</br>auto: 首先使用github源更新,失败后尝试用jsdelivr源更新',
autoUpdateSource: '更新源</br>github: 需代理,实时更新</br>jsdelivr: 可不用代理,更新有延迟</br>standby: 备用</br>auto: 依次使用github, jsdelivr, standby源进行尝试更新',
saveGlobalOptions: '保存全局设置',
settingPage: '设置页面',
name: '名称',
Expand Down Expand Up @@ -147,6 +147,7 @@ const data = {
toKeylol: '前往其乐论坛反馈',
copySuccess: '错误信息已复制到剪切板,是否前往其乐论坛反馈?',
copyFailed: '请复制下方错误信息后前往Keylol论坛反馈!',
updateText: '%0 版本更新内容:',

// Steam
groups: '组',
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/globalOptions.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : HCLonely
* @Date : 2021-12-24 17:21:16
* @LastEditTime : 2022-01-02 10:42:28
* @LastEditTime : 2022-01-03 13:37:56
* @LastEditors : HCLonely
* @FilePath : /auto-task-new/src/scripts/globalOptions.d.ts
*/
Expand Down Expand Up @@ -94,7 +94,7 @@ interface globalOptions {
other: {
twitterVerifyId: string
youtubeVerifyChannel: string
autoUpdateSource: string
autoUpdateSource: 'github' | 'jsdelivr' | 'standby'
language: string
checkLogin: boolean
checkLeftKey: boolean
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/globalOptions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* @Author : HCLonely
* @Date : 2021-12-24 16:41:12
* @LastEditTime : 2022-01-02 11:09:31
* @LastEditTime : 2022-01-03 13:48:12
* @LastEditors : HCLonely
* @FilePath : /auto-task-new/src/scripts/globalOptions.ts
* @Description : 全局设置选项
Expand Down Expand Up @@ -103,7 +103,7 @@ const defaultGlobalOptions: globalOptions = {
other: {
twitterVerifyId: '783214',
youtubeVerifyChannel: 'UCrXUsMBcfTVqwAS7DKg9C0Q',
autoUpdateSource: 'jsDelivr',
autoUpdateSource: 'jsdelivr',
language: 'zh',
checkLogin: true,
checkLeftKey: true,
Expand Down
Loading

1 comment on commit adb20d1

@vercel
Copy link

@vercel vercel bot commented on adb20d1 Jan 3, 2022

Choose a reason for hiding this comment

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

Please sign in to comment.