Revert "feat: start can now watch ts files (#246) (#276)"

This reverts commit b6935b4.

Author: mcollina

.gitignore

@@ -52,8 +52,4 @@ test.sock
 # test artifacts
 test/workdir
 test/fixtures/*.js
-test/fixtures/*.ts
 .vscode/launch.json
-
-# ts compiled
-dist

args.js

@@ -9,7 +9,7 @@ module.exports = function parseArgs (args) {
     },
     number: ['port', 'inspect-port', 'body-limit', 'plugin-timeout'],
     boolean: ['pretty-logs', 'options', 'watch', 'debug'],
-    string: ['log-level', 'address', 'socket', 'prefix', 'ignore-watch', 'logging-module', 'debug-host', 'lang', 'tsconfig'],
+    string: ['log-level', 'address', 'socket', 'prefix', 'ignore-watch', 'logging-module', 'debug-host', 'lang'],
     envPrefix: 'FASTIFY_',
     alias: {
       port: ['p'],
@@ -35,8 +35,7 @@ module.exports = function parseArgs (args) {
       'ignore-watch': 'node_modules build dist .git bower_components logs .swp',
       options: false,
       'plugin-timeout': 10 * 1000, // everything should load in 10 seconds
-      lang: 'js',
-      tsconfig: 'tsconfig.json'
+      lang: 'js'
     }
   })
 
@@ -62,7 +61,6 @@ module.exports = function parseArgs (args) {
     socket: parsedArgs.socket,
     prefix: parsedArgs.prefix,
     loggingModule: parsedArgs.loggingModule,
-    lang: parsedArgs.lang,
-    tsconfig: parsedArgs.tsconfig
+    lang: parsedArgs.lang
   }
 }

examples/plugin.ts

@@ -47,7 +47,7 @@ const typescriptTemplate = {
     test: 'npm run build:ts && tsc -p test/tsconfig.test.json && tap test/**/*.test.ts',
     start: 'npm run build:ts && fastify start -l info dist/app.js',
     'build:ts': 'tsc',
-    dev: 'fastify start -w -l info -P src/app.ts'
+    dev: 'tsc && concurrently -k -p "[{name}]" -n "TypeScript,App" -c "yellow.bold,cyan.bold"  "tsc -w" "fastify start -w -l info -P dist/app.js"'
   },
   dependencies: {
     fastify: cliPkg.dependencies.fastify,
@@ -58,6 +58,7 @@ const typescriptTemplate = {
   devDependencies: {
     '@types/node': cliPkg.devDependencies['@types/node'],
     '@types/tap': cliPkg.devDependencies['@types/tap'],
+    concurrently: cliPkg.devDependencies.concurrently,
     'fastify-tsconfig': cliPkg.devDependencies['fastify-tsconfig'],
     tap: cliPkg.devDependencies.tap,
     typescript: cliPkg.devDependencies.typescript

generate.js

@@ -19,8 +19,7 @@ let Fastify = null
 
 function loadModules (opts) {
   try {
-    const app = opts._[0]
-    const { module: fastifyModule } = requireFastifyForModule(app)
+    const { module: fastifyModule } = requireFastifyForModule(opts._[0])
 
     Fastify = fastifyModule
   } catch (e) {
@@ -30,7 +29,6 @@ function loadModules (opts) {
 
 async function start (args) {
   const opts = parseArgs(args)
-
   if (opts.help) {
     return showHelpForCommand('start')
   }
@@ -43,10 +41,6 @@ async function start (args) {
   // we start crashing on unhandledRejection
   require('make-promises-safe')
 
-  if (path.extname(opts._[0]) === '.ts') {
-    return require('./lib/watch/tsc-watcher')(args, opts)
-  }
-
   loadModules(opts)
 
   if (opts.watch) {

lib/watch/tsc-watcher.js

@@ -1,6 +1,6 @@
 import { FastifyPluginAsync } from "fastify"
 
-const example: FastifyPluginAsync = async (fastify, opts): Promise<void> => {
+const example: FastifyPluginAsync =async (fastify, opts): Promise<void> => {
   fastify.get('/', async function (request, reply) {
     return 'this is an example'
   })

start.js

@@ -1,7 +1,6 @@
 {
     "extends": "fastify-tsconfig",
     "compilerOptions": {
-        "esModuleInterop": true,
         "outDir": "dist"
     },
     "include": ["src/**/*.ts"]

templates/app-ts/src/routes/example/index.ts

@@ -44,8 +44,7 @@ test('should parse args correctly', t => {
     debugPort: 1111,
     debugHost: '1.1.1.1',
     loggingModule: './custom-logger.js',
-    lang: 'js',
-    tsconfig: 'tsconfig.json'
+    lang: 'js'
   })
 })
 
@@ -91,8 +90,7 @@ test('should parse args with = assignment correctly', t => {
     debugPort: 1111,
     debugHost: '1.1.1.1',
     loggingModule: './custom-logger.js',
-    lang: 'js',
-    tsconfig: 'tsconfig.json'
+    lang: 'js'
   })
 })
 
@@ -153,8 +151,7 @@ test('should parse env vars correctly', t => {
     debugPort: 1111,
     debugHost: '1.1.1.1',
     loggingModule: './custom-logger.js',
-    lang: 'js',
-    tsconfig: 'tsconfig.json'
+    lang: 'js'
   })
 })
 
@@ -233,7 +230,6 @@ test('should parse custom plugin options', t => {
     debugPort: 1111,
     debugHost: '1.1.1.1',
     loggingModule: './custom-logger.js',
-    lang: 'js',
-    tsconfig: 'tsconfig.json'
+    lang: 'js'
   })
 })

templates/app-ts/tsconfig.json

@@ -104,7 +104,7 @@ function define (t) {
   })
 
   test('should finish succesfully with typescript template', async (t) => {
-    t.plan(20 + Object.keys(expected).length)
+    t.plan(21 + Object.keys(expected).length)
     try {
       await generate(workdir, typescriptTemplate)
       await verifyPkg(t)
@@ -132,12 +132,13 @@ function define (t) {
         t.equal(pkg.scripts.test, 'npm run build:ts && tsc -p test/tsconfig.test.json && tap test/**/*.test.ts')
         t.equal(pkg.scripts.start, 'npm run build:ts && fastify start -l info dist/app.js')
         t.equal(pkg.scripts['build:ts'], 'tsc')
-        t.equal(pkg.scripts.dev, 'fastify start -w -l info -P src/app.ts')
+        t.equal(pkg.scripts.dev, 'tsc && concurrently -k -p "[{name}]" -n "TypeScript,App" -c "yellow.bold,cyan.bold"  "tsc -w" "fastify start -w -l info -P dist/app.js"')
         t.equal(pkg.dependencies['fastify-cli'], '^' + cliPkg.version)
         t.equal(pkg.dependencies.fastify, cliPkg.dependencies.fastify)
         t.equal(pkg.dependencies['fastify-plugin'], cliPkg.devDependencies['fastify-plugin'] || cliPkg.dependencies['fastify-plugin'])
         t.equal(pkg.dependencies['fastify-autoload'], cliPkg.devDependencies['fastify-autoload'])
         t.equal(pkg.devDependencies['@types/node'], cliPkg.devDependencies['@types/node'])
+        t.equal(pkg.devDependencies.concurrently, cliPkg.devDependencies.concurrently)
         t.equal(pkg.devDependencies.tap, cliPkg.devDependencies.tap)
         t.equal(pkg.devDependencies.typescript, cliPkg.devDependencies.typescript)