diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80004dc..1a85ea8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,5 +81,4 @@ jobs: repo_token: "${{ secrets.GITHUB_TOKEN }}" files: | LICENSE - out/make/**/*.{dmg,rpm,deb} - out/make/**/*Setup.exe + out/make/**/*.{dmg,rpm,deb,Setup.exe} diff --git a/package-lock.json b/package-lock.json index 856e7e4..f4a8445 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "DocKit", - "version": "0.1.0", + "version": "0.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "DocKit", - "version": "0.1.0", + "version": "0.1.1", "license": "Apache-2.0", "dependencies": { "buffer": "^6.0.3", diff --git a/package.json b/package.json index dd2bf3c..6f78f57 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "DocKit", "productName": "DocKit", "private": true, - "version": "0.1.0", + "version": "0.1.1", "description": "A faster, better and more stable NoSQL desktop tools", "author": "geekfun ", "license": "Apache-2.0", diff --git a/scripts/make-distributions.sh b/scripts/make-distributions.sh index 7d7a323..ab2da76 100755 --- a/scripts/make-distributions.sh +++ b/scripts/make-distributions.sh @@ -18,3 +18,10 @@ echo "make distributions, platform: ${platform}" npx electron-forge make --arch="x64" --platform="${platform}" npx electron-forge make --arch="arm64" --platform="${platform}" + +# rename distributions +if [[ $platform == "win32" ]]; then + version=$(node -p "require('./package.json').version") + mv out/make/squirrel.windows/x64/DocKit-${version}\ Setup.exe out/make/squirrel.windows/x64/DocKit-${version}-x64.Setup.exe + mv out/make/squirrel.windows/arm64/DocKit-${version}\ Setup.exe out/make/squirrel.windows/arm64/DocKit-${version}-arm64.Setup.exe +fi diff --git a/src/electron/main.ts b/src/electron/main.ts index f2bc305..dc68e72 100644 --- a/src/electron/main.ts +++ b/src/electron/main.ts @@ -43,13 +43,9 @@ const createWindow = async () => { }); createMenu(mainWindow); // and load the index.html of the app. - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore if (MAIN_WINDOW_VITE_DEV_SERVER_URL) { for (let i = 0; i < 10; i++) { try { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore const response = await fetch(MAIN_WINDOW_VITE_DEV_SERVER_URL); if (response.ok) { break; @@ -60,13 +56,10 @@ const createWindow = async () => { await new Promise(resolve => setTimeout(resolve, 2000)); } - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + await mainWindow.loadURL(MAIN_WINDOW_VITE_DEV_SERVER_URL); } else { await mainWindow.loadFile( - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/index.html`), ); }