create-moost 0.2.36 → 0.3.1

package/dist/index.cjs

@@ -125,8 +125,8 @@ function getPrompts(inputs) {
                     },
                     message: 'Bundler:',
                     choices: [
-                        { title: 'ESBuild (with nodemon for dev)', value: 'esbuild' },
-                        { title: 'Rollup', value: 'rollup' },
+                        { title: 'Rollup (recommended)', value: 'rollup' },
+                        { title: 'ESBuild', value: 'esbuild' },
                     ],
                 },
                 {
@@ -233,6 +233,9 @@ function scaffold(data) {
         if (data.bundler !== 'rollup') {
             excludeCommon.push('rollup.config.js');
         }
+        if (data.bundler !== 'esbuild') {
+            excludeCommon.push('build.js');
+        }
         yield rw.rewriteDir({
             baseDir: templatePath,
             output: projectDir,
@@ -328,13 +331,13 @@ function run() {
     app.adapter(new eventCli.MoostCli({
         globalCliOptions: [
             // { keys: ['ts'], description: '' },
-            { keys: ['http'], description: 'Use Moost HTTP' },
-            { keys: ['cli'], description: 'Use Moost CLI' },
-            { keys: ['eslint'], description: 'Add ESLint' },
-            { keys: ['prettier'], description: 'Add Prettier' },
-            { keys: ['force'], description: 'Force Overwrite' },
-            { keys: ['esbuild'], description: 'Use esbuild for builds' },
-            { keys: ['rollup'], description: 'Use rollup for builds' },
+            { keys: ['http'], description: 'Use Moost HTTP', type: Boolean },
+            { keys: ['cli'], description: 'Use Moost CLI', type: Boolean },
+            { keys: ['eslint'], description: 'Add ESLint', type: Boolean },
+            { keys: ['prettier'], description: 'Add Prettier', type: Boolean },
+            { keys: ['force'], description: 'Force Overwrite', type: Boolean },
+            { keys: ['esbuild'], description: 'Use esbuild for builds', type: Boolean },
+            { keys: ['rollup'], description: 'Use rollup for builds', type: Boolean },
         ],
     }));
     void app.init();

package/dist/index.mjs

@@ -123,8 +123,8 @@ function getPrompts(inputs) {
                     },
                     message: 'Bundler:',
                     choices: [
-                        { title: 'ESBuild (with nodemon for dev)', value: 'esbuild' },
-                        { title: 'Rollup', value: 'rollup' },
+                        { title: 'Rollup (recommended)', value: 'rollup' },
+                        { title: 'ESBuild', value: 'esbuild' },
                     ],
                 },
                 {
@@ -231,6 +231,9 @@ function scaffold(data) {
         if (data.bundler !== 'rollup') {
             excludeCommon.push('rollup.config.js');
         }
+        if (data.bundler !== 'esbuild') {
+            excludeCommon.push('build.js');
+        }
         yield rw.rewriteDir({
             baseDir: templatePath,
             output: projectDir,
@@ -326,13 +329,13 @@ function run() {
     app.adapter(new MoostCli({
         globalCliOptions: [
             // { keys: ['ts'], description: '' },
-            { keys: ['http'], description: 'Use Moost HTTP' },
-            { keys: ['cli'], description: 'Use Moost CLI' },
-            { keys: ['eslint'], description: 'Add ESLint' },
-            { keys: ['prettier'], description: 'Add Prettier' },
-            { keys: ['force'], description: 'Force Overwrite' },
-            { keys: ['esbuild'], description: 'Use esbuild for builds' },
-            { keys: ['rollup'], description: 'Use rollup for builds' },
+            { keys: ['http'], description: 'Use Moost HTTP', type: Boolean },
+            { keys: ['cli'], description: 'Use Moost CLI', type: Boolean },
+            { keys: ['eslint'], description: 'Add ESLint', type: Boolean },
+            { keys: ['prettier'], description: 'Add Prettier', type: Boolean },
+            { keys: ['force'], description: 'Force Overwrite', type: Boolean },
+            { keys: ['esbuild'], description: 'Use esbuild for builds', type: Boolean },
+            { keys: ['rollup'], description: 'Use rollup for builds', type: Boolean },
         ],
     }));
     void app.init();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-moost",
-  "version": "0.2.36",
+  "version": "0.3.1",
   "description": "create-moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -41,10 +41,10 @@
   },
   "homepage": "https://github.com/moostjs/moostjs/tree/main/packages/create-moost#readme",
   "dependencies": {
-    "@moostjs/event-cli": "0.2.36",
-    "@wooksjs/event-cli": "^0.3.12",
+    "@moostjs/event-cli": "0.3.1",
+    "@wooksjs/event-cli": "^0.4.1",
     "@prostojs/rewrite": "^0.0.4",
-    "moost": "0.2.36",
+    "moost": "0.3.1",
     "prompts": "^2.4.2"
   }
 }

package/templates/cli/src/main.ts

@@ -19,7 +19,7 @@ function cli() {
             cliHelp: { name: '{{ packageName }}' },
         },
         globalCliOptions: [
-            { keys: ['help'], description: 'Display instructions for the command.' },
+            { keys: ['help'], description: 'Display instructions for the command.', type: Boolean },
         ],
     }))
 

package/templates/common/build.js

@@ -0,0 +1,28 @@
+const esbuild = require('esbuild')
+const esbuildPluginTsc = require('esbuild-plugin-tsc')
+//=IF (type === 'http')
+const { spawn } = require('child_process')
+//=END IF
+
+const watch = process.argv[2] === 'watch'
+
+esbuild[watch ? 'context' : 'build']({
+    entryPoints: [
+        './src/main.ts',
+    ],
+    logLevel: 'info',
+    bundle: true,
+    outdir: './dist',
+    platform: 'node',
+    packages: 'external',
+    sourcemap: watch,
+    plugins: [esbuildPluginTsc()],
+}).then(async ctx => {
+    if (watch) {
+        //=IF (type === 'http')
+        const nodemon = spawn('nodemon', { stdio: 'inherit' })
+        process.on('SIGTERM', async () => { nodemon.kill(); await ctx.dispose() })
+        //=END IF
+        await ctx.watch()
+    }
+})

package/templates/common/package.json

@@ -24,14 +24,14 @@
         //=END IF
         //=IF (bundler === 'esbuild')
             //=IF (type === 'http')
-        "dev": "npm-run-all --parallel build:watch nodemon",
+        "dev": "npm run build:watch",
+        "nodemon": "NODE_OPTIONS=--enable-source-maps nodemon ./dist/main",
             //=END IF
             //=IF (type === 'cli')
         "dev": "npm run build && ./bin.js",
             //=END IF
-        "nodemon": "NODE_OPTIONS=--enable-source-maps nodemon ./dist/main",
-        "build": "esbuild ./src/main.ts --bundle --outdir=dist --platform=node --packages=external",
-        "build:watch": "esbuild ./src/main.ts --bundle --outdir=dist --watch --platform=node --packages=external --sourcemap",
+        "build": "node ./build",
+        "build:watch": "node ./build watch",
         //=END IF
         //=IF (prettier)
         "prettify": "prettier . --write && lint --fix",
@@ -59,10 +59,10 @@
         "tslib": "^2.5.2",
 //=END IF
 //=IF (bundler === 'esbuild')
-        "esbuild": "^0.17.19",
+        "esbuild": "^0.18.17",
+        "esbuild-plugin-tsc": "^0.4.0",
         //=IF (type === 'http')
         "nodemon": "^2.0.22",
-        "npm-run-all": "^4.1.5",
         //=END IF
 //=END IF
 //=IF (eslint)