Merge remote-tracking branch 'origin/master'

rxliuli · Aug 31, 2021 · dff6bb8 · dff6bb8
2 parents ff1de8c + d805931
commit dff6bb8
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 17 deletions.
diff --git a/apps/liuli-cli/CHANGELOG.md b/apps/liuli-cli/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 更新日志
 
+## 3.8.4
+
+- 修复发布后的内容不包含 .gitignore 的问题
+
 ## 3.8.3
 
 - 修复模板中的一些依赖缺失和脚本错误的问题

diff --git a/apps/liuli-cli/_gitignore b/apps/liuli-cli/_gitignore
@@ -0,0 +1,33 @@
+# ----------------------------- Directories --------------------------
+node_modules
+dist
+tests/server/static
+tests/server/static/upload
+.idea
+
+# ----------------------------- File Types --------------------------
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+*~
+
+# ----------------------------- Files -------------------------------
+.DS_Store
+# local env files
+.env.local
+.env.*.local
+# log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+**/__tests__/temp/
+*.tgz
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+**/i18n/index.d.ts
diff --git a/apps/liuli-cli/package.json b/apps/liuli-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@liuli-util/cli",
-  "version": "3.8.3",
+  "version": "3.8.4",
   "description": "一个针对于库和 CLI 应用程序打包的零配置 CLI",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -12,15 +12,6 @@
     "build": "rimraf dist && yarn start build cli",
     "dev": "yarn start build cli -w"
   },
-  "files": [
-    "dist",
-    "src",
-    "templates",
-    ".gitignore",
-    "CHANGELOG.md",
-    "package.json",
-    "tsconfig.json"
-  ],
   "bin": {
     "liuli-cli": "dist/bin.js"
   },

diff --git a/apps/liuli-cli/src/commands/sync/SyncProgram.ts b/apps/liuli-cli/src/commands/sync/SyncProgram.ts
@@ -109,7 +109,7 @@ export class SyncProgram {
         const gitignorePath = path.resolve(this.base, '.gitignore')
         await writeFile(
           gitignorePath,
-          await readFile(PathUtil.resolveOfProject('.gitignore'), 'utf-8'),
+          await readFile(PathUtil.resolveOfProject('_gitignore'), 'utf-8'),
         )
       },
     },

diff --git a/jetbrains-plugins/vite-jetbrains-plugin/CHANGELOG.md b/jetbrains-plugins/vite-jetbrains-plugin/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 # Changelog
 
+## [0.2.0]
+
+### Changed
+
+- chore: change the name of the plugin displayed in the creation panel to Vite
+- feat: use create-vite instead of the deprecated @vitejs/create-app
+
 ## [0.1.6]
 
 ### Changed

diff --git a/jetbrains-plugins/vite-jetbrains-plugin/gradle.properties b/jetbrains-plugins/vite-jetbrains-plugin/gradle.properties
@@ -2,7 +2,7 @@
 # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 pluginGroup=com.rxliuli
 pluginName=vite-jetbrains-plugin
-pluginVersion=0.1.6
+pluginVersion=0.2.0
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild=202

diff --git a/...ins/vite-jetbrains-plugin/src/main/kotlin/com/rxliuli/vite/cli/ViteCliProjectGenerator.kt b/...ins/vite-jetbrains-plugin/src/main/kotlin/com/rxliuli/vite/cli/ViteCliProjectGenerator.kt
@@ -20,7 +20,8 @@ import javax.swing.DefaultComboBoxModel
 import javax.swing.Icon
 
 class ViteCliProjectGenerator : NpmPackageProjectGenerator() {
-    private val packageName = "@vitejs/create-app"
+    private val packageName = "create-vite"
+    private val executeCmd = "create-vite"
 
     override fun getName(): String {
         return ViteMessage.msg("vite.project.generator.name")
@@ -49,7 +50,7 @@ class ViteCliProjectGenerator : NpmPackageProjectGenerator() {
     }
 
     override fun getNpxCommands(): List<NpxPackageDescriptor.NpxCommand> {
-        return listOf(NpxPackageDescriptor.NpxCommand(packageName, "create-app"))
+        return listOf(NpxPackageDescriptor.NpxCommand(packageName, executeCmd))
     }
 
     val settingsTemplateKey = Key.create<String>("template")
@@ -87,7 +88,7 @@ class ViteCliProjectGenerator : NpmPackageProjectGenerator() {
     override fun generatorArgs(project: Project, baseDir: VirtualFile, settings: Settings): Array<String> {
         val template = settings.getUserData(settingsTemplateKey)
         globalSettings.template = template!!
-        return arrayOf(" ${baseDir.name} --template $template")
+        return arrayOf(baseDir.name, "--template", template)
     }
 
     override fun generateInTemp(): Boolean {

diff --git a/jetbrains-plugins/vite-jetbrains-plugin/src/main/resources/META-INF/plugin.xml b/jetbrains-plugins/vite-jetbrains-plugin/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.rxliuli.vite-jetbrains-plugin</id>
     <name>Vite Integrated</name>
-    <vendor email="[email protected]" url="https://github.com/rxliuli/vite-jetbrains-plugin">rxliuli</vendor>
+    <vendor email="[email protected]" url="https://github.com/rxliuli/liuli-tools/tree/master/jetbrains-plugins/vite-jetbrains-plugin">rxliuli</vendor>
 
     <!-- please see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->

diff --git a/...rains-plugins/vite-jetbrains-plugin/src/main/resources/messages/ViteIntegrated.properties b/...rains-plugins/vite-jetbrains-plugin/src/main/resources/messages/ViteIntegrated.properties
@@ -1,4 +1,4 @@
-vite.project.generator.name=Create Vite Project
+vite.project.generator.name=Vite
 vite.project.generator.description=Use @vitejs/create-app cli to create a project
 vite.project.generator.presentablePackageName=Vite CLI
 vite.project.generator.settings.template=Template