refactor(@angular/cli): use direct schematic workflow option transfor…

…m option (cherry picked from commit aad3bbf)
angular · Nov 16, 2020 · fb0be7d · fb0be7d
1 parent 3839f35
commit fb0be7d
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
@@ -257,6 +257,13 @@ export abstract class SchematicCommand<
         // Global
         : [__dirname, process.cwd()],
       schemaValidation: true,
+      optionTransforms: [
+        // Add configuration file defaults
+        async (schematic, current) => ({
+          ...(await getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName())),
+          ...current,
+        }),
+      ],
     });
 
     const getProjectName = () => {
@@ -284,16 +291,6 @@ export abstract class SchematicCommand<
       return undefined;
     };
 
-    const defaultOptionTransform = async (
-      schematic: FileSystemSchematicDescription,
-      current: {},
-    ) => ({
-      ...(await getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName())),
-      ...current,
-    });
-
-    workflow.engineHost.registerOptionsTransform(defaultOptionTransform);
-
     workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
     workflow.registry.addSmartDefaultProvider('projectName', getProjectName);
     workflow.registry.useXDeprecatedProvider(msg => this.logger.warn(msg));