Added composite build settings.gradle file for running hoist inline

.run/bootRun.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="BootRun" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Duser.timezone=Etc/UTC" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootRun" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/bootRun2.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="BootRun2" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Duser.timezone=Etc/UTC -Dserver.port=8082" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootRun" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/bootRunWithHoist.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="BootRunWithHoist" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Duser.timezone=Etc/UTC -PrunHoistInline=true" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootRun" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/bootRunWithHoist2.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="BootRunWithHoist2" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Duser.timezone=Etc/UTC -PrunHoistInline=true -Dserver.port=8082" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootRun" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

README.md

@@ -7,14 +7,13 @@ usage, and links to related Hoist and Toolbox source code. Toolbox also provides
 examples which may be especially useful as a starting point for application developers new to the
 framework.
 
-Please refer to the [Hoist Core](https://github.com/xh/hoist-core) and
-[Hoist React](https://github.com/xh/hoist-react) repos for detailed information and documentation on
-Hoist, including more information on configuring a local development environment.
+Please refer to the [Hoist Core](https://github.com/xh/hoist-core) and [Hoist React](https://github.com/xh/hoist-react) repos for detailed information and
+documentation on Hoist, including more information on configuring a local development environment.
 
 Toolbox is itself a Hoist Application, and we keep it updated with the latest versions of the Hoist
-Framework. A [toolbox-dev instance](https://toolbox-dev.xh.io) is auto-deployed via Teamcity on each
-commit to either the Toolbox or Hoist `develop` branches. We update a distinct
-["production" instance](https://toolbox.xh.io) manually with each new versioned Hoist release.
+Framework. A [toolbox-dev instance](https://toolbox-dev.xh.io) is auto-deployed via Teamcity on each commit to either the
+Toolbox or Hoist `develop` branches. We update a distinct ["production" instance](https://toolbox.xh.io) manually with
+each new versioned Hoist release.
 
 ## Database
 
@@ -64,59 +63,54 @@ When adding a new top-level entry-point for Toolbox (such as a new example appli
 URL must be registered with Auth0 as a valid OAuth callback URL. Either Lee or Anselm can update our
 Auth0 config accordingly.
 
-## Wrapper project for Toolbox + Hoist development
-
-A special project / directory structure can be useful for developing Toolbox alongside the Hoist
-Core and React libraries, so that changes to the libraries themselves can be developed and tested
-locally using Toolbox as a reference app. This is the recommended configuration for XH developers to
-use when setting up Toolbox.
-
-* Create a new directory within your homedir or another suitable location - name it something like
-  `toolbox-wrapper`.
-* Within this new parent directory, check out the `toolbox`, `hoist-react`, and `hoist-core`
-  repositories as siblings.
-* Create a new `settings.gradle` file within the top-level directory. The contents of this file will
-  be a single line: `include "toolbox", "hoist-core"`. This tells Gradle to reference and combine
-  the `build.gradle` targets of those two sub-projects into a single umbrella project.
-* Create a new `build.gradle` file within the top-level directory. This is required to support the
-  `co.uzzu.dotenv` plugin used by Toolbox to read environment variables - the plugin must be applied
-  to the root project, which is the top-level wrapper directory in this mode. The Toolbox
-  `build.gradle` file is where the plugin is actually applied, but for that to work in wrapper mode
-  the plugin must be defined within the root (wrapper) project also, requiring a build file. Its
-  contents should be:
-    ```groovy
-    buildscript {
-        repositories {
-            gradlePluginPortal()
-        }
-        dependencies {
-            classpath "co.uzzu.dotenv:gradle:4.0.0" // keep in sync with version in Toolbox build.gradle
-        }
-    }
-    ```
-* From the checked-out `toolbox` sub-directory, copy the `gradle` directory and the `gradlew` (or
-  `gradlew.bat` if on Windows) wrapper script and paste the copies into the top-level wrapper
-  directory.
-    * Your top-level directory should now contain four sub-directories, `settings.gradle`,
-      `build.gradle`, and the `gradlew` script.
-* From the top-level directory, run `./gradlew` to ensure that Gradle can properly configure the
-  unified build.
-* If using IntelliJ, create a new project by running through the "New project from existing
-  sources..." workflow and pointing the IDE at the top-level `settings.gradle` file.
-    * IntelliJ should detect that this is a Gradle/Grails project, download and index the
-      server-side dependencies, and set up an appropriate "Run Configuration" to start the Toolbox
-      server.
-
-Having all three repos checked out in a single IntelliJ project can be useful to have the code
-on-hand, but to actually run Toolbox using the local Hoist libraries some additional steps are
-required.
-
-* To run the server using the local `hoist-core`, edit the `toolbox/gradle.properties` file and set
-  `runHoistInline=true`. Note this is _not_ required if you're not changing any hoist-core code -
-  you can still have the project structure setup as described, and only flip this switch if/when
-  testing a local change to the plugin.
-* To run the client using the local `hoist-react`, start your local webpack-dev-server from the
-  `toolbox/client-app` directory by running `yarn startWithHoist`.
+## Toolbox + Hoist development
+
+Toolbox is often developed alongside the Hoist Core and React libraries, so that changes to the
+libraries themselves can be developed and tested locally using Toolbox as a reference app. This is
+the recommended configuration for XH developers to use when setting up Toolbox.
+
+* Create or find a suitable directory for multiple project repositories, like homedir or (if using
+  IntelliJ) `~/IdeaProjects/`.
+* Within this directory, check out the `toolbox`, `hoist-react`, and `hoist-core` repositories as
+  siblings.
+
+### Editing multiple projects together
+
+For editing Hoist Core and React alongside Toolbox, it is recommended to open the `hoist-react` and
+`hoist-core` projects as modules in your editor. Having all three repos in a single IntelliJ project
+can be useful to have the code on-hand.
+
+* Open up the `toolbox` project in IntelliJ.
+* Import `hoist-react` and `hoist-core` as modules:
+  File -> Project Structure -> Modules -> Add (+) -> Import Module
+* Using the Gradle tool window, "Link Gradle Project" (+) both `toolbox` and `hoist-core`.
+
+### Running Toolbox using local Hoist
+
+* To run the server using the local `hoist-core`, you need `hoist-core` to exist as sibling of the
+  `toolbox` package, and do one of the following:
+  * Edit the `toolbox/gradle.properties` file and set `runHoistInline=true`.
+  * Run the command `./gradlew bootRun -PrunHoistInline=true` from the `toolbox` directory.
+  * If using IntelliJ, run the `BootrunWithHoist` saved run configuration.
+
+  Note this is _only_ required if you're changing hoist-core code.
+
+* To run the client using the local `hoist-react`, you need `hoist-react` to exist as sibling of the
+  `toolbox` package, and to start your local webpack-dev-server from the `toolbox/client-app`
+  directory by running `yarn startWithHoist`.
+
+  Note this is _only_ required if you're changing hoist-react code.
+
+### Running multiple instances of Toolbox
+
+* Make sure that the `APP_TOOLBOX_MULTI_INSTANCE_ENABLED` property in `.env` is set to `true`.
+* Run the first instance of the server and client as normal.
+* To run a second instance of the server, you can either:
+  * Run the command `./gradlew bootRun -Dserver.port=8082` from the `toolbox` directory.
+  * If using IntelliJ, run the `Bootrun2` saved run configuration.
+* To run a second instance of the client connected to the second server, start another local
+  webpack-dev-server from the `toolbox/client-app` directory by running `yarn start2` or
+  `yarn start --env devGrailsPort=8082 devWebpackPort=3002`.
 
 ## Developing with HTTPS on `xh.io` domain
 

build.gradle

@@ -43,19 +43,10 @@ springBoot {
     mainClass = xhAppPackage + ".Application"
 }
 
-if (parseBoolean(runHoistInline)) {
-    println "${xhAppName}: running with Hoist Core INLINE...."
-    grails.plugins {
-        implementation project(":hoist-core")
-    }
-} else {
-    println "${xhAppName}: running with Hoist Core PACKAGED at v${hoistCoreVersion}...."
-    dependencies {
-        implementation "io.xh:hoist-core:$hoistCoreVersion"
-    }
-}
-
 dependencies {
+    // If `runHoistInline` is true, `hoistCoreVersion` will be ignored and local hoist-core will be used instead.
+    implementation "io.xh:hoist-core:$hoistCoreVersion"
+
     // For server-side JWT validation.
     implementation "org.bitbucket.b_c:jose4j:0.9.6"
 

client-app/package.json

@@ -12,9 +12,11 @@
     "lint:js": "eslint --ext .js,.jsx,.ts,.tsx .",
     "lint:styles": "stylelint \"**/*.s?(a|c)ss\"",
     "start": "yarn install && cross-env NODE_OPTIONS=--max_old_space_size=3072 webpack-dev-server",
+    "start2": "yarn start --env devGrailsPort=8082 devWebpackPort=3002",
     "startOnDevice": "yarn install && webpack-dev-server --env inlineHoist --env devHost=$(ipconfig getifaddr en0)",
     "startAndAnalyze": "yarn install && webpack-dev-server --env analyzeBundles",
     "startWithHoist": "cd ../../hoist-react && yarn install && cd ../toolbox/client-app && yarn install && cross-env NODE_OPTIONS=--max_old_space_size=3072 webpack-dev-server --env inlineHoist",
+    "startWithHoist2": "yarn startWithHoist --env devGrailsPort=8082 devWebpackPort=3002",
     "startWithHoistSecure": "cd ../../hoist-react && yarn install && cd ../toolbox/client-app && yarn install && cross-env NODE_OPTIONS=--max_old_space_size=3072 webpack-dev-server --env inlineHoist --env devHttps=true --env devHost=toolbox-local.xh.io",
     "startWithHoistAndAnalyze": "yarn startWithHoist --env analyzeBundles",
     "prepare": "cd .. && husky client-app/.husky"

settings.gradle

@@ -0,0 +1,11 @@
+import static java.lang.Boolean.parseBoolean
+
+rootProject.name = 'toolbox'
+
+// Composite build setup for compiling hoist-core locally
+if (parseBoolean(runHoistInline)) {
+    println "${xhAppName}: running with Hoist Core INLINE...."
+    includeBuild '../hoist-core'
+} else {
+    println "${xhAppName}: running with Hoist Core PACKAGED at v${hoistCoreVersion}...."
+}