cmyr-template-cli 1.43.0 → 1.43.2

package/dist/plopfile.js

@@ -996,7 +996,7 @@ async function initDocker(projectPath, answers) {
           if (!await import_fs_extra6.default.pathExists(scriptsDir)) {
             await import_fs_extra6.default.mkdir(scriptsDir);
           }
-          await copyFilesFromTemplates(projectPath, ["scripts/minify-docker.cjs"]);
+          await copyFilesFromTemplates(projectPath, ["scripts/minify-docker.mjs"]);
         }
         break;
       default:
@@ -2277,7 +2277,7 @@ async function init(projectPath, answers) {
     await asyncExec("git add .", {
       cwd: projectPath
     });
-    await asyncExec('git commit -m "chore: init" --no-gpg', {
+    await asyncExec('git commit -m "chore: init" --no-gpg --no-verify', {
       cwd: projectPath
     });
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.43.0",
+  "version": "1.43.2",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -76,7 +76,7 @@
     "ejs": "^3.1.6",
     "fs-extra": "^11.0.0",
     "json5": "^2.2.1",
-    "libsodium-wrappers": "^0.7.15",
+    "libsodium-wrappers": "0.7.15",
     "lodash": "^4.17.20",
     "minimist": "^1.2.5",
     "ora": "^5.4.1",

package/templates/Dockerfile

@@ -28,7 +28,7 @@ RUN pnpm add @vercel/nft@0.24.4 fs-extra@11.2.0 --save-prod
 COPY --from=builder /app /app
 
 RUN export PROJECT_ROOT=/app/ && \
-    node /app/scripts/minify-docker.cjs && \
+    node /app/scripts/minify-docker.mjs && \
     rm -rf /app/node_modules /app/scripts && \
     mv /app/app-minimal/node_modules /app/ && \
     rm -rf /app/app-minimal

package/templates/scripts/minify-docker.mjs

@@ -0,0 +1,38 @@
+import path from 'node:path'
+import fs from 'fs-extra'
+import { nodeFileTrace } from '@vercel/nft'
+const __dirname = import.meta.dirname
+// !!! if any new dependencies are added, update the Dockerfile !!!
+
+const projectRoot = path.resolve(process.env.PROJECT_ROOT || path.join(__dirname, '../..'))
+const resultFolder = path.join(projectRoot, 'app-minimal') // no need to resolve, ProjectRoot is always absolute
+const pkg = await fs.readJSON(path.join(projectRoot, 'package.json'))
+
+let mainPath = ''
+const mainPaths = [pkg.main, 'dist/index.js', 'dist/main.js']
+for (const key of mainPaths) {
+    const fullPath = path.join(projectRoot, key)
+    if (await fs.pathExists(fullPath)) {
+        mainPath = fullPath
+        break
+    }
+}
+if (!mainPath) {
+    process.exit(1)
+}
+
+console.log('Start analyzing, project root:', projectRoot)
+const files = [mainPath]
+const { fileList: fileSet } = await nodeFileTrace(files, {
+    base: projectRoot,
+})
+let fileList = [...fileSet]
+console.log('Total touchable files:', fileList.length)
+fileList = fileList.filter((file) => file.startsWith('node_modules')) // only need node_modules
+console.log('Total files need to be copied (touchable files in node_modules/):', fileList.length)
+console.log('Start copying files, destination:', resultFolder)
+await Promise.all(fileList.map((e) => fs.copy(path.join(projectRoot, e), path.join(resultFolder, e)))).catch((error) => {
+    // fix unhandled promise rejections
+    console.error(error, error.stack)
+    process.exit(1)
+})

package/templates/scripts/minify-docker.cjs

@@ -1,42 +0,0 @@
-const path = require('path')
-const fs = require('fs-extra')
-const { nodeFileTrace } = require('@vercel/nft');
-// !!! if any new dependencies are added, update the Dockerfile !!!
-
-(async () => {
-    const projectRoot = path.resolve(process.env.PROJECT_ROOT || path.join(__dirname, '../'))
-    const resultFolder = path.join(projectRoot, 'app-minimal') // no need to resolve, ProjectRoot is always absolute
-    const pkg = await fs.readJSON(path.join(projectRoot, 'package.json'))
-
-    let mainPath = ''
-    const mainPaths = [pkg.main, 'dist/index.js', 'dist/main.js']
-    for (const key of mainPaths) {
-        const fullPath = path.join(projectRoot, key)
-        if (await fs.pathExists(fullPath)) {
-            mainPath = fullPath
-            break
-        }
-    }
-    if (!mainPath) {
-        process.exit(1)
-    }
-    const files = [mainPath]
-    console.log('Start analyzing, project root:', projectRoot)
-    const { fileList: fileSet } = await nodeFileTrace(files, {
-        base: projectRoot,
-        paths: {
-            '@/': 'dist/',
-        },
-    })
-    let fileList = Array.from(fileSet)
-    console.log('Total touchable files:', fileList.length)
-    fileList = fileList.filter((file) => file.startsWith('node_modules')) // only need node_modules
-    console.log('Total files need to be copied (touchable files in node_modules):', fileList.length)
-    console.log('Start copying files, destination:', resultFolder)
-    return Promise.all(fileList.map((e) => fs.copy(path.join(projectRoot, e), path.join(resultFolder, e)).catch(console.error),
-    ))
-})().catch((err) => {
-    // fix unhandled promise rejections
-    console.error(err, err.stack)
-    process.exit(1)
-})