feat: upgrade to Angular 17 (#42)

BREAKING CHANGE: This library now uses Angular 17
kyubisation · Nov 6, 2023 · a6d5471 · a6d5471
1 parent 0171563
commit a6d5471
Show file tree

Hide file tree

Showing 69 changed files with 4,581 additions and 3,481 deletions.
diff --git a/angular.json b/angular.json
@@ -73,23 +73,23 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "angular-t9n:build"
+            "buildTarget": "angular-t9n:build"
           },
           "configurations": {
             "de": {
-              "browserTarget": "angular-t9n:build:de"
+              "buildTarget": "angular-t9n:build:de"
             },
             "production": {
-              "browserTarget": "angular-t9n:build:production"
+              "buildTarget": "angular-t9n:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "angular-t9n:build",
             "format": "xlf2",
-            "outputPath": "src/locale/xlf2"
+            "outputPath": "src/locale/xlf2",
+            "buildTarget": "angular-t9n:build"
           },
           "configurations": {
             "xlf": {

diff --git a/bin/index.ts b/bin/index.ts
@@ -103,13 +103,13 @@ export async function t9nStandalone(options: Options, currentWorkingDirectory?:
     {
       cors: true,
       logger: ['error', 'warn'],
-    }
+    },
   );
   app.setGlobalPrefix('api');
   app.useWebSocketAdapter(new WsAdapter(app));
   app.useGlobalPipes(new ValidationPipe({ skipMissingProperties: true, whitelist: true }));
   await app.listen(options.port ?? 4300, () =>
-    console.log(`Translation server started: http://localhost:${options.port}\n`)
+    console.log(`Translation server started: http://localhost:${options.port}\n`),
   );
   return new Promise(() => {});
 
@@ -127,7 +127,7 @@ export async function t9nStandalone(options: Options, currentWorkingDirectory?:
   }
 
   async function TRANSLATION_SOURCE_FACTORY(
-    serializationStrategy: SerializationStrategy
+    serializationStrategy: SerializationStrategy,
   ): Promise<TranslationSource> {
     const result = await serializationStrategy.deserializeSource(sourceFile);
     return new TranslationSource(result.language, result.unitMap);
@@ -136,7 +136,7 @@ export async function t9nStandalone(options: Options, currentWorkingDirectory?:
   async function TRANSLATION_TARGET_REGISTRY_FACTORY(
     source: TranslationSource,
     serializationStrategy: SerializationStrategy,
-    persistenceStrategy: PersistenceStrategy
+    persistenceStrategy: PersistenceStrategy,
   ): Promise<TranslationTargetRegistry> {
     const targetRegistry = new TranslationTargetRegistry(source, persistenceStrategy);
     await Promise.all(
@@ -157,7 +157,7 @@ export async function t9nStandalone(options: Options, currentWorkingDirectory?:
             console.log(`Detected ${relative(workspaceRoot, targetPath)}`);
             targetRegistry.register(result.language, result.unitMap);
           } catch {}
-        })
+        }),
     );
     return targetRegistry;
   }

diff --git a/bin/pattern-persistence-strategy.spec.ts b/bin/pattern-persistence-strategy.spec.ts
@@ -25,7 +25,7 @@ describe('PatternPersistenceStrategy', () => {
     mockSerialization = new MockSerialization();
     persistence = new PatternPersistenceStrategy(
       builder,
-      mockSerialization as SerializationStrategy
+      mockSerialization as SerializationStrategy,
     );
   });
 

diff --git a/bin/pattern-persistence-strategy.ts b/bin/pattern-persistence-strategy.ts
@@ -12,7 +12,7 @@ import {
 export class PatternPersistenceStrategy extends PersistenceStrategy {
   constructor(
     private readonly _targetPathBuilder: TargetPathBuilder,
-    private readonly _serializationStrategy: SerializationStrategy
+    private readonly _serializationStrategy: SerializationStrategy,
   ) {
     super();
   }
@@ -22,7 +22,7 @@ export class PatternPersistenceStrategy extends PersistenceStrategy {
     console.log(
       `${timestamp()}: Created translation file for ${
         target.language
-      } at ${this._targetPathBuilder.createPath(target)}`
+      } at ${this._targetPathBuilder.createPath(target)}`,
     );
   }
 
@@ -31,7 +31,7 @@ export class PatternPersistenceStrategy extends PersistenceStrategy {
     console.log(
       `${timestamp()}: Updated translation file for ${
         target.language
-      } at ${this._targetPathBuilder.createPath(target)}`
+      } at ${this._targetPathBuilder.createPath(target)}`,
     );
   }
 

diff --git a/builders/t9n/index.ts b/builders/t9n/index.ts
@@ -74,7 +74,7 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
     workspaceRoot,
     context.target.project,
     targetPathBuilder,
-    () => translationContext
+    () => translationContext,
   );
   const sourceLocale = await angularI18n.sourceLocale();
 
@@ -88,7 +88,7 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
         useValue: new TargetInfo(
           context.target.project,
           options.translationFile,
-          sourceLocale.code
+          sourceLocale.code,
         ),
       },
       { provide: SerializationOptions, useValue: options },
@@ -117,13 +117,13 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
     {
       cors: true,
       logger: ['error', 'warn'],
-    }
+    },
   );
   app.setGlobalPrefix('api');
   app.useWebSocketAdapter(new WsAdapter(app));
   app.useGlobalPipes(new ValidationPipe({ skipMissingProperties: true, whitelist: true }));
   await app.listen(options.port ?? 4300, () =>
-    context.logger.info(`Translation server started: http://localhost:${options.port}\n`)
+    context.logger.info(`Translation server started: http://localhost:${options.port}\n`),
   );
   return new Promise(() => {});
 
@@ -141,15 +141,15 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
   }
 
   async function TRANSLATION_SOURCE_FACTORY(
-    serializationStrategy: SerializationStrategy
+    serializationStrategy: SerializationStrategy,
   ): Promise<TranslationSource> {
     try {
       context.logger.info(`Attempting to serialize source file ${sourceFile}`);
       const result = await serializationStrategy.deserializeSource(sourceFile);
       if (result.language && sourceLocale.code && result.language !== sourceLocale.code) {
         context.logger.warn(
           `Source locale in angular.json is ${sourceLocale} but in the ` +
-            ` source file ${sourceFile} it is ${result.language}.`
+            ` source file ${sourceFile} it is ${result.language}.`,
         );
       }
 
@@ -169,7 +169,7 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
   async function TRANSLATION_TARGET_REGISTRY_FACTORY(
     source: TranslationSource,
     serializationStrategy: SerializationStrategy,
-    persistenceStrategy: PersistenceStrategy
+    persistenceStrategy: PersistenceStrategy,
   ): Promise<TranslationTargetRegistry> {
     try {
       context.logger.info(`Attempting to serialize target files`);
@@ -183,20 +183,20 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
           const relativePath = relative(workspaceRoot, normalizedPath);
           if (locale.translation.every((t) => join(workspaceRoot, t) !== normalizedPath)) {
             context.logger.warn(
-              `Expected translation file ${relativePath} not found listed in i18n! It will be created and added to the i18n entry.`
+              `Expected translation file ${relativePath} not found listed in i18n! It will be created and added to the i18n entry.`,
             );
             const target = await targetRegistry.create(language, locale.baseHref);
             await importExistingTranslationUnits(target, locale.translation, serializationStrategy);
           } else if (!host.isFile(normalizedPath)) {
             context.logger.warn(
-              `Expected translation file ${relativePath} does not exist! It will be created.`
+              `Expected translation file ${relativePath} does not exist! It will be created.`,
             );
             await targetRegistry.create(language, locale.baseHref);
           } else {
             const result = await serializationStrategy.deserializeTarget(normalizedPath);
             targetRegistry.register(result.language, result.unitMap, locale.baseHref);
           }
-        })
+        }),
       );
 
       await angularI18n.update();
@@ -211,7 +211,7 @@ export async function t9n(options: Options, context: BuilderContext): Promise<Bu
   async function importExistingTranslationUnits(
     target: TranslationTarget,
     translationFiles: string[],
-    serializationStrategy: SerializationStrategy
+    serializationStrategy: SerializationStrategy,
   ) {
     for (const translation of translationFiles) {
       const targetPath = join(workspaceRoot, translation);

diff --git a/builders/t9n/persistence/angular-i18n.spec.ts b/builders/t9n/persistence/angular-i18n.spec.ts
@@ -39,7 +39,7 @@ describe('AngularI18n', () => {
       workspaceRoot,
       projectName,
       builder,
-      () => translationContext
+      () => translationContext,
     );
   }
 
@@ -51,7 +51,7 @@ describe('AngularI18n', () => {
           locales: {
             de: 'src/locale/xlf2/messages.de.xlf',
           },
-        })
+        }),
     );
 
     it('should throw without source', () => {
@@ -101,7 +101,7 @@ describe('AngularI18n', () => {
             baseHref: '/en/',
             language: 'en-US',
           },
-        })
+        }),
     );
 
     it('should update the angular.json when changed', async () => {
@@ -144,7 +144,7 @@ describe('AngularI18n', () => {
             fr: 'locales/xlf2/messages.fr.xlf',
             'fr-CH': ['locales/xlf2/messages.fr-CH.xlf', 'locales/xlf2/messages2.fr-CH.xlf'],
           },
-        })
+        }),
     );
 
     it('should return the source locale', async () => {

diff --git a/builders/t9n/persistence/angular-i18n.ts b/builders/t9n/persistence/angular-i18n.ts
@@ -18,7 +18,7 @@ export class AngularI18n {
     private _translationContextFactory: () => {
       source: TranslationSource;
       targetRegistry: TranslationTargetRegistry;
-    }
+    },
   ) {}
 
   async sourceLocale(): Promise<{ code: string; baseHref?: string }> {
@@ -38,7 +38,7 @@ export class AngularI18n {
           Object.assign(current, {
             [next]: this._normalizeI18nLocale(locales[next]),
           }),
-        {} as { [locale: string]: { translation: string[]; baseHref?: string } }
+        {} as { [locale: string]: { translation: string[]; baseHref?: string } },
       );
   }
 
@@ -67,7 +67,7 @@ export class AngularI18n {
           Object.assign(current, {
             [next.language]: this._i18nLocale(next, locales[next.language]),
           }),
-        {}
+        {},
       );
 
     const { project, workspace } = await this._readProject();

diff --git a/builders/t9n/persistence/angular-json-persistence-strategy.spec.ts b/builders/t9n/persistence/angular-json-persistence-strategy.spec.ts
@@ -31,7 +31,7 @@ describe('AngularJsonPersistenceStrategy', () => {
     persistenceStrategy = new AngularJsonPersistenceStrategy(
       new MockAngularI18n() as AngularI18n,
       new logging.NullLogger(),
-      serializationStrategy as unknown as SerializationStrategy
+      serializationStrategy as unknown as SerializationStrategy,
     );
   });
 

diff --git a/builders/t9n/persistence/angular-json-persistence-strategy.ts b/builders/t9n/persistence/angular-json-persistence-strategy.ts
@@ -15,7 +15,7 @@ export class AngularJsonPersistenceStrategy extends PersistenceStrategy {
   constructor(
     private readonly _i18n: AngularI18n,
     private readonly _logger: logging.Logger,
-    private readonly _serializationStrategy: SerializationStrategy
+    private readonly _serializationStrategy: SerializationStrategy,
   ) {
     super();
   }
@@ -25,7 +25,7 @@ export class AngularJsonPersistenceStrategy extends PersistenceStrategy {
     this._logger.info(
       `${timestamp()}: Created translation file for ${
         target.language
-      } at ${this._i18n.projectRelativePath(target)}`
+      } at ${this._i18n.projectRelativePath(target)}`,
     );
   }
 
@@ -34,7 +34,7 @@ export class AngularJsonPersistenceStrategy extends PersistenceStrategy {
     this._logger.info(
       `${timestamp()}: Updated translation file for ${
         target.language
-      } at ${this._i18n.projectRelativePath(target)}`
+      } at ${this._i18n.projectRelativePath(target)}`,
     );
   }