diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae25efcb..3fb57586 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,18 +14,14 @@ jobs: os: [windows, macos, ubuntu] include: - os: windows - build: npx caxa -i . -m "This may take a while to run the first time, please wait..." --output "fosscord-api-windows-${{ github.sha }}.exe" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/dist/start.js" - artifact: fosscord-api-windows-${{ github.sha }}.exe + build: npm run bundle:windows + artifact: fosscord-api-windows.exe - os: macos - build: | - npx caxa -i . -m "This may take a while to run the first time, please wait..." --output "fosscord-api.app" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/dist/start.js" - tar -czf "fosscord-api-macos-${{ github.sha }}.app.tgz" "fosscord-api.app" - artifact: fosscord-api-macos-${{ github.sha }}.app.tgz + build: npm run bundle:macos + artifact: fosscord-api-macos.app.tgz - os: ubuntu - build: | - npx caxa -i . -m "This may take a while to run the first time, please wait..." --output "fosscord" -- "{{caxa}}/node_modules/.bin/node" "{{caxa}}/dist/start.js" - tar -czf "fosscord-api-linux-${{ github.sha }}.tgz" "fosscord" - artifact: fosscord-api-linux-${{ github.sha }}.tgz + build: npm run bundle:linux + artifact: fosscord-api-linux.tgz runs-on: ${{ matrix.os }}-latest steps: - uses: actions/checkout@v2 diff --git a/package-lock.json b/package-lock.json index 33859150..1a674bc8 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 36f98070..7d971585 100644 --- a/package.json +++ b/package.json @@ -11,23 +11,9 @@ "start": "npm run build && node dist/start", "build": "tsc -b .", "dev": "tsnd --respawn src/start.ts", - "bundle": "npm run build && pkg --no-bytecode --public-packages=* package.json" - }, - "pkg": { - "scripts": [ - "dist/**/*.js" - ], - "assets": [ - "locales", - "assets", - "client_test" - ], - "targets": [ - "latest-linux-x64", - "latest-win-x64", - "latest-macos-x64" - ], - "outputPath": "build" + "bundle:macos": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord-api.app' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js' && tar -czf 'fosscord-api-macos.app.tgz' 'fosscord-api.app'", + "bundle:linux": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js' && tar -czf 'fosscord-api-linux.tgz' 'fosscord'", + "bundle:windows": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord-api-windows.exe' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js'" }, "repository": { "type": "git", @@ -89,7 +75,6 @@ "0x": "^4.10.2", "caxa": "^2.1.0", "jest": "^26.6.3", - "pkg": "^5.3.0", "saslprep": "^1.0.3", "ts-node": "^9.1.1", "ts-node-dev": "^1.1.6",