feat(stark-build): add support for environment variables at runtime (…

…importing environment.ts file) and at compilation time (using webpack Define plugin)

ISSUES CLOSED: #50

package.json

@@ -152,7 +152,7 @@
     "update:starter": "npm run clean:starter && npm run install:starter"
   },
   "lint-staged": {
-    "*.{css,js,json,pcss,scss,ts}": [
+    "*.{css,js,json,md,pcss,scss,ts}": [
       "prettier --write",
       "git add"
     ]

packages/stark-build/config/build-utils.js

@@ -4,24 +4,24 @@ const fs = require("fs");
 const helpers = require("./helpers");
 const ngCliUtils = require("./ng-cli-utils");
 
-const _getAngularCliAppConfig = getAngularCliAppConfig();
+const angularCliAppConfig = ngCliUtils.getAngularCliAppConfig(helpers.root("angular.json"));
 const ANGULAR_APP_CONFIG = {
-	config: _getAngularCliAppConfig,
-	deployUrl: _getAngularCliAppConfig.architect.build.options.deployUrl || "",
-	baseHref: _getAngularCliAppConfig.architect.build.options.baseHref || "/",
-	sourceRoot: _getAngularCliAppConfig.sourceRoot,
-	outputPath: _getAngularCliAppConfig.architect.build.options.outputPath
+	config: angularCliAppConfig,
+	deployUrl: angularCliAppConfig.architect.build.options.deployUrl || "",
+	baseHref: angularCliAppConfig.architect.build.options.baseHref || "/",
+	sourceRoot: angularCliAppConfig.sourceRoot,
+	outputPath: angularCliAppConfig.architect.build.options.outputPath
 };
 
 const DEFAULT_METADATA = {
-	title: "Stark Application by @NationalBankBelgium",
-	baseUrl: "/",
-	isDevServer: helpers.isWebpackDevServer(),
+	TITLE: "Stark Application by @NationalBankBelgium",
+	BASE_URL: "/",
+	IS_DEV_SERVER: helpers.isWebpackDevServer(),
 	HMR: helpers.hasProcessFlag("hot"),
 	AOT: process.env.BUILD_AOT || helpers.hasNpmFlag("aot"),
 	E2E: !!process.env.BUILD_E2E,
 	WATCH: helpers.hasProcessFlag("watch"),
-	tsConfigPath: ANGULAR_APP_CONFIG.config.architect.build.options.tsConfig,
+	TS_CONFIG_PATH: ANGULAR_APP_CONFIG.config.architect.build.options.tsConfig,
 	environment: ""
 };
 
@@ -77,11 +77,11 @@ function getEnvironmentFile(environment) {
  * Read the tsconfig to determine if we should prefer ES2015 modules.
  * Load rxjs path aliases.
  * https://github.com/ReactiveX/rxjs/blob/master/doc/pipeable-operators.md#build-and-treeshaking
- * @param supportES2015 Set to true when the output of typescript is >= ES6
+ * @param shouldSupportES2015 Set to true when the output of typescript is >= ES6
  */
-function rxjsAlias(supportES2015) {
+function rxjsAlias(shouldSupportES2015) {
 	try {
-		const rxjsPathMappingImport = supportES2015 ? "rxjs/_esm2015/path-mapping" : "rxjs/_esm5/path-mapping";
+		const rxjsPathMappingImport = shouldSupportES2015 ? "rxjs/_esm2015/path-mapping" : "rxjs/_esm5/path-mapping";
 		const rxPaths = require(rxjsPathMappingImport);
 		return rxPaths();
 	} catch (e) {
@@ -144,25 +144,6 @@ function getApplicationAssetsConfig() {
 	return [];
 }
 
-function getAngularCliAppConfig() {
-	const applicationAngularCliConfigPath = helpers.root("angular.json");
-	if (fs.existsSync(applicationAngularCliConfigPath)) {
-		const angularCliConfig = require(applicationAngularCliConfigPath);
-		const cliConfig = ngCliUtils.validateAngularCLIConfig(angularCliConfig);
-		if (cliConfig) {
-			if (cliConfig.defaultProject && cliConfig.projects[cliConfig.defaultProject]) {
-				return cliConfig.projects[cliConfig.defaultProject];
-			} else {
-				throw new Error("Angular-cli config apps is wrong. Please adapt it to follow Angular CLI way.");
-			}
-		} else {
-			throw new Error("Parsing " + applicationAngularCliConfigPath + " failed. Ensure the file is valid JSON.");
-		}
-	} else {
-		throw new Error("angular.json is not present. Please add this at the root your project because stark-build needs this.");
-	}
-}
-
 /**
  * Return copyWebpack config based on angular cli assets declaration
  *

packages/stark-build/config/ng-cli-utils.js

@@ -3,9 +3,9 @@ const fs = require("fs");
 const cliUtilConfig = require("@angular/cli/utilities/config");
 const { formatDiagnostics } = require("@angular/compiler-cli/ngtools2");
 
-function isDirectory(path) {
+function isDirectory(pathToCheck) {
 	try {
-		return fs.statSync(path).isDirectory();
+		return fs.statSync(pathToCheck).isDirectory();
 	} catch (_) {
 		return false;
 	}
@@ -15,6 +15,26 @@ function getDirectoriesNames(source) {
 	return fs.readdirSync(source).filter(name => isDirectory(path.join(source, name)));
 }
 
+function getAngularCliAppConfig(angularCliAppConfigPath) {
+	if (fs.existsSync(angularCliAppConfigPath)) {
+		const angularCliConfig = require(angularCliAppConfigPath);
+		const cliConfig = validateAngularCLIConfig(angularCliConfig);
+		if (cliConfig) {
+			if (cliConfig.defaultProject && cliConfig.projects[cliConfig.defaultProject]) {
+				return cliConfig.projects[cliConfig.defaultProject];
+			} else {
+				throw new Error(
+					"The configuration of the default project in angular.json is wrong. Please adapt it to follow Angular CLI guidelines."
+				);
+			}
+		} else {
+			throw new Error("Parsing " + angularCliAppConfigPath + " failed. Please make sure that the file is valid JSON.");
+		}
+	} else {
+		throw new Error("angular.json is not present. Please add this at the root your project because stark-build needs this.");
+	}
+}
+
 /**
  * Validate passed angular cli config based on schema: @angular/cli/lib/config/schema.json
  * If the serialized file is equal to the passed json, return the serialized config.
@@ -43,7 +63,8 @@ function getWorkspace() {
 	return cliUtilConfig.getWorkspace();
 }
 
+exports.getAngularCliAppConfig = getAngularCliAppConfig;
 exports.getDirectoriesNames = getDirectoriesNames;
+exports.getWorkspace = getWorkspace;
 exports.isDirectory = isDirectory;
 exports.validateAngularCLIConfig = validateAngularCLIConfig;
-exports.getWorkspace = getWorkspace;

packages/stark-build/config/webpack.common.js

@@ -12,6 +12,7 @@ const commonData = require("./webpack.common-data.js"); // common configuration
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const BaseHrefWebpackPlugin = require("base-href-webpack-plugin").BaseHrefWebpackPlugin;
+const DefinePlugin = require("webpack/lib/DefinePlugin");
 // const InlineManifestWebpackPlugin = require("inline-manifest-webpack-plugin");
 // const ScriptExtHtmlWebpackPlugin = require("script-ext-html-webpack-plugin");
 const { AngularCompilerPlugin } = require("@ngtools/webpack");
@@ -30,14 +31,14 @@ const buildUtils = require("./build-utils");
 module.exports = options => {
 	const isProd = options.ENV === "production";
 	const METADATA = Object.assign({}, buildUtils.DEFAULT_METADATA, options.metadata || {});
-	const supportES2015 = buildUtils.supportES2015(METADATA.tsConfigPath);
+	const supportES2015 = buildUtils.supportES2015(METADATA.TS_CONFIG_PATH);
 
 	const entry = {
 		polyfills: "./src/polyfills.browser.ts",
 		main: "./src/main.browser.ts"
 	};
 
-	const tsConfigApp = buildUtils.readTsConfig(helpers.root(METADATA.tsConfigPath));
+	const tsConfigApp = buildUtils.readTsConfig(helpers.root(METADATA.TS_CONFIG_PATH));
 
 	const defaultNgcOptions = {
 		generateCodeForLibraries: true,
@@ -342,24 +343,26 @@ module.exports = options => {
 		 * See: http://webpack.github.io/docs/configuration.html#plugins
 		 */
 		plugins: [
-			// /**
-			//  * Plugin: DefinePlugin
-			//  * Description: Define free variables.
-			//  * Useful for having development builds with debug logging or adding global constants.
-			//  *
-			//  * Environment helpers
-			//  *
-			//  * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin
-			//  */
-			// // NOTE: when adding more properties make sure you include them in custom-typings.d.ts
-			// new DefinePlugin({
-			// 	'ENV': JSON.stringify(METADATA.ENV),
-			// 	'HMR': METADATA.HMR,
-			// 	'AOT': METADATA.AOT,
-			// 	'process.env.ENV': JSON.stringify(METADATA.ENV),
-			// 	'process.env.NODE_ENV': JSON.stringify(METADATA.ENV),
-			// 	'process.env.HMR': METADATA.HMR
-			// }),
+			/**
+			 * Plugin: DefinePlugin
+			 * Description: Define free variables.
+			 * Useful for having development builds with debug logging or adding global constants.
+			 *
+			 * Environment helpers
+			 * IMPORTANT: when adding more properties make sure you include them in typings/environment.d.ts
+			 *
+			 * See: https://webpack.js.org/plugins/define-plugin
+			 */
+			new DefinePlugin({
+				ENV: JSON.stringify(METADATA.ENV),
+				HMR: METADATA.HMR,
+				AOT: METADATA.AOT, // TODO: is this needed?
+				"process.env": {
+					ENV: JSON.stringify(METADATA.ENV),
+					NODE_ENV: JSON.stringify(METADATA.ENV),
+					HMR: METADATA.HMR
+				}
+			}),
 
 			/**
 			 * Plugin: AngularNamedLazyChunksWebpackPlugin
@@ -441,7 +444,7 @@ module.exports = options => {
 			 */
 			new HtmlWebpackPlugin({
 				template: "src/index.html",
-				title: METADATA.title,
+				title: METADATA.TITLE,
 				chunksSortMode: function(a, b) {
 					const entryPoints = ["inline", "polyfills", "sw-register", "styles", "vendor", "main"];
 					return entryPoints.indexOf(a.names[0]) - entryPoints.indexOf(b.names[0]);
@@ -493,7 +496,7 @@ module.exports = options => {
 				},
 				platform: 0, // 0 = browser, 1 = server
 				compilerOptions: appNgcOptions,
-				tsConfigPath: METADATA.tsConfigPath
+				tsConfigPath: METADATA.TS_CONFIG_PATH
 			})
 
 			/**

packages/stark-build/config/webpack.dev.js

@@ -25,18 +25,16 @@ const WebpackMonitor = require("webpack-monitor");
  * See: https://webpack.js.org/configuration/
  */
 module.exports = function(env) {
-	// for the content of the env parameter see here :  https://webpack.js.org/api/cli/#environment-options
 	const ENV = (process.env.ENV = process.env.NODE_ENV = "development");
-	const HOST = process.env.HOST || "localhost";
-	const PORT = process.env.PORT || 3000;
 	let MONITOR = false;
+	// for the content of the env parameter see here :  https://webpack.js.org/api/cli/#environment-options
 	if (env && typeof env.monitor !== "undefined") {
 		MONITOR = env.monitor;
 	}
 
 	const METADATA = Object.assign({}, buildUtils.DEFAULT_METADATA, {
-		HOST: HOST,
-		PORT: PORT,
+		HOST: process.env.HOST || "localhost",
+		PORT: process.env.PORT || 3000,
 		ENV: ENV,
 		HMR: helpers.hasProcessFlag("hot"),
 		environment: helpers.hasProcessFlag("hot") ? "hmr" : "dev"

packages/stark-build/config/webpack.prod.js

@@ -47,15 +47,14 @@ function getUglifyOptions(supportES2015) {
 
 module.exports = function() {
 	const ENV = (process.env.NODE_ENV = process.env.ENV = "production");
-	const supportES2015 = buildUtils.supportES2015(buildUtils.DEFAULT_METADATA.tsConfigPath);
 	const METADATA = Object.assign({}, buildUtils.DEFAULT_METADATA, {
-		host: process.env.HOST || "localhost",
-		port: process.env.PORT || 8080,
+		HOST: process.env.HOST || "localhost",
+		PORT: process.env.PORT || 8080,
 		ENV: ENV,
-		HMR: false
+		HMR: false,
+		environment: buildUtils.DEFAULT_METADATA.E2E ? "e2e.prod" : "prod"
 	});
-
-	METADATA.environment = METADATA.E2E ? "e2e.prod" : "prod";
+	const supportES2015 = buildUtils.supportES2015(METADATA.TS_CONFIG_PATH);
 
 	return webpackMerge(commonConfig({ ENV: ENV, metadata: METADATA }), {
 		/**

packages/stark-build/package.json

@@ -17,6 +17,7 @@
     "node": ">=6.11.0",
     "npm": ">=5.3.0"
   },
+  "types": "typings/index.d.ts",
   "dependencies": {
     "@angular-devkit/build-angular": "0.6.8",
     "@angular-devkit/build-optimizer": "0.6.8",

packages/stark-build/tsconfig.json

@@ -42,7 +42,7 @@
     "target": "es5",
     "outDir": "./dist",
     "baseUrl": "./src",
-    "rootDirs": ["./src", "./config"],
+    "rootDirs": ["./src", "./config", "./typings"],
     "lib": ["dom", "dom.iterable", "es2017"],
     "typeRoots": ["./node_modules/@types"],
     "paths": {},

packages/stark-build/typings/environment/index.d.ts

@@ -0,0 +1,3 @@
+// Extra variables that live on Global that will be replaced by webpack DefinePlugin
+declare let ENV: "development" | "production";
+declare let HMR: boolean;

packages/stark-build/typings/index.d.ts

@@ -0,0 +1,3 @@
+/* tslint:disable:no-import-side-effect */
+import "./environment";
+/* tslint:enable */

packages/stark-core/src/common.ts

@@ -1,3 +1,4 @@
+export * from "./common/environment";
 export * from "./common/error";
 export * from "./common/routes";
 export * from "./common/store";

packages/stark-core/src/common/environment.ts

@@ -0,0 +1,16 @@
+import { NgModuleRef } from "@angular/core";
+
+export interface StarkEnvironment {
+	production: boolean;
+	hmr: boolean;
+	ENV_PROVIDERS: any;
+
+	decorateModuleRef(modRef: NgModuleRef<any>): NgModuleRef<any>;
+}
+
+// create an empty dummy environment constant (the actual values will be defined in the client app)
+const dummyEnv: Partial<StarkEnvironment> = {};
+
+// export the dummy constant as "environment" to be able to mimic the way it should be imported in the client app
+// like this:  import { environment } from "environments/environment";
+export const environment: StarkEnvironment = <StarkEnvironment>dummyEnv;

packages/stark-core/src/configuration/entities/application/app-config.entity.ts

@@ -121,12 +121,13 @@ export class StarkApplicationConfigImpl implements StarkApplicationConfig {
 
 	public constructor() {
 		// Default values
-		// FIXME: DEVELOPMENT env variable?
-		/*if (DEVELOPMENT) {
+		if (ENV === "development") {
 			this.loggingFlushPersistSize = 500;
-		} else {*/
-		this.loggingFlushPersistSize = 15;
-		// }
+			console.log("CCR==========> this line should be kept only in DEV");
+		} else {
+			this.loggingFlushPersistSize = 15;
+			console.log("CCR==========> this line should be kept only in PROD");
+		}
 
 		this.loggingFlushDisabled = false;
 		this.loggingFlushResourceName = "logging";

packages/stark-core/src/modules/http/builder/http-request-builder.ts

@@ -159,10 +159,10 @@ export class StarkHttpRequestBuilderImpl<T extends StarkResource> implements Sta
 
 		// Add custom QueryParameter so json-server can add collection metadata to the mock response
 		// See: https://jira.prd.nbb/browse/NG-1335
-		// FIXME: DEVELOPMENT env variable?
-		// if (DEVELOPMENT) {
-		builder.addQueryParameter("mockCollectionRequest", "true");
-		// }
+		if (ENV === "development") {
+			builder.addQueryParameter("mockCollectionRequest", "true");
+			console.log("CCR==========> this line should be kept only in DEV");
+		}
 
 		return builder;
 	}
@@ -197,10 +197,10 @@ export class StarkHttpRequestBuilderImpl<T extends StarkResource> implements Sta
 
 		// Add custom QueryParameter so json-server can add collection metadata to the mock response
 		// See: https://jira.prd.nbb/browse/NG-1335
-		// FIXME: DEVELOPMENT env variable?
-		// if (DEVELOPMENT) {
-		builder.addQueryParameter("mockCollectionRequest", "true");
-		// }
+		if (ENV === "development") {
+			builder.addQueryParameter("mockCollectionRequest", "true");
+			console.log("CCR==========> this line should be kept only in DEV");
+		}
 
 		return builder;
 	}

packages/stark-core/src/modules/http/services/http.service.ts

@@ -52,9 +52,9 @@ export class StarkHttpServiceImpl<P extends StarkResource> implements StarkHttpS
 		request = this.removeETagFromRequestItem(request);
 
 		// NG-1346: fake pre-authentication support
-		// FIXME: DEVELOPMENT env variable?
-		if (/*DEVELOPMENT &&*/ request.backend.fakePreAuthenticationEnabled) {
+		if (ENV === "development" && request.backend.fakePreAuthenticationEnabled) {
 			request = this.addFakePreAuthenticationHeaders(request);
+			console.log("CCR==========> this line should be kept only in DEV");
 		}
 
 		// NG-117: add correlation identifier
@@ -98,9 +98,9 @@ export class StarkHttpServiceImpl<P extends StarkResource> implements StarkHttpS
 
 	public executeCollectionRequest(request: StarkHttpRequest<P>): Observable<StarkCollectionResponseWrapper<P>> {
 		// NG-1346: fake pre-authentication support
-		// FIXME: DEVELOPMENT env variable?
-		if (/*DEVELOPMENT &&*/ request.backend.fakePreAuthenticationEnabled) {
+		if (ENV === "development" && request.backend.fakePreAuthenticationEnabled) {
 			request = this.addFakePreAuthenticationHeaders(request);
+			console.log("CCR==========> this line should be kept only in DEV");
 		}
 
 		// NG-117: add correlation identifier

packages/stark-core/src/modules/http/testing/http.mock.ts

@@ -1,5 +1,9 @@
-import { StarkHttpService } from "../services";
-import { StarkHttpRequest, StarkSingleItemResponseWrapper, StarkCollectionResponseWrapper } from "../entities";
+import {
+	StarkHttpService,
+	StarkHttpRequest,
+	StarkSingleItemResponseWrapper,
+	StarkCollectionResponseWrapper
+} from "@nationalbankbelgium/stark-core";
 import { HttpClient } from "@angular/common/http";
 import { Observable } from "rxjs";