create-platformatic 0.30.0 → 0.31.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-platformatic",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "Create platformatic-db interactive tool",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "semver": "^7.5.1",
     "undici": "^5.22.1",
     "which": "^3.0.1",
-    "@platformatic/config": "0.30.0"
+    "@platformatic/config": "0.31.0"
   },
   "devDependencies": {
     "ajv": "^8.12.0",
@@ -45,9 +45,10 @@
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",
     "tap": "^16.3.6",
+    "typescript": "~5.1.6",
     "yaml": "^2.3.1",
-    "@platformatic/db": "0.30.0",
-    "@platformatic/service": "0.30.0"
+    "@platformatic/db": "0.31.0",
+    "@platformatic/service": "0.31.0"
   },
   "scripts": {
     "test": "standard | snazzy && cross-env NODE_OPTIONS=\"--loader=esmock --no-warnings\" c8 tap --no-coverage test/*test.mjs test/*/*test.mjs",

package/src/create-package-json.mjs

@@ -1,27 +1,34 @@
-import pupa from 'pupa'
 import { isFileAccessible } from './utils.mjs'
-import { writeFile } from 'fs/promises'
+import { writeFile, readFile } from 'fs/promises'
 import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 
-const packageJsonTemplate = (addTSBuild = false) => (`\
-{
-  "scripts": {
-    ${addTSBuild
-? `"start": "npm run clean && platformatic start",
-    "clean": "rm -fr ./dist",
-    "build": "npx tsc"`
-: '"start": "platformatic start"'}
-  },
-  "devDependencies": {
-    "fastify": "^{fastifyVersion}"
-  },
-  "dependencies": {
-    "platformatic": "^{platVersion}"
-  },
-  "engines": {
-    "node": "^18.8.0 || >=19"
+const packageJsonTemplate = async (addTSBuild, fastifyVersion, platVersion) => {
+  const __dirname = fileURLToPath(new URL('.', import.meta.url))
+  const pkg = {
+    scripts: {
+      start: 'platformatic start'
+    },
+    devDependencies: {
+      fastify: `^${fastifyVersion}`
+    },
+    dependencies: {
+      platformatic: `^${platVersion}`
+    },
+    engines: {
+      node: '^18.8.0'
+    }
   }
-}`)
+
+  if (addTSBuild) {
+    const typescriptVersion = JSON.parse(await readFile(join(__dirname, '..', 'package.json'), 'utf-8')).devDependencies.typescript
+    pkg.scripts.clean = 'rm -fr ./dist'
+    pkg.scripts.build = 'platformatic compile'
+    pkg.devDependencies.typescript = typescriptVersion
+  }
+
+  return pkg
+}
 
 /**
  * Creates a Platformatic app package.json file
@@ -36,10 +43,9 @@ export const createPackageJson = async (platVersion, fastifyVersion, logger, dir
   const packageJsonFileName = join(dir, 'package.json')
   const isPackageJsonExists = await isFileAccessible(packageJsonFileName)
   if (!isPackageJsonExists) {
-    const packageJson = pupa(packageJsonTemplate(addTSBuild), { platVersion, fastifyVersion })
-    const parsed = JSON.parse(packageJson)
-    Object.assign(parsed.scripts, scripts)
-    await writeFile(packageJsonFileName, JSON.stringify(parsed, null, 2))
+    const pkg = await packageJsonTemplate(addTSBuild, fastifyVersion, platVersion)
+    Object.assign(pkg.scripts, scripts)
+    await writeFile(packageJsonFileName, JSON.stringify(pkg, null, 2))
     logger.debug(`${packageJsonFileName} successfully created.`)
   } else {
     logger.debug(`${packageJsonFileName} found, skipping creation of package.json file.`)

package/src/index.mjs

@@ -65,7 +65,7 @@ const createPlatformatic = async (argv) => {
   if (result) {
     const username = await getUsername()
     const version = await getVersion()
-    const greeting = username ? `Hello, ${username}` : 'Hello,'
+    const greeting = username ? `Hello ${username},` : 'Hello,'
     await say(`${greeting} welcome to ${version ? `Platformatic ${version}!` : 'Platformatic!'}`)
 
     const currentVersion = process.versions.node

package/src/service/README.md

@@ -1,6 +1,6 @@
 # Platformatic Service API
 
-This is a generated [Platformatic DB](https://oss.platformatic.dev/docs/reference/service/introduction) application.
+This is a generated [Platformatic Service](https://oss.platformatic.dev/docs/reference/service/introduction) application.
 
 ## Requirements
 

package/src/service/create-service-cli.mjs

@@ -78,9 +78,7 @@ const createPlatformaticService = async (_args, opts = {}) => {
   const fastifyVersion = await getDependencyVersion('fastify')
 
   if (!opts.skipPackageJson) {
-    // Create the package.json, notes that we don't have the option for TS (yet) so we don't generate
-    // the package.json with the TS build
-    await createPackageJson(version, fastifyVersion, logger, projectDir, false)
+    await createPackageJson(version, fastifyVersion, logger, projectDir, useTypescript)
   }
   if (!opts.skipGitignore) {
     await createGitignore(logger, projectDir)

package/test/create-package-json.test.mjs

@@ -64,9 +64,9 @@ test('creates package.json file with TS build', async ({ equal }) => {
   const accessible = await isFileAccessible(join(tmpDir, 'package.json'))
   equal(accessible, true)
   const packageJson = JSON.parse(readFileSync(join(tmpDir, 'package.json')))
-  equal(packageJson.scripts.start, 'npm run clean && platformatic start')
+  equal(packageJson.scripts.start, 'platformatic start')
   equal(packageJson.scripts.clean, 'rm -fr ./dist')
-  equal(packageJson.scripts.build, 'npx tsc')
+  equal(packageJson.scripts.build, 'platformatic compile')
   equal(packageJson.dependencies.platformatic, `^${version}`)
   equal(packageJson.devDependencies.fastify, `^${fastifyVersion}`)
 })