Skip to content

Commit 0601352

Browse files
committed
fix(AppImage): remove nss lib
1 parent e8d1d0d commit 0601352

File tree

22 files changed

+2932
-2329
lines changed

22 files changed

+2932
-2329
lines changed

.idea/electron-builder.iml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/API.md renamed to docs/Developer API.md

Lines changed: 834 additions & 1702 deletions
Large diffs are not rendered by default.

docs/Options.md

Lines changed: 1575 additions & 280 deletions
Large diffs are not rendered by default.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"contents": [
3+
{
4+
"x": 130,
5+
"y": 220
6+
},
7+
{
8+
"x": 410,
9+
"y": 220,
10+
"type": "link",
11+
"path": "/Applications"
12+
}
13+
]
14+
}

jsdoc/properties-list.hbs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{{#if properties}}**Properties**
2+
3+
{{#each properties~}}
4+
{{#if (regexp-test name "\w+\.\w+")}} {{/if}}- `{{{name}}}`{{#if defaultvalue}} = {{>defaultvalue}}{{/if~}} {{>linked-type-list types=type.names delimiter=" | " ~}}{{#if description}} - {{{inlineLinks description}}}{{/if}}
5+
{{/each}}
6+
7+
{{/if~}}

jsdoc/properties-table.hbs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{#if properties}}**Properties**
2+
3+
{{tableHead properties "name|Name" "type|Type" "description|Description" ~}}
4+
5+
{{#tableRow properties "name" "type" "defaultvalue" "description" ~}}
6+
| {{#if @col1}}{{#unless optional}}**{{/unless~}}{{name}}{{#unless optional}}**{{/unless~}}{{#if defaultvalue}} = {{>defaultvalue}}{{/if~}} | {{/if~}}
7+
{{#if @col2}}{{>linked-type-list types=type.names delimiter=" | " }} | {{/if~}}
8+
{{#if @col4}}{{{propertyAnchor name ../../name }}}{{{stripNewlines (inlineLinks description)}}} |{{/if}}
9+
{{/tableRow}}
10+
11+
{{/if}}

jsdoc/property-link.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
exports.propertyAnchor = function (propertyName, parentName) {
2+
return `<a name="${parentName}-${propertyName}"></a>`
3+
}

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"set-versions": "node test/out/helpers/setVersions.js",
2020
"npm-publish": "yarn compile && ./packages/npm-publish.sh && conventional-changelog -p angular -i CHANGELOG.md -s",
2121
"schema": "typescript-json-schema packages/electron-builder/tsconfig.json Config --out packages/electron-builder/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks",
22-
"jsdoc": "ts2jsdoc packages/electron-updater packages/electron-builder-http packages/electron-builder-util packages/electron-publish packages/electron-builder",
23-
"docs": "jsdoc2md --files 'jsdoc/out/**/*.js' --name-format --module-index-format grouped --separators --partial jsdoc/scope.hbs > docs/API.md",
24-
"api-docs": "node ./test/vendor/yarn.js jsdoc && node ./test/vendor/yarn.js docs"
22+
"jsdoc": "ts2jsdoc packages/electron-builder-http packages/electron-updater packages/electron-builder-util packages/electron-builder packages/electron-builder-core packages/electron-publish",
23+
"jsdoc2md": "node packages/jsdoc2md.js",
24+
"api": "node ./test/vendor/yarn.js jsdoc && node ./test/vendor/yarn.js jsdoc2md"
2525
},
2626
"//": "repository must be specified otherwise conventional-changelog will use forked repo (currently cloned)",
2727
"repository": "electron-userland/electron-builder",
@@ -31,7 +31,7 @@
3131
"ajv": "^5.0.3-beta",
3232
"ajv-keywords": "^2.0.1-beta.1",
3333
"archiver": "^1.3.0",
34-
"aws-sdk": "^2.25.0",
34+
"aws-sdk": "^2.26.0",
3535
"bluebird-lst": "^1.0.1",
3636
"chalk": "^1.1.3",
3737
"chromium-pickle-js": "^0.2.0",
@@ -56,18 +56,18 @@
5656
"sanitize-filename": "^1.6.1",
5757
"semver": "^5.3.0",
5858
"stat-mode": "^0.2.2",
59-
"ts-jsdoc": "^1.0.2",
59+
"ts-jsdoc": "^1.0.6",
6060
"tunnel-agent": "^0.6.0",
6161
"update-notifier": "^2.1.0",
6262
"uuid-1345": "^0.99.6",
63-
"yargs": "^7.0.1"
63+
"yargs": "^7.0.2"
6464
},
6565
"devDependencies": {
6666
"@types/electron": "^1.4.33",
6767
"@types/ini": "^1.3.29",
6868
"@types/jest": "^19.2.0",
6969
"@types/js-yaml": "^3.5.29",
70-
"@types/node-forge": "^0.6.6",
70+
"@types/node-forge": "^0.6.7",
7171
"@types/source-map-support": "^0.2.28",
7272
"@types/xml2js": "^0.0.32",
7373
"babel-plugin-array-includes": "^2.0.3",
@@ -80,6 +80,7 @@
8080
"decompress-zip": "^0.3.0",
8181
"depcheck": "^0.6.7",
8282
"electron-download-tf": "4.0.0",
83+
"globby": "^6.1.0",
8384
"jest-cli": "^19.0.2",
8485
"jest-environment-node-debug": "^2.0.0",
8586
"jest-junit": "^1.3.0",

packages/electron-builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"semver": "^5.3.0",
7171
"update-notifier": "^2.1.0",
7272
"uuid-1345": "^0.99.6",
73-
"yargs": "^7.0.1",
73+
"yargs": "^7.0.2",
7474
"node-forge": "^0.7.0"
7575
},
7676
"typings": "./out/electron-builder.d.ts",

packages/electron-builder/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ export { BuildOptions, build, CliOptions, createTargets } from "./builder"
55
export { Metadata, Config, AfterPackContext, Protocol, MetadataDirectories, FileAssociation, PlatformSpecificBuildOptions } from "./metadata"
66
export { MacOptions, DmgOptions, MasBuildOptions, MacOsTargetName, PkgOptions, DmgContent, DmgWindow } from "./options/macOptions"
77
export { WinBuildOptions, NsisOptions, SquirrelWindowsOptions, AppXOptions, NsisWebOptions } from "./options/winOptions"
8-
export { LinuxBuildOptions, DebOptions, SnapOptions, AppImageOptions } from "./options/linuxOptions"
8+
export { LinuxBuildOptions, DebOptions, SnapOptions } from "./options/linuxOptions"

0 commit comments

Comments
 (0)