cmyr-template-cli 1.25.2 → 1.25.4

package/dist/plopfile.js

@@ -487,10 +487,12 @@ async function init(projectPath, answers) {
             });
             await initConfig(projectPath);
             await initCommitizen(projectPath);
+            const info = await getProjectInfo(projectPath, answers);
+            if (info) {
+                await initProjectJson(projectPath, info);
+            }
             if (isOpenSource) {
-                const info = await getProjectInfo(projectPath, answers);
                 if (info) {
-                    await initProjectJson(projectPath, info);
                     if (isInitReadme) {
                         await initReadme(projectPath, info);
                     }
@@ -531,14 +533,14 @@ async function init(projectPath, answers) {
             await asyncExec('java -version', {
                 cwd: projectPath,
             });
-            await asyncExec('mvn -version', {
+            await asyncExec('gradle -v', {
                 cwd: projectPath,
             });
             await asyncExec('git add .', {
                 cwd: projectPath,
             });
             try {
-                await asyncExec('mvn dependency:go-offline -B -Dmaven.test.skip=true', {
+                await asyncExec('gradle dependencies --no-daemon', {
                     cwd: projectPath,
                 });
             }
@@ -860,7 +862,7 @@ async function getProjectInfo(projectPath, answers) {
     var _a, _b, _c, _d, _e, _f;
     const loading = ora__default["default"]('正在获取项目信息 ……').start();
     try {
-        const { name, author, description, template, isOpenSource, isPublishToNpm, license, isPrivateScopePackage, scopeName } = answers;
+        const { name, author, description, template, isOpenSource, isPublishToNpm, license = 'UNLICENSED', isPrivateScopePackage, scopeName } = answers;
         const templateMeta = getTemplateMeta(template);
         const projectName = name;
         const packageManager = 'npm';
@@ -878,6 +880,7 @@ async function getProjectInfo(projectPath, answers) {
         const testCommand = ((_d = pkg === null || pkg === void 0 ? void 0 : pkg.scripts) === null || _d === void 0 ? void 0 : _d.test) && `${packageManager} run test`;
         const lintCommand = ((_e = pkg === null || pkg === void 0 ? void 0 : pkg.scripts) === null || _e === void 0 ? void 0 : _e.lint) && `${packageManager} run lint`;
         const commitCommand = ((_f = pkg === null || pkg === void 0 ? void 0 : pkg.scripts) === null || _f === void 0 ? void 0 : _f.commit) && `${packageManager} run commit`;
+        const mainFile = pkg === null || pkg === void 0 ? void 0 : pkg.main;
         const githubUsername = (config === null || config === void 0 ? void 0 : config.GITHUB_USERNAME) || author;
         const giteeUsername = config === null || config === void 0 ? void 0 : config.GITEE_USERNAME;
         const weiboUsername = config === null || config === void 0 ? void 0 : config.WEIBO_USERNAME;
@@ -895,7 +898,7 @@ async function getProjectInfo(projectPath, answers) {
         const licenseUrl = `${repositoryUrl}/blob/master/LICENSE`;
         const discussionsUrl = `${repositoryUrl}/discussions`;
         const pullRequestsUrl = `${repositoryUrl}/pulls`;
-        const authorWebsite = await getAuthorWebsiteFromGithubAPI(githubUsername);
+        const authorWebsite = isOpenSource ? await getAuthorWebsiteFromGithubAPI(githubUsername) : '';
         const projectInfos = {
             ...answers,
             currentYear: new Date().getFullYear(),
@@ -951,6 +954,7 @@ async function getProjectInfo(projectPath, answers) {
             twitterUsername,
             npmUsername,
             templateMeta,
+            mainFile,
         };
         loading.succeed('项目信息 初始化成功！');
         return projectInfos;
@@ -1304,33 +1308,45 @@ async function initDocker(projectPath, answers) {
         const templateMeta = getTemplateMeta(answers.template);
         const files = ['.dockerignore', 'docker-compose.yml'];
         await copyFilesFromTemplates(projectPath, files);
-        let dockerfilePath = 'Dockerfile';
+        let dockerfile = 'Dockerfile';
+        const newPath = path__default["default"].join(projectPath, 'Dockerfile');
+        if (await fs__default["default"].pathExists(newPath)) {
+            await fs__default["default"].remove(newPath);
+        }
+        if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) === 'java') {
+            const templatePath = path__default["default"].join(__dirname, '../templates/java/Dockerfile.ejs');
+            await ejsRender(templatePath, { javaVersion: templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.javaVersion }, newPath);
+            loading.succeed('Docker 初始化成功！');
+            return;
+        }
+        if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) === 'nodejs') {
+            if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) === 'nodejs') {
+                const scriptsDir = path__default["default"].join(projectPath, 'scripts');
+                if (!await fs__default["default"].pathExists(scriptsDir)) {
+                    await fs__default["default"].mkdir(scriptsDir);
+                }
+                await copyFilesFromTemplates(projectPath, ['scripts/minify-docker.js']);
+            }
+            const pkg = await getProjectJson(projectPath);
+            const mainFile = pkg === null || pkg === void 0 ? void 0 : pkg.main;
+            const templatePath = path__default["default"].join(__dirname, '../templates/Dockerfile');
+            await ejsRender(templatePath, { mainFile }, newPath);
+            loading.succeed('Docker 初始化成功！');
+            return;
+        }
         switch (templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) {
-            case 'java':
-                dockerfilePath = (templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.javaVersion) === 8 ? 'java/jdk8/Dockerfile' : 'java/jdk17/Dockerfile';
-                break;
             case 'python':
-                dockerfilePath = 'python/Dockerfile';
+                dockerfile = 'python/Dockerfile';
                 break;
             case 'golang':
-                dockerfilePath = 'golang/Dockerfile';
+                dockerfile = 'golang/Dockerfile';
                 break;
             default:
-                dockerfilePath = 'Dockerfile';
+                dockerfile = 'Dockerfile';
                 break;
         }
-        const newPath = path__default["default"].join(projectPath, 'Dockerfile');
-        if (await fs__default["default"].pathExists(newPath)) {
-            await fs__default["default"].remove(newPath);
-        }
-        await fs__default["default"].copyFile(path__default["default"].join(__dirname, '../templates/', dockerfilePath), newPath);
-        if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) === 'nodejs') {
-            const scriptsDir = path__default["default"].join(projectPath, 'scripts');
-            if (!await fs__default["default"].pathExists(scriptsDir)) {
-                await fs__default["default"].mkdir(scriptsDir);
-            }
-            await copyFilesFromTemplates(projectPath, ['scripts/minify-docker.js']);
-        }
+        const dockerfilePath = path__default["default"].join(__dirname, '../templates/', dockerfile);
+        await fs__default["default"].copyFile(dockerfilePath, newPath);
         loading.succeed('Docker 初始化成功！');
     }
     catch (error) {
@@ -1488,6 +1504,14 @@ function kebabCase(str) {
 function getTemplateMeta(template) {
     return TEMPLATES_META_LIST.find((e) => e.name === template);
 }
+async function ejsRender(templatePath, data, outputPath) {
+    const template = (await fs__default["default"].readFile(templatePath, 'utf8')).toString();
+    const content = await ejs__default["default"].render(template, data, {
+        debug: false,
+        async: true,
+    });
+    await fs__default["default"].writeFile(outputPath, content);
+}
 
 module.exports = function (plop) {
     plop.setActionType('initProject', initProject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -47,7 +47,7 @@
     "@types/node": "^20.0.0",
     "@types/promise.any": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "6.15.0",
-    "@typescript-eslint/parser": "6.15.0",
+    "@typescript-eslint/parser": "6.16.0",
     "commitizen": "^4.2.2",
     "conventional-changelog-cli": "^4.0.0",
     "conventional-changelog-cmyr-config": "^2.1.1",

package/templates/Dockerfile

@@ -37,5 +37,4 @@ COPY --from=docker-minifier /home/app /home/app
 
 EXPOSE 3000
 
-CMD ["node", "dist/main.js"]
-# CMD ["node", "dist/index.js"]
+CMD ["node", "<%= mainFile %>"]

package/templates/java/Dockerfile.ejs

@@ -0,0 +1,28 @@
+# 阶段一：安装依赖
+FROM gradle:8.5.0-jdk<%= javaVersion %> as dependencies
+
+WORKDIR /home/app
+
+COPY build.gradle /home/app/build.gradle
+
+# 只安装依赖，跳过测试
+RUN gradle -v && gradle dependencies --no-daemon
+
+# 阶段二：构建阶段
+FROM dependencies as builder
+
+COPY . /home/app
+
+# 构建
+RUN gradle clean build --no-daemon
+
+# 阶段三：生产阶段
+FROM eclipse-temurin:<%= javaVersion %>-jre-alpine
+
+WORKDIR /home/app
+
+COPY --from=builder /home/app/build/libs/main.jar /home/app
+
+EXPOSE 8080
+
+CMD ["java", "-jar", "main.jar"]

package/templates/java/jdk17/Dockerfile

@@ -1,33 +0,0 @@
-# 阶段一：安装依赖
-FROM maven:3-eclipse-temurin-17-alpine as dependencies
-
-WORKDIR /home/app
-
-RUN java -version && mvn -version && \
-    echo '<?xml version="1.0" encoding="UTF-8"?><settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"><mirrors><mirror><id>alimaven</id><mirrorOf>central</mirrorOf><name>aliyun maven</name><url>https://maven.aliyun.com/repository/public/</url></mirror></mirrors></settings>' > /usr/share/maven/conf/settings.xml
-
-COPY pom.xml /home/app/pom.xml
-
-# 只安装依赖，跳过测试
-RUN mvn dependency:go-offline -B -Dmaven.test.skip=true
-
-# 阶段二：构建阶段
-FROM dependencies as builder
-
-COPY . /home/app
-
-# 构建
-RUN mvn clean package -Dmaven.test.skip=true
-
-# 阶段三：生产阶段
-FROM eclipse-temurin:17-jre-alpine
-
-WORKDIR /home/app
-
-RUN java -version
-
-COPY --from=builder /home/app/target/main.jar /home/app
-
-EXPOSE 8080
-
-CMD ["java", "-jar", "main.jar"]

package/templates/java/jdk8/Dockerfile

@@ -1,33 +0,0 @@
-# 阶段一：安装依赖
-FROM maven:3-eclipse-temurin-8-alpine as dependencies
-
-WORKDIR /home/app
-
-RUN java -version && mvn -version && \
-    echo '<?xml version="1.0" encoding="UTF-8"?><settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"><mirrors><mirror><id>alimaven</id><mirrorOf>central</mirrorOf><name>aliyun maven</name><url>https://maven.aliyun.com/repository/public/</url></mirror></mirrors></settings>' > /usr/share/maven/conf/settings.xml
-
-COPY pom.xml /home/app/pom.xml
-
-# 只安装依赖，跳过测试
-RUN mvn dependency:go-offline -B -Dmaven.test.skip=true
-
-# 阶段二：构建阶段
-FROM dependencies as builder
-
-COPY . /home/app
-
-# 构建
-RUN mvn clean package -Dmaven.test.skip=true
-
-# 阶段三：生产阶段
-FROM eclipse-temurin:8-jre-alpine
-
-WORKDIR /home/app
-
-RUN java -version
-
-COPY --from=builder /home/app/target/main.jar /home/app
-
-EXPOSE 8080
-
-CMD ["java", "-jar", "main.jar"]