From 09422f8035e05a56c35826b36b4fea5fa3d723c8 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Mon, 16 Sep 2024 01:26:06 -0400 Subject: [PATCH] build: attempt to simplify release env vars Signed-off-by: Adam Setch --- .github/workflows/release.yml | 3 + package.json | 36 +++++------ pnpm-lock.yaml | 116 +++++++++++++++++----------------- 3 files changed, 79 insertions(+), 76 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a42dc89..004d443 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,9 @@ jobs: - run: pnpm build - run: pnpm make:macos --publish onTagOrDraft env: + APPLE_ID: ${{ secrets.appleid_username }} + APPLE_TEAM_ID: ${{ secrets.appleid_password }} + APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }} CSC_LINK: ${{ secrets.csc_link }} CSC_KEY_PASSWORD: ${{ secrets.csc_key_password }} GH_TOKEN: ${{ secrets.github_token }} diff --git a/package.json b/package.json index dc17ce9..427bd28 100644 --- a/package.json +++ b/package.json @@ -86,13 +86,6 @@ } }, "dependencies": { - "@discordapp/twemoji": "15.1.0", - "@electron/remote": "2.1.2", - "electron-log": "5.2.0", - "electron-updater": "6.3.4", - "update-electron-app": "3.0.0" - }, - "devDependencies": { "@atlaskit/avatar": "21.15.1", "@atlaskit/badge": "16.4.0", "@atlaskit/button": "20.1.1", @@ -108,9 +101,26 @@ "@atlaskit/toggle": "13.4.1", "@atlaskit/tokens": "1.59.1", "@atlaskit/tooltip": "18.7.2", + "@discordapp/twemoji": "15.1.0", + "@electron/remote": "2.1.2", "axios": "1.7.7", "clsx": "2.1.1", - "date-fns": "4.0.0", + "date-fns": "3.6.0", + "electron-log": "5.2.0", + "electron-updater": "6.3.4", + "final-form": "4.20.10", + "menubar": "9.5.0", + "nprogress": "0.2.0", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-final-form": "6.5.9", + "react-router-dom": "6.26.2", + "tailwind-merge": "2.5.2", + "ts-loader": "9.5.1", + "typescript": "5.6.2", + "update-electron-app": "3.0.0" + }, + "devDependencies": { "@biomejs/biome": "1.9.1", "@electron/notarize": "2.4.0", "@testing-library/react": "16.0.1", @@ -123,29 +133,19 @@ "css-loader": "7.1.2", "electron": "32.1.0", "electron-builder": "25.0.5", - "final-form": "4.20.10", "graphql-tag": "2.12.6", "husky": "9.1.6", "jest": "29.7.0", "jest-environment-jsdom": "29.7.0", - "menubar": "9.5.0", - "nprogress": "0.2.0", "nock": "13.5.5", "postcss": "8.4.47", "postcss-loader": "8.1.1", - "react": "18.3.1", - "react-dom": "18.3.1", - "react-final-form": "6.5.9", - "react-router-dom": "6.26.2", "resize-observer-polyfill": "1.5.1", "rimraf": "6.0.1", "style-loader": "4.0.0", - "tailwind-merge": "2.5.2", "tailwindcss": "3.4.11", "ts-jest": "29.2.5", - "ts-loader": "9.5.1", "ts-node": "10.9.2", - "typescript": "5.6.2", "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-merge": "6.0.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f62935..fbb05d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,22 +8,6 @@ importers: .: dependencies: - '@discordapp/twemoji': - specifier: 15.1.0 - version: 15.1.0 - '@electron/remote': - specifier: 2.1.2 - version: 2.1.2(electron@32.1.0) - electron-log: - specifier: 5.2.0 - version: 5.2.0 - electron-updater: - specifier: 6.3.4 - version: 6.3.4 - update-electron-app: - specifier: 3.0.0 - version: 3.0.0 - devDependencies: '@atlaskit/avatar': specifier: 21.15.1 version: 21.15.1(@types/react@18.3.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -69,6 +53,61 @@ importers: '@atlaskit/tooltip': specifier: 18.7.2 version: 18.7.2(@types/react@18.3.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@discordapp/twemoji': + specifier: 15.1.0 + version: 15.1.0 + '@electron/remote': + specifier: 2.1.2 + version: 2.1.2(electron@32.1.0) + axios: + specifier: 1.7.7 + version: 1.7.7 + clsx: + specifier: 2.1.1 + version: 2.1.1 + date-fns: + specifier: 3.6.0 + version: 3.6.0 + electron-log: + specifier: 5.2.0 + version: 5.2.0 + electron-updater: + specifier: 6.3.4 + version: 6.3.4 + final-form: + specifier: 4.20.10 + version: 4.20.10 + menubar: + specifier: 9.5.0 + version: 9.5.0(electron@32.1.0) + nprogress: + specifier: 0.2.0 + version: 0.2.0 + react: + specifier: 18.3.1 + version: 18.3.1 + react-dom: + specifier: 18.3.1 + version: 18.3.1(react@18.3.1) + react-final-form: + specifier: 6.5.9 + version: 6.5.9(final-form@4.20.10)(react@18.3.1) + react-router-dom: + specifier: 6.26.2 + version: 6.26.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + tailwind-merge: + specifier: 2.5.2 + version: 2.5.2 + ts-loader: + specifier: 9.5.1 + version: 9.5.1(typescript@5.6.2)(webpack@5.94.0(webpack-cli@5.1.4)) + typescript: + specifier: 5.6.2 + version: 5.6.2 + update-electron-app: + specifier: 3.0.0 + version: 3.0.0 + devDependencies: '@biomejs/biome': specifier: 1.9.1 version: 1.9.1 @@ -96,27 +135,15 @@ importers: autoprefixer: specifier: 10.4.20 version: 10.4.20(postcss@8.4.47) - axios: - specifier: 1.7.7 - version: 1.7.7 - clsx: - specifier: 2.1.1 - version: 2.1.1 css-loader: specifier: 7.1.2 version: 7.1.2(webpack@5.94.0(webpack-cli@5.1.4)) - date-fns: - specifier: 4.0.0 - version: 4.0.0 electron: specifier: 32.1.0 version: 32.1.0 electron-builder: specifier: 25.0.5 version: 25.0.5(electron-builder-squirrel-windows@24.13.3(dmg-builder@25.0.5)) - final-form: - specifier: 4.20.10 - version: 4.20.10 graphql-tag: specifier: 2.12.6 version: 2.12.6(graphql@16.8.1) @@ -129,33 +156,15 @@ importers: jest-environment-jsdom: specifier: 29.7.0 version: 29.7.0 - menubar: - specifier: 9.5.0 - version: 9.5.0(electron@32.1.0) nock: specifier: 13.5.5 version: 13.5.5 - nprogress: - specifier: 0.2.0 - version: 0.2.0 postcss: specifier: 8.4.47 version: 8.4.47 postcss-loader: specifier: 8.1.1 version: 8.1.1(postcss@8.4.47)(typescript@5.6.2)(webpack@5.94.0(webpack-cli@5.1.4)) - react: - specifier: 18.3.1 - version: 18.3.1 - react-dom: - specifier: 18.3.1 - version: 18.3.1(react@18.3.1) - react-final-form: - specifier: 6.5.9 - version: 6.5.9(final-form@4.20.10)(react@18.3.1) - react-router-dom: - specifier: 6.26.2 - version: 6.26.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) resize-observer-polyfill: specifier: 1.5.1 version: 1.5.1 @@ -165,24 +174,15 @@ importers: style-loader: specifier: 4.0.0 version: 4.0.0(webpack@5.94.0(webpack-cli@5.1.4)) - tailwind-merge: - specifier: 2.5.2 - version: 2.5.2 tailwindcss: specifier: 3.4.11 version: 3.4.11(ts-node@10.9.2(@types/node@20.16.5)(typescript@5.6.2)) ts-jest: specifier: 29.2.5 version: 29.2.5(@babel/core@7.24.3)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@20.16.5)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.16.5)(typescript@5.6.2)))(typescript@5.6.2) - ts-loader: - specifier: 9.5.1 - version: 9.5.1(typescript@5.6.2)(webpack@5.94.0(webpack-cli@5.1.4)) ts-node: specifier: 10.9.2 version: 10.9.2(@types/node@20.16.5)(typescript@5.6.2) - typescript: - specifier: 5.6.2 - version: 5.6.2 webpack: specifier: 5.94.0 version: 5.94.0(webpack-cli@5.1.4) @@ -1622,8 +1622,8 @@ packages: resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==} engines: {node: '>=12'} - date-fns@4.0.0: - resolution: {integrity: sha512-6K33+I8fQ5otvHgLIvKK1xmMbLAh0pduyrx7dwMXKiGYeoWhmk6M3Zoak9n7bXHMJQlHq1yqmdGy1QxKddJjUA==} + date-fns@3.6.0: + resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==} debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} @@ -5965,7 +5965,7 @@ snapshots: whatwg-mimetype: 3.0.0 whatwg-url: 11.0.0 - date-fns@4.0.0: {} + date-fns@3.6.0: {} debug@4.3.4: dependencies: