feat: windows commands for copy (#38)

Bugs5382 · Jan 9, 2024 · fb49d48 · fb49d48
2 parents 9e28856 + 5316e97
commit fb49d48
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 40 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -28,7 +28,7 @@ export const main = async (): Promise<void> => {
   // set var
   const npmName = !isProd() ? undefined : await getProjectName(_.kebabCase(defaultProjectName))
 
-  const { npm, gitLocation, repoOwner, repoName, website, type, node, vite, email, description, license, keywords, port } = await inquirer.prompt([{
+  const { npm, gitLocation, repoOwner, repoName, repoPrivateLocation, website, type, node, vite, email, description, license, keywords, port } = await inquirer.prompt([{
     default: defaultProjectName,
     name: 'npm',
     message: 'Your Project NPM name?',
@@ -182,7 +182,7 @@ export const main = async (): Promise<void> => {
     description,
     gitIssues,
     gitReadme,
-    gitUrl,
+    gitUrl: typeof repoPrivateLocation !== 'undefined' ? repoPrivateLocation : gitUrl,
     license,
     keywords
   }, {

diff --git a/src/modules/helpers.ts b/src/modules/helpers.ts
@@ -65,7 +65,7 @@ export const copyTemplateFile = async (
   let contents = fs.readFileSync(`${resolvedSource}/${file}`, { encoding: 'utf8' })
 
   // Figure out where we're writing this file.
-  let baseFile = file.replace(`${resolvedSource}/`, '')
+  let baseFile = file.replace(`${resolvedSource}`, '')
 
   // make sure we remove ts-nocheck from files
   if ((baseFile.substring(baseFile.length - 2, baseFile.length) === 'ts') || baseFile.substring(baseFile.length - 3, baseFile.length) === 'tsx') {
@@ -126,7 +126,7 @@ export const copyTemplateFiles = async (
     let contents = fs.readFileSync(file, { encoding: 'utf8' })
 
     // Figure out where we're writing this file.
-    let baseFile = file.replace(`${resolvedSource}/`, '')
+    let baseFile = file.replace(`${resolvedSource}`, '')
 
     // make sure we remove ts-nocheck from files
     if ((baseFile.substring(baseFile.length - 2, baseFile.length) === 'ts') || baseFile.substring(baseFile.length - 3, baseFile.length) === 'tsx') {
@@ -244,6 +244,8 @@ export const getProjectName = async (defaultProjectName: string): Promise<string
  */
 export const installDeps = async (dependencies: string[], options: { dev?: boolean } = {}): Promise<void> => {
   const args: string[] = ['install']
+  const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+
   if (options.dev === true) {
     args.push('--save-dev')
   }
@@ -257,7 +259,7 @@ export const installDeps = async (dependencies: string[], options: { dev?: boole
     for (const depend of dependencies) {
       value++
       if (isProd()) {
-        await execFile('npm', [...args, depend])
+        await execFile(npmCmd, [...args, depend])
       }
       bar.update(value)
       if (value >= bar.getTotal()) {

diff --git a/template/fastify-graphql-controller/src/plugins/graphql.ts b/template/fastify-graphql-controller/src/plugins/graphql.ts
@@ -7,23 +7,23 @@ export default fp<MercuriusGatewayOptions>(async (fastify) => {
   const GRAPHQL_HOST = accessEnv('GRAPHQL_HOST', 'localhost')
   const GRAPHQL_PORT = parseInt(accessEnv('GRAPHQL_PORT', '3000'))
 
-  await fastify.register(mercuriusGateway, {
-    gateway: {
-      services: [{
-        name: '<%- npm %>',
-        collectors: {
-          collectHeaders: true
-        },
-        rewriteHeaders: (headers) => {
-          return headers
-        },
-        url: `http://${GRAPHQL_HOST}:${GRAPHQL_PORT}/graphql`,
-        keepAlive: 10
-      }]
-    },
-    graphiql: process.env.NODE_ENV !== 'production',
-    jit: 1
-  })
+  // await fastify.register(mercuriusGateway, {
+  //   gateway: {
+  //     services: [{
+  //       name: '<%- npm %>',
+  //       collectors: {
+  //         collectHeaders: true
+  //       },
+  //       rewriteHeaders: (headers) => {
+  //         return headers
+  //       },
+  //       url: `http://${GRAPHQL_HOST}:${GRAPHQL_PORT}/graphql`,
+  //       keepAlive: 10
+  //     }]
+  //   },
+  //   graphiql: process.env.NODE_ENV !== 'production',
+  //   jit: 1
+  // })
 
   void fastify.ready().then(() => {
     fastify.log.debug('[<%- npm %>-graphql] Started GraphQL Gateway')

diff --git a/template/fastify-graphql-controller/src/plugins/health.ts b/template/fastify-graphql-controller/src/plugins/health.ts
@@ -6,6 +6,6 @@ export default fp<CustomHealthCheckOptions>(async (fastify) => {
   void fastify.register(customHealthCheck)
 
   void fastify.ready().then(() => {
-    fastify.log.debug('[<%- npm %>--health] Started Health')
+    fastify.log.debug('[<%- npm %>-health] Started Health')
   })
 })
diff --git a/template/fastify-graphql-microservice/src/plugins/database.ts b/template/fastify-graphql-microservice/src/plugins/database.ts
@@ -5,11 +5,11 @@ import fastifyMongodb from '@fastify/mongodb'
 import { accessEnv } from '../helpers/accessEnv.js'
 
 export default fp<FastifyPluginOptions>(async (fastify, opts) => {
-  void fastify.register(fastifyMongodb, {
-    forceClose: process.env.NODE_ENV !== 'production',
-    url: accessEnv('MONGODB_URI', 'mongodb://localhost:27017/'),
-    database: accessEnv('MONGODB_DATABASE', '')
-  })
+  // void fastify.register(fastifyMongodb, {
+  //   forceClose: process.env.NODE_ENV !== 'production',
+  //   url: accessEnv('MONGODB_URI', 'mongodb://localhost:27017/'),
+  //   database: accessEnv('MONGODB_DATABASE', '')
+  // })
 
   void fastify.ready().then(() => {
     fastify.log.debug('[<%- npm %>-database] Started Database: Starting Remote Connection')

diff --git a/template/fastify-graphql-microservice/src/plugins/graphql.ts b/template/fastify-graphql-microservice/src/plugins/graphql.ts
@@ -6,12 +6,12 @@ import { resolvers } from '../graphql/reporters.js'
 import schema from '../graphql/schema.js'
 
 export default fp<FastifyPluginOptions>(async (fastify, opts) => {
-  void fastify.register(mercuriusFederationPlugin, {
-    schema,
-    resolvers,
-    graphiql: process.env.NODE_ENV !== 'production',
-    jit: 1
-  })
+  // void fastify.register(mercuriusFederationPlugin, {
+  //   schema,
+  //   resolvers,
+  //   graphiql: process.env.NODE_ENV !== 'production',
+  //   jit: 1
+  // })
 
   void fastify.ready().then(() => {
     fastify.log.debug('[<%- npm %>-graphql] Started GraphQL')

diff --git a/template/fastify-graphql-microservice/src/plugins/health.ts b/template/fastify-graphql-microservice/src/plugins/health.ts
@@ -6,6 +6,6 @@ export default fp<CustomHealthCheckOptions>(async (fastify) => {
   void fastify.register(customHealthCheck)
 
   void fastify.ready().then(() => {
-    fastify.log.debug('[<%- npm %>--health] Started Health')
+    fastify.log.debug('[<%- npm %>-health] Started Health')
   })
 })
diff --git a/template/fastify-graphql-microservice/src/plugins/rabbitmq.ts b/template/fastify-graphql-microservice/src/plugins/rabbitmq.ts
@@ -5,11 +5,11 @@ import fastifyRabbit from 'fastify-rabbitmq'
 import { accessEnv } from '../helpers/accessEnv.js'
 
 export default fp<FastifyPluginOptions>(async (fastify, opt) => {
-  const RABBIT_MQ = accessEnv('RABBIT_MQ', 'localhost')
-
-  void fastify.register(fastifyRabbit, {
-    connection: `amqp://guest:guest@${RABBIT_MQ}`
-  })
+  // const RABBIT_MQ = accessEnv('RABBIT_MQ', 'localhost')
+  //
+  // void fastify.register(fastifyRabbit, {
+  //   connection: `amqp://guest:guest@${RABBIT_MQ}`
+  // })
 
   void fastify.ready().then(async () => {
     fastify.log.debug('[<%- npm %>-rabbitmq] Started RabbitMQ')