diff --git a/.travis.yml b/.travis.yml index 14ac1532..d16aa785 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_script: script: - npm test - - npm run pack-linux + - npm run package:linux branches: only: diff --git a/package.json b/package.json index a1ba4c19..d508b276 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,26 @@ { "name": "ElectronAPIDemos", "productName": "Electron API Demos", - "version": "1.2.0", + "version": "1.3.0", "description": "Electron interactive API demos", "private": true, "main": "main.js", "scripts": { "start": "electron .", "dev": "electron . --debug", - "lint": "standard | snazzy", - "test": "mocha tests && npm run lint", - "sign-exe": "signcode ./out/ElectronAPIDemos-win32-ia32/ElectronAPIDemos.exe --cert ~/electron-api-demos.p12 --prompt --name 'Electron API Demos' --url 'http://electron.atom.io'", - "sign-installer": "signcode ./out/windows-installer/ElectronAPIDemosSetup.exe --cert ~/electron-api-demos.p12 --prompt --name 'Electron API Demos' --url 'http://electron.atom.io'", - "pack-mac": "electron-packager . --asar.unpack=protocol-link.html --overwrite --platform=darwin --arch=x64 --icon=assets/app-icon/mac/app.icns --out=out --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist", - "pack-win": "electron-packager . --asar.unpack=protocol-link.html --overwrite --platform=win32 --arch=ia32 --icon=assets/app-icon/win/app.ico --out=out --version-string.CompanyName='GitHub, Inc.' --version-string.FileDescription='Electron API Demos' --version-string.ProductName='Electron API Demos'", - "pack-linux": "electron-packager . --asar.unpack=protocol-link.html --overwrite --platform=linux --arch=x64 --out=out", - "package": "npm run pack-mac && npm run pack-win && npm run pack-linux", - "installer": "node ./script/installer.js", + "test": "mocha && standard", + "package": "npm-run-all package:*", + "package:mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --out=out --icon=assets/app-icon/mac/app.icns --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist", + "package:win": "electron-packager . --overwrite --platform=win32 --arch=ia32 --out=out --icon=assets/app-icon/win/app.ico", + "package:linux": "electron-packager . --overwrite --platform=linux --arch=x64 --out=out", + "package:sign-exe": "signcode './out/Electron API Demos-win32-ia32/Electron API Demos.exe' --cert ~/electron-api-demos.p12 --prompt --name 'Electron API Demos' --url 'http://electron.atom.io'", + "package:installer": "node ./script/installer.js", + "package:sign-installer": "signcode './out/windows-installer/ElectronAPIDemosSetup.exe' --cert ~/electron-api-demos.p12 --prompt --name 'Electron API Demos' --url 'http://electron.atom.io'", + "package:mas": "./script/mas.sh", "windows-store": "node ./script/windows-store.js", - "mas": "./script/mas.sh", - "prepare-release": "npm run package && npm run sign-exe && npm run installer && npm run sign-installer", "release": "node ./script/release.js" }, - "repository": { - "type": "git", - "url": "git+https://github.com/electron/electron-api-demos.git" - }, + "repository": "https://github.com/electron/electron-api-demos", "keywords": [ "Electron", "API", @@ -33,22 +28,18 @@ ], "author": "GitHub", "license": "MIT", - "bugs": { - "url": "https://github.com/electron/electron-api-demos/issues" - }, - "homepage": "https://github.com/electron/electron-api-demos#readme", "devDependencies": { "chai": "^3.4.1", "chai-as-promised": "^6.0.0", "devtron": "^1.3.0", "electron": "~1.6.2", - "electron-packager": "^8.0.0", + "electron-packager": "^8.6.0", "electron-winstaller": "^2.2.0", "mocha": "^3.1.0", + "npm-run-all": "^4.0.2", "request": "^2.70.0", "rimraf": "^2.5.2", "signcode": "^0.5.0", - "snazzy": "^5.0.0", "spectron": "~3.6.0", "standard": "^8.2.0" }, diff --git a/script/installer.js b/script/installer.js index c3822b40..976a68fb 100755 --- a/script/installer.js +++ b/script/installer.js @@ -17,7 +17,8 @@ function getInstallerConfig () { const outPath = path.join(rootPath, 'out') return Promise.resolve({ - appDirectory: path.join(outPath, 'ElectronAPIDemos-win32-ia32'), + appDirectory: path.join(outPath, 'Electron API Demos-win32-ia32'), + exe: 'Electron API Demos.exe', iconUrl: 'https://raw.githubusercontent.com/electron/electron-api-demos/master/assets/app-icon/win/app.ico', loadingGif: path.join(rootPath, 'assets', 'img', 'loading.gif'), noMsi: true, diff --git a/tests/index.js b/test/index.js similarity index 100% rename from tests/index.js rename to test/index.js