don't use yarn pnp

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

View File

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

View File

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

View File

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

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
}

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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