Use yarn 1.22instead of yarn 3

unknownskl · Sep 25, 2024 · 010cf91 · 010cf91
1 parent 6231445
commit 010cf91
Show file tree

Hide file tree

Showing 11 changed files with 6,229 additions and 8,780 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,10 +38,6 @@ jobs:
  key: ${{ runner.os }}-${{ runner.arch }}-npm-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/yarn.lock') }}
  restore-keys: ${{ runner.os }}-${{ runner.arch }}-npm-
 
- - name: Enable corepack
- run: |
- corepack enable
-
  - name: Install yarn dependencies
  run: yarn
 
@@ -123,10 +119,6 @@ jobs:
  key: ${{ runner.os }}-${{ runner.arch }}-flatpak-builder-${{ hashFiles('flatpak/*') }}
  restore-keys: ${{ runner.os }}-${{ runner.arch }}-flatpak-builder-
 
- - name: Enable corepack
- run: |
- corepack enable
-
  - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
  with:
  bundle: greenlight.flatpak
@@ -169,10 +161,6 @@ jobs:
  key: ${{ runner.os }}-${{ runner.arch }}-npm-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/yarn.lock') }}
  restore-keys: ${{ runner.os }}-${{ runner.arch }}-npm-
 
- - name: Enable corepack
- run: |
- corepack enable
-
  - name: Install yarn dependencies
  run: yarn
 

diff --git a/cli/package.json b/cli/package.json
@@ -2,8 +2,8 @@
  "name": "@greenlight/cli",
  "version": "1.0.0",
  "dependencies": {
- "@greenlight/authentication": "workspace:^",
- "@greenlight/logger": "workspace:^",
+ "@greenlight/authentication": "^1.0.0",
+ "@greenlight/logger": "^1.0.0",
  "debug": "^4.3.4",
  "xbox-webapi": "^1.4.1"
  },

diff --git a/package.json b/package.json
@@ -24,6 +24,5 @@
  "cli",
  "server",
  "packages/*"
- ],
- "packageManager": "[email protected]"
-}
+ ]
+}
diff --git a/packages/authentication/package.json b/packages/authentication/package.json
@@ -2,8 +2,9 @@
  "name": "@greenlight/authentication",
  "version": "1.0.0",
  "dependencies": {
- "@greenlight/logger": "workspace:^",
+ "@greenlight/logger": "^1.0.0",
  "electron-store": "^8.0.1",
+ "electron": "32.1.2",
  "xal-node": "^1.0.2"
  },
  "license": "MIT",

diff --git a/packages/authentication/src/authstore.ts b/packages/authentication/src/authstore.ts
@@ -37,9 +37,9 @@ export default class AuthStore extends TokenStore {
 }
 
 const getAppBasePath = () => {
- let ElectronAppName = '@greenlight/app3 (development)'
+ let ElectronAppName = '@greenlight/app2 (development)'
  if(process.env.NODE_ENV === 'production')
- ElectronAppName = '@greenlight/app3'
+ ElectronAppName = '@greenlight/app'
 
  if(app !== undefined && app.getPath !== undefined)
  return app.getPath('userData')

diff --git a/packages/platform/package.json b/packages/platform/package.json
@@ -2,11 +2,11 @@
  "name": "@greenlight/platform",
  "version": "1.0.0",
  "dependencies": {
- "@greenlight/authentication": "workspace:^",
- "@greenlight/logger": "workspace:^",
- "@greenlight/storeapi": "workspace:^",
- "@greenlight/webapi": "workspace:^",
- "@greenlight/xcloudapi": "workspace:^"
+ "@greenlight/authentication": "^1.0.0",
+ "@greenlight/logger": "^1.0.0",
+ "@greenlight/storeapi": "^1.0.0",
+ "@greenlight/webapi": "^1.0.0",
+ "@greenlight/xcloudapi": "^1.0.0"
  },
  "license": "MIT",
  "main": "dist/index",

diff --git a/packages/storeapi/package.json b/packages/storeapi/package.json
@@ -11,9 +11,9 @@
  "test": "yarn build:deps && yarn build && mocha -r ../../node_modules/ts-node/register tests/**.ts tests/**/*.ts"
  },
  "dependencies": {
- "@greenlight/authentication": "workspace:^",
- "@greenlight/logger": "workspace:^",
- "@greenlight/xcloudapi": "workspace:^",
+ "@greenlight/authentication": "^1.0.0",
+ "@greenlight/logger": "^1.0.0",
+ "@greenlight/xcloudapi": "^1.0.0",
  "sqlite3": "^5.1.7"
  },
  "devDependencies": {

diff --git a/packages/webapi/package.json b/packages/webapi/package.json
@@ -11,8 +11,8 @@
  "test": "yarn build && mocha -r ../../node_modules/ts-node/register tests/**.ts tests/**/*.ts"
  },
  "dependencies": {
- "@greenlight/authentication": "workspace:^",
- "@greenlight/logger": "workspace:^"
+ "@greenlight/authentication": "^1.0.0",
+ "@greenlight/logger": "^1.0.0"
  },
  "devDependencies": {
  "@types/chai": "^4",

diff --git a/packages/xcloudapi/package.json b/packages/xcloudapi/package.json
@@ -11,8 +11,8 @@
  "test": "yarn build && mocha -r ../../node_modules/ts-node/register tests/**.ts tests/**/*.ts"
  },
  "dependencies": {
- "@greenlight/authentication": "workspace:^",
- "@greenlight/logger": "workspace:^"
+ "@greenlight/authentication": "^1.0.0",
+ "@greenlight/logger": "^1.0.0"
  },
  "devDependencies": {
  "@types/chai": "^4",

diff --git a/server/package.json b/server/package.json
@@ -2,11 +2,11 @@
  "name": "@greenlight/server",
  "version": "1.0.0",
  "dependencies": {
- "@greenlight/authentication": "workspace:^",
- "@greenlight/logger": "workspace:^",
- "@greenlight/storeapi": "workspace:^",
- "@greenlight/webapi": "workspace:^",
- "@greenlight/xcloudapi": "workspace:^",
+ "@greenlight/authentication": "^1.0.0",
+ "@greenlight/logger": "^1.0.0",
+ "@greenlight/storeapi": "^1.0.0",
+ "@greenlight/webapi": "^1.0.0",
+ "@greenlight/xcloudapi": "^1.0.0",
  "fastify": "^5.0.0"
  },
  "license": "MIT",