app-builder-lib 22.14.11 → 23.0.0-alpha.1

package/scheme.json

@@ -78,9 +78,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -108,9 +105,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -240,9 +234,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -270,9 +261,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -330,11 +318,6 @@
     "AsarOptions": {
       "additionalProperties": false,
       "properties": {
-        "externalAllowed": {
-          "default": false,
-          "description": "Allows external asar files.",
-          "type": "boolean"
-        },
         "ordering": {
           "type": [
             "null",
@@ -349,101 +332,6 @@
       },
       "type": "object"
     },
-    "BintrayOptions": {
-      "additionalProperties": false,
-      "description": "[Bintray](https://bintray.com/) options. Requires an API key. An API key can be obtained from the user [profile](https://bintray.com/profile/edit) page (\"Edit Your Profile\" -> API Key).\nDefine `BT_TOKEN` environment variable.",
-      "properties": {
-        "component": {
-          "description": "The Bintray component (Debian only).",
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "distribution": {
-          "default": "stable",
-          "description": "The Bintray distribution (Debian only).",
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "owner": {
-          "description": "The owner.",
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "package": {
-          "description": "The Bintray package name.",
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "provider": {
-          "description": "The provider. Must be `bintray`.",
-          "enum": [
-            "bintray"
-          ],
-          "type": "string"
-        },
-        "publishAutoUpdate": {
-          "default": true,
-          "description": "Whether to publish auto update info files.\n\nAuto update relies only on the first provider in the list (you can specify several publishers).\nThus, probably, there`s no need to upload the metadata files for the other configured providers. But by default will be uploaded.",
-          "type": "boolean"
-        },
-        "publisherName": {
-          "anyOf": [
-            {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "repo": {
-          "default": "generic",
-          "description": "The Bintray repository name.",
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "requestHeaders": {
-          "$ref": "#/definitions/OutgoingHttpHeaders",
-          "description": "Any custom request headers"
-        },
-        "token": {
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "updaterCacheDirName": {
-          "type": [
-            "null",
-            "string"
-          ]
-        },
-        "user": {
-          "description": "The Bintray user account. Used in cases where the owner is an organization.",
-          "type": [
-            "null",
-            "string"
-          ]
-        }
-      },
-      "required": [
-        "provider"
-      ],
-      "type": "object"
-    },
     "BitbucketOptions": {
       "additionalProperties": false,
       "description": "Bitbucket options.\nhttps://bitbucket.org/\nDefine `BITBUCKET_TOKEN` environment variable.\n\nFor converting an app password to a usable token, you can utilize this\n```typescript\nconvertAppPassword(owner: string, token: string) {\nconst base64encodedData = Buffer.from(`${owner}:${token.trim()}`).toString(\"base64\")\nreturn `Basic ${base64encodedData}`\n}\n```",
@@ -634,6 +522,7 @@
               "enum": [
                 "bzip2",
                 "gz",
+                "lzo",
                 "xz"
               ],
               "type": "string"
@@ -755,9 +644,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -785,9 +671,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -951,9 +834,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -981,9 +861,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -1127,7 +1004,7 @@
     },
     "FileAssociation": {
       "additionalProperties": false,
-      "description": "File associations.\n\nmacOS (corresponds to [CFBundleDocumentTypes](https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/20001431-101685)) and NSIS only.\n\nOn Windows works only if [nsis.perMachine](https://electron.build/configuration/configuration#NsisOptions-perMachine) is set to `true`.",
+      "description": "File associations.\n\nmacOS (corresponds to [CFBundleDocumentTypes](https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/20001431-101685)), NSIS, and MSI only.\n\nOn Windows (NSIS) works only if [nsis.perMachine](https://electron.build/configuration/configuration#NsisOptions-perMachine) is set to `true`.",
       "properties": {
         "description": {
           "description": "*windows-only.* The description.",
@@ -1151,7 +1028,7 @@
           "description": "The extension (minus the leading period). e.g. `png`."
         },
         "icon": {
-          "description": "The path to icon (`.icns` for MacOS and `.ico` for Windows), relative to `build` (build resources directory). Defaults to `${firstExt}.icns`/`${firstExt}.ico` (if several extensions specified, first is used) or to application icon.\n\nNot supported on Linux, file issue if need (default icon will be `x-office-document`).",
+          "description": "The path to icon (`.icns` for MacOS and `.ico` for Windows), relative to `build` (build resources directory). Defaults to `${firstExt}.icns`/`${firstExt}.ico` (if several extensions specified, first is used) or to application icon.\n\nNot supported on Linux, file issue if need (default icon will be `x-office-document`). Not supported on MSI.",
           "type": [
             "null",
             "string"
@@ -1336,9 +1213,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -1366,9 +1240,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -2002,9 +1873,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -2032,9 +1900,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -2146,6 +2011,7 @@
               "enum": [
                 "bzip2",
                 "gz",
+                "lzo",
                 "xz"
               ],
               "type": "string"
@@ -2260,9 +2126,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -2290,9 +2153,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -2760,9 +2620,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -2790,9 +2647,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -3371,9 +3225,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -3401,9 +3252,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -3625,10 +3473,6 @@
           "description": "Whether to create start menu shortcut.",
           "type": "boolean"
         },
-        "iconId": {
-          "description": "The [shortcut iconId](https://wixtoolset.org/documentation/manual/v4/reference/wxs/shortcut/). Optional, by default generated using app file name.",
-          "type": "string"
-        },
         "menuCategory": {
           "default": false,
           "description": "Whether to create submenu for start menu shortcut and program files directory. If `true`, company name will be used. Or string value.",
@@ -3661,9 +3505,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -3691,9 +3532,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -3955,9 +3793,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -3985,9 +3820,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -4285,9 +4117,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -4315,9 +4144,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -4612,9 +4438,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -4642,9 +4465,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -4752,9 +4572,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -4782,9 +4599,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -5139,6 +4953,22 @@
             "string"
           ]
         },
+        "compression": {
+          "anyOf": [
+            {
+              "enum": [
+                "lzo",
+                "xz"
+              ],
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": "lzo",
+          "description": "Sets the compression type for the snap. Can be xz or lzo. Defaults to lzo when not specified."
+        },
         "confinement": {
           "anyOf": [
             {
@@ -5281,9 +5111,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -5311,9 +5138,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -5609,9 +5433,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -5639,9 +5460,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -6012,9 +5830,6 @@
             {
               "$ref": "#/definitions/GenericServerOptions"
             },
-            {
-              "$ref": "#/definitions/BintrayOptions"
-            },
             {
               "$ref": "#/definitions/CustomPublishOptions"
             },
@@ -6042,9 +5857,6 @@
                   {
                     "$ref": "#/definitions/GenericServerOptions"
                   },
-                  {
-                    "$ref": "#/definitions/BintrayOptions"
-                  },
                   {
                     "$ref": "#/definitions/CustomPublishOptions"
                   },
@@ -6917,9 +6729,6 @@
         {
           "$ref": "#/definitions/GenericServerOptions"
         },
-        {
-          "$ref": "#/definitions/BintrayOptions"
-        },
         {
           "$ref": "#/definitions/CustomPublishOptions"
         },
@@ -6947,9 +6756,6 @@
               {
                 "$ref": "#/definitions/GenericServerOptions"
               },
-              {
-                "$ref": "#/definitions/BintrayOptions"
-              },
               {
                 "$ref": "#/definitions/CustomPublishOptions"
               },

package/templates/msi/template.xml

@@ -18,34 +18,61 @@
 
     <Property Id="ApplicationFolderName" Value="${installationDirectoryWixName}"/>
     <Property Id="WixAppFolder" Value="WixPerUserFolder"/>
+    <Property Id="DISABLEADVTSHORTCUTS" Value="1"/>
 
     {{ if (iconPath) { }}
     <Icon Id="${iconId}" SourceFile="${iconPath}"/>
     <Property Id="ARPPRODUCTICON" Value="${iconId}"/>
     {{ } -}}
 
-    {{ if (isAssisted || isRunAfterFinish) { }}
-    <CustomAction Id="runAfterFinish" FileKey="mainExecutable" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait"/>
+    {{ if (isRunAfterFinish) { }}
+      <CustomAction Id="runAfterFinish" FileKey="mainExecutable" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait"/>
+      {{ if (!isAssisted) { }}
+        <!-- https://stackoverflow.com/questions/1871531/launch-after-install-with-no-ui -->
+        <InstallExecuteSequence>
+          <Custom Action="runAfterFinish" After="InstallFinalize">NOT Installed AND UILevel >= 4</Custom>
+        </InstallExecuteSequence>
+      {{ } -}}
     {{ } -}}
 
-    <Property Id="ALLUSERS" Secure="yes" Value="2"/>
     {{ if (isPerMachine) { }}
-    <Property Id="MSIINSTALLPERUSER" Secure="yes"/>
+      <Property Id="ALLUSERS" Secure="yes" Value="1"/>
     {{ } else { }}
-    <Property Id="MSIINSTALLPERUSER" Secure="yes" Value="1"/>
+      <Property Id="ALLUSERS" Secure="yes" Value="2"/>
     {{ } -}}
+    <Property Id="MSIINSTALLPERUSER" Secure="yes" Value="1"/>
 
     {{ if (isAssisted) { }}
-    <!-- Check "Run after finish" checkbox by default -->
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Run ${productName}"/>
-
-    <UIRef Id="WixUI_Assisted"/>
-    {{ } else if (isRunAfterFinish) { }}
-    <!-- https://stackoverflow.com/questions/1871531/launch-after-install-with-no-ui -->
-    <InstallExecuteSequence>
-      <Custom Action="runAfterFinish" After="InstallFinalize"/>
-    </InstallExecuteSequence>
+      <WixVariable Id="WixUISupportPerUser" Value="1" Overridable="yes"/>
+      <WixVariable Id="WixUISupportPerMachine" Value="1" Overridable="yes"/>
+      {{ if (isPerMachine) { }}
+        <WixVariable Id="WixUISupportPerUser" Value="0"/>
+      {{ } -}}
+
+      {{ if (isRunAfterFinish) { }}
+        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
+        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Run ${productName}"/>
+        <UI>
+          <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="runAfterFinish">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 AND NOT Installed</Publish>
+        </UI>
+      {{ } -}}
+
+      <UIRef Id="WixUI_InstallDir"/>
+      <UI>
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="SpawnWaitDialog" Value="WaitForCostingDlg" Order="2">1 OR CostingComplete = 1</Publish>
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallScopeDlg" Order="2">NOT Installed</Publish>
+
+        <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="1">1</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerUserFolder" Order="1">!(wix.WixUISupportPerUser) AND NOT Privileged</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Property="WixAppFolder" Value="WixPerMachineFolder" Order="2">NOT !(wix.WixUISupportPerUser)</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="{}" Order="3">WixAppFolder = "WixPerUserFolder"</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Property="ALLUSERS" Value="1" Order="4">WixAppFolder = "WixPerMachineFolder"</Publish>
+        <!-- Run 'FindRelatedProducts' again after changing the install scope, because its first run might have ignored an existing installation based on the default scope at the time. https://stackoverflow.com/a/35064434 -->
+        <Publish Dialog="InstallScopeDlg" Control="Next" Event="DoAction" Value="FindRelatedProducts" Order="5">1</Publish>
+        <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="6">1</Publish>
+
+        <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg" Order="2">NOT Installed</Publish>
+      </UI>
     {{ } -}}
 
     <Directory Id="TARGETDIR" Name="SourceDir">

package/templates/nsis/include/extractAppPackage.nsh

@@ -90,5 +90,41 @@
 !macroend
 
 !macro extractUsing7za FILE
+  Push $OUTDIR
+  CreateDirectory "$PLUGINSDIR\7z-out"
+  ClearErrors
+  SetOutPath "$PLUGINSDIR\7z-out"
+  Nsis7z::Extract "${FILE}"
+  Pop $R0
+  SetOutPath $R0
+
+  # Retry counter
+  StrCpy $R1 0
+
+  LoopExtract7za:
+    IntOp $R1 $R1 + 1
+
+    # Attempt to copy files in atomic way
+    CopyFiles /SILENT "$PLUGINSDIR\7z-out\*" $OUTDIR
+    IfErrors 0 DoneExtract7za
+
+    DetailPrint `Can't modify "${PRODUCT_NAME}"'s files.`
+    ${if} $R1 < 5
+      # Try copying a few times before asking for a user action.
+      Goto RetryExtract7za
+    ${else}
+      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(appCannotBeClosed)" /SD IDCANCEL IDRETRY RetryExtract7za
+    ${endIf}
+
+    # As an absolutely last resort after a few automatic attempts and user
+    # intervention - we will just overwrite everything with `Nsis7z::Extract`
+    # even though it is not atomic and will ignore errors.
     Nsis7z::Extract "${FILE}"
+    Quit
+
+  RetryExtract7za:
+    Sleep 1000
+    Goto LoopExtract7za
+
+  DoneExtract7za:
 !macroend