Merge pull request #8608 from ever-co/fix/ui-config-targets

chore(packages): fix target dependencies and optimize build process
ever-co · Dec 22, 2024 · b165252 · b165252
2 parents 5de0dad + adc6e96
commit b165252
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 23 deletions.
diff --git a/.scripts/configure.ts b/.scripts/configure.ts
@@ -2,10 +2,10 @@
 // We are using dotenv (.env) for consistency with other Platform projects
 // This is Angular app and all settings will be loaded into the client browser!
 
-import { env } from './env';
-import { writeFile, unlinkSync } from 'fs';
+import { existsSync, mkdirSync, writeFile, unlinkSync } from 'fs';
 import * as path from 'path';
 import { argv } from 'yargs';
+import { env } from './env';
 
 const environment = argv.environment;
 const isProd = environment === 'prod';
@@ -364,9 +364,25 @@ try {
 const envFileDest: string = isProd ? 'environment.prod.ts' : 'environment.ts';
 const envFileDestOther: string = !isProd ? 'environment.prod.ts' : 'environment.ts';
 
-writeFile(`./packages/ui-config/src/lib/environments/${envFileDest}`, envFileContent, (error) => {
+console.log(`Generating Angular environment file: ${envFileDest}`);
+console.log(`Generating Second Angular environment file: ${envFileDestOther}`);
+
+// Define the folder paths
+const environmentsFolder = './packages/ui-config/src/lib/environments';
+
+// Ensure the environments folder exists
+if (!existsSync(environmentsFolder)) {
+	mkdirSync(environmentsFolder, { recursive: true });
+	console.log(`Created environments folder: ${environmentsFolder}`);
+}
+
+// Paths to environment files
+const envFilePath = path.resolve(`${environmentsFolder}/${envFileDest}`);
+const envFileOtherPath = path.resolve(`${environmentsFolder}/${envFileDestOther}`);
+
+writeFile(envFilePath, envFileContent, (error) => {
 	if (error) {
-		console.log(error);
+		console.error(`Error writing environment file: ${error}`);
 	} else {
 		// Paths to environment files
 		const envFilePath = path.resolve(`./packages/ui-config/src/lib/environments/${envFileDest}`);
@@ -376,9 +392,9 @@ writeFile(`./packages/ui-config/src/lib/environments/${envFileDest}`, envFileCon
 
 let envFileDestOtherContent = `export const environment = { production: ${!isProd} }`;
 
-writeFile(`./packages/ui-config/src/lib/environments/${envFileDestOther}`, envFileDestOtherContent, (error) => {
+writeFile(envFileOtherPath, envFileDestOtherContent, (error) => {
 	if (error) {
-		console.log(error);
+		console.error(`Error writing environment file: ${error}`);
 	} else {
 		const envFileOtherPath = path.resolve(`./packages/ui-config/src/lib/environments/${envFileDestOther}`);
 		console.log(`Generated Second Empty Angular environment file: ${envFileOtherPath}`);

diff --git a/package.json b/package.json
@@ -120,12 +120,12 @@
 		"build:package:ui-auth": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build ui-auth --configuration=development",
 		"build:package:ui-auth:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build ui-auth --configuration=production",
 		"build:package:ui-auth:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build ui-auth --configuration=production",
-		"build:package:ui-config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 && yarn run config:dev && yarn nx build ui-config --configuration=development",
-		"build:package:ui-config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn run config:prod && yarn nx build ui-config --configuration=production",
-		"build:package:ui-config:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn run config:prod && yarn nx build ui-config --configuration=production",
-		"build:package:ui-core": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn build:package:ui-config && yarn nx build ui-core --configuration=development",
-		"build:package:ui-core:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn build:package:ui-config:prod &&  yarn nx build ui-core --configuration=production",
-		"build:package:ui-core:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn build:package:ui-config:docker &&  yarn nx build ui-core --configuration=production",
+		"build:package:ui-config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 && yarn nx build ui-config --configuration=development",
+		"build:package:ui-config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build ui-config --configuration=production",
+		"build:package:ui-config:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build ui-config --configuration=production",
+		"build:package:ui-core": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build ui-core --configuration=development",
+		"build:package:ui-core:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build ui-core --configuration=production",
+		"build:package:ui-core:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build ui-core --configuration=production",
 		"build:package:auth": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build auth --configuration=development",
 		"build:package:auth:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build auth --configuration=production",
 		"build:package:auth:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build auth --configuration=production",

diff --git a/packages/ui-config/package.json b/packages/ui-config/package.json
@@ -19,7 +19,7 @@
 	"private": true,
 	"scripts": {
 		"lib:build": "yarn nx build ui-config --configuration=development",
-		"lib:build:prod": "cross-env NODE_ENV=production yarn ts-node scripts/replace-env-files.ts --environment=prod && yarn nx build ui-config --configuration=production",
+		"lib:build:prod": "yarn nx build ui-config --configuration=production",
 		"lib:watch": "yarn nx build ui-config --watch --configuration=development"
 	},
 	"peerDependencies": {

diff --git a/packages/ui-config/project.json b/packages/ui-config/project.json
@@ -9,6 +9,12 @@
 		"build": {
 			"executor": "@nx/angular:package",
 			"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
+			"dependsOn": [
+				{
+					"target": "replace-env",
+					"projects": "self"
+				}
+			],
 			"options": {
 				"project": "packages/ui-config/ng-package.json",
 				"tsConfig": "packages/ui-config/tsconfig.json"
@@ -23,6 +29,36 @@
 			},
 			"defaultConfiguration": "production"
 		},
+		"generate-env": {
+			"executor": "nx:run-commands",
+			"configurations": {
+				"production": {
+					"commands": ["yarn run config:prod"]
+				},
+				"development": {
+					"commands": ["yarn run config:dev"]
+				}
+			},
+			"defaultConfiguration": "production"
+		},
+		"replace-env": {
+			"executor": "nx:run-commands",
+			"dependsOn": [
+				{
+					"target": "generate-env",
+					"projects": "self"
+				}
+			],
+			"configurations": {
+				"production": {
+					"command": "cross-env NODE_ENV=production yarn ts-node packages/ui-config/scripts/replace-env-files.ts"
+				},
+				"development": {
+					"command": "cross-env NODE_ENV=development yarn ts-node packages/ui-config/scripts/replace-env-files.ts"
+				}
+			},
+			"defaultConfiguration": "production"
+		},
 		"test": {
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],

diff --git a/packages/ui-config/scripts/replace-env-files.ts b/packages/ui-config/scripts/replace-env-files.ts
@@ -5,13 +5,15 @@ import * as fs from 'fs';
  * Replaces the environment.ts file with environment.prod.ts if the environment is set to production.
  */
 function replaceFilesForProduction() {
-	const env = process.env['NODE_ENV'] || 'development';
+	console.log('Replacing environment files for production build...', process.env['NODE_ENV']);
 
+	const env = process.env['NODE_ENV'] || 'development';
 	console.log(`Current NODE_ENV: ${process.env['NODE_ENV']}`);
 
 	if (env === 'production') {
-		const sourceFile = path.join(path.resolve(`./src/lib/environments`), 'environment.prod.ts');
-		const targetFile = path.join(path.resolve(`./src/lib/environments`), 'environment.ts');
+		console.log('Replacing environment files for __dirname: ' + __dirname);
+		const sourceFile = path.join(path.resolve(__dirname, '../src/lib/environments'), 'environment.prod.ts');
+		const targetFile = path.join(path.resolve(__dirname, '../src/lib/environments'), 'environment.ts');
 
 		fs.copyFileSync(sourceFile, targetFile);
 		console.log(`Replaced environment file with ${sourceFile}`);

diff --git a/packages/ui-core/project.json b/packages/ui-core/project.json
@@ -10,6 +10,13 @@
 		"build": {
 			"executor": "@nx/angular:package",
 			"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
+			"dependsOn": [
+				"^build",
+				{
+					"target": "config",
+					"projects": "self"
+				}
+			],
 			"options": {
 				"project": "packages/ui-core/ng-package.json",
 				"tsConfig": "packages/ui-core/tsconfig.json"
@@ -22,17 +29,16 @@
 					"tsConfig": "packages/ui-core/tsconfig.lib.json"
 				}
 			},
-			"defaultConfiguration": "production",
-			"dependsOn": ["^build", "config"]
+			"defaultConfiguration": "production"
 		},
 		"config": {
 			"executor": "nx:run-commands",
 			"configurations": {
 				"production": {
-					"commands": ["yarn ts-node .scripts/configure.ts --prod"]
+					"commands": ["yarn nx build ui-config --configuration=production"]
 				},
 				"development": {
-					"commands": ["yarn ts-node .scripts/configure.ts --dev"]
+					"commands": ["yarn nx build ui-config --configuration=development"]
 				}
 			},
 			"defaultConfiguration": "production"

diff --git a/packages/ui-core/shared/src/lib/project/index.ts b/packages/ui-core/shared/src/lib/project/index.ts
@@ -1,3 +1 @@
-export * from './project-mutation/project-mutation.component';
-export * from './project-mutation/project-mutation.module';
-export * from './project-module/index';
+export * from './project-module';