From df948c03147d10534ba2ffa3a09375418f7bf0c3 Mon Sep 17 00:00:00 2001 From: JoelBirlingmairBeastCode <31551523+JoelBirlingmairBeastCode@users.noreply.github.com> Date: Wed, 25 May 2022 12:38:01 -0500 Subject: [PATCH 01/34] remove auto-updates --- src/main/app-updater.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/app-updater.ts b/src/main/app-updater.ts index 77daf6b4b6..25b783d043 100644 --- a/src/main/app-updater.ts +++ b/src/main/app-updater.ts @@ -18,7 +18,8 @@ import { UserStore } from "../common/user-store"; let installVersion: undefined | string; export function isAutoUpdateEnabled() { - return autoUpdater.isUpdaterActive() && isPublishConfigured; + //return autoUpdater.isUpdaterActive() && isPublishConfigured; + return false; } function handleAutoUpdateBackChannel(event: Electron.IpcMainEvent, ...[arg]: UpdateAvailableToBackchannel) { From 050ec8db458ff23894a47db69b8a52458a210118 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Wed, 25 May 2022 12:59:05 -0500 Subject: [PATCH 02/34] allow downgrading --- src/common/user-store/user-store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/user-store/user-store.ts b/src/common/user-store/user-store.ts index 3cfd551fd7..134d9b7af4 100644 --- a/src/common/user-store/user-store.ts +++ b/src/common/user-store/user-store.ts @@ -101,7 +101,7 @@ export class UserStore extends BaseStore /* implements UserStore } @computed get isAllowedToDowngrade() { - return new SemVer(getAppVersion()).prerelease[0] !== this.updateChannel; + return true; } startMainReactions() { From ef27b850471597c489cbfe1bb0af5682d1c7e576 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Wed, 25 May 2022 15:18:32 -0500 Subject: [PATCH 03/34] default update channel is none --- src/common/user-store/preferences-helpers.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/user-store/preferences-helpers.ts b/src/common/user-store/preferences-helpers.ts index 7bb3aee41b..76251d92c2 100644 --- a/src/common/user-store/preferences-helpers.ts +++ b/src/common/user-store/preferences-helpers.ts @@ -301,6 +301,9 @@ export interface UpdateChannelInfo { } export const updateChannels = readonly(new Map([ + ["none", { + label: "Do Not Update", + }], ["latest", { label: "Stable", }], @@ -311,7 +314,8 @@ export const updateChannels = readonly(new Map([ label: "Alpha", }], ])); -export const defaultUpdateChannel = new SemVer(getAppVersion()).prerelease[0]?.toString() || "latest"; +// export const defaultUpdateChannel = new SemVer(getAppVersion()).prerelease[0]?.toString() || "latest"; +export const defaultUpdateChannel = "none"; const updateChannel: PreferenceDescription = { fromStore(val) { From faf347ec58b85f7a40963cf39f06e666a225041a Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 16:04:42 -0500 Subject: [PATCH 04/34] move workflows to another folder for safe keeping --- .github/{workflows => old-workflows}/add-to-project-board.yaml | 0 .github/{workflows => old-workflows}/check-docs.yml | 0 .github/{workflows => old-workflows}/codeql-analysis.yml | 0 .github/{workflows => old-workflows}/electronegativity.yml | 0 .github/{workflows => old-workflows}/license-header.yml | 0 .github/{workflows => old-workflows}/linter.yml | 0 .github/{workflows => old-workflows}/main.yml | 0 .github/{workflows => old-workflows}/maintenance.yml | 0 .github/{workflows => old-workflows}/mkdocs-delete-version.yml | 0 .github/{workflows => old-workflows}/mkdocs-manual.yml | 0 .../{workflows => old-workflows}/mkdocs-set-default-version.yml | 0 .github/{workflows => old-workflows}/publish-master-npm.yml | 0 .github/{workflows => old-workflows}/publish-release-npm.yml | 0 .github/{workflows => old-workflows}/release-drafter.yml | 0 .github/{workflows => old-workflows}/require-type-labels.yml | 0 .github/{workflows => old-workflows}/stale.yml | 0 .github/{workflows => old-workflows}/test.yml | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => old-workflows}/add-to-project-board.yaml (100%) rename .github/{workflows => old-workflows}/check-docs.yml (100%) rename .github/{workflows => old-workflows}/codeql-analysis.yml (100%) rename .github/{workflows => old-workflows}/electronegativity.yml (100%) rename .github/{workflows => old-workflows}/license-header.yml (100%) rename .github/{workflows => old-workflows}/linter.yml (100%) rename .github/{workflows => old-workflows}/main.yml (100%) rename .github/{workflows => old-workflows}/maintenance.yml (100%) rename .github/{workflows => old-workflows}/mkdocs-delete-version.yml (100%) rename .github/{workflows => old-workflows}/mkdocs-manual.yml (100%) rename .github/{workflows => old-workflows}/mkdocs-set-default-version.yml (100%) rename .github/{workflows => old-workflows}/publish-master-npm.yml (100%) rename .github/{workflows => old-workflows}/publish-release-npm.yml (100%) rename .github/{workflows => old-workflows}/release-drafter.yml (100%) rename .github/{workflows => old-workflows}/require-type-labels.yml (100%) rename .github/{workflows => old-workflows}/stale.yml (100%) rename .github/{workflows => old-workflows}/test.yml (100%) diff --git a/.github/workflows/add-to-project-board.yaml b/.github/old-workflows/add-to-project-board.yaml similarity index 100% rename from .github/workflows/add-to-project-board.yaml rename to .github/old-workflows/add-to-project-board.yaml diff --git a/.github/workflows/check-docs.yml b/.github/old-workflows/check-docs.yml similarity index 100% rename from .github/workflows/check-docs.yml rename to .github/old-workflows/check-docs.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/old-workflows/codeql-analysis.yml similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to .github/old-workflows/codeql-analysis.yml diff --git a/.github/workflows/electronegativity.yml b/.github/old-workflows/electronegativity.yml similarity index 100% rename from .github/workflows/electronegativity.yml rename to .github/old-workflows/electronegativity.yml diff --git a/.github/workflows/license-header.yml b/.github/old-workflows/license-header.yml similarity index 100% rename from .github/workflows/license-header.yml rename to .github/old-workflows/license-header.yml diff --git a/.github/workflows/linter.yml b/.github/old-workflows/linter.yml similarity index 100% rename from .github/workflows/linter.yml rename to .github/old-workflows/linter.yml diff --git a/.github/workflows/main.yml b/.github/old-workflows/main.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/old-workflows/main.yml diff --git a/.github/workflows/maintenance.yml b/.github/old-workflows/maintenance.yml similarity index 100% rename from .github/workflows/maintenance.yml rename to .github/old-workflows/maintenance.yml diff --git a/.github/workflows/mkdocs-delete-version.yml b/.github/old-workflows/mkdocs-delete-version.yml similarity index 100% rename from .github/workflows/mkdocs-delete-version.yml rename to .github/old-workflows/mkdocs-delete-version.yml diff --git a/.github/workflows/mkdocs-manual.yml b/.github/old-workflows/mkdocs-manual.yml similarity index 100% rename from .github/workflows/mkdocs-manual.yml rename to .github/old-workflows/mkdocs-manual.yml diff --git a/.github/workflows/mkdocs-set-default-version.yml b/.github/old-workflows/mkdocs-set-default-version.yml similarity index 100% rename from .github/workflows/mkdocs-set-default-version.yml rename to .github/old-workflows/mkdocs-set-default-version.yml diff --git a/.github/workflows/publish-master-npm.yml b/.github/old-workflows/publish-master-npm.yml similarity index 100% rename from .github/workflows/publish-master-npm.yml rename to .github/old-workflows/publish-master-npm.yml diff --git a/.github/workflows/publish-release-npm.yml b/.github/old-workflows/publish-release-npm.yml similarity index 100% rename from .github/workflows/publish-release-npm.yml rename to .github/old-workflows/publish-release-npm.yml diff --git a/.github/workflows/release-drafter.yml b/.github/old-workflows/release-drafter.yml similarity index 100% rename from .github/workflows/release-drafter.yml rename to .github/old-workflows/release-drafter.yml diff --git a/.github/workflows/require-type-labels.yml b/.github/old-workflows/require-type-labels.yml similarity index 100% rename from .github/workflows/require-type-labels.yml rename to .github/old-workflows/require-type-labels.yml diff --git a/.github/workflows/stale.yml b/.github/old-workflows/stale.yml similarity index 100% rename from .github/workflows/stale.yml rename to .github/old-workflows/stale.yml diff --git a/.github/workflows/test.yml b/.github/old-workflows/test.yml similarity index 100% rename from .github/workflows/test.yml rename to .github/old-workflows/test.yml From 68cd9aa259ca52ddc182dcadc0dd16c6531bd1d3 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 16:04:57 -0500 Subject: [PATCH 05/34] add build for windows workflow --- .github/workflows/build-for-windows.yml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/build-for-windows.yml diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml new file mode 100644 index 0000000000..5a1878565f --- /dev/null +++ b/.github/workflows/build-for-windows.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: Build For Windows + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the "master" branch + push: + branches: ["stop-updating"] + pull_request: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: windows-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + + # Runs a single command using the runners shell + - name: Run a one-line script + run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script + run: | + echo Add other actions to build, + echo test, and deploy your project. From aff1b20d12c4f1511e4ce6c2a221ea093d2e2fd5 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 16:15:55 -0500 Subject: [PATCH 06/34] attempt setting up and using yarn --- .github/workflows/build-for-windows.yml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 5a1878565f..32a0fd27bc 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -24,13 +24,22 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 - # Runs a single command using the runners shell - - name: Run a one-line script - run: echo Hello, world! - - # Runs a set of commands using the runners shell - - name: Run a multi-line script + # use npm to set up yarn + - name: Set up yarn cli run: | - echo Add other actions to build, - echo test, and deploy your project. + npm install --global yarn + yarn --version + + # Sets up the node_modules folder with the Windows version of the dependencies + - name: Yarn install + run: | + yarn install --frozen-lockfile --network-timeout=100000 + yarn check --verify-tree --integrity + + # Downloads kubernetes dependencies + - name: Download client binaries + run: yarn download:binaries From 5d8bf9a09a0e461469328cb0a09c7308552b1583 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 16:18:17 -0500 Subject: [PATCH 07/34] downgrade to node 14 for this branch --- .github/workflows/build-for-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 32a0fd27bc..cdebe4cb30 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 14 # use npm to set up yarn - name: Set up yarn cli From 6d03997201e1a6b4576eb586bb2fb676b09ca084 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 16:28:52 -0500 Subject: [PATCH 08/34] updated README --- README.md | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 595def597b..80dc01e3a7 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,10 @@ -# Lens Open Source Project (OpenLens) +# A place to build Open Lens for Windows -[![Build Status](https://github.com/lensapp/lens/actions/workflows/test.yml/badge.svg)](https://github.com/lensapp/lens/actions/workflows/test.yml) -[![Chat on Slack](https://img.shields.io/badge/chat-on%20slack-blue.svg?logo=slack&longCache=true&style=flat)](https://join.slack.com/t/k8slens/shared_invite/enQtOTc5NjAyNjYyOTk4LWU1NDQ0ZGFkOWJkNTRhYTc2YjVmZDdkM2FkNGM5MjhiYTRhMDU2NDQ1MzIyMDA4ZGZlNmExOTc0N2JmY2M3ZGI) +[![Build For Windows](https://github.com/JoelBirlingmairBeastCode/lens-without-lens-ID/actions/workflows/build-for-windows.yml/badge.svg?branch=stop-updating)](https://github.com/JoelBirlingmairBeastCode/lens-without-lens-ID/actions/workflows/build-for-windows.yml) ## The Repository -This repository ("OpenLens") is where Team Lens develops the [Lens IDE](https://k8slens.dev) product together with the community. It is backed by a number of Kubernetes and cloud native ecosystem pioneers. This source code is available to everyone under the [MIT license](./LICENSE). +This is a forked repository of the "OpenLens" repo. -## Lens - The Kubernetes IDE - -Lens - The Kubernetes IDE ("Lens IDE") is a distribution of the OpenLens repository with Team Lens specific customizations released under a traditional [EULA](https://k8slens.dev/licenses/eula). - -Lens IDE provides the full situational awareness for everything that runs in Kubernetes. It's lowering the barrier of entry for people just getting started and radically improving productivity for people with more experience. - -Lens IDE a standalone application for MacOS, Windows and Linux operating systems. You can download it free of charge for Windows, MacOS, and Linux from [Lens IDE website](https://k8slens.dev). - -[![Screenshot](.github/screenshot.png)](https://www.youtube.com/watch?v=eeDwdVXattc) - -## Installation - -See [Getting Started](https://docs.k8slens.dev/latest/getting-started/) page. - -## Development - -See [Development](https://docs.k8slens.dev/latest/contributing/development/) page. - -## Contributing - -See [Contributing](https://docs.k8slens.dev/latest/contributing/) page. +Observe the github actions on this repo. +The file (./.github\workflows\build-for-windows.yml) shows how to build the basic Lens app without any of the proprietary extensions like the Lens ID log in screen. From 60c28ce989e53fd2d89481503bbef2d37111c2a2 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:27:15 -0500 Subject: [PATCH 09/34] comment out artifacts until I can find where they go --- .github/workflows/build-for-windows.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index cdebe4cb30..50ac745a47 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -34,6 +34,11 @@ jobs: npm install --global yarn yarn --version + # install GNU make + - name: Install gnu make using choclatey + uses: crazy-max/ghaction-chocolatey@v2 + run: choco install make + # Sets up the node_modules folder with the Windows version of the dependencies - name: Yarn install run: | @@ -43,3 +48,22 @@ jobs: # Downloads kubernetes dependencies - name: Download client binaries run: yarn download:binaries + + # Fix the version of the build + - name: Fix Build version + run: yarn run npm:fix-build-version + + # Compile + - name: Compile + run: yarn run compile + + # clear our pem folder before publish + # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish + - name: Clear CA trust + run: rm -rf node_modules/win-ca/pem + + # - name: Upload artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: built-artifacts + # path: path/to/artifact/ From fb02e1d46142677a3e697ffb2a2459fc5301c20f Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:33:05 -0500 Subject: [PATCH 10/34] fix args for choclatey install make --- .github/workflows/build-for-windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 50ac745a47..f57c3d5e65 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -37,7 +37,8 @@ jobs: # install GNU make - name: Install gnu make using choclatey uses: crazy-max/ghaction-chocolatey@v2 - run: choco install make + with: + args: install make # Sets up the node_modules folder with the Windows version of the dependencies - name: Yarn install From bb588754c947696404894c7d6faef8c075738a23 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:40:42 -0500 Subject: [PATCH 11/34] publish electron builder --- .github/workflows/build-for-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index f57c3d5e65..26cec6a817 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -63,6 +63,9 @@ jobs: - name: Clear CA trust run: rm -rf node_modules/win-ca/pem + - name: Electron Builder + run: yarn run electron-builder --publish onTag --win --dir + # - name: Upload artifacts # uses: actions/upload-artifact@v3 # with: From 93e3ebe65fdb16edbe89106fc5dc236c14176518 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:40:57 -0500 Subject: [PATCH 12/34] add build artifacts from completed build --- .github/workflows/build-for-windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 26cec6a817..232dbc3e08 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -66,8 +66,8 @@ jobs: - name: Electron Builder run: yarn run electron-builder --publish onTag --win --dir - # - name: Upload artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: built-artifacts - # path: path/to/artifact/ + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: built-artifacts + path: ./static/build From 3d3c2aab1e0ebd5fb60f59377b1ca9cc09053943 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:47:21 -0500 Subject: [PATCH 13/34] update readme file path --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 80dc01e3a7..086914bef0 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,5 @@ This is a forked repository of the "OpenLens" repo. -Observe the github actions on this repo. -The file (./.github\workflows\build-for-windows.yml) shows how to build the basic Lens app without any of the proprietary extensions like the Lens ID log in screen. +Observe the github actions on this repo. +The file [./.github/workflows/build-for-windows.yml](./.github/workflows/build-for-windows.yml) shows how to build the basic Lens app without any of the proprietary extensions like the Lens ID log in screen. From 38e1d499f955d4615bd2c0050b8f6c80da7ee5f8 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:48:34 -0500 Subject: [PATCH 14/34] use make --- .github/workflows/build-for-windows.yml | 43 +++++++++++++------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 232dbc3e08..1edf8a0c66 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -40,31 +40,34 @@ jobs: with: args: install make - # Sets up the node_modules folder with the Windows version of the dependencies - - name: Yarn install - run: | - yarn install --frozen-lockfile --network-timeout=100000 - yarn check --verify-tree --integrity + # # Sets up the node_modules folder with the Windows version of the dependencies + # - name: Yarn install + # run: | + # yarn install --frozen-lockfile --network-timeout=100000 + # yarn check --verify-tree --integrity - # Downloads kubernetes dependencies - - name: Download client binaries - run: yarn download:binaries + # # Downloads kubernetes dependencies + # - name: Download client binaries + # run: yarn download:binaries - # Fix the version of the build - - name: Fix Build version - run: yarn run npm:fix-build-version + # # Fix the version of the build + # - name: Fix Build version + # run: yarn run npm:fix-build-version - # Compile - - name: Compile - run: yarn run compile + # # Compile + # - name: Compile + # run: yarn run compile - # clear our pem folder before publish - # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish - - name: Clear CA trust - run: rm -rf node_modules/win-ca/pem + # # clear our pem folder before publish + # # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish + # - name: Clear CA trust + # run: rm -rf node_modules/win-ca/pem - - name: Electron Builder - run: yarn run electron-builder --publish onTag --win --dir + # - name: Electron Builder + # run: yarn run electron-builder --publish onTag --win --dir + + - name: Make + run: make build - name: Upload artifacts uses: actions/upload-artifact@v3 From 7ec532bc53f16d4f67fac2bb5481c8be03097e78 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 17:57:43 -0500 Subject: [PATCH 15/34] remove unused imports --- src/common/user-store/preferences-helpers.ts | 2 -- src/common/user-store/user-store.ts | 2 +- src/main/app-updater.ts | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/common/user-store/preferences-helpers.ts b/src/common/user-store/preferences-helpers.ts index 76251d92c2..94f8510be7 100644 --- a/src/common/user-store/preferences-helpers.ts +++ b/src/common/user-store/preferences-helpers.ts @@ -6,10 +6,8 @@ import moment from "moment-timezone"; import path from "path"; import os from "os"; -import { getAppVersion } from "../utils"; import type { editor } from "monaco-editor"; import merge from "lodash/merge"; -import { SemVer } from "semver"; import { defaultThemeId, defaultEditorFontFamily, defaultFontSize, defaultTerminalFontFamily } from "../vars"; import type { ObservableMap } from "mobx"; import { observable } from "mobx"; diff --git a/src/common/user-store/user-store.ts b/src/common/user-store/user-store.ts index 134d9b7af4..1714508296 100644 --- a/src/common/user-store/user-store.ts +++ b/src/common/user-store/user-store.ts @@ -4,7 +4,7 @@ */ import { app } from "electron"; -import semver, { SemVer } from "semver"; +import semver from "semver"; import { action, computed, observable, reaction, makeObservable, isObservableArray, isObservableSet, isObservableMap } from "mobx"; import { BaseStore } from "../base-store"; import migrations from "../../migrations/user-store"; diff --git a/src/main/app-updater.ts b/src/main/app-updater.ts index 25b783d043..859f7606db 100644 --- a/src/main/app-updater.ts +++ b/src/main/app-updater.ts @@ -6,7 +6,7 @@ import type { UpdateInfo } from "electron-updater"; import { autoUpdater } from "electron-updater"; import logger from "./logger"; -import { isPublishConfigured, isTestEnv } from "../common/vars"; +import { isTestEnv } from "../common/vars"; import { delay } from "../common/utils"; import type { UpdateAvailableToBackchannel } from "../common/ipc"; import { areArgsUpdateAvailableToBackchannel, AutoUpdateChecking, AutoUpdateLogPrefix, AutoUpdateNoUpdateAvailable, broadcastMessage, onceCorrect, UpdateAvailableChannel } from "../common/ipc"; @@ -50,7 +50,7 @@ interface Dependencies { * starts the automatic update checking * @param interval milliseconds between interval to check on, defaults to 2h */ -export const startUpdateChecking = ({ isAutoUpdateEnabled } : Dependencies) => once(function (interval = 1000 * 60 * 60 * 2): void { +export const startUpdateChecking = ({ isAutoUpdateEnabled }: Dependencies) => once(function (interval = 1000 * 60 * 60 * 2): void { if (!isAutoUpdateEnabled() || isTestEnv) { return; } From ae2610387afe71067667ea9e26a50a6764b55077 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 18:03:04 -0500 Subject: [PATCH 16/34] move repo clone down here so higher up can be cached maybe --- .github/workflows/build-for-windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 1edf8a0c66..c9eacee578 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -23,7 +23,6 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 14 @@ -34,12 +33,15 @@ jobs: npm install --global yarn yarn --version + # install GNU make - name: Install gnu make using choclatey uses: crazy-max/ghaction-chocolatey@v2 with: args: install make + - uses: actions/checkout@v3 + # # Sets up the node_modules folder with the Windows version of the dependencies # - name: Yarn install # run: | From 21f879bf52883b07e9e631686715e720a5abce3e Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 18:03:19 -0500 Subject: [PATCH 17/34] force to latest node gyp --- .github/workflows/build-for-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index c9eacee578..d9c09f154f 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -33,6 +33,8 @@ jobs: npm install --global yarn yarn --version + - name: update Node GYP to latest + run: npm install -g node-gyp@latest # install GNU make - name: Install gnu make using choclatey From 451ecfd959f86bdc24d69a6cff0df9374fea5e25 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 18:18:52 -0500 Subject: [PATCH 18/34] update node-gyp --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 0743efbc38..c05421f85a 100644 --- a/package.json +++ b/package.json @@ -377,7 +377,7 @@ "make-plural": "^6.2.2", "mini-css-extract-plugin": "^2.6.0", "mock-http": "^1.1.0", - "node-gyp": "7.1.2", + "node-gyp": "^9.1.0", "node-loader": "^2.0.0", "nodemon": "^2.0.16", "playwright": "^1.20.2", diff --git a/yarn.lock b/yarn.lock index f2aff02221..3c40d001ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9391,22 +9391,6 @@ node-forge@^1, node-forge@^1.2.1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== -node-gyp@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - node-gyp@^5.0.2, node-gyp@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e" @@ -9424,6 +9408,22 @@ node-gyp@^5.0.2, node-gyp@^5.1.0: tar "^4.4.12" which "^1.3.1" +node-gyp@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8" + integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.6" + make-fetch-happen "^10.0.3" + nopt "^5.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.2" + which "^2.0.2" + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" From 162cd175cb699259c47d9be32fade2ea32094fca Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 18:19:49 -0500 Subject: [PATCH 19/34] add no-optional to avoid nonessentials and switch back from make to allow node gyp error --- .github/workflows/build-for-windows.yml | 44 ++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index d9c09f154f..0424dabbc2 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -44,34 +44,34 @@ jobs: - uses: actions/checkout@v3 - # # Sets up the node_modules folder with the Windows version of the dependencies - # - name: Yarn install - # run: | - # yarn install --frozen-lockfile --network-timeout=100000 - # yarn check --verify-tree --integrity + # Sets up the node_modules folder with the Windows version of the dependencies + - name: Yarn install + run: | + yarn install --frozen-lockfile --network-timeout=100000 --no-optional + yarn check --verify-tree --integrity - # # Downloads kubernetes dependencies - # - name: Download client binaries - # run: yarn download:binaries + # Downloads kubernetes dependencies + - name: Download client binaries + run: yarn download:binaries - # # Fix the version of the build - # - name: Fix Build version - # run: yarn run npm:fix-build-version + # Fix the version of the build + - name: Fix Build version + run: yarn run npm:fix-build-version - # # Compile - # - name: Compile - # run: yarn run compile + # Compile + - name: Compile + run: yarn run compile - # # clear our pem folder before publish - # # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish - # - name: Clear CA trust - # run: rm -rf node_modules/win-ca/pem + # clear our pem folder before publish + # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish + - name: Clear CA trust + run: rm -rf node_modules/win-ca/pem - # - name: Electron Builder - # run: yarn run electron-builder --publish onTag --win --dir + - name: Electron Builder + run: yarn run electron-builder --publish onTag - - name: Make - run: make build + # - name: Make + # run: make build - name: Upload artifacts uses: actions/upload-artifact@v3 From 36e7280fce65a99b9d360c4f97d3ac7cf4a64c63 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 20:03:37 -0500 Subject: [PATCH 20/34] remove this job for now --- .github/workflows/build-for-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 0424dabbc2..8b2d475582 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -64,8 +64,8 @@ jobs: # clear our pem folder before publish # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish - - name: Clear CA trust - run: rm -rf node_modules/win-ca/pem + # - name: Clear CA trust + # run: rm -Recursive node_modules/win-ca/pem - name: Electron Builder run: yarn run electron-builder --publish onTag From 5a5f0e9ed5ad41de3a1e73b54aa8d96c03201f9e Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Tue, 23 Aug 2022 20:06:51 -0500 Subject: [PATCH 21/34] try installing windows build tools --- .github/workflows/build-for-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 8b2d475582..4026ce51ca 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -33,6 +33,9 @@ jobs: npm install --global yarn yarn --version + - name: Install build tools for Node GYP + run: npm install -g windows-build-tools + - name: update Node GYP to latest run: npm install -g node-gyp@latest From 3fa26a5ceb2af60eae0a70180aebc6f7490ce1ba Mon Sep 17 00:00:00 2001 From: JoelBirlingmairBeastCode <31551523+JoelBirlingmairBeastCode@users.noreply.github.com> Date: Tue, 23 Aug 2022 20:19:02 -0500 Subject: [PATCH 22/34] Change to specific version --- .github/workflows/build-for-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 4026ce51ca..5438283bc6 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -34,7 +34,7 @@ jobs: yarn --version - name: Install build tools for Node GYP - run: npm install -g windows-build-tools + run: npm install --global windows-build-tools@4.0.0 - name: update Node GYP to latest run: npm install -g node-gyp@latest From ebd3e3ce02e37158f4b69014e00b46713a6b4de7 Mon Sep 17 00:00:00 2001 From: JoelBirlingmairBeastCode <31551523+JoelBirlingmairBeastCode@users.noreply.github.com> Date: Tue, 23 Aug 2022 20:51:30 -0500 Subject: [PATCH 23/34] Use special node gyp --- .github/workflows/build-for-windows.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 5438283bc6..da7cdf5816 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -33,11 +33,14 @@ jobs: npm install --global yarn yarn --version - - name: Install build tools for Node GYP - run: npm install --global windows-build-tools@4.0.0 - - - name: update Node GYP to latest - run: npm install -g node-gyp@latest + + - name: Update node-gyp + run: | + $WhereNode = Get-Command node | Select-Object -ExpandProperty Definition + $NodeDirPath = Split-Path $WhereNode -Parent + $NodeModulesPath = $NodeDirPath + "\node_modules\npm\node_modules\npm-lifecycle" + cd $NodeModulesPath + npm install node-gyp@8.x # install GNU make - name: Install gnu make using choclatey From ff63182a932c5b947ac6d488cce8ef6fecc835b3 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Wed, 24 Aug 2022 10:54:43 -0500 Subject: [PATCH 24/34] yarn install force --- yarn.lock | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 244 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c40d001ab..03bb716e4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -496,6 +496,11 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== + "@hapi/b64@5.x.x": version "5.0.0" resolved "https://registry.yarnpkg.com/@hapi/b64/-/b64-5.0.0.tgz#b8210cbd72f4774985e78569b77e97498d24277d" @@ -989,6 +994,22 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@npmcli/fs@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" + integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== + dependencies: + "@gar/promisify" "^1.1.3" + semver "^7.3.5" + +"@npmcli/move-file@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" + integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@ogre-tools/fp@7.0.0", "@ogre-tools/fp@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-7.0.0.tgz#55cd32cc2fcf0505fa0d3ebfd45eb0a9bbb9554c" @@ -2566,6 +2587,15 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== + dependencies: + debug "^4.1.0" + depd "^1.1.2" + humanize-ms "^1.2.1" + aggregate-error@^3.0.0, aggregate-error@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -2750,7 +2780,7 @@ aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -"aproba@^1.1.2 || 2", aproba@^2.0.0: +"aproba@^1.0.3 || ^2.0.0", "aproba@^1.1.2 || 2", aproba@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== @@ -2760,6 +2790,14 @@ archy@~1.0.0: resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + are-we-there-yet@~1.1.2: version "1.1.7" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" @@ -3389,6 +3427,30 @@ cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3: unique-filename "^1.1.1" y18n "^4.0.0" +cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== + dependencies: + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + glob "^8.0.1" + infer-owner "^1.0.4" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + unique-filename "^2.0.0" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -3813,6 +3875,11 @@ color-string@^1.6.0, color-string@^1.9.0: color-name "^1.0.0" simple-swizzle "^0.2.2" +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + color@^3.1.3, color@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" @@ -4374,7 +4441,7 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -4557,7 +4624,7 @@ depd@2.0.0: resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -depd@~1.1.2: +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -4981,7 +5048,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.11: +encoding@^0.1.11, encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5023,6 +5090,11 @@ err-code@^1.0.0: resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + errno@^0.1.1, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -6100,7 +6172,7 @@ fs-minipass@^1.2.7: dependencies: minipass "^2.6.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -6166,6 +6238,20 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -6318,6 +6404,17 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" @@ -6436,7 +6533,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -6537,7 +6634,7 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.0, has-unicode@~2.0.1: +has-unicode@^2.0.0, has-unicode@^2.0.1, has-unicode@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= @@ -6694,7 +6791,7 @@ http-cache-semantics@^3.8.1: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -7064,6 +7161,11 @@ ip@^1.1.5: resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.6.tgz#5a651a37644586e18b6ba3b48ca122bf56495f67" integrity sha512-/dAvCivFs/VexXAtiAoMIqyhkhStNC9CPD0h1noonimOgB1xrCkexF2c5CjlqQ72GgMPjN6tiV+oreoPv3Ft1g== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -7291,6 +7393,11 @@ is-installed-globally@^0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== + is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -8797,6 +8904,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.7.1: + version "7.14.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" + integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== + lru_map@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" @@ -8846,6 +8958,28 @@ make-error@1.x, make-error@^1.1.1, make-error@^1.3.6: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== +make-fetch-happen@^10.0.3: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^16.1.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-fetch "^2.0.3" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" + make-fetch-happen@^5.0.0: version "5.0.2" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd" @@ -9088,6 +9222,45 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1. resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-fetch@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" + integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== + dependencies: + minipass "^3.1.6" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== + dependencies: + minipass "^3.0.0" + minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -9103,6 +9276,13 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" +minipass@^3.1.1, minipass@^3.1.6: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== + dependencies: + yallist "^4.0.0" + minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -9110,7 +9290,7 @@ minizlib@^1.3.3: dependencies: minipass "^2.9.0" -minizlib@^2.1.1: +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -9147,7 +9327,7 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@1.x, mkdirp@^1.0.3, mkdirp@~1.0.4: +mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -9319,7 +9499,7 @@ needle@^2.5.2: iconv-lite "^0.4.4" sax "^1.2.4" -negotiator@0.6.3: +negotiator@0.6.3, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -9789,6 +9969,16 @@ npmlog@^4.0.1, npmlog@^4.1.2, npmlog@~4.1.2: gauge "~2.7.3" set-blocking "~2.0.0" +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + nth-check@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" @@ -10672,6 +10862,14 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -11860,7 +12058,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -11971,6 +12169,15 @@ socks-proxy-agent@^4.0.0: agent-base "~4.2.1" socks "~2.3.2" +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + socks@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a" @@ -11979,6 +12186,14 @@ socks@^2.6.1: ip "^1.1.5" smart-buffer "^4.2.0" +socks@^2.6.2: + version "2.7.0" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" + integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== + dependencies: + ip "^2.0.0" + smart-buffer "^4.2.0" + socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" @@ -12169,6 +12384,13 @@ ssri@^6.0.0, ssri@^6.0.1, ssri@^6.0.2: dependencies: figgy-pudding "^3.5.1" +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== + dependencies: + minipass "^3.1.1" + stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -12557,7 +12779,7 @@ tar@^4.4.10, tar@^4.4.12, tar@^4.4.19: safe-buffer "^5.2.1" yallist "^3.1.1" -tar@^6.0.2, tar@^6.1.11: +tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -13127,7 +13349,14 @@ unique-filename@^1.1.1: dependencies: unique-slug "^2.0.0" -unique-slug@^2.0.0: +unique-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.0.tgz#c844c84c3b22e92038b0c53950f9dc34d2b55490" + integrity sha512-tpzoz2RpZ//6Zt4GPpOFTyrnfZuSvjIfe8lvx6Thp4yTQwJtAFwPlssEBE62VhGA2We5/COyNpcIu+OABu3/Yg== + dependencies: + unique-slug "^2.0.2" + +unique-slug@^2.0.0, unique-slug@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== @@ -13657,7 +13886,7 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: +wide-align@^1.1.0, wide-align@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== From 1c4e91b50f1606785b62b9f48f77994e7b36a105 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Wed, 24 Aug 2022 11:32:58 -0500 Subject: [PATCH 25/34] set the msvs version --- .github/workflows/build-for-windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index da7cdf5816..33a64b48b8 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -33,14 +33,16 @@ jobs: npm install --global yarn yarn --version - + - name: Set MSVC version + run: npm config set msvs_version 2022 + - name: Update node-gyp run: | $WhereNode = Get-Command node | Select-Object -ExpandProperty Definition $NodeDirPath = Split-Path $WhereNode -Parent $NodeModulesPath = $NodeDirPath + "\node_modules\npm\node_modules\npm-lifecycle" cd $NodeModulesPath - npm install node-gyp@8.x + npm install node-gyp@8.x # install GNU make - name: Install gnu make using choclatey From a3cefc117c0e1aa45af1fc491594cef0e882b9a5 Mon Sep 17 00:00:00 2001 From: JoelBirlingmairBeastCode <31551523+JoelBirlingmairBeastCode@users.noreply.github.com> Date: Wed, 24 Aug 2022 20:25:05 -0500 Subject: [PATCH 26/34] Update build-for-windows.yml Try adding path --- .github/workflows/build-for-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 33a64b48b8..b9cd5031b4 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -75,6 +75,9 @@ jobs: # - name: Clear CA trust # run: rm -Recursive node_modules/win-ca/pem + - name: add path to msbuild + run: PATH="/c/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/":$PATH + - name: Electron Builder run: yarn run electron-builder --publish onTag From aa828a94acb2c92da3758714e7b9edc71c9bd4c5 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Thu, 25 Aug 2022 17:09:18 -0500 Subject: [PATCH 27/34] print out versions --- .github/workflows/build-for-windows.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index b9cd5031b4..980b927a6f 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -27,10 +27,18 @@ jobs: with: node-version: 14 + - name: Check node/npm version + run: | + echo "NodeJs version: " + node --version + echo "npm version: " + npm --version + # use npm to set up yarn - name: Set up yarn cli run: | npm install --global yarn + echo "Yarn version: " yarn --version - name: Set MSVC version From 0e92ea608e29599ce0b828f36c6e5ca51d2fb261 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Thu, 25 Aug 2022 17:18:30 -0500 Subject: [PATCH 28/34] try to force node-gyp to latest --- .github/workflows/build-for-windows.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 980b927a6f..cf2560e072 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -50,7 +50,12 @@ jobs: $NodeDirPath = Split-Path $WhereNode -Parent $NodeModulesPath = $NodeDirPath + "\node_modules\npm\node_modules\npm-lifecycle" cd $NodeModulesPath - npm install node-gyp@8.x + npm install node-gyp@latest + + - name: Force to latest node-gyp + run: | + npm install --global node-gyp@latest + for /f "delims=" %P in ('npm prefix -g') do npm config set node_gyp "%P\node_modules\node-gyp\bin\node-gyp.js" # install GNU make - name: Install gnu make using choclatey @@ -83,9 +88,9 @@ jobs: # - name: Clear CA trust # run: rm -Recursive node_modules/win-ca/pem - - name: add path to msbuild + - name: add path to msbuild run: PATH="/c/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/":$PATH - + - name: Electron Builder run: yarn run electron-builder --publish onTag From a766ea61078afc467e0fbdbce65379b8777ca160 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Thu, 25 Aug 2022 17:28:16 -0500 Subject: [PATCH 29/34] use powershell syntax --- .github/workflows/build-for-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index cf2560e072..553c51fe2f 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -55,7 +55,7 @@ jobs: - name: Force to latest node-gyp run: | npm install --global node-gyp@latest - for /f "delims=" %P in ('npm prefix -g') do npm config set node_gyp "%P\node_modules\node-gyp\bin\node-gyp.js" + npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} # install GNU make - name: Install gnu make using choclatey From e6df67dc1eac2af5742f434ef66192591c6c524d Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Fri, 26 Aug 2022 11:01:55 -0500 Subject: [PATCH 30/34] fix path env editing for powershell syntax --- .github/workflows/build-for-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 553c51fe2f..2c8e1815ab 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -89,7 +89,7 @@ jobs: # run: rm -Recursive node_modules/win-ca/pem - name: add path to msbuild - run: PATH="/c/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/":$PATH + run: $env:Path += ";/c/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/" - name: Electron Builder run: yarn run electron-builder --publish onTag From a1b1818226e2fed43006da32eb4858d7464b7fd6 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Fri, 26 Aug 2022 11:02:23 -0500 Subject: [PATCH 31/34] add comment for possible helpful step --- .github/workflows/build-for-windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 2c8e1815ab..e3c3d4f926 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -44,6 +44,10 @@ jobs: - name: Set MSVC version run: npm config set msvs_version 2022 + # This might be helpful for issues building node-gyp modules on Windows. + # - name: Set up npm Windows build tools + # run: yarn install -g windows-build-tools + - name: Update node-gyp run: | $WhereNode = Get-Command node | Select-Object -ExpandProperty Definition From 02bbb1dc5f2dc28951c8b880078a30a9208a2344 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Fri, 26 Aug 2022 11:07:29 -0500 Subject: [PATCH 32/34] move yarn install to its own line to possibly improve error exit code reporting to Github --- .github/workflows/build-for-windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index e3c3d4f926..cedcc6a855 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -71,9 +71,7 @@ jobs: # Sets up the node_modules folder with the Windows version of the dependencies - name: Yarn install - run: | - yarn install --frozen-lockfile --network-timeout=100000 --no-optional - yarn check --verify-tree --integrity + run: yarn install --frozen-lockfile --network-timeout=100000 --no-optional # Downloads kubernetes dependencies - name: Download client binaries From 81848ac148d5828513c6d1430c03a41f66c37e09 Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Mon, 29 Aug 2022 16:04:43 -0500 Subject: [PATCH 33/34] add win dir to build --- .github/workflows/build-for-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index cedcc6a855..64bd9a8b3b 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -94,7 +94,7 @@ jobs: run: $env:Path += ";/c/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/" - name: Electron Builder - run: yarn run electron-builder --publish onTag + run: yarn run electron-builder --publish onTag --win --dir # - name: Make # run: make build From 643a75bcd0e61c0694795ffa1b65d3eef265f0ff Mon Sep 17 00:00:00 2001 From: JoelTrain Date: Mon, 29 Aug 2022 16:12:15 -0500 Subject: [PATCH 34/34] make an artifact of the dist folder --- .github/workflows/build-for-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-for-windows.yml b/.github/workflows/build-for-windows.yml index 64bd9a8b3b..6bdc4fcecf 100644 --- a/.github/workflows/build-for-windows.yml +++ b/.github/workflows/build-for-windows.yml @@ -103,4 +103,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: built-artifacts - path: ./static/build + path: ./dist