fix(intellij): wrong version of @package/app was used

fwouts · Feb 20, 2022 · 4b19b1f · 4b19b1f
1 parent dbdabfe
commit 4b19b1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...tions/intellij/src/main/kotlin/com/previewjs/intellij/plugin/services/PreviewJsService.kt b/...tions/intellij/src/main/kotlin/com/previewjs/intellij/plugin/services/PreviewJsService.kt
@@ -27,6 +27,8 @@ import java.util.*
 
 
 const val PLUGIN_ID = "com.previewjs.intellij.plugin"
+const val PACKAGE_NAME = "@previewjs/app"
+const val PACKAGE_VERSION = "1.1.0"
 
 @Service
 class PreviewJsSharedService : Disposable {
@@ -117,8 +119,8 @@ ${e.stackTraceToString()}""",
     private fun isInstalled(): Boolean {
         val builder = processBuilder("node dist/is-installed.js")
             .directory(nodeDirPath.toFile())
-        builder.environment()["PREVIEWJS_PACKAGE_NAME"] = "@previewjs/app"
-        builder.environment()["PREVIEWJS_PACKAGE_VERSION"] = "1.1.0"
+        builder.environment()["PREVIEWJS_PACKAGE_NAME"] = PACKAGE_NAME
+        builder.environment()["PREVIEWJS_PACKAGE_VERSION"] = PACKAGE_VERSION
         val process = builder.start()
         if (process.waitFor() != 0) {
             throw Error(readInputStream(process.errorStream))
@@ -153,8 +155,8 @@ ${e.stackTraceToString()}""",
     private fun install(project: Project) {
         val builder = processBuilder("node dist/install.js")
             .directory(nodeDirPath.toFile())
-        builder.environment()["PREVIEWJS_PACKAGE_NAME"] = "@previewjs/app"
-        builder.environment()["PREVIEWJS_PACKAGE_VERSION"] = "1.0.3"
+        builder.environment()["PREVIEWJS_PACKAGE_NAME"] = PACKAGE_NAME
+        builder.environment()["PREVIEWJS_PACKAGE_VERSION"] = PACKAGE_VERSION
         val process = builder.start()
         val reader = BufferedReader(InputStreamReader(process.inputStream))
         val consoleView = project.service<ProjectService>().consoleView
@@ -173,8 +175,7 @@ ${e.stackTraceToString()}""",
                 .directory(nodeDirPath.toFile())
         builder.environment()["PORT"] = "$PORT"
         builder.environment()["PREVIEWJS_INTELLIJ_VERSION"] = plugin.getVersion()
-        builder.environment()["PREVIEWJS_PACKAGE_NAME"] = "@previewjs/app"
-        builder.environment()["PREVIEWJS_PACKAGE_VERSION"] = "1.0.3"
+        builder.environment()["PREVIEWJS_PACKAGE_NAME"] = PACKAGE_NAME
         val process = builder.start()
         serverProcess = process
         serverOutputReader = BufferedReader(InputStreamReader(process.inputStream))

diff --git a/scripts/release.ts b/scripts/release.ts
@@ -33,8 +33,8 @@ async function main() {
         const version = await updateNodePackage("app");
         await replaceInFile(
           "integrations/intellij/src/main/kotlin/com/previewjs/intellij/plugin/services/PreviewJsService.kt",
-          /\["PREVIEWJS_PACKAGE_VERSION"\] = "\d+\.\d+\.\d+"/,
-          `["PREVIEWJS_PACKAGE_VERSION"] = "${version}"`
+          /const val PACKAGE_VERSION = "\d+\.\d+\.\d+"/,
+          `const val PACKAGE_VERSION = "${version}"`
         );
         await replaceInFile(
           "integrations/vscode/webpack.config.js",