From 4fae044cb61c7bb9e4bfbec51a69ea1e4f032837 Mon Sep 17 00:00:00 2001
From: Ben <30801141+asdwsxzc123@users.noreply.github.com>
Date: Mon, 7 Aug 2023 23:04:25 +0800
Subject: [PATCH 1/3] fix: build:win:noSign Error (#336)
---
scripts/baseConfig.ts | 72 +++++++++++++++++++++++++++++++++++++
scripts/build.ts | 81 ++++--------------------------------------
scripts/buildNoSign.ts | 9 +++--
3 files changed, 83 insertions(+), 79 deletions(-)
create mode 100644 scripts/baseConfig.ts
diff --git a/scripts/baseConfig.ts b/scripts/baseConfig.ts
new file mode 100644
index 00000000..6f9bc0f1
--- /dev/null
+++ b/scripts/baseConfig.ts
@@ -0,0 +1,72 @@
+import { Configuration } from 'electron-builder';
+
+import { COMMON_APP_CONFIG } from '../src/environment';
+
+export const ELECTRON_BUILD_CONFIG: Configuration = {
+ appId: '.postcat.io',
+ productName: 'Postcat',
+ asar: true,
+ directories: {
+ output: 'release/'
+ },
+ files: [
+ 'out/app/**/*.js*',
+ 'out/platform/**/*.js*',
+ 'out/environment.js',
+ 'out/shared/**/*.js*',
+ 'src/browser/dist/**/*',
+ 'out/browser/src/**/*.js*',
+ 'out/node/test-server/**/*.js*',
+ 'out/app/common/**/*',
+ '!**/*.ts'
+ ],
+ publish: [
+ 'github',
+ {
+ provider: 'generic',
+ url: COMMON_APP_CONFIG.BASE_DOWNLOAD_URL
+ }
+ ],
+ generateUpdatesFilesForAllChannels: true,
+ nsis: {
+ // 指定guid，此guid会存放在注册表中，如果没有指定则系统会自动生成
+ guid: 'Postcat',
+ oneClick: false,
+ allowElevation: true,
+ allowToChangeInstallationDirectory: true,
+ // for win - 将协议写入主机的脚本
+ include: 'scripts/urlProtoco.nsh'
+ },
+ protocols: [
+ // for macOS - 用于在主机注册指定协议
+ {
+ name: 'eoapi',
+ schemes: ['eoapi']
+ }
+ ],
+ portable: {
+ splashImage: 'src/app/common/images/postcat.bmp'
+ },
+ dmg: {
+ sign: false
+ },
+ afterSign: 'scripts/notarize.js',
+ linux: {
+ icon: 'src/app/common/images/',
+ target: ['AppImage']
+ },
+ mac: {
+ icon: 'src/app/common/images/512x512.png',
+ hardenedRuntime: true,
+ category: 'public.app-category.productivity',
+ gatekeeperAssess: false,
+ entitlements: 'scripts/entitlements.mac.plist',
+ entitlementsInherit: 'scripts/entitlements.mac.plist',
+ target: [
+ {
+ target: 'default',
+ arch: ['x64', 'arm64']
+ }
+ ]
+ }
+};
diff --git a/scripts/build.ts b/scripts/build.ts
index 739e4341..3d8a817b 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -1,16 +1,16 @@
-import { sign, doSign } from 'app-builder-lib/out/codeSign/windowsCodeSign';
-import { build, BuildResult, Platform } from 'electron-builder';
+import { doSign, sign } from 'app-builder-lib/out/codeSign/windowsCodeSign';
import type { Configuration } from 'electron-builder';
+import { Platform, build } from 'electron-builder';
import minimist from 'minimist';
import YAML from 'yaml';
import pkgInfo from '../package.json';
-import { COMMON_APP_CONFIG } from '../src/environment';
+import { ELECTRON_BUILD_CONFIG } from './baseConfig';
-import { execSync, exec, spawn } from 'node:child_process';
+import { exec, execSync, spawn } from 'node:child_process';
import { createHash } from 'node:crypto';
-import { copyFileSync, createReadStream, readFileSync, writeFileSync } from 'node:fs';
-import path, { resolve } from 'node:path';
+import { createReadStream, readFileSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
import { exit, platform } from 'node:process';
const pkgPath = path.join(__dirname, '../package.json');
@@ -52,74 +52,7 @@ function hashFile(file: string, algorithm = 'sha512', encoding: 'base64' | 'hex'
.pipe(hash, { end: false });
});
}
-export const ELECTRON_BUILD_CONFIG: Configuration = {
- appId: '.postcat.io',
- productName: 'Postcat',
- asar: true,
- directories: {
- output: 'release/'
- },
- files: [
- 'out/app/**/*.js*',
- 'out/platform/**/*.js*',
- 'out/environment.js',
- 'out/shared/**/*.js*',
- 'src/browser/dist/**/*',
- 'out/browser/src/**/*.js*',
- 'out/node/test-server/**/*.js*',
- 'out/app/common/**/*',
- '!**/*.ts'
- ],
- publish: [
- 'github',
- {
- provider: 'generic',
- url: COMMON_APP_CONFIG.BASE_DOWNLOAD_URL
- }
- ],
- generateUpdatesFilesForAllChannels: true,
- nsis: {
- // 指定guid，此guid会存放在注册表中，如果没有指定则系统会自动生成
- guid: 'Postcat',
- oneClick: false,
- allowElevation: true,
- allowToChangeInstallationDirectory: true,
- // for win - 将协议写入主机的脚本
- include: 'scripts/urlProtoco.nsh'
- },
- protocols: [
- // for macOS - 用于在主机注册指定协议
- {
- name: 'eoapi',
- schemes: ['eoapi']
- }
- ],
- portable: {
- splashImage: 'src/app/common/images/postcat.bmp'
- },
- dmg: {
- sign: false
- },
- afterSign: 'scripts/notarize.js',
- linux: {
- icon: 'src/app/common/images/',
- target: ['AppImage']
- },
- mac: {
- icon: 'src/app/common/images/512x512.png',
- hardenedRuntime: true,
- category: 'public.app-category.productivity',
- gatekeeperAssess: false,
- entitlements: 'scripts/entitlements.mac.plist',
- entitlementsInherit: 'scripts/entitlements.mac.plist',
- target: [
- {
- target: 'default',
- arch: ['x64', 'arm64']
- }
- ]
- }
-};
+
const config: Configuration = {
...ELECTRON_BUILD_CONFIG,
win: {
diff --git a/scripts/buildNoSign.ts b/scripts/buildNoSign.ts
index 3fe2009e..62b9ff99 100644
--- a/scripts/buildNoSign.ts
+++ b/scripts/buildNoSign.ts
@@ -1,15 +1,14 @@
-import { sign, doSign } from 'app-builder-lib/out/codeSign/windowsCodeSign';
-import { build, BuildResult, Platform } from 'electron-builder';
+import { sign } from 'app-builder-lib/out/codeSign/windowsCodeSign';
import type { Configuration } from 'electron-builder';
+import { Platform, build } from 'electron-builder';
import minimist from 'minimist';
-import YAML from 'yaml';
import pkgInfo from '../package.json';
-import { ELECTRON_BUILD_CONFIG } from './build';
+import { ELECTRON_BUILD_CONFIG } from './baseConfig';
import { exec, spawn } from 'node:child_process';
import { writeFileSync } from 'node:fs';
-import path, { resolve } from 'node:path';
+import path from 'node:path';
import { exit, platform } from 'node:process';
const pkgPath = path.join(__dirname, '../package.json');
--
Gitee
From 12850fb724e8f5f9ce40f99637e49ad5d27abd05 Mon Sep 17 00:00:00 2001
From: scarqin <1054139596@qq.com>
Date: Tue, 8 Aug 2023 12:27:55 +0800
Subject: [PATCH 2/3] docs: add contrib.rocks
---
README.md | 14 ++++++++++++--
wiki/README.en.md | 13 +++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 6a7dc1a5..b1a5867f 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,18 @@
也欢迎给我们多多提需求~
+## 💪 贡献者 💪
+
+感谢你们让美好发生！
+
+
+
+ 
+
+
+
## Bug 和需求反馈
@@ -86,7 +98,6 @@
-
## 开发 Postcat
@@ -161,4 +172,3 @@ yarn add @angular/cli --global
| ------------ | ------------ |
|yarn test |执行单元测试 |
-
diff --git a/wiki/README.en.md b/wiki/README.en.md
index 670a7e02..f50299f2 100644
--- a/wiki/README.en.md
+++ b/wiki/README.en.md
@@ -38,6 +38,19 @@ Therefore, Postcat is theoretically an API product with infinite possibilities.
Learn more：[Github Project](https://github.com/orgs/Postcatlab/projects/3)
+## 💪 Contributors 💪
+
+Thank you for making good things happen!
+
+
+
+
+
+
+
+
## Bug and Feature Request
If you'd like to contact us, please create a [Github issue](https://github.com/Postcatlab/postcat/issues). Thank you!
--
Gitee
From 250b7be47ffe8cec4617b69bc03278847eef7002 Mon Sep 17 00:00:00 2001
From: LouisTsang <646168919@qq.com>
Date: Fri, 17 Nov 2023 11:56:53 +0800
Subject: [PATCH 3/3] docs: update README with restructuring information (#376)
Co-authored-by: louistsang
---
README.md | 12 ++++++++++++
wiki/README.en.md | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/README.md b/README.md
index b1a5867f..255bd7f5 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,18 @@
+## 🛠️ 小更新，大改变：Postcat 正在重构中！ 🚀
+
+嘿，Postcat 的朋友们！
+
+只是想快速告诉大家，我们的项目现在正处在一次激动人心的重构旅程中。这并不意味着 Postcat 没有得到维护，恰恰相反，我们正在给它注入新的活力！
+
+在这个阶段，可能会有些静悄悄的，但请相信，我们在幕后正忙得不可开交。我们致力于让 Postcat 变得更酷、更易用，只是需要一点时间来打磨和完善。
+
+所以，请继续关注，不久的将来，你们会见到一个焕然一新的 Postcat。你的支持和耐心是我们最宝贵的动力！
+
+敬请期待，更多精彩即将来临！
+
## 概述
**Postcat** 是一个强大的开源、免费的、跨平台（Windows、Mac、Linux、Browsers...）的 **API 开发测试工具**，支持 REST、Websocket 等协议（即将支持 GraphQL、gRPC、TCP、UDP），帮助你加速完成 API 开发和测试工作。它非常适合中小团队及个人使用。
diff --git a/wiki/README.en.md b/wiki/README.en.md
index f50299f2..108268ba 100644
--- a/wiki/README.en.md
+++ b/wiki/README.en.md
@@ -10,6 +10,18 @@
+## `🛠️ A Little Update, A Big Transformation: Postcat is Undergoing a Revamp! 🚀
+
+Hey there, Postcat friends!
+
+Just a quick shout-out to let you all know that our project is currently on an exciting journey of restructuring. It's not that Postcat is unattended; in fact, we're actively injecting new energy into it!
+
+Things might seem a bit quiet for now, but rest assured, we're busy behind the scenes. We're committed to making Postcat cooler and more user-friendly - it just takes a bit of time to polish and perfect.
+
+So, stay tuned! Soon, you'll be meeting a revamped and rejuvenated Postcat. Your support and patience mean the world to us!
+
+Exciting updates are on the horizon, stay tuned!`
+
Postcat is a powerful open source, cross-platform (Windows, Mac, Linux, Browsers...) **API development and testing tool** that supports REST, Websocket and other protocols (soon to support GraphQL, gRPC, TCP, UDP), helping you speed up the completion of API Development and testing work.
--
Gitee