From 14d10e9ff6458be02d7b5272544d668d66125030 Mon Sep 17 00:00:00 2001 From: James Ide Date: Tue, 29 Mar 2016 14:26:46 -0700 Subject: [PATCH] Add analytics support, fix packaging by reverting electron-packager --- gulp/package-tasks.js | 3 +- npm-shrinkwrap.json | 126 +++++++++++++++++++++++++++--------------- package.json | 9 +-- src/main.js | 2 - web/index.html | 17 ++++++ 5 files changed, 105 insertions(+), 52 deletions(-) diff --git a/gulp/package-tasks.js b/gulp/package-tasks.js index 8b61dc40..217e5072 100644 --- a/gulp/package-tasks.js +++ b/gulp/package-tasks.js @@ -72,7 +72,8 @@ async function packageAppAsync(signed) { ignore: [/^\/src(\/|$)/, /^\/\.babelrc$/], overwrite: true, prune: true, - 'osx-sign': signed ? { identity: CODE_SIGNING_IDENTITY } : null, + // 'osx-sign': signed ? { identity: CODE_SIGNING_IDENTITY } : null, + sign: signed ? CODE_SIGNING_IDENTITY : null, }); logger.info(`Packaged ${signed ? 'signed' : 'unsigned'} app at ${appPath}`); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 4be0c764..faf60c8c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -19,6 +19,10 @@ } } }, + "@exponent/electron-cookies": { + "version": "1.0.0", + "from": "@exponent/electron-cookies@>=1.0.0 <2.0.0" + }, "@exponent/json-file": { "version": "4.0.0", "from": "@exponent/json-file@>=4.0.0 <5.0.0", @@ -157,9 +161,26 @@ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz" }, "asar": { - "version": "0.10.0", - "from": "asar@>=0.10.0 <0.11.0", - "resolved": "https://registry.npmjs.org/asar/-/asar-0.10.0.tgz" + "version": "0.8.3", + "from": "asar@>=0.8.2 <0.9.0", + "resolved": "https://registry.npmjs.org/asar/-/asar-0.8.3.tgz", + "dependencies": { + "commander": { + "version": "2.3.0", + "from": "commander@2.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz" + }, + "glob": { + "version": "5.0.15", + "from": "glob@>=5.0.5 <6.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz" + }, + "minimatch": { + "version": "2.0.4", + "from": "minimatch@2.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz" + } + } }, "asn1": { "version": "0.2.3", @@ -900,7 +921,7 @@ }, "chromium-pickle-js": { "version": "0.1.0", - "from": "chromium-pickle-js@>=0.1.0 <0.2.0", + "from": "chromium-pickle-js@0.1.0", "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.1.0.tgz" }, "classnames": { @@ -1019,9 +1040,9 @@ "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz" }, "cuint": { - "version": "0.2.1", - "from": "cuint@>=0.2.1 <0.3.0", - "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.1.tgz" + "version": "0.1.5", + "from": "cuint@0.1.5", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.1.5.tgz" }, "d": { "version": "0.1.1", @@ -1213,9 +1234,9 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz" }, "doctrine": { - "version": "1.2.0", + "version": "1.2.1", "from": "doctrine@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.1.tgz", "dependencies": { "esutils": { "version": "1.1.6", @@ -1272,9 +1293,9 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" }, "electron-download": { - "version": "2.1.0", - "from": "electron-download@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-2.1.0.tgz", + "version": "1.4.1", + "from": "electron-download@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-1.4.1.tgz", "dependencies": { "deep-extend": { "version": "0.4.1", @@ -1293,20 +1314,37 @@ } } }, - "electron-osx-sign": { - "version": "0.3.0", - "from": "electron-osx-sign@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.3.0.tgz" - }, "electron-packager": { - "version": "6.0.0", - "from": "electron-packager@>=6.0.0 <7.0.0", - "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-6.0.0.tgz" + "version": "5.2.1", + "from": "electron-packager@>=5.2.1 <6.0.0", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-5.2.1.tgz" }, "electron-prebuilt": { "version": "0.37.2", "from": "electron-prebuilt@>=0.37.2 <0.38.0", - "resolved": "https://registry.npmjs.org/electron-prebuilt/-/electron-prebuilt-0.37.2.tgz" + "resolved": "https://registry.npmjs.org/electron-prebuilt/-/electron-prebuilt-0.37.2.tgz", + "dependencies": { + "deep-extend": { + "version": "0.4.1", + "from": "deep-extend@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" + }, + "electron-download": { + "version": "2.1.0", + "from": "electron-download@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-2.1.0.tgz" + }, + "rc": { + "version": "1.1.6", + "from": "rc@>=1.1.2 <2.0.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz" + }, + "strip-json-comments": { + "version": "1.0.4", + "from": "strip-json-comments@>=1.0.4 <1.1.0", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" + } + } }, "end-of-stream": { "version": "1.1.0", @@ -1396,8 +1434,8 @@ } }, "eslint-config-exponent": { - "version": "1.0.7", - "from": "eslint-config-exponent@>=1.0.7 <2.0.0" + "version": "1.0.8", + "from": "eslint-config-exponent@>=1.0.8 <2.0.0" }, "eslint-plugin-react": { "version": "4.2.3", @@ -2610,9 +2648,9 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz" }, "ignore": { - "version": "3.0.12", + "version": "3.0.13", "from": "ignore@>=3.0.10 <4.0.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.0.12.tgz" + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.0.13.tgz" }, "imurmurhash": { "version": "0.1.4", @@ -3462,7 +3500,7 @@ }, "mksnapshot": { "version": "0.1.0", - "from": "mksnapshot@>=0.1.0 <0.2.0", + "from": "mksnapshot@0.1.0", "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.1.0.tgz", "dependencies": { "asn1": { @@ -3664,9 +3702,9 @@ "resolved": "https://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz" }, "nan": { - "version": "2.2.0", + "version": "2.2.1", "from": "nan@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz" + "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz" }, "ncp": { "version": "2.0.0", @@ -4010,9 +4048,9 @@ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.3.0.tgz" }, "react": { - "version": "0.14.7", - "from": "react@>=0.14.7 <0.15.0", - "resolved": "https://registry.npmjs.org/react/-/react-0.14.7.tgz" + "version": "0.14.8", + "from": "react@>=0.14.8 <0.15.0", + "resolved": "https://registry.npmjs.org/react/-/react-0.14.8.tgz" }, "react-bootstrap": { "version": "0.28.4", @@ -4020,9 +4058,9 @@ "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.28.4.tgz" }, "react-dom": { - "version": "0.14.7", - "from": "react-dom@>=0.14.7 <0.15.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.14.7.tgz" + "version": "0.14.8", + "from": "react-dom@>=0.14.8 <0.15.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.14.8.tgz" }, "react-loading-indicator": { "version": "0.2.0", @@ -4227,20 +4265,14 @@ } }, "semver": { - "version": "5.1.0", - "from": "semver@>=5.1.0 <6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" + "version": "4.3.6", + "from": "semver@>=4.0.3 <5.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" }, "semver-greatest-satisfied-range": { "version": "1.0.0", "from": "semver-greatest-satisfied-range@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.0.0.tgz", - "dependencies": { - "semver": { - "version": "4.3.6", - "from": "semver@>=4.2.0 <5.0.0" - } - } + "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.0.0.tgz" }, "semver-regex": { "version": "1.0.0", @@ -4566,9 +4598,13 @@ }, "tough-cookie": { "version": "2.2.2", - "from": "tough-cookie@>=2.2.0 <2.3.0", + "from": "tough-cookie@>=2.2.2 <3.0.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" }, + "tough-cookie-web-storage-store": { + "version": "1.0.0", + "from": "tough-cookie-web-storage-store@>=1.0.0 <2.0.0" + }, "traverse": { "version": "0.3.9", "from": "traverse@>=0.3.0 <0.4.0", diff --git a/package.json b/package.json index b20faa22..deade481 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ }, "homepage": "https://github.com/exponentjs/xde#readme", "dependencies": { + "@exponent/electron-cookies": "^1.0.0", "@exponent/json-file": "^4.0.0", "autobind-decorator": "^1.3.3", "babel-polyfill": "^6.7.4", @@ -29,9 +30,9 @@ "git-info-async": "^1.1.0", "lodash": "^4.6.1", "radium": "^0.17.0", - "react": "^0.14.7", + "react": "^0.14.8", "react-bootstrap": "^0.28.4", - "react-dom": "^0.14.7", + "react-dom": "^0.14.8", "react-loading-indicator": "^0.2.0", "xdl": "0.0.10" }, @@ -43,10 +44,10 @@ "babel-preset-es2015": "^6.6.0", "babel-preset-react": "^6.5.0", "babel-preset-stage-1": "^6.5.0", - "electron-packager": "^6.0.0", + "electron-packager": "^5.2.1", "electron-prebuilt": "^0.37.2", "eslint": "^2.5.3", - "eslint-config-exponent": "^1.0.7", + "eslint-config-exponent": "^1.0.8", "eslint-plugin-react": "^4.2.3", "gulp": "gulpjs/gulp#4.0", "gulp-babel": "^6.1.2", diff --git a/src/main.js b/src/main.js index e111f3bf..4a813dd8 100644 --- a/src/main.js +++ b/src/main.js @@ -1,9 +1,7 @@ import 'babel-polyfill'; import electron from 'electron'; -import os from 'os'; import path from 'path'; -import process from 'process'; import Menu from './remote/Menu'; diff --git a/web/index.html b/web/index.html index 5f8bf33e..cc6d0136 100644 --- a/web/index.html +++ b/web/index.html @@ -4,6 +4,23 @@ Exponent XDE +