From 7249e1cc849e4c889ec1d59b0413364a57278e77 Mon Sep 17 00:00:00 2001 From: Aleksandr Serenko Date: Tue, 11 Feb 2020 09:58:56 +0700 Subject: [PATCH] Update translations --- apps/frontend/base/server.ts | 25 ++++++++++++------- apps/frontend/base/src/polyfills.ts | 4 +++ apps/frontend/base/tsconfig.app.json | 7 ++---- apps/frontend/base/tsconfig.server.json | 9 +++---- apps/frontend/common-styles/server.ts | 25 ++++++++++++------- apps/frontend/common-styles/src/polyfills.ts | 4 +++ apps/frontend/common-styles/tsconfig.app.json | 7 ++---- .../common-styles/tsconfig.server.json | 9 +++---- apps/frontend/forms/server.ts | 25 ++++++++++++------- apps/frontend/forms/src/polyfills.ts | 4 +++ apps/frontend/forms/tsconfig.app.json | 7 ++---- apps/frontend/forms/tsconfig.server.json | 9 +++---- apps/frontend/graphql/server.ts | 25 ++++++++++++------- apps/frontend/graphql/src/polyfills.ts | 4 +++ apps/frontend/graphql/tsconfig.app.json | 7 ++---- apps/frontend/graphql/tsconfig.server.json | 9 +++---- apps/frontend/markup/server.ts | 25 ++++++++++++------- apps/frontend/markup/src/polyfills.ts | 4 +++ apps/frontend/markup/tsconfig.app.json | 7 ++---- apps/frontend/markup/tsconfig.server.json | 9 +++---- apps/frontend/responsive/server.ts | 25 ++++++++++++------- apps/frontend/responsive/src/polyfills.ts | 4 +++ apps/frontend/responsive/tsconfig.app.json | 7 ++---- apps/frontend/responsive/tsconfig.server.json | 9 +++---- apps/frontend/shared/server.ts | 25 ++++++++++++------- apps/frontend/shared/src/polyfills.ts | 4 +++ apps/frontend/shared/tsconfig.app.json | 7 ++---- apps/frontend/shared/tsconfig.server.json | 9 +++---- apps/frontend/storage/server.ts | 25 ++++++++++++------- apps/frontend/storage/src/polyfills.ts | 4 +++ apps/frontend/storage/tsconfig.app.json | 7 ++---- apps/frontend/storage/tsconfig.server.json | 9 +++---- apps/frontend/store/server.ts | 25 ++++++++++++------- apps/frontend/store/src/polyfills.ts | 4 +++ apps/frontend/store/tsconfig.app.json | 7 ++---- apps/frontend/store/tsconfig.server.json | 9 +++---- apps/frontend/theming/server.ts | 25 ++++++++++++------- apps/frontend/theming/src/polyfills.ts | 4 +++ apps/frontend/theming/tsconfig.app.json | 7 ++---- apps/frontend/theming/tsconfig.server.json | 9 +++---- apps/frontend/translation-state/server.ts | 25 ++++++++++++------- .../translation-state/src/polyfills.ts | 4 +++ .../translation-state/tsconfig.app.json | 7 ++---- .../translation-state/tsconfig.server.json | 9 +++---- apps/frontend/translation/server.ts | 25 ++++++++++++------- apps/frontend/translation/src/polyfills.ts | 4 +++ apps/frontend/translation/tsconfig.app.json | 7 ++---- .../frontend/translation/tsconfig.server.json | 9 +++---- package.json | 2 +- yarn.lock | 8 +++--- 50 files changed, 317 insertions(+), 233 deletions(-) diff --git a/apps/frontend/base/server.ts b/apps/frontend/base/server.ts index 46429c2..d889a8c 100644 --- a/apps/frontend/base/server.ts +++ b/apps/frontend/base/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/base/src/polyfills.ts b/apps/frontend/base/src/polyfills.ts index 6f894db..81d5326 100644 --- a/apps/frontend/base/src/polyfills.ts +++ b/apps/frontend/base/src/polyfills.ts @@ -62,3 +62,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/base/tsconfig.app.json b/apps/frontend/base/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/base/tsconfig.app.json +++ b/apps/frontend/base/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/base/tsconfig.server.json b/apps/frontend/base/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/base/tsconfig.server.json +++ b/apps/frontend/base/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/common-styles/server.ts b/apps/frontend/common-styles/server.ts index 7cfd27b..cbfaf96 100644 --- a/apps/frontend/common-styles/server.ts +++ b/apps/frontend/common-styles/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/common-styles/src/polyfills.ts b/apps/frontend/common-styles/src/polyfills.ts index 1c689f4..16de805 100644 --- a/apps/frontend/common-styles/src/polyfills.ts +++ b/apps/frontend/common-styles/src/polyfills.ts @@ -62,3 +62,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/common-styles/tsconfig.app.json b/apps/frontend/common-styles/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/common-styles/tsconfig.app.json +++ b/apps/frontend/common-styles/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/common-styles/tsconfig.server.json b/apps/frontend/common-styles/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/common-styles/tsconfig.server.json +++ b/apps/frontend/common-styles/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/forms/server.ts b/apps/frontend/forms/server.ts index 84e2afc..3861e19 100644 --- a/apps/frontend/forms/server.ts +++ b/apps/frontend/forms/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/forms/src/polyfills.ts b/apps/frontend/forms/src/polyfills.ts index 6174ef5..b7aa6d5 100644 --- a/apps/frontend/forms/src/polyfills.ts +++ b/apps/frontend/forms/src/polyfills.ts @@ -65,3 +65,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/forms/tsconfig.app.json b/apps/frontend/forms/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/forms/tsconfig.app.json +++ b/apps/frontend/forms/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/forms/tsconfig.server.json b/apps/frontend/forms/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/forms/tsconfig.server.json +++ b/apps/frontend/forms/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/graphql/server.ts b/apps/frontend/graphql/server.ts index c0f01d2..a4c0b32 100644 --- a/apps/frontend/graphql/server.ts +++ b/apps/frontend/graphql/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/graphql/src/polyfills.ts b/apps/frontend/graphql/src/polyfills.ts index 6174ef5..b7aa6d5 100644 --- a/apps/frontend/graphql/src/polyfills.ts +++ b/apps/frontend/graphql/src/polyfills.ts @@ -65,3 +65,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/graphql/tsconfig.app.json b/apps/frontend/graphql/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/graphql/tsconfig.app.json +++ b/apps/frontend/graphql/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/graphql/tsconfig.server.json b/apps/frontend/graphql/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/graphql/tsconfig.server.json +++ b/apps/frontend/graphql/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/markup/server.ts b/apps/frontend/markup/server.ts index 8365d9d..8174700 100644 --- a/apps/frontend/markup/server.ts +++ b/apps/frontend/markup/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/markup/src/polyfills.ts b/apps/frontend/markup/src/polyfills.ts index 6174ef5..b7aa6d5 100644 --- a/apps/frontend/markup/src/polyfills.ts +++ b/apps/frontend/markup/src/polyfills.ts @@ -65,3 +65,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/markup/tsconfig.app.json b/apps/frontend/markup/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/markup/tsconfig.app.json +++ b/apps/frontend/markup/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/markup/tsconfig.server.json b/apps/frontend/markup/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/markup/tsconfig.server.json +++ b/apps/frontend/markup/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/responsive/server.ts b/apps/frontend/responsive/server.ts index d89c6fa..c754288 100644 --- a/apps/frontend/responsive/server.ts +++ b/apps/frontend/responsive/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/responsive/src/polyfills.ts b/apps/frontend/responsive/src/polyfills.ts index 63f42ea..ab285ec 100644 --- a/apps/frontend/responsive/src/polyfills.ts +++ b/apps/frontend/responsive/src/polyfills.ts @@ -62,3 +62,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/responsive/tsconfig.app.json b/apps/frontend/responsive/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/responsive/tsconfig.app.json +++ b/apps/frontend/responsive/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/responsive/tsconfig.server.json b/apps/frontend/responsive/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/responsive/tsconfig.server.json +++ b/apps/frontend/responsive/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/shared/server.ts b/apps/frontend/shared/server.ts index 7d5d772..80c3fa7 100644 --- a/apps/frontend/shared/server.ts +++ b/apps/frontend/shared/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/shared/src/polyfills.ts b/apps/frontend/shared/src/polyfills.ts index 63f42ea..ab285ec 100644 --- a/apps/frontend/shared/src/polyfills.ts +++ b/apps/frontend/shared/src/polyfills.ts @@ -62,3 +62,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/shared/tsconfig.app.json b/apps/frontend/shared/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/shared/tsconfig.app.json +++ b/apps/frontend/shared/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/shared/tsconfig.server.json b/apps/frontend/shared/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/shared/tsconfig.server.json +++ b/apps/frontend/shared/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/storage/server.ts b/apps/frontend/storage/server.ts index c2df012..228c90e 100644 --- a/apps/frontend/storage/server.ts +++ b/apps/frontend/storage/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/storage/src/polyfills.ts b/apps/frontend/storage/src/polyfills.ts index 8a3eed5..5714020 100644 --- a/apps/frontend/storage/src/polyfills.ts +++ b/apps/frontend/storage/src/polyfills.ts @@ -61,3 +61,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/storage/tsconfig.app.json b/apps/frontend/storage/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/storage/tsconfig.app.json +++ b/apps/frontend/storage/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/storage/tsconfig.server.json b/apps/frontend/storage/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/storage/tsconfig.server.json +++ b/apps/frontend/storage/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/store/server.ts b/apps/frontend/store/server.ts index c8a0e55..63b4f16 100644 --- a/apps/frontend/store/server.ts +++ b/apps/frontend/store/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/store/src/polyfills.ts b/apps/frontend/store/src/polyfills.ts index 8a3eed5..5714020 100644 --- a/apps/frontend/store/src/polyfills.ts +++ b/apps/frontend/store/src/polyfills.ts @@ -61,3 +61,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/store/tsconfig.app.json b/apps/frontend/store/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/store/tsconfig.app.json +++ b/apps/frontend/store/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/store/tsconfig.server.json b/apps/frontend/store/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/store/tsconfig.server.json +++ b/apps/frontend/store/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/theming/server.ts b/apps/frontend/theming/server.ts index 651f83c..83c5b9e 100644 --- a/apps/frontend/theming/server.ts +++ b/apps/frontend/theming/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/theming/src/polyfills.ts b/apps/frontend/theming/src/polyfills.ts index 8a3eed5..5714020 100644 --- a/apps/frontend/theming/src/polyfills.ts +++ b/apps/frontend/theming/src/polyfills.ts @@ -61,3 +61,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/theming/tsconfig.app.json b/apps/frontend/theming/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/theming/tsconfig.app.json +++ b/apps/frontend/theming/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/theming/tsconfig.server.json b/apps/frontend/theming/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/theming/tsconfig.server.json +++ b/apps/frontend/theming/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/translation-state/server.ts b/apps/frontend/translation-state/server.ts index 23659ba..e85bcbe 100644 --- a/apps/frontend/translation-state/server.ts +++ b/apps/frontend/translation-state/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/translation-state/src/polyfills.ts b/apps/frontend/translation-state/src/polyfills.ts index 8a3eed5..5714020 100644 --- a/apps/frontend/translation-state/src/polyfills.ts +++ b/apps/frontend/translation-state/src/polyfills.ts @@ -61,3 +61,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/translation-state/tsconfig.app.json b/apps/frontend/translation-state/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/translation-state/tsconfig.app.json +++ b/apps/frontend/translation-state/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/translation-state/tsconfig.server.json b/apps/frontend/translation-state/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/translation-state/tsconfig.server.json +++ b/apps/frontend/translation-state/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/apps/frontend/translation/server.ts b/apps/frontend/translation/server.ts index 495b3d3..92d57dc 100644 --- a/apps/frontend/translation/server.ts +++ b/apps/frontend/translation/server.ts @@ -1,12 +1,13 @@ import 'zone.js/dist/zone-node'; +import { APP_BASE_HREF } from '@angular/common'; +import '@angular/localize/init'; import { ngExpressEngine } from '@nguniversal/express-engine'; import * as express from 'express'; +import { existsSync } from 'fs'; import { join } from 'path'; import { AppServerModule } from './src/main.server'; -import { APP_BASE_HREF } from '@angular/common'; -import { existsSync } from 'fs'; // The Express app is exported so that it can be used by serverless Functions. export function app() { @@ -15,9 +16,12 @@ export function app() { const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index'; // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine) - server.engine('html', ngExpressEngine({ - bootstrap: AppServerModule, - })); + server.engine( + 'html', + ngExpressEngine({ + bootstrap: AppServerModule + }) + ); server.set('view engine', 'html'); server.set('views', distFolder); @@ -25,9 +29,12 @@ export function app() { // Example Express Rest API endpoints // app.get('/api/**', (req, res) => { }); // Serve static files from /browser - server.get('*.*', express.static(distFolder, { - maxAge: '1y' - })); + server.get( + '*.*', + express.static(distFolder, { + maxAge: '1y' + }) + ); // All regular routes use the Universal engine server.get('*', (req, res) => { @@ -52,7 +59,7 @@ function run() { // The below code is to ensure that the server is run only when not requiring the bundle. declare const __non_webpack_require__: NodeRequire; const mainModule = __non_webpack_require__.main; -const moduleFilename = mainModule && mainModule.filename || ''; +const moduleFilename = (mainModule && mainModule.filename) || ''; if (moduleFilename === __filename || moduleFilename.includes('iisnode')) { run(); } diff --git a/apps/frontend/translation/src/polyfills.ts b/apps/frontend/translation/src/polyfills.ts index 8a3eed5..5714020 100644 --- a/apps/frontend/translation/src/polyfills.ts +++ b/apps/frontend/translation/src/polyfills.ts @@ -61,3 +61,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; diff --git a/apps/frontend/translation/tsconfig.app.json b/apps/frontend/translation/tsconfig.app.json index c2fc4aa..3282a12 100644 --- a/apps/frontend/translation/tsconfig.app.json +++ b/apps/frontend/translation/tsconfig.app.json @@ -2,11 +2,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../../dist/out-tsc", - "types": [] + "types": ["node"] }, - "files": [ - "src/main.browser.ts", - "src/polyfills.ts" - ], + "files": ["src/main.browser.ts", "src/polyfills.ts"], "include": ["**/*.d.ts"] } diff --git a/apps/frontend/translation/tsconfig.server.json b/apps/frontend/translation/tsconfig.server.json index 9f46a42..eae4b6e 100644 --- a/apps/frontend/translation/tsconfig.server.json +++ b/apps/frontend/translation/tsconfig.server.json @@ -2,13 +2,12 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc-server" + "outDir": "../../../dist/out-tsc-server", + "types": ["node"] }, "angularCompilerOptions": { "entryModule": "./src/app/app.server.module#AppServerModule" }, - "files": [ - "src/main.server.ts", - "server.ts" - ] + "files": ["src/main.server.ts", "server.ts"], + "include": ["**/*.d.ts"] } diff --git a/package.json b/package.json index 3578b61..b10692b 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "@ngrx/store": "^9.0.0-beta.0", "@nguniversal/common": "^9.0.0", "@nguniversal/express-engine": "^9.0.0", - "@ngx-translate/core": "^11.0.1", + "@ngx-translate/core": "^12.0.0", "@ngx-translate/http-loader": "^4.0.0", "@nrwl/angular": "^9.0.0-rc.2", "apollo-angular": "^1.8.0", diff --git a/yarn.lock b/yarn.lock index a66a9f1..7cbc335 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1573,10 +1573,10 @@ dependencies: "@nguniversal/common" "9.0.0" -"@ngx-translate/core@^11.0.1": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-11.0.1.tgz#cecefad41f06368f5859dac48fec8fcc4485615f" - integrity sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg== +"@ngx-translate/core@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-12.0.0.tgz#d177b03ea84d37fb2d7d352246867ba533d93225" + integrity sha512-hxuaLEqxlZ3IWBupyAoRXAhMZHCmaCg58XpY5+vevJmDhMEFJUEKdQyWVOKcf3+6PkoIFcuKJCeHa5C3Hb65gA== dependencies: tslib "^1.9.0"