Skip to content

Commit 267670c

Browse files
committed
Merge branch 'wind' into dependabot/npm_and_yarn/tailwindcss-scoped-preflight-3.5.4
2 parents b825563 + 31fdd96 commit 267670c

10 files changed

Lines changed: 1546 additions & 1949 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ dist-ssr
2222
*.sw?
2323
.env
2424
*.ps1
25+
26+
.npmrc

farm.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ export default defineConfig((cfg) => {
3737
changeOrigin: true
3838
},
3939
"/v2": {
40-
target: "http://localhost:8000",
40+
// target: "http://localhost:8000",
41+
target: "https://api.test.status.otc-service.com",
4142
changeOrigin: true
4243
}
4344
}

package.json

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
"test": "vitest"
1212
},
1313
"dependencies": {
14-
"@fluentui/react-components": "^9.72.7",
14+
"@fluentui/react-components": "^9.72.11",
1515
"@telekom/scale-components": "3.0.0-beta.156",
1616
"@telekom/scale-components-react": "3.0.0-beta.158",
1717
"ahooks": "^3.9.6",
1818
"dayjs": "^1.11.19",
1919
"idb": "^8.0.3",
2020
"jwt-decode": "^4.0.0",
21-
"lodash": "^4.17.21",
22-
"oidc-client-ts": "^3.4.0",
23-
"react": "^19.2.0",
24-
"react-dom": "^19.2.0",
21+
"lodash": "^4.17.23",
22+
"oidc-client-ts": "^3.4.1",
23+
"react": "^19.2.4",
24+
"react-dom": "^19.2.4",
2525
"react-helmet": "^6.1.0",
2626
"react-oidc-context": "^3.3.0",
2727
"rxjs": "^7.8.2"
@@ -31,21 +31,20 @@
3131
"@farmfe/core": "^1.7.11",
3232
"@farmfe/js-plugin-postcss": "^1.12.0",
3333
"@farmfe/plugin-react": "^1.2.6",
34-
"@tailwindcss/postcss": "^4.1.17",
35-
"@types/lodash": "^4.17.20",
36-
"@types/node": "^24.10.1",
37-
"@types/react": "^19.2.5",
34+
"@tailwindcss/postcss": "^4.1.18",
35+
"@types/lodash": "^4.17.23",
36+
"@types/node": "^25.2.0",
37+
"@types/react": "^19.2.11",
3838
"@types/react-dom": "^19.2.3",
3939
"@types/react-helmet": "^6.1.11",
40-
"autoprefixer": "^10.4.22",
41-
"core-js": "^3.46.0",
42-
"eslint": "^9.39.1",
43-
"globals": "^16.5.0",
40+
"core-js": "^3.48.0",
41+
"eslint": "^9.39.2",
42+
"globals": "^17.3.0",
4443
"postcss": "^8.5.6",
4544
"react-refresh": "^0.18.0",
46-
"tailwindcss": "3.4.18",
47-
"tailwindcss-scoped-preflight": "^3.5.4",
48-
"typescript-eslint": "^8.46.4"
45+
"tailwindcss": "4.1.18",
46+
"tailwindcss-scoped-preflight": "^3.5.7",
47+
"typescript-eslint": "^8.54.0"
4948
},
50-
"packageManager": "pnpm@10.20.0"
49+
"packageManager": "pnpm@10.28.2"
5150
}

0 commit comments

Comments
 (0)