From 5a8859def6e67b6a89bf949952cbefa89e152e53 Mon Sep 17 00:00:00 2001
From: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
Date: Mon, 17 Jul 2023 15:12:27 +0200
Subject: [PATCH] Update scripts to work with 1.39 and earlier Theia releases
 #170

* rebuild needs to be run performed before build
---
 templates/README.md                 | 6 ++++--
 templates/app-browser-package.json  | 5 +++--
 templates/app-electron-package.json | 5 +++--
 templates/root-package.json         | 8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/templates/README.md b/templates/README.md
index 7e1544b..0d375d2 100644
--- a/templates/README.md
+++ b/templates/README.md
@@ -7,11 +7,12 @@ Please install all necessary [prerequisites](https://github.com/eclipse-theia/th
 
 ## Running the browser example
 
+    yarn build:browser
     yarn start:browser
 
 *or:*
 
-    yarn rebuild:browser
+    yarn build:browser
     cd browser-app
     yarn start
 
@@ -21,11 +22,12 @@ Open http://localhost:3000 in the browser.
 
 ## Running the Electron example
 
+    yarn build:electron
     yarn start:electron
 
 *or:*
 
-    yarn rebuild:electron
+    yarn build:electron
     cd electron-app
     yarn start
 
diff --git a/templates/app-browser-package.json b/templates/app-browser-package.json
index 5a6d3f1..c18fdd5 100644
--- a/templates/app-browser-package.json
+++ b/templates/app-browser-package.json
@@ -20,9 +20,10 @@
     "@theia/cli": "<%= params.theiaVersion %>"<% if (params.browserDevDependencies) { %><%- params.browserDevDependencies %><% } %>
   },
   "scripts": {
-    "prepare": "theia build --mode development",
+    "bundle": "yarn rebuild && theia build --mode development",
+    "rebuild": "theia rebuild:browser",
     "start": "theia start",
-    "watch": "theia build --watch --mode development"
+    "watch": "yarn rebuild && theia build --watch --mode development"
   },
   "theia": {
     "target": "<%= appMode %>"
diff --git a/templates/app-electron-package.json b/templates/app-electron-package.json
index a4f9745..c8210ad 100644
--- a/templates/app-electron-package.json
+++ b/templates/app-electron-package.json
@@ -22,9 +22,10 @@
     "electron": "^23.2.4"
   },
   "scripts": {
-    "prepare": "theia build --mode development",
+    "bundle": "yarn rebuild && theia build --mode development",
+    "rebuild": "theia rebuild:electron",
     "start": "theia start",
-    "watch": "theia build --watch --mode development"
+    "watch": "yarn rebuild && theia build --watch --mode development"
   },
   "theia": {
     "target": "<%= appMode %>"
diff --git a/templates/root-package.json b/templates/root-package.json
index 2e8259b..e4e5cd1 100644
--- a/templates/root-package.json
+++ b/templates/root-package.json
@@ -5,12 +5,12 @@
     "node": ">=14.18.0"
   },
   "scripts": {
+    "build:browser": "yarn --cwd browser-app bundle",
+    "build:electron": "yarn --cwd electron-app bundle",
     "prepare": "lerna run prepare",
     "postinstall": "theia check:theia-version",
-    "rebuild:browser": "theia rebuild:browser",
-    "rebuild:electron": "theia rebuild:electron",
-    "start:browser": "yarn rebuild:browser && yarn --cwd browser-app start",
-    "start:electron": "yarn rebuild:electron && yarn --cwd electron-app start",
+    "start:browser": "yarn --cwd browser-app start",
+    "start:electron": "yarn --cwd electron-app start",
     "watch": "lerna run --parallel watch"<% if (params.rootscripts) { %><%- params.rootscripts %><% } %>
   },
   "devDependencies": {