Merge branch 'v3.x/staging' into v3.x/logging

.github/workflows/build-core.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - v3.x/staging
+      - v3.x/rc
+      - v3.x/master
   pull_request:
     types: [opened, reopened, synchronize]
 
@@ -154,9 +156,9 @@ jobs:
             ${{ runner.os }}-build-cache-node-modules-
 
       - name: '[Prep 2] Setup Node'
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.15.0
+          node-version: 18
 
       - name: '[Prep 3] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the Zlux App Server package will be documented in this fi
 ## v3.0.0
 - Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#317)
 
+## v3.0.0
+- Enhancement: Added new plugin identifier for the V3 Ivy Desktop to list of default plugins. Also added this plugin to list of allowedPlugins.json.
+- Enhancement: Updated schema to document new entry points in V3.
+
 ## v2.17.0
 - Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#303)
 - Enhancement: The app-server configure stage performance increased due to combining two seperate processes in this stage (plugins-init.js and initInstance.js) into one. (#304)

defaults/README.md

@@ -0,0 +1,2 @@
+**Note:** During a full Zowe build, the files in this location become overwritten by files present in:
+https://github.com/zowe/zowe-install-packaging/tree/v3.x/staging/files/zlux/config

defaults/ZLUX/pluginStorage/org.zowe.zlux.bootstrap/plugins/allowedPlugins.json

@@ -78,6 +78,12 @@
         "*"
       ]
     },
+    {
+      "identifier": "org.zowe.zlux.ivydesktop",
+      "versions": [
+        "*"
+      ]
+    },
     {
       "identifier": "org.zowe.zlux.ng2desktop.settings",
       "versions": [

defaults/plugins/org.zowe.zlux.ng2desktop.json → defaults/plugins/org.zowe.zlux.ivydesktop.json

@@ -1,4 +1,4 @@
 {
-  "identifier": "org.zowe.zlux.ng2desktop",
+  "identifier": "org.zowe.zlux.ivydesktop",
   "pluginLocation": "../../zlux-app-manager/virtual-desktop"
-}
+}

schemas/plugindefinition-schema.json

@@ -228,6 +228,22 @@
         "framework": {
           "type": "string",
           "enum": [ "angular2", "angular", "react" ]
+        },
+        "entryPoint": {
+          "type": "object",
+          "description": "Describes a path, relative to the app's '/web' folder in the browser, where the main file is that will be loaded by the Zowe Desktop. This is assumed to be 'main.js' for Zowe versions older than v3 but allows you to ship multiple entryPoints to target different versions of Zowe",
+          "additionalProperties": false,
+          "properties": {
+            "2.0": {
+              "const": "main.js",
+              "type": "string",
+              "description": "This property is not configurable. The Zowe Desktop in v2 will always search for web/main.js. This entry is just defined to document this fact."
+            },
+            "3.0": {
+              "type": "string",
+              "description": "This is a path, relative to the app's '/web' folder in the browser, where the main file that will be loaded by the Zowe Desktop is located. This should not be 'main.js' to avoid conflict with that name used in Zowe v2."
+            }
+          }
         }
       }
     },