Skip to content

Commit

Permalink
feat: start command
Browse files Browse the repository at this point in the history
For now, electron-webpack supported, in the feature other boilerplate can be supported
  • Loading branch information
develar committed Jul 11, 2017
1 parent 791b94b commit 7da827e
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 18 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"///": "all dependencies for all packages (hoisted)",
"dependencies": {
"7zip-bin": "^2.1.0",
"ajv": "^5.2.1",
"ajv": "^5.2.2",
"ajv-keywords": "^2.1.0",
"archiver": "^2.0.0",
"aws-sdk": "^2.82.0",
Expand Down Expand Up @@ -67,7 +67,7 @@
"devDependencies": {
"@types/ini": "^1.3.29",
"@types/jest": "^20.0.2",
"@types/js-yaml": "^3.5.31",
"@types/js-yaml": "^3.9.0",
"@types/source-map-support": "^0.4.0",
"@types/xml2js": "^0.4.0",
"babel-plugin-array-includes": "^2.0.3",
Expand All @@ -80,7 +80,7 @@
"decompress-zip": "^0.3.0",
"depcheck": "^0.6.7",
"develar-typescript-json-schema": "0.17.0",
"electron-builder-tslint-config": "^1.0.2",
"electron-builder-tslint-config": "^1.0.3",
"env-paths": "^1.0.0",
"globby": "^6.1.0",
"jest-cli": "^20.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"homepage": "https://github.com/electron-userland/electron-builder",
"dependencies": {
"7zip-bin": "^2.1.0",
"ajv": "^5.2.1",
"ajv": "^5.2.2",
"ajv-keywords": "^2.1.0",
"bluebird-lst": "^1.0.2",
"chalk": "^2.0.1",
Expand Down
4 changes: 4 additions & 0 deletions packages/electron-builder/src/cli/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { getElectronVersion } from "../util/config"
import { getGypEnv } from "../util/yarn"
import { createSelfSignedCert } from "./create-self-signed-cert"
import { configureInstallAppDepsCommand, installAppDeps } from "./install-app-deps"
import { start } from "./start"

// tslint:disable:no-unused-expression
yargs
Expand All @@ -29,6 +30,9 @@ yargs
})
.demandOption("publisher"),
wrap(argv => createSelfSignedCert(argv.publisher)))
.command("start", "Run application in a development mode using electron-webpack",
yargs => yargs,
wrap(argv => start()))
.help()
.epilog(`See the Wiki (${underline("https://github.com/electron-userland/electron-builder/wiki")}) for more documentation.`)
.strict()
Expand Down
4 changes: 4 additions & 0 deletions packages/electron-builder/src/cli/start.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @internal */
export async function start() {
require("electron-webpack/dev-runner")
}
3 changes: 1 addition & 2 deletions test/src/helpers/lint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ const printErrorAndExit = require("../../../packages/electron-builder-util/out/p

const rootDir = path.join(__dirname, "../../..")
const packageDir = path.join(rootDir, "packages")
const workers = workerFarm(path.join(packageDir, "lint.js"))

const workers = workerFarm({maxRetries: 1, maxCallTime: 2 * 60 * 1000}, path.join(packageDir, "lint.js"))

async function main(): Promise<void> {
const packages = (await readdir(packageDir)).filter(it => !it.includes(".")).sort()
Expand Down
2 changes: 1 addition & 1 deletion test/src/linux/linuxPackagerTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { app, appThrows, modifyPackageJson } from "../helpers/packTester"

test.ifNotWindows.ifNotCiMac("AppImage", app({targets: Platform.LINUX.createTarget()}))

test.ifDevOrLinuxCi("AppImage - default icon, custom executable and custom desktop", app({
test.ifNotWindows.ifNotCiMac("AppImage - default icon, custom executable and custom desktop", app({
targets: Platform.LINUX.createTarget("appimage"),
config: {
linux: {
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
version "20.0.2"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-20.0.2.tgz#86c751121fb53dbd39bb1a08c45083da13f2dc67"

"@types/js-yaml@^3.5.31":
version "3.5.31"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.5.31.tgz#54aeb8bcaaf94a7b1a64311bc318dbfe601a593a"
"@types/js-yaml@^3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.9.0.tgz#cf82d31326251e8e94848d98a0665875928cdae6"

"@types/node@*":
version "8.0.10"
Expand Down Expand Up @@ -89,9 +89,9 @@ ajv@^4.9.1:
co "^4.6.0"
json-stable-stringify "^1.0.1"

ajv@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.1.tgz#dcd03045175883ba1b636e5ae9ec3df9ab85323a"
ajv@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
Expand Down Expand Up @@ -1087,9 +1087,9 @@ ecc-jsbn@~0.1.1:
dependencies:
jsbn "~0.1.0"

electron-builder-tslint-config@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/electron-builder-tslint-config/-/electron-builder-tslint-config-1.0.2.tgz#434bbddafa9137c53d82648cec2badb4b6e1966c"
electron-builder-tslint-config@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/electron-builder-tslint-config/-/electron-builder-tslint-config-1.0.3.tgz#3fde180068f34314ab547476fe97144c6f6499a6"

[email protected]:
version "4.3.1"
Expand Down Expand Up @@ -3399,8 +3399,8 @@ tslint@^5.5.0:
tsutils "^2.5.1"

tsutils@^2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.5.1.tgz#c2001390c79eec1a5ccfa7ac12d599639683e0cf"
version "2.6.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.6.0.tgz#e5e99c79a8accd3977ce18d83fdf1d235a6c2ebb"
dependencies:
tslib "^1.7.1"

Expand Down

0 comments on commit 7da827e

Please sign in to comment.