fix(cli): Ensure code injection points are not code style dependent (#2832)

daffl · web-flow · commit 0776e26bfe4c · 2022-10-25T09:26:15.000-07:00
diff --git a/packages/cli/src/authentication/templates/client.tpl.ts b/packages/cli/src/authentication/templates/client.tpl.ts
@@ -10,7 +10,7 @@ const toClientFile = toFile<ServiceGeneratorContext>(({ lib }) => [lib, 'client'
 
 export const generate = async (ctx: ServiceGeneratorContext) =>
   generator(ctx)
-    .then(injectSource(importTemplate, after("from '@feathersjs/feathers'"), toClientFile))
+    .then(injectSource(importTemplate, after('import authenticationClient'), toClientFile))
     .then(
       when(
         ({ language }) => language === 'ts',
diff --git a/packages/cli/src/service/templates/client.tpl.ts b/packages/cli/src/service/templates/client.tpl.ts
@@ -50,7 +50,7 @@ export const generate = async (ctx: ServiceGeneratorContext) =>
     .then(
       when(
         (ctx) => ctx.language === 'ts',
-        injectSource(importTemplate, after("from '@feathersjs/feathers'"), toClientFile),
+        injectSource(importTemplate, after('import authenticationClient'), toClientFile),
         injectSource(methodsTemplate, before('\nexport interface ServiceTypes'), toClientFile),
         injectSource(declarationTemplate, after('export interface ServiceTypes'), toClientFile)
       )

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export const generate = async (ctx: ServiceGeneratorContext) =>`
`50`	`50`	`.then(`
`51`	`51`	`when(`
`52`	`52`	`(ctx) => ctx.language === 'ts',`
`53`		`- injectSource(importTemplate, after("from '@feathersjs/feathers'"), toClientFile),`
	`53`	`+ injectSource(importTemplate, after('import authenticationClient'), toClientFile),`
`54`	`54`	`injectSource(methodsTemplate, before('\nexport interface ServiceTypes'), toClientFile),`
`55`	`55`	`injectSource(declarationTemplate, after('export interface ServiceTypes'), toClientFile)`
`56`	`56`	`)`