diff --git a/app/build/tasks/package-task.js b/app/build/tasks/package-task.js index 48d4425b0..c5ebdadf0 100644 --- a/app/build/tasks/package-task.js +++ b/app/build/tasks/package-task.js @@ -132,7 +132,7 @@ module.exports = grunt => { appCategoryType: 'public.app-category.business', tmpdir: tmpdir, arch: { - win32: 'ia32', + win32: 'x64', }[platform], icon: { darwin: path.resolve( diff --git a/app/package-lock.json b/app/package-lock.json index 0dbdf9572..16180e683 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -12,7 +12,7 @@ "@bengotow/slate-edit-list": "github:bengotow/slate-edit-list#b868e108", "@electron/remote": "^2.0.1", "app-module-path": "^2.2.0", - "better-sqlite3": "^7.5.0", + "better-sqlite3": "^7.5.1", "cheerio": "^1.0.0-rc.6", "chromium-net-errors": "1.0.3", "chrono-node": "^1.1.2", @@ -537,9 +537,9 @@ } }, "node_modules/better-sqlite3": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.5.0.tgz", - "integrity": "sha512-6FdG9DoytYGDhLW7VWW1vxjEz7xHkqK6LnaUQYA8d6GHNgZhu9PFX2xwKEEnSBRoT1J4PjTUPeg217ShxNmuPg==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.5.1.tgz", + "integrity": "sha512-+i6tH1y9KEIol1iYpZJrqDwBDQZGHioDENU49Rnidorp3bSXvw/QTYDjQGq9+TFF7RX4q0YV1sEOIRq4vDZdRg==", "hasInstallScript": true, "dependencies": { "bindings": "^1.5.0", @@ -6071,9 +6071,9 @@ } }, "better-sqlite3": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.5.0.tgz", - "integrity": "sha512-6FdG9DoytYGDhLW7VWW1vxjEz7xHkqK6LnaUQYA8d6GHNgZhu9PFX2xwKEEnSBRoT1J4PjTUPeg217ShxNmuPg==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.5.1.tgz", + "integrity": "sha512-+i6tH1y9KEIol1iYpZJrqDwBDQZGHioDENU49Rnidorp3bSXvw/QTYDjQGq9+TFF7RX4q0YV1sEOIRq4vDZdRg==", "requires": { "bindings": "^1.5.0", "prebuild-install": "^7.0.0" diff --git a/app/package.json b/app/package.json index 683a7b8fb..5d05e7019 100644 --- a/app/package.json +++ b/app/package.json @@ -14,7 +14,7 @@ "app-module-path": "^2.2.0", "@bengotow/slate-edit-list": "github:bengotow/slate-edit-list#b868e108", "@electron/remote": "^2.0.1", - "better-sqlite3": "^7.5.0", + "better-sqlite3": "^7.5.1", "cheerio": "^1.0.0-rc.6", "chromium-net-errors": "1.0.3", "chrono-node": "^1.1.2", diff --git a/package.json b/package.json index ff73e98e9..339d3da34 100644 --- a/package.json +++ b/package.json @@ -91,11 +91,11 @@ }, "scripts": { "postinstall": "node scripts/postinstall.js", - "start": "node_modules/.bin/electron ./app --enable-logging --dev", + "start": "electron ./app --enable-logging --dev", "lint": "grunt lint --gruntfile=app/build/Gruntfile.js --base=./", - "test": "node_modules/.bin/electron ./app --enable-logging --test", - "test-window": "node_modules/.bin/electron ./app --enable-logging --test=window", - "tsc-watch": "node_modules/.bin/tsc -w -p ./app --noEmit", + "test": "electron ./app --enable-logging --test", + "test-window": "electron ./app --enable-logging --test=window", + "tsc-watch": "tsc -w -p ./app --noEmit", "build": "grunt build-client --gruntfile=app/build/Gruntfile.js --base=./", "build-docs": "grunt docs --gruntfile=app/build/Gruntfile.js --base=./ && mkdir -p app/dist-docs && cp README.md ./app/build/docs_src/README.md && gitbook --gitbook=latest build . ./app/dist-docs --log=debug --debug && rm ./app/build/docs_src/README.md && rm -rf ./app/build/docs_src/classes", "build-licenses-file": "cat ./app/static/all_licenses_preamble.html | ./node_modules/.bin/marked > ./app/static/all_licenses.html && licext --source ./app --mode output | ./node_modules/.bin/marked >> ./app/static/all_licenses.html", diff --git a/scripts/postinstall.js b/scripts/postinstall.js index 57e373fb1..17bcef13b 100644 --- a/scripts/postinstall.js +++ b/scripts/postinstall.js @@ -16,8 +16,8 @@ const npmEnvs = { system: process.env, electron: Object.assign({}, process.env, { npm_config_target: npmElectronTarget, - npm_config_arch: process.platform === 'win32' ? 'ia32' : process.arch, - npm_config_target_arch: process.platform === 'win32' ? 'ia32' : process.arch, + npm_config_arch: process.arch, + npm_config_target_arch: process.arch, npm_config_disturl: 'https://atom.io/download/electron', npm_config_runtime: 'electron', npm_config_build_from_source: true,