Enhance generated VS Code configuration (#485)

Author: segevfiner

generate.js

@@ -48,7 +48,9 @@ const typescriptTemplate = {
     test: 'npm run build:ts && tsc -p test/tsconfig.json && tap --ts test/**/*.test.ts',
     start: 'npm run build:ts && fastify start -l info dist/app.js',
     'build:ts': 'tsc',
-    dev: 'tsc && concurrently -k -p "[{name}]" -n "TypeScript,App" -c "yellow.bold,cyan.bold" "tsc -w" "fastify start --ignore-watch=.ts$ -w -l info -P dist/app.js"'
+    'watch:ts': 'tsc -w',
+    dev: 'npm run build:ts && concurrently -k -p "[{name}]" -n "TypeScript,App" -c "yellow.bold,cyan.bold" "npm:watch:ts" "npm:dev:start"',
+    'dev:start': 'fastify start --ignore-watch=.ts$ -w -l info -P dist/app.js'
   },
   dependencies: {
     fastify: cliPkg.dependencies.fastify,
@@ -63,7 +65,6 @@ const typescriptTemplate = {
     'ts-node': cliPkg.devDependencies['ts-node'],
     concurrently: cliPkg.devDependencies.concurrently,
     'fastify-tsconfig': cliPkg.devDependencies['fastify-tsconfig'],
-    nodemon: '^2.0.15',
     tap: cliPkg.devDependencies.tap,
     typescript: cliPkg.devDependencies.typescript
   },

templates/app-ts/.vscode/launch.json

@@ -2,18 +2,19 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "pwa-node",
-            "request": "launch",
+            "type": "node",
             "name": "Launch Fastify",
+            "request": "launch",
+            "runtimeArgs": [
+                "run",
+                "dev:start"
+            ],
+            "runtimeExecutable": "npm",
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceRoot}/node_modules/.bin/nodemon",
-            "args": ["--exec", "npm", "run", "dev"],
-            "preLaunchTask": "tsc: build - tsconfig.json",
-            "outFiles": [
-                "${workspaceFolder}/dist/**/*.js"
-            ]
+            "console": "integratedTerminal",
+            "preLaunchTask": "npm: watch:ts"
         }
     ]
 }

templates/app-ts/.vscode/tasks.json

@@ -0,0 +1,21 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "npm",
+            "label": "npm: watch:ts",
+            "detail": "tsc -w",
+            "group": {
+                "type": "build",
+                "isDefault": true
+            },
+            "script": "watch:ts",
+            "isBackground": true,
+            "problemMatcher": "$tsc-watch",
+            "presentation": {
+                "reveal": "never",
+                "group": "watchers"
+            }
+        }
+    ]
+}

templates/app/.vscode/launch.json

@@ -2,14 +2,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "pwa-node",
-            "request": "launch",
+            "type": "node",
             "name": "Launch Fastify",
+            "request": "launch",
+            "runtimeArgs": [
+                "run",
+                "dev"
+            ],
+            "runtimeExecutable": "npm",
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceRoot}/node_modules/.bin/fastify",
-            "args": ["start", "-l", "info", "app.js"]
+            "console": "integratedTerminal"
         }
     ]
 }

test/generate-typescript.test.js

@@ -100,7 +100,7 @@ function define (t) {
   })
 
   test('should finish successfully with typescript template', async (t) => {
-    t.plan(23 + Object.keys(expected).length)
+    t.plan(25 + Object.keys(expected).length)
     try {
       await generate(workdir, typescriptTemplate)
       await verifyPkg(t)
@@ -128,7 +128,9 @@ function define (t) {
         t.equal(pkg.scripts.test, 'npm run build:ts && tsc -p test/tsconfig.json && tap --ts 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, 'tsc && concurrently -k -p "[{name}]" -n "TypeScript,App" -c "yellow.bold,cyan.bold" "tsc -w" "fastify start --ignore-watch=.ts$ -w -l info -P dist/app.js"')
+        t.equal(pkg.scripts['watch:ts'], 'tsc -w')
+        t.equal(pkg.scripts.dev, 'npm run build:ts && concurrently -k -p "[{name}]" -n "TypeScript,App" -c "yellow.bold,cyan.bold" "npm:watch:ts" "npm:dev:start"')
+        t.equal(pkg.scripts['dev:start'], 'fastify start --ignore-watch=.ts$ -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'])