Skip to content

Commit 30a5db2

Browse files
evereqevereq
authored
Merge pull request #9363 from ever-co/develop
Stage
2 parents ea2fa77 + c4de2af commit 30a5db2

File tree

67 files changed

+2644
-792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2644
-792
lines changed

‎apps/agent/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
"electronmon": "^2.0.2"
3838
},
3939
"dependencies": {
40-
"@angular/animations": "^20.0.7",
41-
"@angular/cdk": "^20.0.6",
42-
"@angular/common": "^20.0.7",
43-
"@angular/core": "^20.0.7",
44-
"@angular/forms": "^20.0.7",
45-
"@angular/material": "^20.0.6",
46-
"@angular/router": "^20.0.7",
40+
"@angular/animations": "^20.2.4",
41+
"@angular/cdk": "^20.2.14",
42+
"@angular/common": "^20.2.4",
43+
"@angular/core": "^20.2.4",
44+
"@angular/forms": "^20.2.4",
45+
"@angular/material": "^20.2.14",
46+
"@angular/router": "^20.2.4",
4747
"@datorama/akita": "^8.0.1",
4848
"@datorama/akita-ngdevtools": "^7.0.0",
4949
"@electron/remote": "^2.0.8",

‎apps/agent/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@
133133
"executor": "@nx/jest:jest",
134134
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
135135
"options": {
136-
"jestConfig": "apps/agent/jest.config.ts"
136+
"jestConfig": "apps/agent/jest.config.ts",
137+
"tsConfig": "apps/agent/tsconfig.spec.json"
137138
}
138139
}
139140
}

‎apps/api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@nestjs/cli": "^11.0.16",
6969
"@nestjs/schematics": "^11.0.9",
7070
"@nestjs/testing": "^11.1.12",
71-
"cross-env": "^7.0.3",
71+
"cross-env": "^10.1.0",
7272
"nodemon": "^3.1.0",
7373
"ts-node": "^10.9.2",
7474
"typescript": "^5.9.3"

‎apps/desktop-timer/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
"terser-webpack-plugin": "^5.3.16"
3535
},
3636
"dependencies": {
37-
"@angular/animations": "^20.0.7",
38-
"@angular/cdk": "^20.0.6",
39-
"@angular/common": "^20.0.7",
40-
"@angular/core": "^20.0.7",
41-
"@angular/forms": "^20.0.7",
42-
"@angular/material": "^20.0.6",
43-
"@angular/router": "^20.0.7",
37+
"@angular/animations": "^20.2.4",
38+
"@angular/cdk": "^20.2.14",
39+
"@angular/common": "^20.2.4",
40+
"@angular/core": "^20.2.4",
41+
"@angular/forms": "^20.2.4",
42+
"@angular/material": "^20.2.14",
43+
"@angular/router": "^20.2.4",
4444
"@datorama/akita": "^8.0.1",
4545
"@datorama/akita-ngdevtools": "^7.0.0",
4646
"@electron/remote": "^2.0.8",

‎apps/desktop-timer/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@
132132
"executor": "@nx/jest:jest",
133133
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
134134
"options": {
135-
"jestConfig": "apps/desktop-timer/jest.config.ts"
135+
"jestConfig": "apps/desktop-timer/jest.config.ts",
136+
"tsConfig": "apps/desktop-timer/tsconfig.spec.json"
136137
}
137138
}
138139
}

‎apps/desktop/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"terser-webpack-plugin": "^5.3.16"
3636
},
3737
"dependencies": {
38-
"@angular/animations": "^20.0.7",
39-
"@angular/cdk": "^20.0.6",
40-
"@angular/common": "^20.0.7",
41-
"@angular/core": "^20.0.7",
42-
"@angular/forms": "^20.0.7",
43-
"@angular/material": "^20.0.6",
44-
"@angular/router": "^20.0.7",
38+
"@angular/animations": "^20.2.4",
39+
"@angular/cdk": "^20.2.14",
40+
"@angular/common": "^20.2.4",
41+
"@angular/core": "^20.2.4",
42+
"@angular/forms": "^20.2.4",
43+
"@angular/material": "^20.2.14",
44+
"@angular/router": "^20.2.4",
4545
"@datorama/akita": "^8.0.1",
4646
"@datorama/akita-ngdevtools": "^7.0.0",
4747
"@electron/remote": "^2.0.8",

‎apps/desktop/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@
120120
"executor": "@nx/jest:jest",
121121
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
122122
"options": {
123-
"jestConfig": "apps/desktop/jest.config.ts"
123+
"jestConfig": "apps/desktop/jest.config.ts",
124+
"tsConfig": "apps/desktop/tsconfig.spec.json"
124125
}
125126
}
126127
}

‎apps/gauzy-e2e/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@cypress/browserify-preprocessor": "^3.0.2",
5959
"@types/jest": "29.5.14",
6060
"concurrently": "^5.3.0",
61-
"cross-env": "^7.0.3",
61+
"cross-env": "^10.1.0",
6262
"cypress": "^9.4.1",
6363
"cypress-cucumber-preprocessor": "^4.3.1",
6464
"cypress-file-upload": "^5.0.8",

‎apps/gauzy/config/custom-webpack.config.js‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,54 @@ const TerserPlugin = require('terser-webpack-plugin');
22

33
console.log('Using custom Webpack config...');
44

5+
/**
6+
* Checks if the build is running in CircleCI environment
7+
*
8+
* @returns {boolean} True if the build is running in CircleCI environment
9+
*/
510
function isCircleCI() {
611
return process.env.CI === 'true' && process.env.CIRCLECI === 'true';
712
}
813

14+
/**
15+
* Checks if the build is running in development mode
16+
*
17+
* @returns {boolean} True if the build is running in development mode
18+
*/
19+
function isDevelopment() {
20+
return process.env.NODE_ENV === 'development';
21+
}
22+
923
const isCircleEnv = isCircleCI();
24+
const isDev = isDevelopment();
1025

1126
if (isCircleEnv) {
1227
console.log('Building in CircleCI environment');
1328
}
1429

30+
if (isDev) {
31+
console.log('Building in development mode - optimizations disabled for faster builds');
32+
}
33+
1534
module.exports = {
1635
resolve: {
1736
mainFields: ['es2016', 'browser', 'module', 'main']
1837
},
38+
// Enable persistent caching for faster rebuilds in development
39+
// Note: Angular's build system may handle caching differently, so this may not have full effect
40+
cache: isDev ? {
41+
type: 'filesystem',
42+
buildDependencies: {
43+
config: [__filename]
44+
}
45+
} : false,
1946
optimization: {
20-
concatenateModules: true, // Enable module concatenation for better performance
21-
// for now let's disable minimize in CircleCI
22-
minimize: !isCircleCI,
23-
minimizer: [
47+
// Disable module concatenation in development - it's slow and not needed
48+
concatenateModules: !isDev,
49+
// Only minimize in production builds
50+
minimize: !isCircleCI && !isDev,
51+
// Only use Terser in production builds
52+
minimizer: isDev ? [] : [
2453
new TerserPlugin({
2554
parallel: isCircleEnv ? 2 : true, // Use all available CPUs
2655
terserOptions: {

‎apps/gauzy/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919
},
2020
"resolutions": {
2121
"uglify-js": "npm:terser",
22-
"webpack": "^5.99.7",
22+
"webpack": "5.101.3",
2323
"webpack-cli": "^6.0.1"
2424
},
2525
"dependencies": {
2626
"@akveo/ng2-completer": "^9.0.1",
2727
"@ali-hm/angular-tree-component": "^20.1.6",
2828
"@angular-slider/ngx-slider": "^20.0.0",
29-
"@angular/animations": "^20.0.7",
30-
"@angular/cdk": "^20.0.6",
31-
"@angular/common": "^20.0.7",
32-
"@angular/core": "^20.0.7",
33-
"@angular/forms": "^20.0.7",
34-
"@angular/language-service": "^20.0.7",
35-
"@angular/material": "^20.0.6",
36-
"@angular/platform-browser": "^20.0.7",
37-
"@angular/platform-browser-dynamic": "^20.0.7",
38-
"@angular/router": "^20.0.7",
39-
"@angular/service-worker": "^20.0.7",
29+
"@angular/animations": "^20.2.4",
30+
"@angular/cdk": "^20.2.14",
31+
"@angular/common": "^20.2.4",
32+
"@angular/core": "^20.2.4",
33+
"@angular/forms": "^20.2.4",
34+
"@angular/language-service": "^20.2.4",
35+
"@angular/material": "^20.2.14",
36+
"@angular/platform-browser": "^20.2.4",
37+
"@angular/platform-browser-dynamic": "^20.2.4",
38+
"@angular/router": "^20.2.4",
39+
"@angular/service-worker": "^20.2.4",
4040
"@bluehalo/ngx-leaflet": "^20.0.0",
4141
"@datorama/akita": "^8.0.1",
4242
"@datorama/akita-ngdevtools": "^7.0.0",
@@ -192,7 +192,7 @@
192192
"karma-jasmine-html-reporter": "^1.5.4",
193193
"terser": "^5.30.3",
194194
"terser-webpack-plugin": "^5.3.16",
195-
"webpack": "^5.99.7",
195+
"webpack": "5.101.3",
196196
"webpack-cli": "^6.0.1",
197197
"webpack-merge": "^6.0.1",
198198
"webpack-node-externals": "^3.0.0"

0 commit comments

Comments
 (0)