Skip to content

Commit 2f59253

Browse files
BenjozorkSaschl
andauthoredDec 17, 2023
build: install packages using pnpm (flybywiresim#8329)
* add pnpm * add lockfile * fix typing error * disable eslint rule temporarily --------- Co-authored-by: Saschl <[email protected]>
1 parent 51ddd9f commit 2f59253

File tree

11 files changed

+9891
-18222
lines changed

11 files changed

+9891
-18222
lines changed
 

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node-linker=hoisted

‎fbw-a32nx/src/.eslintrc.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Copyright (c) 2021-2023 FlyByWire Simulations
2+
//
3+
// SPDX-License-Identifier: GPL-3.0
4+
15
'use strict';
26

37
module.exports = {
@@ -108,11 +112,12 @@ module.exports = {
108112
'no-undef': 'off',
109113
'max-len': ['error', { code: 192 }],
110114

111-
// Irrelevant for our use
115+
// Irrelevant for our use TODO we should probably fix those anyway, in the EFB at least, since that will be accessible remotely
112116
'jsx-a11y/alt-text': 'off',
113117
'jsx-a11y/no-static-element-interactions': 'off',
114118
'jsx-a11y/click-events-have-key-events': 'off',
115119
'jsx-a11y/anchor-is-valid': 'off',
120+
'jsx-a11y/control-has-associated-label': 'off',
116121
'object-curly-newline': ['error', { multiline: true }],
117122
'linebreak-style': 'off',
118123

‎fbw-a32nx/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => {
8585
const std = new Date(parseInt(schedOut) * 1000);
8686
schedOutParsed = `${std.getUTCHours().toString().padStart(2, '0')}${std.getUTCMinutes().toString().padStart(2, '0')}Z`;
8787
}
88-
const shutoffTimerRef = useRef<NodeJS.Timer | null>(null);
88+
const shutoffTimerRef = useRef<number | null>(null);
8989

9090
const [simBridgeConnected, setSimBridgeConnected] = useState(false);
9191

‎package-lock.json

-18,212
This file was deleted.

‎package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"rollup-plugin-livereload": "~2.0.0",
135135
"rollup-plugin-postcss": "^4.0.2",
136136
"rollup-plugin-typescript-paths": "^1.3.0",
137-
"tailwindcss": "^3.0.23",
137+
"tailwindcss": "^3.0.24",
138138
"ts-jest": "^29.1.1",
139139
"typescript": "^5.2.2",
140140
"vite": "^4.4.9",
@@ -169,7 +169,7 @@
169169
"qrcode.react": "^1.0.1",
170170
"rc-slider": "^9.7.5",
171171
"react": "^17.0.0",
172-
"react-bootstrap-icons": "^1.7.2",
172+
"react-bootstrap-icons": "^1.10.3",
173173
"react-canvas-draw": "^1.2.1",
174174
"react-dom": "^17.0.0",
175175
"react-error-boundary": "^3.1.4",
@@ -189,7 +189,6 @@
189189
"sass": "^1.45.1",
190190
"semver": "^7.3.8",
191191
"simple-keyboard-layouts": "^3.1.32",
192-
"tailwindcss": "^2.2.2",
193192
"use-events": "^1.4.2",
194193
"use-long-press": "^1.1.2",
195194
"uuid": "^9.0.0",

‎pnpm-lock.yaml

+9,876
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/dev-env/run-local.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
rem This is a script to use a locally build docker image to run the tests
44

5-
set image="sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4"
5+
set image="sha256:d1fa5a6ced00ca075f1e54aacdea086c52f321387245126bcb0cd7f84fbfa34b"
66

77
docker image inspect %image% 1> nul || docker system prune --filter label=flybywiresim=true -f
88
docker run --rm -it -v "%cd%:/external" %image% %*

‎scripts/dev-env/run-local.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# This is a script to use a locally build docker image to run the tests
55

6-
IMAGE="sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4"
6+
IMAGE="sha256:2cf75753022112a79d4a512caecfbdf601e12b01b382263cf78f90635cdea6bf"
77

88
# only set `-it` if there is a tty
99
if [ -t 0 ] && [ -t 1 ];

‎scripts/dev-env/run.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
set image="ghcr.io/flybywiresim/dev-env@sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4"
3+
set image="ghcr.io/flybywiresim/dev-env@sha256:2cf75753022112a79d4a512caecfbdf601e12b01b382263cf78f90635cdea6bf"
44

55
docker image inspect %image% 1> nul || docker system prune --filter label=flybywiresim=true -f
66
docker run --rm -it -v "%cd%:/external" %image% %*

‎scripts/dev-env/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
IMAGE="ghcr.io/flybywiresim/dev-env@sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4"
3+
IMAGE="ghcr.io/flybywiresim/dev-env@sha256:2cf75753022112a79d4a512caecfbdf601e12b01b382263cf78f90635cdea6bf"
44

55
# only set `-it` if there is a tty
66
if [ -t 0 ] && [ -t 1 ];

‎scripts/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ for arg in "$@"; do
1111
fi
1212
done
1313

14-
npm ci
14+
pnpm i

0 commit comments

Comments
 (0)
Please sign in to comment.