Skip to content

Commit b67eeb2

Browse files
committed
Merge remote-tracking branch 'origin/vnext' into sstoychev/updating-vite-config-for-iis
2 parents 1a9f3c5 + 748124a commit b67eeb2

7 files changed

Lines changed: 355 additions & 265 deletions

File tree

azure-pipelines/build-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ stages:
3333
displayName: 'Install Node'
3434
inputs:
3535
versionSource: 'spec'
36-
versionSpec: '16.x'
36+
versionSpec: '22.x'
3737

3838
- task: RegexReplace@3
3939
enabled: false

browser/package-lock.json

Lines changed: 320 additions & 254 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

browser/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"@types/react-router-dom": "^5.3.3",
6262
"@typescript-eslint/eslint-plugin": "^5.51.0",
6363
"@typescript-eslint/parser": "^5.51.0",
64-
"@vitejs/plugin-react": "^5.0.4",
65-
"@vitest/browser": "^3.2.4",
64+
"@vitejs/plugin-react": "^5.0.4",
65+
"@vitest/browser": "^3.2.4",
6666
"browser-sync": "^3.0.4",
6767
"del": "^5.1.0",
6868
"eslint": "^8.33.0",
@@ -93,9 +93,10 @@
9393
"ts-loader": "^9.5.4",
9494
"ts-node": "^10.9.2",
9595
"typescript": "^4.8.4",
96-
"vite": "^7.1.9",
97-
"vitest": "^3.2.4",
98-
"vitest-canvas-mock": "^0.3.3",
96+
"vite": "^7.1.9",
97+
"vite-tsconfig-paths": "^5.1.4",
98+
"vitest": "^3.2.4",
99+
"vitest-canvas-mock": "^0.3.3",
99100
"web-vitals": "^0.2.4",
100101
"webpack": "^5.101.3",
101102
"worker-loader": "^3.0.8"

browser/public/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"23.2.915","date":"2025-10-22 17:58:11","note":"this file is auto-generated"}
1+
{"version":"23.2.915","date":"2025-10-22 17:58:11","note":"this file is auto-generated"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"23.2.915","date":"2025-10-22 17:58:11","note":"this file is auto-generated"}
1+
{"version":"23.2.915","date":"2025-10-22 17:58:11","note":"this file is auto-generated"}

browser/tsconfig.paths.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"igniteui-react-spreadsheet": [ "node_modules/igniteui-react-spreadsheet", "node_modules/@infragistics/igniteui-react-spreadsheet" ],
1919
"igniteui-react-spreadsheet-chart-adapter": [ "node_modules/igniteui-react-spreadsheet-chart-adapter", "node_modules/@infragistics/igniteui-react-spreadsheet-chart-adapter" ],
2020
"igniteui-webcomponents": [ "node_modules/igniteui-webcomponents", "node_modules/@infragistics/igniteui-webcomponents" ],
21-
"igniteui-dockmanager": [ "node_modules/igniteui-dockmanager", "node_modules/@infragisics/igniteui-dockmanager" ],
21+
"igniteui-dockmanager": [ "node_modules/igniteui-dockmanager", "node_modules/@infragistics/igniteui-dockmanager" ],
2222
"igniteui-dockmanager/loader": [ "node_modules/igniteui-dockmanager/loader", "node_modules/@infragistics/igniteui-dockmanager/loader" ]
2323
}
2424
}

browser/vite.config.js

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,34 @@
11
import { defineConfig } from 'vite';
22
import react from '@vitejs/plugin-react';
3+
import tsconfigPaths from 'vite-tsconfig-paths';
4+
import { resolve } from 'path';
35

46
export default defineConfig(({ mode }) => ({
5-
plugins: [react()],
7+
plugins: [
8+
react(),
9+
tsconfigPaths()
10+
],
611
base: mode === 'production' ? '/react-demos/' : '/',
12+
resolve: {
13+
alias: {
14+
'igniteui-react-grids/grids': resolve(__dirname, 'node_modules/igniteui-react-grids/grids'),
15+
'igniteui-react-grids/grids/themes/light/': resolve(__dirname, 'node_modules/igniteui-react-grids/grids/themes/light/'),
16+
'@infragistics/igniteui-react-grids/grids': resolve(__dirname, 'node_modules/@infragistics/igniteui-react-grids/grids'),
17+
'@infragistics/igniteui-react-grids/grids/themes/light/': resolve(__dirname, 'node_modules/@infragistics/igniteui-react-grids/grids/themes/light/')
18+
}
19+
},
20+
optimizeDeps: {
21+
include: [
22+
'pako',
23+
'jszip'
24+
]
25+
},
726
build: {
8-
outDir: 'build'
27+
outDir: 'build',
28+
commonjsOptions: {
29+
transformMixedEsModules: true,
30+
include: [/node_modules/]
31+
}
932
},
1033
server: {
1134
open: false

0 commit comments

Comments
 (0)