andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

don't use yarn pnp

Browse Source
This commit is contained in:
proddy
2023-04-04 11:27:02 +02:00
parent 24eccf1e04
commit fe8aa8f727
10 changed files with 888 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
interface/.prettierignore
View File

@@ -1,4 +1,5 @@
node_modules/
build/
dist/
.prettierrc
.yarn/

8
interface/.typesafe-i18n.json
View File

@@ -1,5 +1,5 @@
{
"adapter": "react",
"baseLocale": "pl",
"$schema": "https://unpkg.com/typesafe-i18n@5.24.3/schema/typesafe-i18n.json"
}
"adapter": "react",
"baseLocale": "pl",
"$schema": "https://unpkg.com/typesafe-i18n@5.24.3/schema/typesafe-i18n.json"
}

7
interface/.vscode/extensions.json vendored
View File

@@ -1,7 +0,0 @@
{
"recommendations": [
"arcanis.vscode-zipfs",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode"
]
}

10
interface/.vscode/settings.json vendored
View File

@@ -1,10 +0,0 @@
{
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"eslint.nodePath": ".yarn/sdks",
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}

11
interface/.yarnrc.yml
View File

@@ -3,7 +3,12 @@ plugins:
spec: '@yarnpkg/plugin-typescript'
yarnPath: .yarn/releases/yarn-3.4.1.cjs
# uing pnp
# nodeLinker: pnp
# use these if not using PnP and have node_modules
# compressionLevel: 0
# nmMode: hardlinks-local
# enableGlobalCache: true
nodeLinker: node-modules
compressionLevel: 0
nmMode: hardlinks-local
enableGlobalCache: true

8
interface/package.json
View File

@@ -28,7 +28,7 @@
"@table-library/react-table-library": "4.1.0",
"@types/lodash-es": "^4.17.7",
"@types/node": "^18.15.11",
"@types/react": "^18.0.32",
"@types/react": "^18.0.33",
"@types/react-dom": "^18.0.11",
"@types/react-router-dom": "^5.3.3",
"@yarnpkg/pnpify": "^4.0.0-rc.42",
@@ -51,8 +51,8 @@
"devDependencies": {
"@types/mime-types": "^2",
"@types/styled-components": "^5",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^5.57.0",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"@vitejs/plugin-react-swc": "^3.2.0",
"eslint": "^8.37.0",
"eslint-config-airbnb": "^19.0.4",
@@ -72,7 +72,7 @@
"vite": "^4.2.1",
"vite-plugin-minify": "^1.5.2",
"vite-plugin-svgr": "^2.4.0",
"vite-tsconfig-paths": "^4.0.7"
"vite-tsconfig-paths": "^4.0.8"
},
"packageManager": "yarn@3.4.1"
}

2
interface/src/App.tsx
View File

@@ -28,7 +28,7 @@ const App: FC = () => {
<AppRouting />
<ToastContainer
position="bottom-left"
autoClose={2000}
autoClose={3000}
hideProgressBar={false}
newestOnTop={false}
closeOnClick={true}

1749
interface/yarn.lock
View File

File diff suppressed because it is too large Load Diff

3
mock-api/.yarnrc.yml
View File

@@ -1,3 +1,4 @@
nodeLinker: pnp
#nodeLinker: pnp
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-3.4.1.cjs

12
mock-api/server.js
View File

@@ -364,19 +364,19 @@ const emsesp_devices = {
{
i: 1,
s: 'Thermostat (RC20/Moduline 300)',
t: 4,
t: 5,
tn: 'thermostat'
},
{
i: 2,
s: 'Boiler (Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i)',
t: 3,
t: 4,
tn: 'boiler'
},
{
i: 4,
s: 'Thermostat (RC100/Moduline 1000/1010)',
t: 4,
t: 5,
tn: 'thermostat'
}
]
@@ -388,7 +388,7 @@ const emsesp_coredata = {
devices: [
{
id: '2',
t: 3,
t: 4,
tn: 'Boiler',
b: 'Nefit',
n: 'GBx72/Trendline/Cerapur/Greenstar Si/27i',
@@ -399,7 +399,7 @@ const emsesp_coredata = {
},
{
id: '1',
t: 4,
t: 5,
tn: 'Thermostat',
b: '',
n: 'RC20/Moduline 300',
@@ -410,7 +410,7 @@ const emsesp_coredata = {
},
{
id: '4',
t: 4,
t: 5,
tn: 'Thermostat',
b: 'Buderus',
n: 'RC100/Moduline 1000/1010',