Skip to content

Commit

Permalink
chore: update yarn to v4 (#2746)
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian authored Feb 17, 2024
1 parent 25811df commit 3f3a91e
Show file tree
Hide file tree
Showing 191 changed files with 14,947 additions and 12,458 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.{js,json,yml,ts,tsx,jsx,cjs,mjs}]
charset = utf-8
indent_style = space
indent_size = 2
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated
9 changes: 7 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ jobs:
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- name: yarn update
- name: yarn install
run: |
yarn
corepack enable
# try and avoid timeout errors
yarn config set httpTimeout 100000
yarn install --immutable
- name: check format
run: |
yarn prettier --check .
50 changes: 28 additions & 22 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,22 @@ jobs:
with:
node-version-file: '.node-version'

- name: Prepare (server)
- name: Prepare
run: |
corepack enable
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
yarn config set httpTimeout 100000
yarn --immutable
yarn --frozen-lockfile
yarn build:ts
- name: Check types (server)
run: |
cd companion
yarn check-types
- name: Prepare (client)
run: |
cd webui
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
yarn --frozen-lockfile
- name: Check types (client)
run: |
cd webui
Expand Down Expand Up @@ -61,9 +58,12 @@ jobs:

- name: build & package
run: |
corepack enable
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
yarn config set httpTimeout 100000
yarn --immutable
yarn update
yarn zx tools/build/complete.mjs
Expand Down Expand Up @@ -128,9 +128,12 @@ jobs:

- name: build & package
run: |
corepack enable
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
yarn config set httpTimeout 100000
yarn --immutable
yarn update
yarn zx tools/build/complete.mjs linux-arm64
Expand Down Expand Up @@ -194,9 +197,12 @@ jobs:

- name: build & package
run: |
corepack enable
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
yarn config set httpTimeout 100000
yarn --immutable
yarn update
yarn zx tools/build/complete.mjs
Expand Down Expand Up @@ -259,9 +265,12 @@ jobs:

- name: yarn update
run: |
corepack enable
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
yarn config set httpTimeout 100000
yarn --immutable
yarn update
env:
CI: 1
Expand Down Expand Up @@ -329,17 +338,14 @@ jobs:
- name: build & package
shell: bash
run: |
# try and avoid timeout errors
yarn config set network-timeout 100000 -g
corepack enable
# This fixes it somehow, and without it we get no logs from any shell scripts which are run
yarn config set script-shell bash
# try and avoid timeout errors
yarn config set httpTimeout 100000
yarn --immutable
yarn update
# zx needs this to be unset..
yarn config set script-shell ''
yarn zx tools/build/complete.mjs
env:
CI: 1
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,16 @@ jobs:
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
- name: yarn update
- name: yarn install
run: |
yarn
corepack enable
# try and avoid timeout errors
yarn config set httpTimeout 100000
yarn install --immutable
yarn build:ts
- name: run tests
run: |
yarn test
182 changes: 95 additions & 87 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,87 +1,95 @@
BUILD
SENTRY
.DS_Store
*-x64/*
package-lock.json
.cache
/build/
out/
config
db
/module-tmp
/bundle-*.zip
.vscode

dist

# Visual Studio 2015/2017 cache/options directory
.vs/

# Electron
electron-output/

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
node_modules2/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

# jsdoc
docs/jsdoc/
BUILD
SENTRY
.DS_Store
*-x64/*
package-lock.json
.cache
/build/
out/
config
db
/module-tmp
/bundle-*.zip
.vscode

dist

# Visual Studio 2015/2017 cache/options directory
.vs/

# Electron
electron-output/

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
node_modules2/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

# jsdoc
docs/jsdoc/


.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
5 changes: 2 additions & 3 deletions jsdoc.json → companion/jsdoc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"source": {
"include": ["lib", "package.json", "README.md"],
"exclude": ["lib/Resources/Font.js"],
"include": ["lib", "package.json", "../README.md"],
"includePattern": ".js$",
"excludePattern": "(node_modules/|docs/)"
},
"opts": {
"encoding": "utf8",
"readme": "./README.md",
"readme": "../README.md",
"destination": "docs/jsdoc/",
"recurse": true,
"verbose": true
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import CoreBase from '../Core/Base.js'
import CloudRegion from './Region.js'
import got from 'got'
import { v4 } from 'uuid'
import { xyToOldBankIndex } from '../Shared/ControlId.js'
import { xyToOldBankIndex } from '@companion/shared/ControlId.js'

const CLOUD_URL = 'https://api.bitfocus.io/v1'

Expand Down
1 change: 1 addition & 0 deletions lib/Cloud/Region.js → companion/lib/Cloud/Region.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ class CloudRegion {
;(async () => {
while (this.socket) {
for await (let event of this.socket.listener('error')) {
// @ts-expect-error unknown property
if (event.error.code === 4401) {
// Disconnected by another process with the same id, let us disable this cloud instance,
// to prevent connection looping
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ function SessionRoom(id) {
}

/**
* @typedef {import('../Shared/Model/ActionRecorderModel.js').RecordSessionInfo} RecordSessionInfo
* @typedef {import('../Shared/Model/ActionRecorderModel.js').RecordSessionListInfo} RecordSessionListInfo
* @typedef {import('../Shared/Model/ActionRecorderModel.js').RecordActionTmp} RecordActionTmp
* @typedef {import('@companion/shared/Model/ActionRecorderModel.js').RecordSessionInfo} RecordSessionInfo
* @typedef {import('@companion/shared/Model/ActionRecorderModel.js').RecordSessionListInfo} RecordSessionListInfo
* @typedef {import('@companion/shared/Model/ActionRecorderModel.js').RecordActionTmp} RecordActionTmp
*/

/**
Expand Down
Loading

0 comments on commit 3f3a91e

Please sign in to comment.