diff --git a/.idea/scopes/src.xml b/.idea/scopes/src.xml index 67c76fc93ff..7c566ec8998 100644 --- a/.idea/scopes/src.xml +++ b/.idea/scopes/src.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/package.json b/package.json index ed8a5618ca3..cdab4ad137f 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "node-gyp-rebuild": "./out/cli/node-gyp-rebuild.js" }, "scripts": { - "compile": "ts-babel packages/electron-builder-http . packages/electron-auto-updater test", - "lint": "node ./test/lint.js", + "compile": "ts-babel packages/electron-builder-http packages/electron-builder packages/electron-auto-updater test", + "lint": "node ./packages/lint.js", "pretest": "node ./test/vendor/yarn.js run compile && node ./test/vendor/yarn.js run lint", "check-deps": "node ./test/out/helpers/checkDeps.js", "test": "node ./test/out/helpers/runTests.js", @@ -56,54 +56,8 @@ "license": "MIT", "bugs": "https://github.com/electron-userland/electron-builder/issues", "homepage": "https://github.com/electron-userland/electron-builder", - "dependencies": { - "7zip-bin": "^2.0.4", - "ansi-escapes": "^1.4.0", - "archiver": "^1.3.0", - "asar-electron-builder": "^0.13.5", - "bluebird-lst-c": "^1.0.5", - "chalk": "^1.1.3", - "chromium-pickle-js": "^0.2.0", - "cli-cursor": "^1.0.2", - "cuint": "^0.2.2", - "debug": "2.5.2", - "electron-download-tf": "3.1.0", - "electron-macos-sign": "~1.4.0", - "fs-extra-p": "^3.0.3", - "hosted-git-info": "^2.1.5", - "ini": "^1.3.4", - "interactive": "^0.1.9", - "is-ci": "^1.0.10", - "isbinaryfile": "^3.0.1", - "js-yaml": "^3.7.0", - "lodash.template": "^4.4.0", - "mime": "^1.3.4", - "minimatch": "^3.0.3", - "node-emoji": "^1.4.3", - "normalize-package-data": "^2.3.5", - "parse-color": "^1.0.0", - "plist": "^2.0.1", - "pretty-ms": "^2.1.0", - "progress": "^1.1.8", - "progress-stream": "^1.2.0", - "read-installed": "^4.0.3", - "sanitize-filename": "^1.6.1", - "semver": "^5.3.0", - "source-map-support": "^0.4.8", - "stat-mode": "^0.2.2", - "tunnel-agent": "^0.4.3", - "update-notifier": "^1.0.3", - "uuid-1345": "^0.99.6", - "yargs": "^6.5.0", - "electron-builder-http": "1.0.0" - }, "devDependencies": { "@develar/semantic-release": "^6.3.26", - "@types/electron": "^1.4.30", - "@types/ini": "^1.3.29", - "@types/jest": "^16.0.2", - "@types/js-yaml": "^3.5.29", - "@types/source-map-support": "^0.2.28", "babel-plugin-array-includes": "^2.0.3", "babel-plugin-transform-async-to-module-method": "^6.16.0", "babel-plugin-transform-es2015-destructuring": "^6.19.0", @@ -112,6 +66,7 @@ "babel-plugin-transform-inline-imports-commonjs": "^1.2.0", "decompress-zip": "^0.3.0", "depcheck": "^0.6.7", + "electron-download-tf": "3.1.0", "jest-cli": "^18.0.0", "jest-environment-node-debug": "^0.0.2", "lerna": "2.0.0-beta.31", @@ -131,8 +86,8 @@ ], "testRegex": "\\.js$", "modulePaths": [ - "", - "/packages" + "/packages", + "/packages/electron-builder/node_modules" ], "setupTestFrameworkScriptFile": "/test/jestSetup.js" }, diff --git a/packages/electron-auto-updater/package.json b/packages/electron-auto-updater/package.json index 86fdec4b13f..3c88ad255c2 100644 --- a/packages/electron-auto-updater/package.json +++ b/packages/electron-auto-updater/package.json @@ -20,5 +20,9 @@ "source-map-support": "^0.4.8", "electron-builder-http": "1.0.0" }, + "devDependencies": { + "@types/electron": "^1.4.30", + "@types/js-yaml": "^3.5.29" + }, "typings": "./out/electron-auto-updater.d.ts" } diff --git a/packages/electron-auto-updater/tsconfig.json b/packages/electron-auto-updater/tsconfig.json index 14026ebfd40..07dc799280e 100755 --- a/packages/electron-auto-updater/tsconfig.json +++ b/packages/electron-auto-updater/tsconfig.json @@ -21,12 +21,12 @@ "files": [ "../../typings/semver.d.ts", "../../typings/debug.d.ts", - "../../node_modules/@types/node/index.d.ts", "../../node_modules/fs-extra-p/index.d.ts", "../../node_modules/bluebird-lst-c/index.d.ts", "../electron-builder-http/out/electron-builder-http.d.ts" ], "include": [ - "src/**/*.ts" + "src/**/*.ts", + "node_modules/@types/*/*.d.ts" ] } \ No newline at end of file diff --git a/packages/electron-builder-http/package.json b/packages/electron-builder-http/package.json index 09ce0524e50..7aa12c2481c 100644 --- a/packages/electron-builder-http/package.json +++ b/packages/electron-builder-http/package.json @@ -12,5 +12,8 @@ ], "dependencies": { }, + "devDependencies": { + "@types/node": "^6.0.55" + }, "typings": "./out/electron-builder-http.d.ts" } diff --git a/packages/electron-builder-http/src/httpExecutor.ts b/packages/electron-builder-http/src/httpExecutor.ts index 3a609273dd1..a2811cae60b 100644 --- a/packages/electron-builder-http/src/httpExecutor.ts +++ b/packages/electron-builder-http/src/httpExecutor.ts @@ -13,7 +13,7 @@ export class HttpExecutorHolder { get httpExecutor(): HttpExecutor { if (this._httpExecutor == null) { - this._httpExecutor = new (require((global).__test_app == null ? "./nodeHttpExecutor" : "out/util/nodeHttpExecutor").NodeHttpExecutor)() + this._httpExecutor = new (require((global).__test_app == null ? "./nodeHttpExecutor" : "electron-builder/out/util/nodeHttpExecutor").NodeHttpExecutor)() } return this._httpExecutor } diff --git a/packages/electron-builder-http/tsconfig.json b/packages/electron-builder-http/tsconfig.json index 0e08a7f2f07..7d6c451194a 100755 --- a/packages/electron-builder-http/tsconfig.json +++ b/packages/electron-builder-http/tsconfig.json @@ -19,6 +19,7 @@ "electron-builder-http": "out/electron-builder-http.d.ts" }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "node_modules/@types/*/*.d.ts" ] } \ No newline at end of file diff --git a/packages/electron-builder-http/yarn.lock b/packages/electron-builder-http/yarn.lock new file mode 100644 index 00000000000..723a6a886a7 --- /dev/null +++ b/packages/electron-builder-http/yarn.lock @@ -0,0 +1,7 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@types/node@^6.0.55": + version "6.0.55" + resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.55.tgz#e5cb679a43561f42afd1bd6d58d3992ec8f31720" diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json new file mode 100644 index 00000000000..9ab7e37d618 --- /dev/null +++ b/packages/electron-builder/package.json @@ -0,0 +1,96 @@ +{ + "name": "electron-builder", + "description": "A complete solution to package and build a ready for distribution Electron app for MacOS, Windows and Linux with “auto update” support out of the box", + "version": "0.0.0-semantic-release", + "main": "out/index.js", + "files": [ + "out", + "templates", + "certs/root_certs.keychain" + ], + "bin": { + "build": "./out/cli/build-cli.js", + "install-app-deps": "./out/cli/install-app-deps.js", + "node-gyp-rebuild": "./out/cli/node-gyp-rebuild.js" + }, + "repository": "electron-userland/electron-builder", + "engines": { + "node": ">=0.4.0" + }, + "keywords": [ + "electron", + "builder", + "build", + "installer", + "install", + "packager", + "pack", + "nsis", + "app", + "dmg", + "msi", + "exe", + "setup", + "Windows", + "OS X", + "MacOS", + "Mac", + "appx" + ], + "author": "Stefan Judis", + "license": "MIT", + "bugs": "https://github.com/electron-userland/electron-builder/issues", + "homepage": "https://github.com/electron-userland/electron-builder", + "dependencies": { + "7zip-bin": "^2.0.4", + "ansi-escapes": "^1.4.0", + "archiver": "^1.3.0", + "asar-electron-builder": "^0.13.5", + "bluebird-lst-c": "^1.0.5", + "chalk": "^1.1.3", + "chromium-pickle-js": "^0.2.0", + "cli-cursor": "^1.0.2", + "cuint": "^0.2.2", + "debug": "2.5.2", + "electron-download-tf": "3.1.0", + "electron-macos-sign": "~1.4.0", + "fs-extra-p": "^3.0.3", + "hosted-git-info": "^2.1.5", + "ini": "^1.3.4", + "interactive": "^0.1.9", + "is-ci": "^1.0.10", + "isbinaryfile": "^3.0.1", + "js-yaml": "^3.7.0", + "lodash.template": "^4.4.0", + "mime": "^1.3.4", + "minimatch": "^3.0.3", + "node-emoji": "^1.4.3", + "normalize-package-data": "^2.3.5", + "parse-color": "^1.0.0", + "plist": "^2.0.1", + "pretty-ms": "^2.1.0", + "progress": "^1.1.8", + "progress-stream": "^1.2.0", + "read-installed": "^4.0.3", + "sanitize-filename": "^1.6.1", + "semver": "^5.3.0", + "source-map-support": "^0.4.8", + "stat-mode": "^0.2.2", + "tunnel-agent": "^0.4.3", + "update-notifier": "^1.0.3", + "uuid-1345": "^0.99.6", + "yargs": "^6.5.0", + "electron-builder-http": "1.0.0" + }, + "devDependencies": { + "@types/node": "^6.0.55", + "@types/ini": "^1.3.29", + "@types/jest": "^16.0.2", + "@types/js-yaml": "^3.5.29", + "@types/source-map-support": "^0.2.28" + }, + "typings": "./out/electron-builder.d.ts", + "publishConfig": { + "tag": "next" + } +} diff --git a/src/appInfo.ts b/packages/electron-builder/src/appInfo.ts similarity index 100% rename from src/appInfo.ts rename to packages/electron-builder/src/appInfo.ts diff --git a/src/asarUtil.ts b/packages/electron-builder/src/asarUtil.ts similarity index 100% rename from src/asarUtil.ts rename to packages/electron-builder/src/asarUtil.ts diff --git a/src/builder.ts b/packages/electron-builder/src/builder.ts similarity index 100% rename from src/builder.ts rename to packages/electron-builder/src/builder.ts diff --git a/src/cli/build-cli.ts b/packages/electron-builder/src/cli/build-cli.ts similarity index 100% rename from src/cli/build-cli.ts rename to packages/electron-builder/src/cli/build-cli.ts diff --git a/src/cli/cliOptions.ts b/packages/electron-builder/src/cli/cliOptions.ts similarity index 100% rename from src/cli/cliOptions.ts rename to packages/electron-builder/src/cli/cliOptions.ts diff --git a/src/cli/create-self-signed-cert.ts b/packages/electron-builder/src/cli/create-self-signed-cert.ts similarity index 100% rename from src/cli/create-self-signed-cert.ts rename to packages/electron-builder/src/cli/create-self-signed-cert.ts diff --git a/src/cli/install-app-deps.ts b/packages/electron-builder/src/cli/install-app-deps.ts similarity index 100% rename from src/cli/install-app-deps.ts rename to packages/electron-builder/src/cli/install-app-deps.ts diff --git a/src/cli/node-gyp-rebuild.ts b/packages/electron-builder/src/cli/node-gyp-rebuild.ts similarity index 100% rename from src/cli/node-gyp-rebuild.ts rename to packages/electron-builder/src/cli/node-gyp-rebuild.ts diff --git a/src/codeSign.ts b/packages/electron-builder/src/codeSign.ts similarity index 100% rename from src/codeSign.ts rename to packages/electron-builder/src/codeSign.ts diff --git a/src/errorMessages.ts b/packages/electron-builder/src/errorMessages.ts similarity index 100% rename from src/errorMessages.ts rename to packages/electron-builder/src/errorMessages.ts diff --git a/src/fileMatcher.ts b/packages/electron-builder/src/fileMatcher.ts similarity index 100% rename from src/fileMatcher.ts rename to packages/electron-builder/src/fileMatcher.ts diff --git a/src/index.ts b/packages/electron-builder/src/index.ts similarity index 100% rename from src/index.ts rename to packages/electron-builder/src/index.ts diff --git a/src/linuxPackager.ts b/packages/electron-builder/src/linuxPackager.ts similarity index 100% rename from src/linuxPackager.ts rename to packages/electron-builder/src/linuxPackager.ts diff --git a/src/macPackager.ts b/packages/electron-builder/src/macPackager.ts similarity index 100% rename from src/macPackager.ts rename to packages/electron-builder/src/macPackager.ts diff --git a/src/metadata.ts b/packages/electron-builder/src/metadata.ts similarity index 100% rename from src/metadata.ts rename to packages/electron-builder/src/metadata.ts diff --git a/src/options/linuxOptions.ts b/packages/electron-builder/src/options/linuxOptions.ts similarity index 100% rename from src/options/linuxOptions.ts rename to packages/electron-builder/src/options/linuxOptions.ts diff --git a/src/options/macOptions.ts b/packages/electron-builder/src/options/macOptions.ts similarity index 100% rename from src/options/macOptions.ts rename to packages/electron-builder/src/options/macOptions.ts diff --git a/src/options/winOptions.ts b/packages/electron-builder/src/options/winOptions.ts similarity index 100% rename from src/options/winOptions.ts rename to packages/electron-builder/src/options/winOptions.ts diff --git a/src/packager.ts b/packages/electron-builder/src/packager.ts similarity index 100% rename from src/packager.ts rename to packages/electron-builder/src/packager.ts diff --git a/src/packager/dirPackager.ts b/packages/electron-builder/src/packager/dirPackager.ts similarity index 100% rename from src/packager/dirPackager.ts rename to packages/electron-builder/src/packager/dirPackager.ts diff --git a/src/packager/mac.ts b/packages/electron-builder/src/packager/mac.ts similarity index 100% rename from src/packager/mac.ts rename to packages/electron-builder/src/packager/mac.ts diff --git a/src/platformPackager.ts b/packages/electron-builder/src/platformPackager.ts similarity index 100% rename from src/platformPackager.ts rename to packages/electron-builder/src/platformPackager.ts diff --git a/src/publish/BintrayPublisher.ts b/packages/electron-builder/src/publish/BintrayPublisher.ts similarity index 100% rename from src/publish/BintrayPublisher.ts rename to packages/electron-builder/src/publish/BintrayPublisher.ts diff --git a/src/publish/gitHubPublisher.ts b/packages/electron-builder/src/publish/gitHubPublisher.ts similarity index 100% rename from src/publish/gitHubPublisher.ts rename to packages/electron-builder/src/publish/gitHubPublisher.ts diff --git a/src/publish/publisher.ts b/packages/electron-builder/src/publish/publisher.ts similarity index 100% rename from src/publish/publisher.ts rename to packages/electron-builder/src/publish/publisher.ts diff --git a/src/publish/uploader.ts b/packages/electron-builder/src/publish/uploader.ts similarity index 100% rename from src/publish/uploader.ts rename to packages/electron-builder/src/publish/uploader.ts diff --git a/src/repositoryInfo.ts b/packages/electron-builder/src/repositoryInfo.ts similarity index 100% rename from src/repositoryInfo.ts rename to packages/electron-builder/src/repositoryInfo.ts diff --git a/src/targets/LinuxTargetHelper.ts b/packages/electron-builder/src/targets/LinuxTargetHelper.ts similarity index 100% rename from src/targets/LinuxTargetHelper.ts rename to packages/electron-builder/src/targets/LinuxTargetHelper.ts diff --git a/src/targets/appImage.ts b/packages/electron-builder/src/targets/appImage.ts similarity index 100% rename from src/targets/appImage.ts rename to packages/electron-builder/src/targets/appImage.ts diff --git a/src/targets/appx.ts b/packages/electron-builder/src/targets/appx.ts similarity index 100% rename from src/targets/appx.ts rename to packages/electron-builder/src/targets/appx.ts diff --git a/src/targets/archive.ts b/packages/electron-builder/src/targets/archive.ts similarity index 100% rename from src/targets/archive.ts rename to packages/electron-builder/src/targets/archive.ts diff --git a/src/targets/dmg.ts b/packages/electron-builder/src/targets/dmg.ts similarity index 100% rename from src/targets/dmg.ts rename to packages/electron-builder/src/targets/dmg.ts diff --git a/src/targets/fpm.ts b/packages/electron-builder/src/targets/fpm.ts similarity index 100% rename from src/targets/fpm.ts rename to packages/electron-builder/src/targets/fpm.ts diff --git a/src/targets/nsis.ts b/packages/electron-builder/src/targets/nsis.ts similarity index 100% rename from src/targets/nsis.ts rename to packages/electron-builder/src/targets/nsis.ts diff --git a/src/targets/pkg.ts b/packages/electron-builder/src/targets/pkg.ts similarity index 100% rename from src/targets/pkg.ts rename to packages/electron-builder/src/targets/pkg.ts diff --git a/src/targets/snap.ts b/packages/electron-builder/src/targets/snap.ts similarity index 100% rename from src/targets/snap.ts rename to packages/electron-builder/src/targets/snap.ts diff --git a/src/targets/squirrelPack.ts b/packages/electron-builder/src/targets/squirrelPack.ts similarity index 100% rename from src/targets/squirrelPack.ts rename to packages/electron-builder/src/targets/squirrelPack.ts diff --git a/src/targets/squirrelWindows.ts b/packages/electron-builder/src/targets/squirrelWindows.ts similarity index 100% rename from src/targets/squirrelWindows.ts rename to packages/electron-builder/src/targets/squirrelWindows.ts diff --git a/src/targets/targetFactory.ts b/packages/electron-builder/src/targets/targetFactory.ts similarity index 100% rename from src/targets/targetFactory.ts rename to packages/electron-builder/src/targets/targetFactory.ts diff --git a/src/util/binDownload.ts b/packages/electron-builder/src/util/binDownload.ts similarity index 100% rename from src/util/binDownload.ts rename to packages/electron-builder/src/util/binDownload.ts diff --git a/src/util/deepAssign.ts b/packages/electron-builder/src/util/deepAssign.ts similarity index 100% rename from src/util/deepAssign.ts rename to packages/electron-builder/src/util/deepAssign.ts diff --git a/src/util/filter.ts b/packages/electron-builder/src/util/filter.ts similarity index 100% rename from src/util/filter.ts rename to packages/electron-builder/src/util/filter.ts diff --git a/src/util/fs.ts b/packages/electron-builder/src/util/fs.ts similarity index 100% rename from src/util/fs.ts rename to packages/electron-builder/src/util/fs.ts diff --git a/src/util/log.ts b/packages/electron-builder/src/util/log.ts similarity index 100% rename from src/util/log.ts rename to packages/electron-builder/src/util/log.ts diff --git a/src/util/nodeHttpExecutor.ts b/packages/electron-builder/src/util/nodeHttpExecutor.ts similarity index 100% rename from src/util/nodeHttpExecutor.ts rename to packages/electron-builder/src/util/nodeHttpExecutor.ts diff --git a/src/util/promise.ts b/packages/electron-builder/src/util/promise.ts similarity index 100% rename from src/util/promise.ts rename to packages/electron-builder/src/util/promise.ts diff --git a/src/util/readPackageJson.ts b/packages/electron-builder/src/util/readPackageJson.ts similarity index 100% rename from src/util/readPackageJson.ts rename to packages/electron-builder/src/util/readPackageJson.ts diff --git a/src/util/tmp.ts b/packages/electron-builder/src/util/tmp.ts similarity index 100% rename from src/util/tmp.ts rename to packages/electron-builder/src/util/tmp.ts diff --git a/src/util/util.ts b/packages/electron-builder/src/util/util.ts similarity index 100% rename from src/util/util.ts rename to packages/electron-builder/src/util/util.ts diff --git a/src/winPackager.ts b/packages/electron-builder/src/winPackager.ts similarity index 100% rename from src/winPackager.ts rename to packages/electron-builder/src/winPackager.ts diff --git a/src/windowsCodeSign.ts b/packages/electron-builder/src/windowsCodeSign.ts similarity index 100% rename from src/windowsCodeSign.ts rename to packages/electron-builder/src/windowsCodeSign.ts diff --git a/src/yarn.ts b/packages/electron-builder/src/yarn.ts similarity index 100% rename from src/yarn.ts rename to packages/electron-builder/src/yarn.ts diff --git a/templates/appx/appxmanifest.xml b/packages/electron-builder/templates/appx/appxmanifest.xml similarity index 100% rename from templates/appx/appxmanifest.xml rename to packages/electron-builder/templates/appx/appxmanifest.xml diff --git a/templates/dmg/Mac/Finder/DSStore.pm b/packages/electron-builder/templates/dmg/Mac/Finder/DSStore.pm similarity index 100% rename from templates/dmg/Mac/Finder/DSStore.pm rename to packages/electron-builder/templates/dmg/Mac/Finder/DSStore.pm diff --git a/templates/dmg/Mac/Finder/DSStore/BuddyAllocator.pm b/packages/electron-builder/templates/dmg/Mac/Finder/DSStore/BuddyAllocator.pm similarity index 100% rename from templates/dmg/Mac/Finder/DSStore/BuddyAllocator.pm rename to packages/electron-builder/templates/dmg/Mac/Finder/DSStore/BuddyAllocator.pm diff --git a/templates/dmg/Mac/Finder/DSStore/Format.pod b/packages/electron-builder/templates/dmg/Mac/Finder/DSStore/Format.pod similarity index 100% rename from templates/dmg/Mac/Finder/DSStore/Format.pod rename to packages/electron-builder/templates/dmg/Mac/Finder/DSStore/Format.pod diff --git a/templates/dmg/background.tiff b/packages/electron-builder/templates/dmg/background.tiff similarity index 100% rename from templates/dmg/background.tiff rename to packages/electron-builder/templates/dmg/background.tiff diff --git a/templates/dmg/dmgProperties.pl b/packages/electron-builder/templates/dmg/dmgProperties.pl similarity index 100% rename from templates/dmg/dmgProperties.pl rename to packages/electron-builder/templates/dmg/dmgProperties.pl diff --git a/templates/linux/AppRun.sh b/packages/electron-builder/templates/linux/AppRun.sh similarity index 100% rename from templates/linux/AppRun.sh rename to packages/electron-builder/templates/linux/AppRun.sh diff --git a/templates/linux/after-install.tpl b/packages/electron-builder/templates/linux/after-install.tpl similarity index 100% rename from templates/linux/after-install.tpl rename to packages/electron-builder/templates/linux/after-install.tpl diff --git a/templates/linux/after-remove.tpl b/packages/electron-builder/templates/linux/after-remove.tpl similarity index 100% rename from templates/linux/after-remove.tpl rename to packages/electron-builder/templates/linux/after-remove.tpl diff --git a/templates/linux/desktop.tpl b/packages/electron-builder/templates/linux/desktop.tpl similarity index 100% rename from templates/linux/desktop.tpl rename to packages/electron-builder/templates/linux/desktop.tpl diff --git a/templates/linux/electron-icons/128x128.png b/packages/electron-builder/templates/linux/electron-icons/128x128.png similarity index 100% rename from templates/linux/electron-icons/128x128.png rename to packages/electron-builder/templates/linux/electron-icons/128x128.png diff --git a/templates/linux/electron-icons/16x16.png b/packages/electron-builder/templates/linux/electron-icons/16x16.png similarity index 100% rename from templates/linux/electron-icons/16x16.png rename to packages/electron-builder/templates/linux/electron-icons/16x16.png diff --git a/templates/linux/electron-icons/24x24.png b/packages/electron-builder/templates/linux/electron-icons/24x24.png similarity index 100% rename from templates/linux/electron-icons/24x24.png rename to packages/electron-builder/templates/linux/electron-icons/24x24.png diff --git a/templates/linux/electron-icons/256x256.png b/packages/electron-builder/templates/linux/electron-icons/256x256.png similarity index 100% rename from templates/linux/electron-icons/256x256.png rename to packages/electron-builder/templates/linux/electron-icons/256x256.png diff --git a/templates/linux/electron-icons/32x32.png b/packages/electron-builder/templates/linux/electron-icons/32x32.png similarity index 100% rename from templates/linux/electron-icons/32x32.png rename to packages/electron-builder/templates/linux/electron-icons/32x32.png diff --git a/templates/linux/electron-icons/48x48.png b/packages/electron-builder/templates/linux/electron-icons/48x48.png similarity index 100% rename from templates/linux/electron-icons/48x48.png rename to packages/electron-builder/templates/linux/electron-icons/48x48.png diff --git a/templates/linux/electron-icons/64x64.png b/packages/electron-builder/templates/linux/electron-icons/64x64.png similarity index 100% rename from templates/linux/electron-icons/64x64.png rename to packages/electron-builder/templates/linux/electron-icons/64x64.png diff --git a/templates/linux/electron-icons/96x96.png b/packages/electron-builder/templates/linux/electron-icons/96x96.png similarity index 100% rename from templates/linux/electron-icons/96x96.png rename to packages/electron-builder/templates/linux/electron-icons/96x96.png diff --git a/templates/nsis/FileAssociation.nsh b/packages/electron-builder/templates/nsis/FileAssociation.nsh similarity index 100% rename from templates/nsis/FileAssociation.nsh rename to packages/electron-builder/templates/nsis/FileAssociation.nsh diff --git a/templates/nsis/allowOnlyOneInstallerInstance.nsh b/packages/electron-builder/templates/nsis/allowOnlyOneInstallerInstance.nsh similarity index 100% rename from templates/nsis/allowOnlyOneInstallerInstance.nsh rename to packages/electron-builder/templates/nsis/allowOnlyOneInstallerInstance.nsh diff --git a/templates/nsis/boringInstaller.nsh b/packages/electron-builder/templates/nsis/boringInstaller.nsh similarity index 100% rename from templates/nsis/boringInstaller.nsh rename to packages/electron-builder/templates/nsis/boringInstaller.nsh diff --git a/templates/nsis/common.nsh b/packages/electron-builder/templates/nsis/common.nsh similarity index 100% rename from templates/nsis/common.nsh rename to packages/electron-builder/templates/nsis/common.nsh diff --git a/templates/nsis/getProcessInfo.nsh b/packages/electron-builder/templates/nsis/getProcessInfo.nsh similarity index 100% rename from templates/nsis/getProcessInfo.nsh rename to packages/electron-builder/templates/nsis/getProcessInfo.nsh diff --git a/templates/nsis/installSection.nsh b/packages/electron-builder/templates/nsis/installSection.nsh similarity index 100% rename from templates/nsis/installSection.nsh rename to packages/electron-builder/templates/nsis/installSection.nsh diff --git a/templates/nsis/installer.nsi b/packages/electron-builder/templates/nsis/installer.nsi similarity index 100% rename from templates/nsis/installer.nsi rename to packages/electron-builder/templates/nsis/installer.nsi diff --git a/templates/nsis/langs.nsh b/packages/electron-builder/templates/nsis/langs.nsh similarity index 100% rename from templates/nsis/langs.nsh rename to packages/electron-builder/templates/nsis/langs.nsh diff --git a/templates/nsis/multiUser.nsh b/packages/electron-builder/templates/nsis/multiUser.nsh similarity index 100% rename from templates/nsis/multiUser.nsh rename to packages/electron-builder/templates/nsis/multiUser.nsh diff --git a/templates/nsis/multiUserUi.nsh b/packages/electron-builder/templates/nsis/multiUserUi.nsh similarity index 100% rename from templates/nsis/multiUserUi.nsh rename to packages/electron-builder/templates/nsis/multiUserUi.nsh diff --git a/templates/nsis/oneClick.nsh b/packages/electron-builder/templates/nsis/oneClick.nsh similarity index 100% rename from templates/nsis/oneClick.nsh rename to packages/electron-builder/templates/nsis/oneClick.nsh diff --git a/templates/nsis/readme.md b/packages/electron-builder/templates/nsis/readme.md similarity index 100% rename from templates/nsis/readme.md rename to packages/electron-builder/templates/nsis/readme.md diff --git a/templates/nsis/uninstaller.nsh b/packages/electron-builder/templates/nsis/uninstaller.nsh similarity index 100% rename from templates/nsis/uninstaller.nsh rename to packages/electron-builder/templates/nsis/uninstaller.nsh diff --git a/tsconfig.json b/packages/electron-builder/tsconfig.json similarity index 66% rename from tsconfig.json rename to packages/electron-builder/tsconfig.json index 98a95eb6a1f..e42ef63362b 100755 --- a/tsconfig.json +++ b/packages/electron-builder/tsconfig.json @@ -16,10 +16,9 @@ "skipLibCheck": true }, "declaration": { - "electron-builder": "out/electron-builder.d.ts", - "": "test/typings/electron-builder.d.ts" + "electron-builder": "out/electron-builder.d.ts" }, - "docs": "docs/Options.md", + "docs": "../../docs/Options.md", "paths": { "fs-extra-p": [ "node_modules/fs-extra-p/index.d.ts" @@ -30,15 +29,12 @@ "node_modules/bluebird-lst-c/index.d.ts", "node_modules/7zip-bin/index.d.ts", "node_modules/electron-macos-sign/index.d.ts", - "packages/electron-builder-http/out/electron-builder-http.d.ts" + "../electron-builder-http/out/electron-builder-http.d.ts" ], "include": [ "src/**/*.ts", - "typings/*.d.ts", - "node_modules/@types/ini/*.d.ts", - "node_modules/@types/js-yaml/*.d.ts", - "node_modules/@types/node/*.d.ts", - "node_modules/@types/source-map-support/*.d.ts" + "../../typings/*.d.ts", + "node_modules/@types/*/*.d.ts" ], "exclude": [ ] diff --git a/test/lint.js b/packages/lint.js similarity index 89% rename from test/lint.js rename to packages/lint.js index c1bbb3e67be..52de513ffab 100644 --- a/test/lint.js +++ b/packages/lint.js @@ -1,6 +1,7 @@ "use strict" const Linter = require("tslint").Linter +const fs = require("fs") const path = require("path") const configuration = { @@ -68,7 +69,9 @@ const options = { } let hasErrors = false -for (const projectDir of [path.join(__dirname, ".."), path.join(__dirname, "..", "packages", "electron-auto-updater"), __dirname]) { +const packages = fs.readdirSync(__dirname).filter(it => !it.includes(".")).sort().map(it => path.join(__dirname, it)) +for (const projectDir of packages) { + console.log(`Linting ${path.basename(projectDir)}`) const program = Linter.createProgram("tsconfig.json", projectDir) for (const file of Linter.getFileNames(program)) { const fileContents = program.getSourceFile(file).getFullText() diff --git a/templates/appx/assets/SampleAppx.150x150.png b/templates/appx/assets/SampleAppx.150x150.png deleted file mode 100755 index 83fb2d72057..00000000000 --- a/templates/appx/assets/SampleAppx.150x150.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6d709ba362df5eb3fd7bb11616ecaede1a8c6228b366d06e8b1da0dd3e63bda -size 12034 diff --git a/templates/appx/assets/SampleAppx.310x150.png b/templates/appx/assets/SampleAppx.310x150.png deleted file mode 100755 index ed53297d4d8..00000000000 --- a/templates/appx/assets/SampleAppx.310x150.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f93fbe8780cfe89a7aa8065d71765fda49b48718e4aae17bbb0e99da4baedb23 -size 19309 diff --git a/templates/appx/assets/SampleAppx.44x44.png b/templates/appx/assets/SampleAppx.44x44.png deleted file mode 100755 index 426d4afb745..00000000000 --- a/templates/appx/assets/SampleAppx.44x44.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8bac33b74a3c76f3e8eb04de0f0bdb56c439398ccdc9c61811a12c62ac059327 -size 1912 diff --git a/templates/appx/assets/SampleAppx.50x50.png b/templates/appx/assets/SampleAppx.50x50.png deleted file mode 100755 index d274af609f3..00000000000 --- a/templates/appx/assets/SampleAppx.50x50.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebda946cecc7a2b3569be328ab4b785091a2c7c48a28bb719e97af22575aeb35 -size 1742 diff --git a/templates/install-spinner.gif b/templates/install-spinner.gif deleted file mode 100644 index 2ee0e124289..00000000000 --- a/templates/install-spinner.gif +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce636d201ef86ffbf4ee8c8762b4d9dc255be9d5f490d0a22e36fe0c938f7244 -size 44410 diff --git a/test/src/ArtifactPublisherTest.ts b/test/src/ArtifactPublisherTest.ts index 17508fc7f79..fc00f12c936 100644 --- a/test/src/ArtifactPublisherTest.ts +++ b/test/src/ArtifactPublisherTest.ts @@ -1,7 +1,7 @@ -import { GitHubPublisher } from "out/publish/gitHubPublisher" +import { GitHubPublisher } from "electron-builder/out/publish/gitHubPublisher" import { join } from "path" -import { BintrayPublisher } from "out/publish/BintrayPublisher" -import { createPublisher } from "out/builder" +import { BintrayPublisher } from "electron-builder/out/publish/BintrayPublisher" +import { createPublisher } from "electron-builder/out/builder" import isCi from "is-ci" import { HttpError } from "electron-builder-http/out/httpExecutor" diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts index b183462b3a5..e26e15ba041 100644 --- a/test/src/BuildTest.ts +++ b/test/src/BuildTest.ts @@ -12,13 +12,13 @@ import { move, outputJson } from "fs-extra-p" import BluebirdPromise from "bluebird-lst-c" import * as path from "path" import { assertThat } from "./helpers/fileAssert" -import { BuildOptions, Platform, PackagerOptions, DIR_TARGET, Arch } from "out" -import { normalizeOptions, build } from "out/builder" -import { createYargs } from "out/cli/cliOptions" +import { BuildOptions, Platform, PackagerOptions, DIR_TARGET, Arch } from "electron-builder" +import { normalizeOptions, build } from "electron-builder/out/builder" +import { createYargs } from "electron-builder/out/cli/cliOptions" import { extractFile } from "asar-electron-builder" import { ELECTRON_VERSION } from "./helpers/config" import isCi from "is-ci" -import { checkWineVersion } from "out/packager" +import { checkWineVersion } from "electron-builder/out/packager" test("cli", async () => { const yargs = createYargs() diff --git a/test/src/RepoSlugTest.ts b/test/src/RepoSlugTest.ts index 3b742ba069f..b68195a3dd1 100644 --- a/test/src/RepoSlugTest.ts +++ b/test/src/RepoSlugTest.ts @@ -1,4 +1,4 @@ -import { getRepositoryInfo } from "out/repositoryInfo" +import { getRepositoryInfo } from "electron-builder/out/repositoryInfo" test("repo slug from TRAVIS_REPO_SLUG", async () => { const oldValue = process.env.TRAVIS_REPO_SLUG diff --git a/test/src/extraMetadataTest.ts b/test/src/extraMetadataTest.ts index 63302b7b584..4a38a64ceec 100644 --- a/test/src/extraMetadataTest.ts +++ b/test/src/extraMetadataTest.ts @@ -1,5 +1,5 @@ import { modifyPackageJson, appTwoThrows, app, appTwo } from "./helpers/packTester" -import { Platform, DIR_TARGET } from "out" +import { Platform, DIR_TARGET } from "electron-builder" import { assertThat } from "./helpers/fileAssert" import * as path from "path" import { extractFile } from "asar-electron-builder" diff --git a/test/src/filesTest.ts b/test/src/filesTest.ts index 9e5dc34b4e8..02cc6303680 100644 --- a/test/src/filesTest.ts +++ b/test/src/filesTest.ts @@ -4,12 +4,12 @@ import { assertPack, modifyPackageJson, getPossiblePlatforms, app } from "./help import BluebirdPromise from "bluebird-lst-c" import * as path from "path" import { assertThat } from "./helpers/fileAssert" -import { Platform, DIR_TARGET } from "out" +import { Platform, DIR_TARGET } from "electron-builder" import pathSorter from "path-sort" import Mode from "stat-mode" import { Permissions } from "stat-mode" -import { TmpDir } from "out/util/tmp" -import { copyDir } from "out/util/fs" +import { TmpDir } from "electron-builder/out/util/tmp" +import { copyDir } from "electron-builder/out/util/fs" test.ifDevOrLinuxCi("files", app({ targets: Platform.LINUX.createTarget(DIR_TARGET), diff --git a/test/src/globTest.ts b/test/src/globTest.ts index b06fa17142e..30e770d6a02 100644 --- a/test/src/globTest.ts +++ b/test/src/globTest.ts @@ -3,7 +3,7 @@ import { assertPack, modifyPackageJson, app } from "./helpers/packTester" import BluebirdPromise from "bluebird-lst-c" import * as path from "path" import { assertThat } from "./helpers/fileAssert" -import { Platform, DIR_TARGET } from "out" +import { Platform, DIR_TARGET } from "electron-builder" import { statFile } from "asar-electron-builder" test.ifDevOrLinuxCi("unpackDir one", app({ diff --git a/test/src/helpers/fileAssert.ts b/test/src/helpers/fileAssert.ts index adcb8e60e2e..1e41c5bf5df 100644 --- a/test/src/helpers/fileAssert.ts +++ b/test/src/helpers/fileAssert.ts @@ -1,6 +1,6 @@ import { stat, Stats } from "fs-extra-p" import * as path from "path" -import { exists } from "out/util/fs" +import { exists } from "electron-builder/out/util/fs" // http://joel-costigliola.github.io/assertj/ export function assertThat(actual: any): Assertions { diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts index 2e8417eb5d0..3481818ab34 100755 --- a/test/src/helpers/packTester.ts +++ b/test/src/helpers/packTester.ts @@ -4,21 +4,21 @@ import * as path from "path" import { parse as parsePlist } from "plist" import { CSC_LINK } from "./codeSignData" import { expectedLinuxContents, expectedWinContents } from "./expectedContents" -import { Packager, PackagerOptions, Platform, ArtifactCreated, Arch, DIR_TARGET, createTargets, getArchSuffix, MacOsTargetName, Target, MacOptions, BuildInfo, SquirrelWindowsOptions } from "out" -import { exec, spawn, getTempName } from "out/util/util" -import { log, warn } from "out/util/log" +import { Packager, PackagerOptions, Platform, ArtifactCreated, Arch, DIR_TARGET, createTargets, getArchSuffix, MacOsTargetName, Target, MacOptions, BuildInfo, SquirrelWindowsOptions } from "electron-builder" +import { exec, spawn, getTempName } from "electron-builder/out/util/util" +import { log, warn } from "electron-builder/out/util/log" import pathSorter from "path-sort" import DecompressZip from "decompress-zip" -import { convertVersion } from "out/targets/squirrelPack" +import { convertVersion } from "electron-builder/out/targets/squirrelPack" import { TEST_DIR } from "./config" -import { deepAssign } from "out/util/deepAssign" -import { SignOptions } from "out/windowsCodeSign" -import { WinPackager } from "out/winPackager" -import SquirrelWindowsTarget from "out/targets/squirrelWindows" -import { DmgTarget } from "out/targets/dmg" -import OsXPackager from "out/macPackager" +import { deepAssign } from "electron-builder/out/util/deepAssign" +import { SignOptions } from "electron-builder/out/windowsCodeSign" +import { WinPackager } from "electron-builder/out/winPackager" +import SquirrelWindowsTarget from "electron-builder/out/targets/squirrelWindows" +import { DmgTarget } from "electron-builder/out/targets/dmg" +import OsXPackager from "electron-builder/out/macPackager" import { SignOptions as MacSignOptions } from "electron-macos-sign" -import { copyDir, FileCopier } from "out/util/fs" +import { copyDir, FileCopier } from "electron-builder/out/util/fs" import isCi from "is-ci" if (process.env.TRAVIS !== "true") { diff --git a/test/src/helpers/wine.ts b/test/src/helpers/wine.ts index bd3057ff9a7..916a909403b 100644 --- a/test/src/helpers/wine.ts +++ b/test/src/helpers/wine.ts @@ -1,10 +1,10 @@ -import { exec } from "out/util/util" +import { exec } from "electron-builder/out/util/util" import { homedir } from "os" import { emptyDir, readFile, writeFile, ensureDir } from "fs-extra-p" import * as path from "path" import BluebirdPromise from "bluebird-lst-c" import pathSorter from "path-sort" -import { unlinkIfExists } from "out/util/fs" +import { unlinkIfExists } from "electron-builder/out/util/fs" export class WineManager { wineDir: string diff --git a/test/src/ignoreTest.ts b/test/src/ignoreTest.ts index 02c7add21f3..b2ff7fb4a19 100644 --- a/test/src/ignoreTest.ts +++ b/test/src/ignoreTest.ts @@ -3,7 +3,7 @@ import { assertPack, modifyPackageJson, app } from "./helpers/packTester" import BluebirdPromise from "bluebird-lst-c" import * as path from "path" import { assertThat } from "./helpers/fileAssert" -import { Platform, DIR_TARGET } from "out" +import { Platform, DIR_TARGET } from "electron-builder" test.ifDevOrLinuxCi("ignore build resources", app({ targets: Platform.LINUX.createTarget(DIR_TARGET), diff --git a/test/src/linux/debTest.ts b/test/src/linux/debTest.ts index d10a837949f..6aa3273e0b5 100644 --- a/test/src/linux/debTest.ts +++ b/test/src/linux/debTest.ts @@ -1,4 +1,4 @@ -import { Platform, Arch } from "out" +import { Platform, Arch } from "electron-builder" import { app } from "../helpers/packTester" test.ifNotWindows("deb", app({targets: Platform.LINUX.createTarget("deb")})) diff --git a/test/src/linux/fpmTest.ts b/test/src/linux/fpmTest.ts index 3928d80ef2d..288cd6af515 100644 --- a/test/src/linux/fpmTest.ts +++ b/test/src/linux/fpmTest.ts @@ -1,5 +1,5 @@ // "apk" is very slow, don't test for now -import { Platform } from "out" +import { Platform } from "electron-builder" import { app } from "../helpers/packTester" test.ifDevOrLinuxCi("targets", app({targets: Platform.LINUX.createTarget(["sh", "freebsd", "pacman", "zip", "7z"])})) diff --git a/test/src/linux/linuxArchiveTest.ts b/test/src/linux/linuxArchiveTest.ts index ef321459279..ff4ac267b20 100644 --- a/test/src/linux/linuxArchiveTest.ts +++ b/test/src/linux/linuxArchiveTest.ts @@ -1,4 +1,4 @@ -import { Platform } from "out" +import { Platform } from "electron-builder" import { app } from "../helpers/packTester" test.ifDevOrLinuxCi("tar", app({targets: Platform.LINUX.createTarget(["tar.xz", "tar.lz", "tar.bz2"])})) \ No newline at end of file diff --git a/test/src/linux/linuxPackagerTest.ts b/test/src/linux/linuxPackagerTest.ts index 90a5558a286..cd85c43e3af 100755 --- a/test/src/linux/linuxPackagerTest.ts +++ b/test/src/linux/linuxPackagerTest.ts @@ -1,7 +1,7 @@ import { modifyPackageJson, app, appThrows } from "../helpers/packTester" import { remove, readFile } from "fs-extra-p" import * as path from "path" -import { Platform } from "out" +import { Platform } from "electron-builder" test.ifDevOrLinuxCi("AppImage", app({targets: Platform.LINUX.createTarget()})) diff --git a/test/src/linux/snapTest.ts b/test/src/linux/snapTest.ts index 6ec4322df8d..ec563b9d793 100644 --- a/test/src/linux/snapTest.ts +++ b/test/src/linux/snapTest.ts @@ -1,4 +1,4 @@ -import { Platform } from "out" +import { Platform } from "electron-builder" import { app } from "../helpers/packTester" test.ifLinuxOrDevMac("platform", app({ diff --git a/test/src/mac/CodeSignTest.ts b/test/src/mac/CodeSignTest.ts index fcd9fd927d0..e11042d2c9e 100644 --- a/test/src/mac/CodeSignTest.ts +++ b/test/src/mac/CodeSignTest.ts @@ -1,7 +1,7 @@ -import { createKeychain } from "out/codeSign" +import { createKeychain } from "electron-builder/out/codeSign" import { CSC_LINK } from "../helpers/codeSignData" -import { removePassword } from "out/util/util" -import { TmpDir } from "out/util/tmp" +import { removePassword } from "electron-builder/out/util/util" +import { TmpDir } from "electron-builder/out/util/tmp" if (process.env.CSC_KEY_PASSWORD == null) { fit("Skip keychain-specific tests because CSC_KEY_PASSWORD is not defined", () => { diff --git a/test/src/mac/dmgTest.ts b/test/src/mac/dmgTest.ts index 35dce2a61b9..d9703e59763 100644 --- a/test/src/mac/dmgTest.ts +++ b/test/src/mac/dmgTest.ts @@ -3,8 +3,8 @@ import { remove, copy } from "fs-extra-p" import * as path from "path" import BluebirdPromise from "bluebird-lst-c" import { assertThat } from "../helpers/fileAssert" -import { Platform } from "out" -import { attachAndExecute } from "out/targets/dmg" +import { Platform } from "electron-builder" +import { attachAndExecute } from "electron-builder/out/targets/dmg" test.ifMac("no build directory", app({ targets: Platform.MAC.createTarget("dmg"), diff --git a/test/src/mac/macPackagerTest.ts b/test/src/mac/macPackagerTest.ts index 4cd9e5092f2..a57ea8038a9 100644 --- a/test/src/mac/macPackagerTest.ts +++ b/test/src/mac/macPackagerTest.ts @@ -1,7 +1,7 @@ import { assertPack, platform, modifyPackageJson, app, appThrows } from "../helpers/packTester" -import { Platform, createTargets } from "out" -import { DIR_TARGET } from "out/targets/targetFactory" -import { copyFile } from "out/util/fs" +import { Platform, createTargets } from "electron-builder" +import { DIR_TARGET } from "electron-builder/out/targets/targetFactory" +import { copyFile } from "electron-builder/out/util/fs" import * as path from "path" import { assertThat } from "../helpers/fileAssert" diff --git a/test/src/mac/masTest.ts b/test/src/mac/masTest.ts index fbc45f3bb02..3444b2c9f21 100644 --- a/test/src/mac/masTest.ts +++ b/test/src/mac/masTest.ts @@ -2,7 +2,7 @@ import { assertPack, signed, CheckingMacPackager, createMacTargetTest } from ".. import { writeFile } from "fs-extra-p" import * as path from "path" import BluebirdPromise from "bluebird-lst-c" -import { Platform } from "out" +import { Platform } from "electron-builder" if (process.platform !== "darwin") { fit("Skip mas tests because platform is not macOS", () => { diff --git a/test/src/nsisUpdaterTest.ts b/test/src/nsisUpdaterTest.ts index cdcd7afaae0..365c0546fdb 100644 --- a/test/src/nsisUpdaterTest.ts +++ b/test/src/nsisUpdaterTest.ts @@ -1,7 +1,7 @@ import { assertThat } from "./helpers/fileAssert" import { NsisUpdater } from "electron-auto-updater/out/NsisUpdater" import * as path from "path" -import { TmpDir } from "out/util/tmp" +import { TmpDir } from "electron-builder/out/util/tmp" import { outputFile } from "fs-extra-p" import { safeDump } from "js-yaml" import { GenericServerOptions, GithubOptions } from "electron-builder-http/out/publishOptions" diff --git a/test/src/windows/appxTest.ts b/test/src/windows/appxTest.ts index 67f3a025ed8..a1cf47995a1 100644 --- a/test/src/windows/appxTest.ts +++ b/test/src/windows/appxTest.ts @@ -1,4 +1,4 @@ -import { Platform } from "out" +import { Platform } from "electron-builder" import { app } from "../helpers/packTester" test.ifWinCi("AppX", app({targets: Platform.WINDOWS.createTarget(["appx"])})) \ No newline at end of file diff --git a/test/src/windows/nsisBoring.ts b/test/src/windows/nsisBoring.ts index b78f8d56b80..904d9ea9967 100644 --- a/test/src/windows/nsisBoring.ts +++ b/test/src/windows/nsisBoring.ts @@ -1,4 +1,4 @@ -import { Platform, Arch } from "out" +import { Platform, Arch } from "electron-builder" import { assertPack, app, copyTestAsset } from "../helpers/packTester" import * as path from "path" diff --git a/test/src/windows/nsisTest.ts b/test/src/windows/nsisTest.ts index f98ece0d5f3..af8bd5f8916 100644 --- a/test/src/windows/nsisTest.ts +++ b/test/src/windows/nsisTest.ts @@ -1,11 +1,11 @@ -import { Platform, Arch } from "out" +import { Platform, Arch } from "electron-builder" import { assertPack, app, copyTestAsset } from "../helpers/packTester" import { outputFile, readFile } from "fs-extra-p" import * as path from "path" import BluebirdPromise from "bluebird-lst-c" import { assertThat } from "../helpers/fileAssert" import { extractFile } from "asar-electron-builder" -import { walk } from "out/util/fs" +import { walk } from "electron-builder/out/util/fs" import { nsisPerMachineInstall } from "../helpers/expectedContents" import { WineManager, diff } from "../helpers/wine" import { safeLoad } from "js-yaml" diff --git a/test/src/windows/squirrelWindowsTest.ts b/test/src/windows/squirrelWindowsTest.ts index 72fc15a3897..b127f9651f9 100644 --- a/test/src/windows/squirrelWindowsTest.ts +++ b/test/src/windows/squirrelWindowsTest.ts @@ -1,4 +1,4 @@ -import { Platform, Arch } from "out" +import { Platform, Arch } from "electron-builder" import { app, modifyPackageJson, appThrows, assertPack, CheckingWinPackager, copyTestAsset } from "../helpers/packTester" import * as path from "path" import BluebirdPromise from "bluebird-lst-c" diff --git a/test/src/windows/winPackagerTest.ts b/test/src/windows/winPackagerTest.ts index 3320baf0b05..3ff9ed21bf2 100755 --- a/test/src/windows/winPackagerTest.ts +++ b/test/src/windows/winPackagerTest.ts @@ -1,4 +1,4 @@ -import { Platform } from "out" +import { Platform } from "electron-builder" import { assertPack, platform, modifyPackageJson, app, appThrows, CheckingWinPackager } from "../helpers/packTester" import { writeFile, rename, unlink } from "fs-extra-p" import * as path from "path" diff --git a/test/tsconfig.json b/test/tsconfig.json index cea7ea0d03d..3f76f2eb9db 100755 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -3,7 +3,6 @@ "module": "es2015", "target": "es2017", "noImplicitAny": true, - "removeComments": true, "outDir": "out", "newLine": "LF", "noEmitOnError": true, @@ -15,21 +14,16 @@ "noUnusedLocals": true, "skipLibCheck": true }, - "rootDirs": [ - "src", - "../src" - ], "include": [ "../typings/*.d.ts", "typings/*.d.ts", "src/**/*.ts", - "../node_modules/fs-extra-p/index.d.ts", - "../node_modules/bluebird-lst-c/index.d.ts", - "../node_modules/electron-macos-sign/index.d.ts", - "../node_modules/@types/**/*.d.ts", + "../packages/electron-builder/node_modules/fs-extra-p/index.d.ts", + "../packages/electron-builder/node_modules/bluebird-lst-c/index.d.ts", + "../packages/electron-builder/node_modules/electron-macos-sign/index.d.ts", + "../packages/electron-builder/node_modules/@types/*/*.d.ts", "../packages/electron-builder-http/out/electron-builder-http.d.ts", - "../packages/electron-auto-updater/out/electron-auto-updater.d.ts" - ], - "exclude": [ + "../packages/electron-auto-updater/out/electron-auto-updater.d.ts", + "../packages/electron-builder/out/electron-builder.d.ts" ] } diff --git a/test/typings/js-yaml.d.ts b/test/typings/js-yaml.d.ts new file mode 100644 index 00000000000..e039a03d020 --- /dev/null +++ b/test/typings/js-yaml.d.ts @@ -0,0 +1,99 @@ +// Type definitions for js-yaml 3.5.2 +// Project: https://github.com/nodeca/js-yaml +// Definitions by: Bart van der Schoor , Sebastian Clausen +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +declare module "js-yaml" { + declare namespace jsyaml { + export function safeLoad(str: string, opts?: LoadOptions): any; + + export function load(str: string, opts?: LoadOptions): any; + + export class Type implements TypeConstructorOptions { + constructor(tag: string, opts?: TypeConstructorOptions); + + tag: string; + } + export class Schema { + constructor(definition: SchemaDefinition); + + public static create(args: any[]): Schema; + } + + export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any; + + export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any; + + export function safeDump(obj: any, opts?: DumpOptions): string; + + export function dump(obj: any, opts?: DumpOptions): string; + + export interface LoadOptions { + // string to be used as a file path in error/warning messages. + filename?: string; + // makes the loader to throw errors instead of warnings. + strict?: boolean; + // specifies a schema to use. + schema?: any; + } + + export interface DumpOptions { + // indentation width to use (in spaces). + indent?: number; + // do not throw on invalid types (like function in the safe schema) and skip pairs and single values with such types. + skipInvalid?: boolean; + // specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere + flowLevel?: number; + // Each tag may have own set of styles. - "tag" => "style" map. + styles?: Object; + // specifies a schema to use. + schema?: any; + // if true, sort keys when dumping YAML. If a function, use the function to sort the keys. (default: false) + sortKeys?: boolean; + // set max line width. (default: 80) + lineWidth?: number; + // if true, don't convert duplicate objects into references (default: false) + noRefs?: boolean; + // if true don't try to be compatible with older yaml versions. Currently: don't quote "yes", "no" and so on, as required for YAML 1.1 (default: false) + noCompatMode?: boolean; + } + + export interface TypeConstructorOptions { + kind?: string; + resolve?: Function; + construct?: Function; + instanceOf?: Object; + predicate?: string; + represent?: Function; + defaultStyle?: string; + styleAliases?: Object; + } + + export interface SchemaDefinition { + implicit?: any[]; + explicit?: any[]; + include?: any[]; + } + + // only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346 + export var FAILSAFE_SCHEMA: any; + // only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346 + export var JSON_SCHEMA: any; + // same as JSON_SCHEMA: http://www.yaml.org/spec/1.2/spec.html#id2804923 + export var CORE_SCHEMA: any; + // all supported YAML types, without unsafe ones (!!js/undefined, !!js/regexp and !!js/function): http://yaml.org/type/ + export var DEFAULT_SAFE_SCHEMA: any; + // all supported YAML types. + export var DEFAULT_FULL_SCHEMA: any; + export var MINIMAL_SCHEMA: any; + export var SAFE_SCHEMA: any; + + export class YAMLException extends Error { + constructor(reason?: any, mark?: any); + + toString(compact?: boolean): string; + } + } + + export = jsyaml; +// export as namespace jsyaml; +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 8e5bafe92aa..60f8248fad9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,26 +2,6 @@ # yarn lockfile v1 -"7zip-bin-linux@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/7zip-bin-linux/-/7zip-bin-linux-1.0.3.tgz#66724d7bb7526381574393888f62566ed537151c" - -"7zip-bin-mac@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz#3e68778bbf0926adc68159427074505d47555c02" - -"7zip-bin-win@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/7zip-bin-win/-/7zip-bin-win-2.0.2.tgz#4c36399413922f111b8e80df3065a4069cfc0a64" - -"7zip-bin@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-2.0.4.tgz#0cd28ac3301b1302fbd99922bacb8bad98103e12" - optionalDependencies: - "7zip-bin-linux" "^1.0.3" - "7zip-bin-mac" "^1.0.1" - "7zip-bin-win" "^2.0.2" - "@develar/semantic-release@^6.3.26": version "6.3.26" resolved "https://registry.yarnpkg.com/@develar/semantic-release/-/semantic-release-6.3.26.tgz#f012e505e079cfb7d79e213240ce10f3d4b02b26" @@ -48,34 +28,6 @@ dependencies: conventional-changelog "0.0.17" -"@types/electron@^1.4.30": - version "1.4.30" - resolved "https://registry.yarnpkg.com/@types/electron/-/electron-1.4.30.tgz#d79b1bc117b6cfa770220d6aeb5a475659cd7961" - dependencies: - "@types/node" "*" - -"@types/ini@^1.3.29": - version "1.3.29" - resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.29.tgz#1325e981e047d40d13ce0359b821475b97741d2f" - -"@types/jest@^16.0.2": - version "16.0.2" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-16.0.2.tgz#77dd322d5c59119ccc41480c57b98e4f735c1c01" - -"@types/js-yaml@^3.5.29": - version "3.5.29" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.5.29.tgz#29f4dd9314fbccb080d8bd84b9c23811ec5090c2" - -"@types/node@*": - version "6.0.54" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.54.tgz#65859962ba988052cbdd5c48881395acfdd46931" - -"@types/source-map-support@^0.2.28": - version "0.2.28" - resolved "https://registry.yarnpkg.com/@types/source-map-support/-/source-map-support-0.2.28.tgz#ce6497dfa9c9fbd21a753955b4a51d8993d759dd" - dependencies: - "@types/node" "*" - JSONStream@^1.0.4: version "1.3.0" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.0.tgz#680ab9ac6572a8a1a207e0b38721db1c77b215e5" @@ -150,31 +102,6 @@ aproba@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.0.4.tgz#2713680775e7614c8ba186c065d4e2e52d1072c0" -archiver-utils@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174" - dependencies: - glob "^7.0.0" - graceful-fs "^4.1.0" - lazystream "^1.0.0" - lodash "^4.8.0" - normalize-path "^2.0.0" - readable-stream "^2.0.0" - -archiver@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-1.3.0.tgz#4f2194d6d8f99df3f531e6881f14f15d55faaf22" - dependencies: - archiver-utils "^1.3.0" - async "^2.0.0" - buffer-crc32 "^0.2.1" - glob "^7.0.0" - lodash "^4.8.0" - readable-stream "^2.0.0" - tar-stream "^1.5.0" - walkdir "^0.0.11" - zip-stream "^1.1.0" - are-we-there-yet@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3" @@ -198,10 +125,6 @@ arr-flatten@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b" -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" @@ -218,21 +141,11 @@ array-ify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" -arrify@^1.0.0, arrify@^1.0.1: +arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -240,16 +153,6 @@ asap@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f" -asar-electron-builder@^0.13.5: - version "0.13.5" - resolved "https://registry.yarnpkg.com/asar-electron-builder/-/asar-electron-builder-0.13.5.tgz#4ccd4d11fd7c9d3b3cffc782fde3deed9ef91af6" - dependencies: - chromium-pickle-js "^0.2.0" - commander "^2.9.0" - cuint "^0.2.1" - minimatch "^3.0.2" - mkdirp "^0.5.1" - asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" @@ -266,7 +169,7 @@ async@^1.4.0, async@^1.4.2, async@^1.5.0: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.0.0, async@^2.1.4: +async@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" dependencies: @@ -529,10 +432,6 @@ balanced-match@^0.4.1: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" -base64-js@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.1.2.tgz#d6400cac1c4c660976d90d07a04351d89395f5e8" - bcrypt-pbkdf@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz#3ca76b85241c7170bf7d9703e7b9aa74630040d4" @@ -546,19 +445,13 @@ binary@^0.3.0: buffers "~0.1.1" chainsaw "~0.1.0" -bl@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.0.tgz#1397e7ec42c5f5dc387470c500e34a9f6be9ea98" - dependencies: - readable-stream "^2.0.5" - bluebird-lst-c@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/bluebird-lst-c/-/bluebird-lst-c-1.0.5.tgz#50da657dcde337a0e29d9e080ba714c5a52016e2" dependencies: bluebird "^3.4.6" -bluebird@^3.4.6, bluebird@^3.4.7: +bluebird@^3.4.6: version "3.4.7" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" @@ -609,10 +502,6 @@ bser@^1.0.2: dependencies: node-int64 "^0.4.0" -buffer-crc32@^0.2.1: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - buffer-shims@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" @@ -686,10 +575,6 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chromium-pickle-js@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - ci-info@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534" @@ -698,7 +583,7 @@ cli-boxes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" -cli-cursor@^1.0.1, cli-cursor@^1.0.2: +cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" dependencies: @@ -748,10 +633,6 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -color-convert@~0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd" - colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -786,19 +667,6 @@ compare-func@^1.3.1: array-ify "^1.0.0" dot-prop "^3.0.0" -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - -compress-commons@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.1.0.tgz#9f4460bb1288564c7473916e0298aa3c320dcadb" - dependencies: - buffer-crc32 "^0.2.1" - crc32-stream "^1.0.0" - normalize-path "^2.0.0" - readable-stream "^2.0.0" - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -979,13 +847,6 @@ core-util-is@^1.0.1, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -crc32-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-1.0.0.tgz#ea155e5e1d738ed3778438ffe92ffe2a141aeb3f" - dependencies: - buffer-crc32 "^0.2.1" - readable-stream "^2.0.0" - create-error-class@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" @@ -1015,10 +876,6 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0": dependencies: cssom "0.3.x" -cuint@^0.2.1, cuint@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" - currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -1044,16 +901,12 @@ dateformat@^1.0.11, dateformat@^1.0.12: get-stdin "^4.0.1" meow "^3.3.0" -debug@2, debug@2.5.2, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.2, debug@^2.3.3, debug@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.5.2.tgz#50c295a53dbf1657146e0c1b21307275e90d49cb" +debug@2, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.2, debug@^2.3.3: + version "2.6.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" dependencies: ms "0.7.2" -debuglog@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" - decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1123,7 +976,7 @@ detect-newline@^1.0.3: get-stdin "^4.0.1" minimist "^1.1.0" -dezalgo@^1.0.0, dezalgo@^1.0.1: +dezalgo@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" dependencies: @@ -1169,23 +1022,6 @@ electron-download-tf@3.1.0: semver "^5.3.0" sumchecker "^1.2.0" -electron-macos-sign@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/electron-macos-sign/-/electron-macos-sign-1.4.0.tgz#9065ffcfc77db9cc41a521b97081d5193e371c84" - dependencies: - bluebird "^3.4.7" - compare-version "^0.1.2" - debug "^2.5.2" - isbinaryfile "^3.0.1" - minimist "^1.2.0" - plist "^2.0.1" - -end-of-stream@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07" - dependencies: - once "~1.3.0" - entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" @@ -1497,8 +1333,8 @@ github-url-from-username-repo@^1.0.0: resolved "https://registry.yarnpkg.com/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz#7dd79330d2abe69c10c2cef79714c97215791dfa" github@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/github/-/github-7.1.0.tgz#ba12eece6dc0fc65ddbf104b8fe36e8a7b9d5b30" + version "7.2.0" + resolved "https://registry.yarnpkg.com/github/-/github-7.2.0.tgz#6d9133479ce67ed1af4997a6b51faeee81bf6059" dependencies: follow-redirects "0.0.7" https-proxy-agent "^1.0.0" @@ -1518,17 +1354,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@^6.0.0: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1: +glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -1573,7 +1399,7 @@ got@^5.0.0: unzip-response "^1.0.2" url-parse-lax "^1.0.0" -graceful-fs@^4.1.0, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9: +graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -1693,7 +1519,7 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.2, ini@~1.3.0: version "1.3.4" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" @@ -1715,10 +1541,6 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -interactive@^0.1.9: - version "0.1.9" - resolved "https://registry.yarnpkg.com/interactive/-/interactive-0.1.9.tgz#6dd3e2f9a00341863bc7dd84afce9d191b6f9e8e" - invariant@^2.2.0: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" @@ -1743,7 +1565,7 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-ci@^1.0.10, is-ci@^1.0.9: +is-ci@^1.0.9: version "1.0.10" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e" dependencies: @@ -1767,7 +1589,7 @@ is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" -is-finite@^1.0.0, is-finite@^1.0.1: +is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" dependencies: @@ -1858,10 +1680,6 @@ isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" -isbinaryfile@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.1.tgz#6e99573675372e841a0520c036b41513d783e79e" - isexe@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0" @@ -1876,7 +1694,7 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -istanbul-api@^1.0.0-aplha.10: +istanbul-api@^1.1.0-alpha.1: version "1.1.0" resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.0.tgz#fb3f62edd5bfc6ae09da09453ded6e10ae7e483b" dependencies: @@ -1945,29 +1763,29 @@ jest-changed-files@^17.0.2: resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7" jest-cli@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-18.0.0.tgz#11d141f5e9158d4f02c5c303815b5280f6887c55" + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-18.1.0.tgz#5ead36ecad420817c2c9baa2aa7574f63257b3d6" dependencies: ansi-escapes "^1.4.0" callsites "^2.0.0" chalk "^1.1.1" graceful-fs "^4.1.6" is-ci "^1.0.9" - istanbul-api "^1.0.0-aplha.10" + istanbul-api "^1.1.0-alpha.1" istanbul-lib-coverage "^1.0.0" istanbul-lib-instrument "^1.1.1" jest-changed-files "^17.0.2" - jest-config "^18.0.0" - jest-environment-jsdom "^18.0.0" + jest-config "^18.1.0" + jest-environment-jsdom "^18.1.0" jest-file-exists "^17.0.0" - jest-haste-map "^18.0.0" - jest-jasmine2 "^18.0.0" + jest-haste-map "^18.1.0" + jest-jasmine2 "^18.1.0" jest-mock "^18.0.0" - jest-resolve "^18.0.0" - jest-resolve-dependencies "^18.0.0" - jest-runtime "^18.0.0" - jest-snapshot "^18.0.0" - jest-util "^18.0.0" + jest-resolve "^18.1.0" + jest-resolve-dependencies "^18.1.0" + jest-runtime "^18.1.0" + jest-snapshot "^18.1.0" + jest-util "^18.1.0" json-stable-stringify "^1.0.0" node-notifier "^4.6.1" sane "~1.4.1" @@ -1977,140 +1795,141 @@ jest-cli@^18.0.0: worker-farm "^1.3.1" yargs "^6.3.0" -jest-config@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-18.0.0.tgz#21473ab68fef2fa79760d05419859b3c320e55e9" +jest-config@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-18.1.0.tgz#6111740a6d48aab86ff5a9e6ab0b98bd993b6ff4" dependencies: chalk "^1.1.1" - jest-environment-jsdom "^18.0.0" - jest-environment-node "^18.0.0" - jest-jasmine2 "^18.0.0" + jest-environment-jsdom "^18.1.0" + jest-environment-node "^18.1.0" + jest-jasmine2 "^18.1.0" jest-mock "^18.0.0" - jest-resolve "^18.0.0" - jest-util "^18.0.0" + jest-resolve "^18.1.0" + jest-util "^18.1.0" json-stable-stringify "^1.0.0" -jest-diff@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-18.0.0.tgz#f24b6f8bedaae425548511ab45edbfb9fee930b7" +jest-diff@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-18.1.0.tgz#4ff79e74dd988c139195b365dc65d87f606f4803" dependencies: chalk "^1.1.3" diff "^3.0.0" - jest-matcher-utils "^18.0.0" - pretty-format "^18.0.0" + jest-matcher-utils "^18.1.0" + pretty-format "^18.1.0" -jest-environment-jsdom@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-18.0.0.tgz#7341266285abce09f13f60e9b49de899802b76c5" +jest-environment-jsdom@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-18.1.0.tgz#18b42f0c4ea2bae9f36cab3639b1e8f8c384e24e" dependencies: jest-mock "^18.0.0" - jest-util "^18.0.0" - jsdom "^9.8.1" + jest-util "^18.1.0" + jsdom "^9.9.1" jest-environment-node-debug@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/jest-environment-node-debug/-/jest-environment-node-debug-0.0.2.tgz#f9d8190cb241c2ed50e670623927adda90bca33d" -jest-environment-node@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-18.0.0.tgz#6f4947b324d6b4e17df20b1998f532c161a2821d" +jest-environment-node@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-18.1.0.tgz#4d6797572c8dda99acf5fae696eb62945547c779" dependencies: jest-mock "^18.0.0" - jest-util "^18.0.0" + jest-util "^18.1.0" jest-file-exists@^17.0.0: version "17.0.0" resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169" -jest-haste-map@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-18.0.0.tgz#707d3b5ae3bcbda971c39e8b911d20ad8502c748" +jest-haste-map@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-18.1.0.tgz#06839c74b770a40c1a106968851df8d281c08375" dependencies: fb-watchman "^1.9.0" graceful-fs "^4.1.6" - multimatch "^2.1.0" + micromatch "^2.3.11" sane "~1.4.1" worker-farm "^1.3.1" -jest-jasmine2@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-18.0.0.tgz#05a35ee8cf61dd6d6d04826aa0e5915a2167a877" +jest-jasmine2@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-18.1.0.tgz#094e104c2c189708766c77263bb2aecb5860a80b" dependencies: graceful-fs "^4.1.6" - jest-matcher-utils "^18.0.0" - jest-matchers "^18.0.0" - jest-snapshot "^18.0.0" - jest-util "^18.0.0" + jest-matcher-utils "^18.1.0" + jest-matchers "^18.1.0" + jest-snapshot "^18.1.0" + jest-util "^18.1.0" -jest-matcher-utils@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-18.0.0.tgz#74ad046aeb9414094fc6cd0d313847e4311f8538" +jest-matcher-utils@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-18.1.0.tgz#1ac4651955ee2a60cef1e7fcc98cdfd773c0f932" dependencies: chalk "^1.1.3" - pretty-format "^18.0.0" + pretty-format "^18.1.0" -jest-matchers@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-18.0.0.tgz#d081e2dfd556a0c9f11c7fdc26dc1702fad50189" +jest-matchers@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-18.1.0.tgz#0341484bf87a1fd0bac0a4d2c899e2b77a3f1ead" dependencies: - jest-diff "^18.0.0" - jest-matcher-utils "^18.0.0" - jest-util "^18.0.0" + jest-diff "^18.1.0" + jest-matcher-utils "^18.1.0" + jest-util "^18.1.0" + pretty-format "^18.1.0" jest-mock@^18.0.0: version "18.0.0" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-18.0.0.tgz#5c248846ea33fa558b526f5312ab4a6765e489b3" -jest-resolve-dependencies@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-18.0.0.tgz#a2980a634ae2554d8ed5922686883a2988979b70" +jest-resolve-dependencies@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-18.1.0.tgz#8134fb5caf59c9ed842fe0152ab01c52711f1bbb" dependencies: jest-file-exists "^17.0.0" - jest-resolve "^18.0.0" + jest-resolve "^18.1.0" -jest-resolve@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-18.0.0.tgz#a47b0b939d8c53fc79e907db0a5110384432f3c8" +jest-resolve@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-18.1.0.tgz#6800accb536658c906cd5e29de412b1ab9ac249b" dependencies: browser-resolve "^1.11.2" jest-file-exists "^17.0.0" - jest-haste-map "^18.0.0" - resolve "^1.1.6" + jest-haste-map "^18.1.0" + resolve "^1.2.0" -jest-runtime@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-18.0.0.tgz#fff982dffe061b89bbea5c3b6f4d3fbf7b3cf56e" +jest-runtime@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-18.1.0.tgz#3abfd687175b21fc3b85a2b8064399e997859922" dependencies: babel-core "^6.0.0" babel-jest "^18.0.0" babel-plugin-istanbul "^3.0.0" chalk "^1.1.3" graceful-fs "^4.1.6" - jest-config "^18.0.0" + jest-config "^18.1.0" jest-file-exists "^17.0.0" - jest-haste-map "^18.0.0" + jest-haste-map "^18.1.0" jest-mock "^18.0.0" - jest-resolve "^18.0.0" - jest-snapshot "^18.0.0" - jest-util "^18.0.0" + jest-resolve "^18.1.0" + jest-snapshot "^18.1.0" + jest-util "^18.1.0" json-stable-stringify "^1.0.0" - multimatch "^2.1.0" + micromatch "^2.3.11" yargs "^6.3.0" -jest-snapshot@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-18.0.0.tgz#3602c6b13cbf5788fd101bf0d73fc76104b88486" +jest-snapshot@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-18.1.0.tgz#55b96d2ee639c9bce76f87f2a3fd40b71c7a5916" dependencies: - jest-diff "^18.0.0" + jest-diff "^18.1.0" jest-file-exists "^17.0.0" - jest-matcher-utils "^18.0.0" - jest-util "^18.0.0" + jest-matcher-utils "^18.1.0" + jest-util "^18.1.0" natural-compare "^1.4.0" - pretty-format "^18.0.0" + pretty-format "^18.1.0" -jest-util@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-18.0.0.tgz#4ef7c397ad7e1ac8f9c63a482c12a31df5e376a7" +jest-util@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-18.1.0.tgz#3a99c32114ab17f84be094382527006e6d4bfc6a" dependencies: chalk "^1.1.1" diff "^3.0.0" @@ -2119,10 +1938,6 @@ jest-util@^18.0.0: jest-mock "^18.0.0" mkdirp "^0.5.1" -jju@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa" - jodid25519@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967" @@ -2144,7 +1959,7 @@ jsbn@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" -jsdom@^9.8.1: +jsdom@^9.9.1: version "9.9.1" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.9.1.tgz#84f3972ad394ab963233af8725211bce4d01bfd5" dependencies: @@ -2173,12 +1988,6 @@ jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" -json-parse-helpfulerror@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" - dependencies: - jju "^1.1.0" - json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -2249,19 +2058,13 @@ lazy-req@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac" -lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - dependencies: - readable-stream "^2.0.5" - lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" dependencies: invert-kv "^1.0.0" -lerna@^2.0.0-beta: +lerna@2.0.0-beta.31: version "2.0.0-beta.31" resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.0.0-beta.31.tgz#68da53b860f8193d4653a6d0601ef300b8d7176d" dependencies: @@ -2413,7 +2216,7 @@ lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" -lodash.template@^4.0.2, lodash.template@^4.4.0: +lodash.template@^4.0.2: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0" dependencies: @@ -2434,7 +2237,7 @@ lodash@^3.6.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.0: +lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1: version "4.17.3" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.3.tgz#557ed7d2a9438cac5fd5a43043ca60cb455e01f7" @@ -2466,10 +2269,6 @@ lru-cache@^4.0.1: pseudomap "^1.0.1" yallist "^2.0.0" -macaddress@^0.2.7: - version "0.2.8" - resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" - makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -2559,7 +2358,7 @@ mime-types@^2.1.12, mime-types@~2.1.7: dependencies: mime-db "~1.25.0" -mime@^1.2.11, mime@^1.3.4: +mime@^1.2.11: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" @@ -2595,15 +2394,6 @@ ms@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" -multimatch@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" - dependencies: - array-differ "^1.0.0" - array-union "^1.0.1" - arrify "^1.0.0" - minimatch "^3.0.0" - mute-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" @@ -2616,7 +2406,7 @@ netrc@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444" -node-emoji@^1.4.1, node-emoji@^1.4.3: +node-emoji@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.4.3.tgz#5272f70b823c4df6d7c39f84fd8203f35b3e5d36" dependencies: @@ -2662,7 +2452,7 @@ normalize-package-data@^1.0.3: github-url-from-username-repo "^1.0.0" semver "2 || 3 || 4" -normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, "normalize-package-data@~1.0.1 || ^2.0.0": +normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, "normalize-package-data@~1.0.1 || ^2.0.0": version "2.3.5" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df" dependencies: @@ -2671,7 +2461,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1: +normalize-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" @@ -2759,12 +2549,6 @@ once@^1.3.0, once@^1.3.3, once@^1.4.0: dependencies: wrappy "1" -once@~1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - dependencies: - wrappy "1" - onetime@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" @@ -2821,12 +2605,6 @@ pad@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/pad/-/pad-1.0.2.tgz#f6e36ff3ceb468e4ae2ed33ad5ecf25ace920960" -parse-color@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619" - dependencies: - color-convert "~0.5.0" - parse-github-repo-url@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.3.0.tgz#d4de02d68e2e60f0d6a182e7a8cb21b6f38c730b" @@ -2846,10 +2624,6 @@ parse-json@^2.1.0, parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-ms@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d" - parse5@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94" @@ -2911,18 +2685,6 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -plist@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/plist/-/plist-2.0.1.tgz#0a32ca9481b1c364e92e18dc55c876de9d01da8b" - dependencies: - base64-js "1.1.2" - xmlbuilder "8.2.2" - xmldom "0.1.x" - -plur@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -2942,20 +2704,12 @@ pretty-bytes@^1.0.2: get-stdin "^4.0.1" meow "^3.1.0" -pretty-format@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-18.0.0.tgz#5f45c59fe2ed6749d46765429679670b08b21137" +pretty-format@^18.1.0: + version "18.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-18.1.0.tgz#fb65a86f7a7f9194963eee91865c1bcf1039e284" dependencies: ansi-styles "^2.2.1" -pretty-ms@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-2.1.0.tgz#4257c256df3fb0b451d6affaab021884126981dc" - dependencies: - is-finite "^1.0.1" - parse-ms "^1.0.0" - plur "^1.0.0" - private@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/private/-/private-0.1.6.tgz#55c6a976d0f9bafb9924851350fe47b9b5fbb7c1" @@ -2964,7 +2718,7 @@ process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -progress-stream@^1.1.0, progress-stream@^1.2.0: +progress-stream@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77" dependencies: @@ -3024,29 +2778,6 @@ read-cmd-shim@^1.0.1: dependencies: graceful-fs "^4.1.2" -read-installed@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067" - dependencies: - debuglog "^1.0.1" - read-package-json "^2.0.0" - readdir-scoped-modules "^1.0.0" - semver "2 || 3 || 4 || 5" - slide "~1.1.3" - util-extend "^1.0.1" - optionalDependencies: - graceful-fs "^4.1.2" - -read-package-json@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.4.tgz#61ed1b2256ea438d8008895090be84b8e799c853" - dependencies: - glob "^6.0.0" - json-parse-helpfulerror "^1.0.2" - normalize-package-data "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.2" - read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -3083,15 +2814,6 @@ readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2. string_decoder "~0.10.x" util-deprecate "~1.0.1" -readdir-scoped-modules@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" - dependencies: - debuglog "^1.0.1" - dezalgo "^1.0.0" - graceful-fs "^4.1.2" - once "^1.3.0" - readline2@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35" @@ -3195,7 +2917,7 @@ resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" -resolve@^1.1.6, resolve@^1.1.7: +resolve@^1.1.7, resolve@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" @@ -3253,12 +2975,6 @@ sane@~1.4.1: walker "~1.0.5" watch "~0.10.0" -sanitize-filename@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a" - dependencies: - truncate-utf8-bytes "^1.0.0" - sax@^1.1.4: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" @@ -3307,7 +3023,7 @@ slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" -slide@^1.1.3, slide@^1.1.5, slide@~1.1.3: +slide@^1.1.3, slide@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" @@ -3321,7 +3037,7 @@ sorted-object@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz#7d631f4bd3a798a24af1dffcfbfe83337a5df5fc" -source-map-support@^0.4.2, source-map-support@^0.4.6, source-map-support@^0.4.8: +source-map-support@^0.4.2, source-map-support@^0.4.6: version "0.4.8" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.8.tgz#4871918d8a3af07289182e974e32844327b2e98b" dependencies: @@ -3398,10 +3114,6 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" -stat-mode@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502" - stream-combiner@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" @@ -3483,15 +3195,6 @@ sync-exec@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105" -tar-stream@^1.5.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.2.tgz#fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf" - dependencies: - bl "^1.0.0" - end-of-stream "^1.0.0" - readable-stream "^2.0.0" - xtend "^4.0.0" - test-exclude@^3.2.2: version "3.3.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-3.3.0.tgz#7a17ca1239988c98367b0621456dbb7d4bc38977" @@ -3533,8 +3236,8 @@ through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" timed-out@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.1.tgz#2eaaa1021888e4ce3b6ce3511fa7a8556114752b" + version "3.1.3" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" tmpl@1.0.x: version "1.0.4" @@ -3572,12 +3275,6 @@ trim-off-newlines@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - dependencies: - utf8-byte-length "^1.0.1" - ts-babel@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-1.2.2.tgz#d2e315c9202924b4979adcf56c047aa7ba1e002d" @@ -3603,7 +3300,7 @@ tslint@^4.2.0: underscore.string "^3.3.4" update-notifier "^1.0.2" -tunnel-agent@^0.4.3, tunnel-agent@~0.4.1: +tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -3653,7 +3350,7 @@ unzip-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" -update-notifier@^1.0.2, update-notifier@^1.0.3: +update-notifier@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a" dependencies: @@ -3672,24 +3369,10 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - -uuid-1345@^0.99.6: - version "0.99.6" - resolved "https://registry.yarnpkg.com/uuid-1345/-/uuid-1345-0.99.6.tgz#b1270ae015a7721c7adec6c46ec169c6098aed40" - dependencies: - macaddress "^0.2.7" - uuid@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" @@ -3717,7 +3400,7 @@ walk@^2.3.9: dependencies: foreachasync "^3.0.0" -walkdir@0.0.11, walkdir@^0.0.11: +walkdir@0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532" @@ -3782,10 +3465,6 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" -window-size@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -3834,14 +3513,6 @@ xdg-basedir@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" -xmlbuilder@8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" - -xmldom@0.1.x: - version "0.1.27" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" - "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -3866,9 +3537,9 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" -yargs@^6.0.0, yargs@^6.3.0, yargs@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.5.0.tgz#a902e23a1f0fe912b2a03f6131b7ed740c9718ff" +yargs@^6.0.0, yargs@^6.3.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: camelcase "^3.0.0" cliui "^3.2.0" @@ -3881,7 +3552,6 @@ yargs@^6.0.0, yargs@^6.3.0, yargs@^6.5.0: set-blocking "^2.0.0" string-width "^1.0.2" which-module "^1.0.0" - window-size "^0.2.0" y18n "^3.2.1" yargs-parser "^4.2.0" @@ -3893,12 +3563,3 @@ yargs@~3.10.0: cliui "^2.1.0" decamelize "^1.0.0" window-size "0.1.0" - -zip-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.1.0.tgz#2ad479fffc168e05a888e8c348ff6813b3f13733" - dependencies: - archiver-utils "^1.3.0" - compress-commons "^1.1.0" - lodash "^4.8.0" - readable-stream "^2.0.0"