Skip to content

Commit 534ee43

Browse files
authored
refactor(angular): simplify runtime file writing logic (#146)
remove server output dir parameter and related code since it's unused
1 parent c0b97fe commit 534ee43

File tree

8 files changed

+8
-41
lines changed

8 files changed

+8
-41
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,4 @@ export default {
316316

317317
## License
318318

319-
MIT © [Chihab Otmani](https://twitter.com/chihabotmani)
319+
MIT © [Chihab Otmani](https://chihab.dev)

examples/nx-workspace/apps/ng-app-cli/angular.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"maximumError": "4kb"
5757
}
5858
],
59-
"outputHashing": "all"
59+
"outputHashing": "all",
60+
"sourceMap": true
6061
},
6162
"development": {
6263
"optimization": false,

packages/angular/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -600,14 +600,10 @@ If you prefer using import.meta.env.NGX_SOME_VARIABLE instead of import.meta.env
600600
+"noPropertyAccessFromIndexSignature": false,
601601
```
602602
603-
# How It Works
604-
605-
I wrote an article on [InDepth.dev](https://indepth.dev/tutorials/angular/inject-environment-variables) explaining how it works.
606-
607603
# Credits
608604
609605
- [dotenv](https://github.com/motdotla/dotenv)
610606
611607
# License
612608
613-
MIT © [Chihab Otmani](https://twitter.com/chihabotmani)
609+
MIT © [Chihab Otmani](https://chihab.dev)

packages/angular/src/builders/application/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { NgxEnvSchema } from "../ngx-env/ngx-env-schema";
1212
import { getEnvironment } from "../utils/get-environment";
1313
import { writeRuntimeFile } from "../utils/write-ngx-env-runtime";
1414
import { getProjectCwd } from "../utils/project";
15-
import { replaceHtmlVars } from "../utils/replace-html-vars";
1615
import { indexHtmlTransformer } from "../utils/index-html-transform";
1716

1817
export const executeWithEnv = (
@@ -49,7 +48,6 @@ export const executeWithEnv = (
4948
);
5049
writeRuntimeFile(
5150
join(outputDir, "browser"),
52-
options.ssr ? join(outputDir, "server") : null,
5351
Array.isArray(options.localize) ? options.localize : [],
5452
raw
5553
);

packages/angular/src/builders/utils/index-html-transform-legacy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ export function indexHtmlTransformerLegacy(
5353
});
5454
}
5555
if (runtime) {
56-
writeRuntimeFile(browserOutputDir, serverOutputDir, locales, raw);
56+
writeRuntimeFile(browserOutputDir, locales, raw);
5757
}
5858
}

packages/angular/src/builders/utils/index-html-transform.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { replaceHtmlVars } from "./replace-html-vars";
44
export function indexHtmlTransformer(
55
content: string,
66
raw: Dict,
7-
serve: boolean,
7+
devServer: boolean,
88
runtime = false
99
) {
1010
const html = replaceHtmlVars(content, raw);
1111
return runtime
1212
? html.replace(
1313
/<head>/,
14-
serve
14+
devServer
1515
? `<head><script>globalThis._NGX_ENV_ = ${JSON.stringify(
1616
raw
1717
)}</script>`

packages/angular/src/builders/utils/write-ngx-env-runtime.ts

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { writeFileSync } from "fs";
33

44
export function writeRuntimeFile(
55
browserOutputDir: string,
6-
serverOutputDir: string | null,
76
locales: string[] = [],
87
raw: Dict
98
) {
@@ -17,22 +16,6 @@ export function writeRuntimeFile(
1716
);
1817
try {
1918
writeFileSync(`${browserOutputDir}/${locale}/ngx-env.js`, runtimeStmt);
20-
if (serverOutputDir) {
21-
try {
22-
console.log(
23-
`📦 Writing ngx-env.js to ${serverOutputDir}/${locale}/ngx-env.js`
24-
);
25-
writeFileSync(
26-
`${serverOutputDir}/${locale}/ngx-env.js`,
27-
runtimeStmt
28-
);
29-
} catch (e) {
30-
console.log(
31-
`❌ Failed to create ngx-env.js at ${serverOutputDir}/ngx-env.js ❌`
32-
);
33-
throw e;
34-
}
35-
}
3619
} catch (e) {
3720
console.log(
3821
`❌ Failed to create ngx-env.js at ${browserOutputDir}/${locale}/ngx-env.js ❌`
@@ -50,16 +33,5 @@ export function writeRuntimeFile(
5033
);
5134
throw e;
5235
}
53-
if (serverOutputDir) {
54-
try {
55-
console.log(`📦 Writing ngx-env.js to ${serverOutputDir}/ngx-env.js`);
56-
writeFileSync(`${serverOutputDir}/ngx-env.js`, runtimeStmt);
57-
} catch (e) {
58-
console.log(
59-
`❌ Failed to create ngx-env.js at ${serverOutputDir}/ngx-env.js ❌`
60-
);
61-
throw e;
62-
}
63-
}
6436
}
6537
}

packages/cli/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,4 @@ Use [@ngx-env/builder](https://www.npmjs.com/package/@ngx-env/builder)
192192

193193
# License
194194

195-
MIT © [Chihab Otmani](https://twitter.com/chihabotmani)
195+
MIT © [Chihab Otmani](https://chihab.dev)

0 commit comments

Comments
 (0)