From d5fea78d2e09a061361595508446cb6ef9056baa Mon Sep 17 00:00:00 2001 From: bob620 Date: Fri, 24 Jul 2020 23:06:48 -0500 Subject: [PATCH 1/6] chore(version) bump beta version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7b6039e..67df8ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "probelab-reimager-app", "productName": "Probelab ReImager", - "version": "1.1.0-stable", + "version": "1.3.0-beta", "description": "Visual UI for Probelab ReImager using Electron", "main": "./src/backend/main.js", "scripts": { @@ -104,6 +104,6 @@ "dependencies": { "canvas": "^2.5.0", "sharp": "^0.25.4", - "thermo-reimager": "github:bob620/thermo-reimager" + "thermo-reimager": "github:bob620/thermo-reimager#beta" } } From 985aa6c34a4b5d80dffee2a95ea758704638d7d9 Mon Sep 17 00:00:00 2001 From: bob620 Date: Thu, 30 Jul 2020 21:47:42 -0500 Subject: [PATCH 2/6] chore(tests) update relative test dir --- tests/reimager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/reimager.js b/tests/reimager.js index a4b818c..008ed26 100644 --- a/tests/reimager.js +++ b/tests/reimager.js @@ -63,7 +63,7 @@ outsideComm.send({ type: 'getDir', uuid: 'get', data: { - uri: '../../thermo-reimager/tests/data/' + uri: '../../thermo-reimager/test/data/' } }); @@ -109,7 +109,7 @@ setTimeout(() => { type: 'writeImage', uuid: 'write', data: { - uri: '../../thermo-reimager/tests/data/1024(1).PS.EDS/1024(1).p_s', + uri: '../../thermo-reimager/test/data/1024.PS.EDS/1024.p_s', operations: [{ command: 'addLayer', args: [{name: 'base'}] From b43f3b50dee4492047567d0e56993c4cfd10ab13 Mon Sep 17 00:00:00 2001 From: bob620 Date: Thu, 30 Jul 2020 21:48:04 -0500 Subject: [PATCH 3/6] chore(version) bump version --- package-lock.json | 181 ++++++++++++++++------------------------------ package.json | 6 +- 2 files changed, 64 insertions(+), 123 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19fb81c..5ca157e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "probelab-reimager-app", - "version": "1.2.3-beta", + "version": "1.4.0-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -20,9 +20,9 @@ }, "dependencies": { "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", "dev": true } } @@ -157,12 +157,12 @@ } }, "@tanem/svg-injector": { - "version": "8.0.59", - "resolved": "https://registry.npmjs.org/@tanem/svg-injector/-/svg-injector-8.0.59.tgz", - "integrity": "sha512-eQ7UsrWb3nJjfyXdPbPq0/8PoxxkbA6YZssNnkJI5J8/zVqiPwGXNfOGOpzLBFDtg4VlziY21jFyjJ/pxdHv9A==", + "version": "8.0.60", + "resolved": "https://registry.npmjs.org/@tanem/svg-injector/-/svg-injector-8.0.60.tgz", + "integrity": "sha512-OFUqD3/B7up1NPCoXxoMpNF70DD5u8WVBSqdzUjl9npOE3Lf6h7Ym/WHqwynD51vIO4L99tDsIrnRvyzHpwxTQ==", "dev": true, "requires": { - "@babel/runtime": "^7.10.4" + "@babel/runtime": "^7.10.5" } }, "@types/color-name": { @@ -481,6 +481,12 @@ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, + "arch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz", + "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==", + "optional": true + }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", @@ -2745,6 +2751,15 @@ "assert-plus": "^1.0.0" } }, + "database-js-adodb": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/database-js-adodb/-/database-js-adodb-1.1.3.tgz", + "integrity": "sha512-ktD/06LAQr44FJCL/jgWZtor+Yjol+sukAXBoFHRFypisHHCLBSc8Xtm0e4XzucALpcpJi+9pfTfx3ku7Gsrhg==", + "optional": true, + "requires": { + "node-adodb": "^5.0.2" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -3070,9 +3085,9 @@ } }, "electron": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.1.0.tgz", - "integrity": "sha512-VRAF8KX1m0py9I9sf0kw1kWfeC87mlscfFcbcRdLBsNJ44/GrJhi3+E8rKbpHUeZNQxsPaVA5Zu5Lxb6dV/scQ==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.1.2.tgz", + "integrity": "sha512-xEYadr3XqIqJ4ktBPo0lhzPdovv4jLCpiUUGc2M1frUhFhwqXokwhPaTUcE+zfu5+uf/ONDnQApwjzznBsRrgQ==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -5985,6 +6000,33 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.1.tgz", "integrity": "sha512-YUpjl57P55u2yUaKX5Bgy4t5s6SCNYMg+62XNg+k41aYbBL1NgWrZfcgljR5MxDxHDjzl0qHDNtH6SkW4DXNCA==" }, + "node-adodb": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/node-adodb/-/node-adodb-5.0.3.tgz", + "integrity": "sha512-xQnoe7mx3b7B0QeW6visiQ2VxlX6rYaol20Ka5jZVKcetxOsXM4lsxfEZDmlOOoVJq/6BeoqPJHm3aZ4vjY+Bg==", + "optional": true, + "requires": { + "arch": "^2.1.1", + "debug": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "optional": true + } + } + }, "node-pre-gyp": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", @@ -6795,13 +6837,13 @@ "dev": true }, "react-svg": { - "version": "11.0.31", - "resolved": "https://registry.npmjs.org/react-svg/-/react-svg-11.0.31.tgz", - "integrity": "sha512-4yiZiIOOaCjQi/PO6w8Khhfw1UN0NTaZQKani+aTmvtb76kXBqBIjoxwbnYY0zaviIqS5drlqgdLKJlqdTnf9w==", + "version": "11.0.32", + "resolved": "https://registry.npmjs.org/react-svg/-/react-svg-11.0.32.tgz", + "integrity": "sha512-LKRWFaeleibu8IpEO6kkWVmIln6zuDRDyUdx5kFJuhnxGe8BNbEW1D6DjrVEl+k8oyve8T7xXVeRHfPnV4qrng==", "dev": true, "requires": { - "@babel/runtime": "^7.10.4", - "@tanem/svg-injector": "^8.0.58", + "@babel/runtime": "^7.10.5", + "@tanem/svg-injector": "^8.0.59", "prop-types": "^15.7.2" } }, @@ -7987,112 +8029,11 @@ } }, "thermo-reimager": { - "version": "github:bob620/thermo-reimager#91685dc3b701d046a7947a25f255abd07466e87a", - "from": "github:bob620/thermo-reimager", + "version": "github:bob620/thermo-reimager#6765ea0b225db62eeb34e2e395f87d889cb25a18", + "from": "github:bob620/thermo-reimager#beta", "requires": { - "canvas": "^2.6.1", + "database-js-adodb": "^1.1.3", "sharp": "^0.25.4" - }, - "dependencies": { - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" - }, - "decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "requires": { - "mimic-response": "^3.1.0" - } - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "requires": { - "minipass": "^3.0.0" - } - }, - "mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" - }, - "minipass": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", - "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", - "requires": { - "yallist": "^4.0.0" - } - }, - "minizlib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", - "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" - }, - "sharp": { - "version": "0.25.4", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.25.4.tgz", - "integrity": "sha512-umSzJJ1oBwIOfwFFt/fJ7JgCva9FvrEU2cbbm7u/3hSDZhXvkME8WE5qpaJqLIe2Har5msF5UG4CzYlEg5o3BQ==", - "requires": { - "color": "^3.1.2", - "detect-libc": "^1.0.3", - "node-addon-api": "^3.0.0", - "npmlog": "^4.1.2", - "prebuild-install": "^5.3.4", - "semver": "^7.3.2", - "simple-get": "^4.0.0", - "tar": "^6.0.2", - "tunnel-agent": "^0.6.0" - } - }, - "simple-get": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz", - "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==", - "requires": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "tar": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz", - "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==", - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.0", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "dependencies": { - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - } - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } } }, "through": { diff --git a/package.json b/package.json index 67df8ab..dbdcabd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "probelab-reimager-app", "productName": "Probelab ReImager", - "version": "1.3.0-beta", + "version": "1.4.0-beta", "description": "Visual UI for Probelab ReImager using Electron", "main": "./src/backend/main.js", "scripts": { @@ -89,14 +89,14 @@ "bakadux": "^1.1.0", "browserify": "^16.5.1", "browserify-css": "^0.15.0", - "electron": "^9.1.0", + "electron": "^9.1.2", "electron-builder": "^22.8.0", "electron-packager": "^15.0.0", "electron-rebuild": "^1.11.0", "envify": "^4.1.0", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-svg": "^11.0.31", + "react-svg": "^11.0.32", "scssify": "^3.0.1", "uglify-js": "^3.10.0", "uglifyify": "^5.0.2" From 5a5b214195b7dc2353e5283e01955d283891a6e3 Mon Sep 17 00:00:00 2001 From: bob620 Date: Thu, 30 Jul 2020 21:48:41 -0500 Subject: [PATCH 4/6] feat(jeol) implement jeol image processing --- constants.json | 3 +- src/backend/children/reimager/functions.js | 14 +++++++-- src/backend/createwindow.js | 4 +-- src/components/general/actions.js | 10 ++++++ src/components/miniposition/miniposition.scss | 31 +++++++++++++++++++ src/components/options/options.jsx | 6 ++++ src/components/options/options.scss | 13 +++++++- 7 files changed, 74 insertions(+), 7 deletions(-) diff --git a/constants.json b/constants.json index e57ab67..22da4bc 100644 --- a/constants.json +++ b/constants.json @@ -10,7 +10,8 @@ "LOWERCENTER": "lc", "BELOWLEFT": "bl", "BELOWRIGHT": "br", - "BELOWCENTER": "bc" + "BELOWCENTER": "bc", + "JEOL": "jeol" }, "pointTypes": { "THERMOLIKE": "thermo", diff --git a/src/backend/children/reimager/functions.js b/src/backend/children/reimager/functions.js index 96be9c7..73d3593 100644 --- a/src/backend/children/reimager/functions.js +++ b/src/backend/children/reimager/functions.js @@ -1,6 +1,6 @@ const fs = require('fs'); const fsPromise = fs.promises; -const { PointShoot, ExtractedMap, constants, JeolImage, PFEImage, getPFEExpectedImages } = require('thermo-reimager'); +const {PointShoot, ExtractedMap, constants, JeolImage, PFEImage, getPFEExpectedImages} = require('thermo-reimager'); const appConstants = require('../../../../constants.json'); @@ -24,6 +24,8 @@ const Functions = { return constants.scale.types.BELOWRIGHT; case appConstants.settings.scalePositions.BELOWCENTER: return constants.scale.types.BELOWCENTER; + case appConstants.settings.scalePositions.JEOL: + return constants.scale.types.JEOL; } }, sanitizeColor: inputColor => { @@ -72,7 +74,7 @@ const Functions = { if (inputSettings.png) settings.png = inputSettings.png; - if(inputSettings.jpeg) + if (inputSettings.jpeg) settings.jpeg = inputSettings.jpeg; if (inputSettings.tiff) settings.tiff = inputSettings.tiff; @@ -119,11 +121,17 @@ const Functions = { return []; } }, - createThermo: (file, canvas, uuid=undefined) => { + createThermo: (file, canvas, uuid = undefined) => { if (file.isFile()) { let thermo; const fileName = file.name.toLowerCase(); + if (fileName.endsWith(constants.jeol.fileFormats.ENTRY)) + try { + thermo = new JeolImage(file, canvas); + } catch(err) { + } + if (fileName.endsWith(constants.pointShoot.fileFormats.ENTRY)) thermo = new PointShoot(file, canvas); diff --git a/src/backend/createwindow.js b/src/backend/createwindow.js index 32b7395..f2d419c 100644 --- a/src/backend/createwindow.js +++ b/src/backend/createwindow.js @@ -55,7 +55,7 @@ const template = [ ] }, */ -/* + // { role: 'viewMenu' } { label: 'View', @@ -71,7 +71,7 @@ const template = [ { role: 'togglefullscreen' } ] }, -*/ + // { role: 'windowMenu' } { label: 'Window', diff --git a/src/components/general/actions.js b/src/components/general/actions.js index 2adf501..79bd3d8 100644 --- a/src/components/general/actions.js +++ b/src/components/general/actions.js @@ -6,6 +6,8 @@ import GenerateUuid from './generateuuid.js'; import constants from '../../../constants'; import settingStore from '../settings/store.js'; +import generalStore from './store.js'; +import settingActions from '../settings/actions.js'; const comms = new Communications(new IPC(ipcRenderer)); @@ -191,6 +193,7 @@ const actions = CreateActions([ //settingStore.set('activePoints', settingStore.get('activePoints').filter(name => image.points[name] !== undefined)); generalStore.set('selectedUuid', uuid); generalStore.set('selectedImage', undefined); + generalStore.set('jeolImage', false); settingStore.set('layers', sortLayers(Array.from(image.layers.values()), settingStore.get('layerOrder'))); @@ -295,11 +298,18 @@ const actions = CreateActions([ generalStore.set('selectedUuids', new Set([uuid])); + if (settingStore.get('scalePosition') === constants.settings.scalePositions.JEOL && !image.jeolFile) { + data.settings.scalePosition = constants.settings.scalePositions.LOWERCENTER; + settingActions.setScalePosition(constants.settings.scalePositions.LOWERCENTER) + } + comms.send('loadImage', data).then(([{uuid, image, data}]) => { if (generalStore.get('selectedUuid') === uuid) generalStore.set('selectedImage', image); if (images.has(uuid)) images.get(uuid).output = data.output; + + generalStore.set('jeolImage', data.jeolFile); actions.navigateHome(); }).catch(() => { }); diff --git a/src/components/miniposition/miniposition.scss b/src/components/miniposition/miniposition.scss index 4948e81..ccdf884 100644 --- a/src/components/miniposition/miniposition.scss +++ b/src/components/miniposition/miniposition.scss @@ -122,4 +122,35 @@ height: 8px; } } + + &.jeol { + justify-content: center; + align-items: flex-end; + + > :first-child { + background-color: rgba(0,0,0,0); + border-top-width: 2px; + border-top-style: solid; + border-top-color: white; + height: 8px; + display: block; + } + + > :last-child { + background-color: rgba(0,0,0,0); + border-top-width: 2px; + border-top-style: solid; + border-top-color: white; + height: 8px; + display: block; + } + + > .pos { + background-color: rgba(0,0,0,0); + border-top-width: 2px; + border-top-style: solid; + border-top-color: white; + height: 8px; + } + } } \ No newline at end of file diff --git a/src/components/options/options.jsx b/src/components/options/options.jsx index 400c211..f3877f1 100644 --- a/src/components/options/options.jsx +++ b/src/components/options/options.jsx @@ -23,6 +23,7 @@ class Options extends Component { const currentPos = settingStore.get('scalePosition'); const interactable = generalStore.get('interactable'); const optionsList = generalStore.get('optionsList'); + const jeolImage = generalStore.get('jeolImage'); return (
@@ -73,6 +74,11 @@ class Options extends Component { >

Below Right

+
{}} + > +

Jeol-like

+
diff --git a/src/components/options/options.scss b/src/components/options/options.scss index 0ed1c1f..2ab48cf 100644 --- a/src/components/options/options.scss +++ b/src/components/options/options.scss @@ -31,7 +31,7 @@ display: grid; grid-template-columns: 1fr 10px 1fr 10px 1fr; grid-template-rows: 1fr 10px 1fr 10px 1fr; - grid-template-areas: "ul . . . ur" ". . . . ." "ll . lc . lr" "f f f f f" "bl fl bc fr br"; + grid-template-areas: "ul . . . ur" ". . . . ." "ll . lc . lr" "f f f f f" "bl fl bc fr br""jeol jeol jeol jeol jeol"; height: 200px; width: calc(90% - 4px); margin-left: 5%; @@ -120,6 +120,17 @@ background-color: white; color: black; } + + > .jeol { + grid-area: jeol; + background-color: white; + color: black; + + > p { + width: fit-content; + padding: 10px; + } + } } > .toggleables { From cff53f866b6fbf01863ac57bb3547e10778260af Mon Sep 17 00:00:00 2001 From: bob620 Date: Fri, 31 Jul 2020 14:53:09 -0500 Subject: [PATCH 5/6] chore(postpack) append postpack --- package-lock.json | 82 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ca157e..3b8ff19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -294,9 +294,9 @@ } }, "ajv-keywords": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz", - "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, "amdefine": { @@ -360,27 +360,27 @@ "dev": true }, "app-builder-bin": { - "version": "3.5.9", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.9.tgz", - "integrity": "sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==", + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.10.tgz", + "integrity": "sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ==", "dev": true }, "app-builder-lib": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.8.0.tgz", - "integrity": "sha512-RGaIRjCUrqkmh6QOGsyekQPEOaVynHfmeh8JZuyUymFYUOFdzBbPamkA2nhBVBTkkgfjRHsxK7LhedFKPzvWEQ==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.8.1.tgz", + "integrity": "sha512-D/ac1+vuGIAAwEeTtXl8b+qWl7Gz/IQatFyzYl2ocag/7N8LqUjKzZFJJISQPWt6PFDPDH0oCj8/GMh63aV0yw==", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@develar/schema-utils": "~2.6.5", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.8.0", + "builder-util": "22.8.1", "builder-util-runtime": "8.7.2", "chromium-pickle-js": "^0.2.0", - "debug": "^4.1.1", + "debug": "^4.2.0", "ejs": "^3.1.3", - "electron-publish": "22.8.0", + "electron-publish": "22.8.1", "fs-extra": "^9.0.1", "hosted-git-info": "^3.0.5", "is-ci": "^2.0.0", @@ -396,12 +396,12 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "fs-extra": { @@ -2018,19 +2018,19 @@ "dev": true }, "builder-util": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.8.0.tgz", - "integrity": "sha512-H80P1JzVy3TGpi63x81epQDK24XalL034+jAZlrPb5IhLtYmnNNdxCCAVJvg3VjSISd73Y71O+uhqCxWpqbPHw==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.8.1.tgz", + "integrity": "sha512-LZG+E1xszMdut5hL5h7RkJQ7yOsQqdhJYgn1wvOP7MmF3MoUPRNDiRodLpYiWlaqZmgYhcfaipR/Mb8F/RqK8w==", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@types/debug": "^4.1.5", "@types/fs-extra": "^9.0.1", - "app-builder-bin": "3.5.9", + "app-builder-bin": "3.5.10", "bluebird-lst": "^1.0.9", "builder-util-runtime": "8.7.2", "chalk": "^4.1.0", - "debug": "^4.1.1", + "debug": "^4.2.0", "fs-extra": "^9.0.1", "is-ci": "^2.0.0", "js-yaml": "^3.14.0", @@ -2075,12 +2075,12 @@ "dev": true }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "fs-extra": { @@ -2965,13 +2965,13 @@ } }, "dmg-builder": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.8.0.tgz", - "integrity": "sha512-orePWjcrl97SYLA8F/6UUtbXJSoZCYu5KOP1lVqD4LOomr8bjGDyEVYZmZYcg5WqKmXucdmO6OpqgzH/aRMMuA==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.8.1.tgz", + "integrity": "sha512-WeGom1moM00gBII6swljl4DQGrlJuEivoUhOmh8U9p1ALgeJL+EiTHbZFERlj8Ejy62xUUjURV+liOxUKmJFWg==", "dev": true, "requires": { - "app-builder-lib": "22.8.0", - "builder-util": "22.8.0", + "app-builder-lib": "22.8.1", + "builder-util": "22.8.1", "fs-extra": "^9.0.1", "iconv-lite": "^0.6.2", "js-yaml": "^3.14.0", @@ -3096,25 +3096,25 @@ } }, "electron-builder": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.8.0.tgz", - "integrity": "sha512-dUv4F3srJouqxhWivtKqSoQP4Df6vYgjooGdzms+iYMTFi9f0b4LlEbr7kgsPvte8zAglee7VOGOODkCRJDkUQ==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.8.1.tgz", + "integrity": "sha512-Hs7KTMq1rGSvT0fwGKXrjbLiJkK6sAKDQooUSwklOkktUgWi4ATjlP0fVE3l8SmS7zcLoww2yDZonSDqxEFhaQ==", "dev": true, "requires": { "@types/yargs": "^15.0.5", - "app-builder-lib": "22.8.0", + "app-builder-lib": "22.8.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.8.0", + "builder-util": "22.8.1", "builder-util-runtime": "8.7.2", "chalk": "^4.1.0", - "dmg-builder": "22.8.0", + "dmg-builder": "22.8.1", "fs-extra": "^9.0.1", "is-ci": "^2.0.0", "lazy-val": "^1.0.4", "read-config-file": "6.0.0", "sanitize-filename": "^1.6.3", "update-notifier": "^4.1.0", - "yargs": "^15.3.1" + "yargs": "^15.4.1" }, "dependencies": { "ansi-regex": { @@ -3520,14 +3520,14 @@ } }, "electron-publish": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.8.0.tgz", - "integrity": "sha512-uM0Zdi9hUqqGOrPj478v7toTvV1Kgto1w11rIiI168batiXAJvNLD8VZRfehOrZT0ibUyZlw8FtxoGCrjyHUOw==", + "version": "22.8.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.8.1.tgz", + "integrity": "sha512-zqI66vl7j1CJZJ60J+1ez1tQNQeuqVspW44JvYDa5kZbM5wSFDAJFMK9RWHOqRF1Ezd4LDeiBa4aeTOwOt9syA==", "dev": true, "requires": { "@types/fs-extra": "^9.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.8.0", + "builder-util": "22.8.1", "builder-util-runtime": "8.7.2", "chalk": "^4.1.0", "fs-extra": "^9.0.1", diff --git a/package.json b/package.json index dbdcabd..09289cb 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "compile": "npm run build-prod && node package.js && cd ./bin/unpackaged && npm install --production && npm run rebuild", "package": "npm run compile && electron-packager ./bin/unpackaged --out ./bin --overwrite", "win-package": "npm run compile && electron-packager ./bin/unpackaged --out ./bin --overwrite --platform=win32 --arch=x64", - "postpack": "electron-builder --pd ./dist/win-unpacked" + "postpack": "electron-builder --pd \"./bin/Probelab ReImager-win32-x64\"" }, "browserify": { "transform": [ From 58533ad239502c1d2ae71764b1c9dd1fde023a91 Mon Sep 17 00:00:00 2001 From: bob620 Date: Fri, 31 Jul 2020 15:01:23 -0500 Subject: [PATCH 6/6] chore(package) update for stable --- package.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 09289cb..8ec6dcf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "probelab-reimager-app", "productName": "Probelab ReImager", - "version": "1.4.0-beta", + "version": "1.4.0-stable", "description": "Visual UI for Probelab ReImager using Electron", "main": "./src/backend/main.js", "scripts": { @@ -71,6 +71,17 @@ ] } ] + }, + "mac": { + "target": [ + { + "sign": false, + "target": "dmg", + "arch": [ + "x64" + ] + } + ] } }, "author": "Bob620", @@ -104,6 +115,6 @@ "dependencies": { "canvas": "^2.5.0", "sharp": "^0.25.4", - "thermo-reimager": "github:bob620/thermo-reimager#beta" + "thermo-reimager": "github:bob620/thermo-reimager" } }