fix: Appx name changed

Close #1650

docs/api/electron-builder-http.md

@@ -7,6 +7,8 @@
 <dd></dd>
 <dt><a href="#module_electron-builder-http/out/ProgressCallbackTransform">electron-builder-http/out/ProgressCallbackTransform</a></dt>
 <dd></dd>
+<dt><a href="#module_electron-builder-http/out/rfc2253Parser">electron-builder-http/out/rfc2253Parser</a></dt>
+<dd></dd>
 <dt><a href="#module_electron-builder-http">electron-builder-http</a></dt>
 <dd></dd>
 </dl>
@@ -220,6 +222,18 @@
 | encoding | <code>String</code> | 
 | callback | <code>function</code> | 
 
+<a name="module_electron-builder-http/out/rfc2253Parser"></a>
+
+## electron-builder-http/out/rfc2253Parser
+<a name="module_electron-builder-http/out/rfc2253Parser.parseDn"></a>
+
+### `electron-builder-http/out/rfc2253Parser.parseDn(seq)` ⇒ <code>Map&lt;String \| String&gt;</code>
+**Kind**: method of [<code>electron-builder-http/out/rfc2253Parser</code>](#module_electron-builder-http/out/rfc2253Parser)  
+
+| Param | Type |
+| --- | --- |
+| seq | <code>String</code> | 
+
 <a name="module_electron-builder-http"></a>
 
 ## electron-builder-http

jsdoc/helpers.js

@@ -20,6 +20,12 @@ function renderTypeNames(types, delimiter, root, isTypeAsCode, isSkipNull) {
   const tagOpen = isTypeAsCode ? "<code>" : ""
   const tagClose = isTypeAsCode ? "</code>" : ""
 
+  for (let obj of types) {
+    if (obj.includes("CancellationToken")) {
+      break
+    }
+  }
+
   if (isSkipNull) {
     types = types.filter(it => !isSkipNull || it !== "null")
   }
@@ -173,18 +179,7 @@ function _link(input, options) {
     }
   }
   else {
-    let pageUrl = ""
-    for (const page of exports.pages) {
-      if (page.dataMap.has(linked.id)) {
-        const a = page.data
-        const b = options.data.root
-        if (a.length !== b.length && a[a.length - 1] !== b[a.length - 1]) {
-          pageUrl = page.pageUrl
-        }
-        break
-      }
-    }
-    output.url = `${pageUrl}#${anchorName.call(linked, options)}`
+    output.url = fullLink(linked, options.data.root)
   }
   return output
 }
@@ -258,19 +253,23 @@ function identifierToLink(id, root) {
     }
     return output
   }
+  return `[${linked.name}](${fullLink(linked, root)})`
+}
 
+function fullLink(linked, root) {
+  const relativeName = anchorName.call(linked)
   let pageUrl = ""
   for (const page of exports.pages) {
     if (page.dataMap.has(linked.id)) {
       const a = page.data
       const b = root
-      if (a.length !== b.length && a[a.length - 1] !== b[a.length - 1]) {
+      if (a.length !== b.length || a[a.length - 1] !== b[a.length - 1]) {
         pageUrl = page.pageUrl
       }
       break
     }
   }
-  return `[${linked.name}](${pageUrl}#${anchorName.call(linked)})`
+  return `${pageUrl}#${relativeName}`
 }
 
 function resolveById(id) {

package.json

@@ -40,7 +40,7 @@
     "electron-download-tf": "4.3.1",
     "electron-is-dev": "^0.1.2",
     "electron-osx-sign": "0.4.6",
-    "fcopy-pre-bundled": "^0.1.2",
+    "fcopy-pre-bundled": "0.2.0",
     "fs-extra-p": "^4.3.0",
     "hosted-git-info": "^2.4.2",
     "ini": "^1.3.4",

packages/electron-builder-util/package.json

@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.3.0",
-    "fcopy-pre-bundled": "^0.1.2",
+    "fcopy-pre-bundled": "0.2.0",
     "is-ci": "^1.0.10",
     "stat-mode": "^0.2.2",
     "bluebird-lst": "^1.0.2",

packages/electron-builder/src/macPackager.ts

@@ -236,7 +236,7 @@ export default class MacPackager extends PlatformPackager<MacOptions> {
 
       const pkg = path.join(outDir!, this.expandArtifactNamePattern(masOptions, "pkg"))
       await this.doFlat(appPath, pkg, masInstallerIdentity, keychainName)
-      this.dispatchArtifactCreated(pkg, null, Arch.x64, `${this.appInfo.name}-${this.appInfo.version}.pkg`)
+      this.dispatchArtifactCreated(pkg, null, Arch.x64, this.computeSafeArtifactName("pkg"))
     }
   }
 

packages/electron-builder/src/platformPackager.ts

@@ -341,12 +341,19 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
     await this.checkFileInPackage(resourcesDir, "package.json", "Application", isAsar)
   }
 
-  expandArtifactNamePattern(targetSpecificOptions: TargetSpecificOptions | n, ext: string, arch?: Arch | null, defaultPattern?: string): string {
+  computeSafeArtifactName(ext: string, arch?: Arch | null, skipArchIfX64 = true) {
+    return this.computeArtifactName("${name}-${version}-${arch}.${ext}", ext, skipArchIfX64 && arch === Arch.x64 ? null : arch)
+  }
+
+  expandArtifactNamePattern(targetSpecificOptions: TargetSpecificOptions | n, ext: string, arch?: Arch | null, defaultPattern?: string, skipArchIfX64 = true): string {
     let pattern = targetSpecificOptions == null ? null : targetSpecificOptions.artifactName
     if (pattern == null) {
-      pattern = this.platformSpecificBuildOptions.artifactName || this.config.artifactName || defaultPattern || "${productName}-${version}.${ext}"
+      pattern = this.platformSpecificBuildOptions.artifactName || this.config.artifactName || defaultPattern || "${productName}-${version}-${arch}.${ext}"
     }
+    return this.computeArtifactName(pattern, ext, skipArchIfX64 && arch === Arch.x64 ? null : arch)
+  }
 
+  private computeArtifactName(pattern: any, ext: string, arch: Arch | null | undefined) {
     let archName: string | null = arch == null ? null : Arch[arch]
     if (arch === Arch.x64) {
       if (ext === "AppImage" || ext === "rpm") {

packages/electron-builder/src/targets/ArchiveTarget.ts

@@ -18,7 +18,7 @@ export class ArchiveTarget extends Target {
     log(`Building ${isMac ? "macOS " : ""}${format}`)
 
     // do not specify arch if x64
-    const outFile = path.join(this.outDir, packager.expandArtifactNamePattern(this.options, format, arch === Arch.x64 ? null : arch, packager.platform === Platform.LINUX ? "${name}-${version}-${arch}.${ext}" : "${productName}-${version}-${arch}-${os}.${ext}"))
+    const outFile = path.join(this.outDir, packager.expandArtifactNamePattern(this.options, format, arch, packager.platform === Platform.LINUX ? "${name}-${version}-${arch}.${ext}" : "${productName}-${version}-${arch}-${os}.${ext}"))
     if (format.startsWith("tar.")) {
       await tar(packager.config.compression, format, outFile, appOutDir, isMac)
     }

packages/electron-builder/src/targets/appImage.ts

@@ -38,7 +38,7 @@ export default class AppImageTarget extends Target {
     const packager = this.packager
 
     // https://github.com/electron-userland/electron-builder/issues/775
-    const resultFile = path.join(this.outDir, packager.expandArtifactNamePattern(this.options, "AppImage", arch, "${name}-${version}-${arch}.${ext}"))
+    const resultFile = path.join(this.outDir, packager.computeSafeArtifactName("AppImage", arch, false))
     await unlinkIfExists(resultFile)
 
     const appImagePath = await appImagePathPromise

packages/electron-builder/src/targets/appx.ts

@@ -72,7 +72,7 @@ export default class AppXTarget extends Target {
     await spawn(path.join(vendorPath, "windows-10", arch === Arch.ia32 ? "ia32" : "x64", "makeappx.exe"), args)
 
     await packager.sign(destination)
-    packager.dispatchArtifactCreated(destination, this, arch, packager.expandArtifactNamePattern(this.options, "appx", arch, "${name}-${version}-${arch}.${ext}"))
+    packager.dispatchArtifactCreated(destination, this, arch, packager.computeSafeArtifactName("appx"))
   }
 
   private async writeManifest(templatePath: string, preAppx: string, safeName: string, arch: Arch, publisher: string) {

packages/electron-builder/src/targets/dmg.ts

@@ -23,7 +23,6 @@ export class DmgTarget extends Target {
 
   async build(appPath: string, arch: Arch) {
     const packager = this.packager
-    const appInfo = packager.appInfo
     log("Building DMG")
 
     const specification = await this.computeDmgOptions()
@@ -178,7 +177,7 @@ export class DmgTarget extends Target {
 
     await addLicenseToDmg(packager, artifactPath)
 
-    this.packager.dispatchArtifactCreated(artifactPath, this, arch, `${appInfo.name}-${appInfo.version}.dmg`)
+    this.packager.dispatchArtifactCreated(artifactPath, this, arch, packager.computeSafeArtifactName("dmg"))
   }
 
   computeVolumeName(custom?: string | null): string {

packages/electron-builder/src/targets/fpm.ts

@@ -78,7 +78,7 @@ export default class FpmTarget extends Target {
       isUseArchIfX64 = true
     }
 
-    const destination = path.join(this.outDir, this.packager.expandArtifactNamePattern(this.options, target, arch !== Arch.x64 || isUseArchIfX64 ? arch : null, nameFormat))
+    const destination = path.join(this.outDir, this.packager.expandArtifactNamePattern(this.options, target, arch, nameFormat, !isUseArchIfX64))
     await unlinkIfExists(destination)
     if (this.packager.info.prepackaged != null) {
       await ensureDir(this.outDir)

packages/jsdoc2md.js

@@ -63,6 +63,7 @@ async function main() {
     "!***/*-dmgLicense.js",
     "!***/*-repositoryInfo.js",
     "!***/*-readPackageJson.js",
+    "!***/*-create-self-signed-cert.js",
   ], {cwd: source}))
     .filter(it => !userFiles.includes(it))
 
@@ -77,10 +78,11 @@ async function main() {
     {page: "api/electron-updater.md", pageUrl: "electron-updater", files: updaterFiles},
 
     {page: "Publishing Artifacts.md", pageUrl: "Publishing-Artifacts", mainHeader: "API", files: publishOptionsFiles},
+    {page: "api/electron-publish.md", pageUrl: "electron-publish", files: publishFiles},
+
     {page: "api/electron-builder-util.md", pageUrl: "electron-builder-util", files: utilFiles},
     {page: "api/electron-builder-core.md", pageUrl: "electron-builder-core", files: coreFiles},
     {page: "api/electron-builder-http.md", pageUrl: "electron-builder-http", files: httpFiles},
-    {page: "api/electron-publish.md", pageUrl: "electron-publish", files: publishFiles},
   ]
 
   await render(pages, {
@@ -169,7 +171,10 @@ async function render(pages, jsdoc2MdOptions) {
   sortAutoUpdate(pages)
 
   for (const page of pages) {
-    const finalOptions = Object.assign({data: page.data, "property-list-format": page === pages[0] ? "list" : "table"}, jsdoc2MdOptions)
+    const finalOptions = Object.assign({
+      data: page.data,
+      "property-list-format": page === pages[0] ? "list" : "table"
+    }, jsdoc2MdOptions)
 
     if (page === pages[0]) {
       finalOptions["heading-depth"] = 1

test/out/windows/__snapshots__/appxTest.js.snap

@@ -3,10 +3,15 @@
 exports[`AppX 1`] = `
 Object {
   "win": Array [
+    Object {
+      "arch": 0,
+      "file": "Test App ßW-1.1.0-ia32.appx",
+      "safeArtifactName": "TestApp-1.1.0.appx",
+    },
     Object {
       "arch": 1,
       "file": "Test App ßW-1.1.0.appx",
-      "safeArtifactName": "TestApp-1.1.0-x64.appx",
+      "safeArtifactName": "TestApp-1.1.0.appx",
     },
   ],
 }

test/src/windows/appxTest.ts

@@ -1,9 +1,9 @@
-import { Platform } from "electron-builder"
+import { Arch, Platform } from "electron-builder"
 import { app } from "../helpers/packTester"
 
 // noinspection SpellCheckingInspection
 test.ifWindows("AppX", app({
-  targets: Platform.WINDOWS.createTarget(["appx"]),
+  targets: Platform.WINDOWS.createTarget(["appx"], Arch.ia32, Arch.x64),
   cscLink: "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\n",
   cscKeyPassword: "",
 }))