diff --git a/Dockerfile b/Dockerfile index 73ad24d..11eec11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,26 +6,25 @@ ARG NPM_REGISTRY_URL=https://registry.npmjs.org/ WORKDIR /opt/oak COPY . /opt/oak -RUN apt-get update -qq \ - && apt-get install -y -qq \ - apt-utils \ - build-essential \ - dbus-x11 \ - libasound2 \ - libcanberra-gtk-module \ - libcurl3 \ - libexif-dev \ - libgconf-2-4 \ - libgl1-mesa-dri \ - libgl1-mesa-glx \ - libgtk2.0-0 \ - libnotify4 \ - libnss3 \ - libudev-dev \ - libxss1 \ - libxtst6 \ - python \ - udev +RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \ + apt-utils \ + build-essential \ + dbus-x11 \ + libasound2 \ + libcanberra-gtk-module \ + libcurl3 \ + libexif-dev \ + libgconf-2-4 \ + libgl1-mesa-dri \ + libgl1-mesa-glx \ + libgtk2.0-0 \ + libnotify4 \ + libnss3 \ + libudev-dev \ + libxss1 \ + libxtst6 \ + python \ + udev RUN npm install --engine-strict=true --progress=false --loglevel="error" \ && npm link \ @@ -37,7 +36,8 @@ WORKDIR / ENTRYPOINT ["oak"] CMD ["--help"] -ENV ELECTRON_VERSION=1.8.4 \ +ENV NODE_ENV=production \ + ELECTRON_VERSION=1.8.6 \ DISPLAY=:0 \ DEBUG=false \ IGNORE_GPU_BLACKLIST=false \ diff --git a/Dockerfile.template b/Dockerfile.template index 86af6a4..95dbed7 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -6,28 +6,28 @@ ARG NPM_REGISTRY_URL=https://registry.npmjs.org/ WORKDIR /opt/oak COPY . /opt/oak -RUN apt-get update -qq \ - && apt-get install -y -qq --no-install-recommends \ - apt-utils \ - build-essential \ - dbus-x11 \ - libasound2 \ - libcanberra-gtk-module \ - libcurl3 \ - libexif-dev \ - libgconf-2-4 \ - libgl1-mesa-dri \ - libgl1-mesa-glx \ - libgtk2.0-0 \ - libnotify4 \ - libnss3 \ - libudev-dev \ - libxss1 \ - libxtst6 \ - python \ - udev +RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \ + apt-utils \ + build-essential \ + dbus-x11 \ + libasound2 \ + libcanberra-gtk-module \ + libcurl3 \ + libexif-dev \ + libgconf-2-4 \ + libgl1-mesa-dri \ + libgl1-mesa-glx \ + libgtk2.0-0 \ + libnotify4 \ + libnss3 \ + libudev-dev \ + libxss1 \ + libxtst6 \ + python \ + udev RUN npm install --engine-strict=true --progress=false --loglevel="error" \ + && npm test \ && npm link \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -37,7 +37,8 @@ WORKDIR / ENTRYPOINT ["oak"] CMD ["--help"] -ENV ELECTRON_VERSION=%%ELECTRON_VERSION%% \ +ENV NODE_ENV=production \ + ELECTRON_VERSION=%%ELECTRON_VERSION%% \ DISPLAY=:0 \ DEBUG=false \ IGNORE_GPU_BLACKLIST=false \ diff --git a/docker-build.sh b/docker-build.sh index 42a4ce3..61aaebe 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1,12 +1,12 @@ #!/bin/bash -e -OAK_VERSION="4.2.2"; +OAK_VERSION="4.2.3"; BASE="oaklabs/oak:$OAK_VERSION"; # our FROM line in the Dockerfile, should ideally match the current electron node version FROM="node"; NODE_VERSION="8.11.1"; -ELECTRON_VERSION="1.8.4" +ELECTRON_VERSION="1.8.6" FROM_TAG="$NODE_VERSION-stretch"; NPM_URL="https://registry.npmjs.org/"; diff --git a/docker-compose.yml b/docker-compose.yml index c333396..d380669 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: oak: build: . container_name: oak - image: oaklabs/oak:4.2.2 + image: oaklabs/oak:4.2.3 network_mode: host devices: # our video card device, may vary per operating system diff --git a/examples/multiple-windows/Dockerfile b/examples/multiple-windows/Dockerfile index bfad112..57c69c8 100644 --- a/examples/multiple-windows/Dockerfile +++ b/examples/multiple-windows/Dockerfile @@ -1,4 +1,4 @@ -FROM oaklabs/oak:4.2.2 +FROM oaklabs/oak:4.2.3 WORKDIR /app COPY . /app diff --git a/examples/simple-url/Dockerfile b/examples/simple-url/Dockerfile index 17a2f8f..becc359 100644 --- a/examples/simple-url/Dockerfile +++ b/examples/simple-url/Dockerfile @@ -1,4 +1,4 @@ -FROM oaklabs/oak:4.2.2 +FROM oaklabs/oak:4.2.3 WORKDIR /app COPY . /app diff --git a/manifest.yml b/manifest.yml index bc2a6b6..343eac8 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,14 +1,14 @@ -image: oaklabs/oak:4.2.2 +image: oaklabs/oak:4.2.3 manifests: - # - image: oaklabs/oak:4.2.2-arm + # - image: oaklabs/oak:4.2.3-arm # platform: # architecture: arm # os: linux - # - image: oaklabs/oak:4.2.2-arm64 + # - image: oaklabs/oak:4.2.3-arm64 # platform: # architecture: arm64 # os: linux - - image: oaklabs/oak:4.2.2-amd64 + - image: oaklabs/oak:4.2.3-amd64 platform: architecture: amd64 os: linux diff --git a/package-lock.json b/package-lock.json index 558aba4..3984f9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "oak", - "version": "4.2.2", + "version": "4.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -20,9 +20,9 @@ } }, "@types/node": { - "version": "8.10.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.9.tgz", - "integrity": "sha512-GUUTbeDaJSRaoLkqVQ5jwwKbDiLWFX3JrKLvC078q2P51Z9Dcb5F5UdnApSYqdMk4X0VrKod1gzeoX8bGl8DMg==" + "version": "8.10.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.11.tgz", + "integrity": "sha512-FM7tvbjbn2BUzM/Qsdk9LUGq3zeh7li8NcHoS398dBzqLzfmSqSP1+yKbMRTCcZzLcu2JAR5lq3IKIEYkto7iQ==" }, "abbrev": { "version": "1.1.1", @@ -128,9 +128,9 @@ "async": "2.6.0", "buffer-crc32": "0.2.13", "glob": "7.1.2", - "lodash": "4.17.5", + "lodash": "4.17.10", "readable-stream": "2.3.6", - "tar-stream": "1.5.5", + "tar-stream": "1.6.0", "zip-stream": "1.2.0" }, "dependencies": { @@ -150,7 +150,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -161,7 +161,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -175,7 +175,7 @@ "glob": "7.1.2", "graceful-fs": "4.1.11", "lazystream": "1.0.0", - "lodash": "4.17.5", + "lodash": "4.17.10", "normalize-path": "2.1.1", "readable-stream": "2.3.6" }, @@ -196,7 +196,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -207,7 +207,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -238,7 +238,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -249,7 +249,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -350,7 +350,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.5" + "lodash": "4.17.10" } }, "async-limiter": { @@ -364,9 +364,9 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz", - "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", + "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", "dev": true }, "author-regex": { @@ -468,7 +468,7 @@ "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", "requires": { "readable-stream": "2.3.6", - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" }, "dependencies": { "isarray": { @@ -485,7 +485,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -495,7 +495,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -537,12 +537,34 @@ "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.1.2.tgz", "integrity": "sha1-PkC4FmP4HS3WWWpMtxSo3BbPq+A=" }, + "buffer-alloc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.1.0.tgz", + "integrity": "sha1-BVFNM78WVtNUDGhPZbEgLpDsowM=", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "0.1.1", + "buffer-fill": "0.1.1" + } + }, + "buffer-alloc-unsafe": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz", + "integrity": "sha1-/+H2dVHdBVc33iUzN7/oU9+rGmo=", + "dev": true + }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, + "buffer-fill": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-0.1.1.tgz", + "integrity": "sha512-YgBMBzdRLEfgxJIGu2wrvI2E03tMCFU1p7d1KhB4BOoMN0VxmTFjSyN5JtKt9z8Z9JajMHruI6SE25W96wNv7Q==", + "dev": true + }, "buffers": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", @@ -609,9 +631,9 @@ } }, "chalk": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz", - "integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "requires": { "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", @@ -692,9 +714,9 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colors": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz", - "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.3.tgz", + "integrity": "sha512-qTfM2pNFeMZcLvf/RbrVAzDEVttZjFhaApfx9dplNjvHSX88Ui66zBRb/4YGob/xUWxDceirgoC1lT676asfCQ==", "dev": true }, "combined-stream": { @@ -744,7 +766,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -755,7 +777,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -789,7 +811,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -799,7 +821,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -832,9 +854,9 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "coveralls": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.0.tgz", - "integrity": "sha512-ZppXR9y5PraUOrf/DzHJY6gzNUhXYE3b9D43xEXs4QYZ7/Oe0Gy0CS+IPKWFfvQFXB3RG9QduaQUFehzSpGAFw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.1.tgz", + "integrity": "sha512-FAzXwiDOYLGDWH+zgoIA+8GbWv50hlx+kpEJyvzLKOdnIBv9uWoVl4DhqGgyUHpiRjAlF8KYZSipWXYtllWH6Q==", "dev": true, "requires": { "js-yaml": "3.11.0", @@ -876,7 +898,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -887,7 +909,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -931,14 +953,14 @@ } }, "css": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", - "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.3.tgz", + "integrity": "sha512-0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==", "dev": true, "requires": { "inherits": "2.0.3", "source-map": "0.1.43", - "source-map-resolve": "0.3.1", + "source-map-resolve": "0.5.1", "urix": "0.1.0" }, "dependencies": { @@ -959,7 +981,7 @@ "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", "dev": true, "requires": { - "css": "2.2.1" + "css": "2.2.3" } }, "css-value": { @@ -1009,6 +1031,12 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true + }, "decompress-zip": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz", @@ -1031,9 +1059,9 @@ "dev": true }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" }, "deep-is": { "version": "0.1.3", @@ -1079,9 +1107,9 @@ "requires": { "find-root": "1.1.0", "glob": "7.1.2", - "ignore": "3.3.7", + "ignore": "3.3.8", "pkg-config": "1.1.1", - "run-parallel": "1.1.8", + "run-parallel": "1.1.9", "uniq": "1.0.1" } }, @@ -1169,11 +1197,11 @@ "dev": true }, "electron": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.4.tgz", - "integrity": "sha512-2f1cx0G3riMFODXFftF5AHXy+oHfhpntZHTDN66Hxtl09gmEr42B3piNEod9MEmw72f75LX2JfeYceqq1PF8cA==", + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.6.tgz", + "integrity": "sha512-rdbGinUDRh7rO0aJDXcaQ5UuJRg82wLkUU/V63wtaMFH04RVMkd5SUsyqgaP5IlVq3iYlJk/CPSVEsiBbPDMeg==", "requires": { - "@types/node": "8.10.9", + "@types/node": "8.10.11", "electron-download": "3.3.0", "extract-zip": "1.6.6" } @@ -1200,7 +1228,7 @@ "minimist": "1.2.0", "nugget": "2.0.1", "path-exists": "3.0.0", - "rc": "1.2.6", + "rc": "1.2.7", "semver": "5.5.0", "sumchecker": "2.0.2" } @@ -1239,7 +1267,7 @@ "dev": true, "requires": { "@paulcbetts/mime-types": "2.1.10", - "@types/node": "7.0.61", + "@types/node": "7.0.62", "btoa": "1.1.2", "debug": "2.6.9", "lru-cache": "4.1.2", @@ -1252,9 +1280,9 @@ }, "dependencies": { "@types/node": { - "version": "7.0.61", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.61.tgz", - "integrity": "sha512-X4MNN+Z36OmVPv7n08wxq46/t61/rauW4+xeyxGPueDQ9t7SetHnuEPS0p9n6wU/15HvJLGjzfLTc/RwN7id3A==", + "version": "7.0.62", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.62.tgz", + "integrity": "sha512-sOCty/ewg1pBfNpK8bS5ALoPbJPEW6ualNMcd47LRtdgNabAdNKsbFojoexvk3MpMuu6PxxR6N1sRrPixFPhGA==", "dev": true }, "minimist": { @@ -1285,7 +1313,7 @@ "minimist": "1.2.0", "nugget": "2.0.1", "path-exists": "2.1.0", - "rc": "1.2.6", + "rc": "1.2.7", "semver": "5.5.0", "sumchecker": "1.3.1" } @@ -1365,7 +1393,7 @@ "minimist": "1.2.0", "nugget": "2.0.1", "path-exists": "3.0.0", - "rc": "1.2.6", + "rc": "1.2.7", "semver": "5.5.0", "sumchecker": "2.0.2" }, @@ -1462,11 +1490,11 @@ "integrity": "sha1-JK4GrZ3WHLfk1oiWH0kRjEChEOs=", "dev": true, "requires": { - "colors": "1.2.1", + "colors": "1.2.3", "debug": "2.6.9", "detect-libc": "1.0.3", "fs-extra": "3.0.1", - "node-abi": "2.3.0", + "node-abi": "2.4.0", "node-gyp": "3.6.2", "ora": "1.4.0", "rimraf": "2.6.2", @@ -1639,7 +1667,7 @@ "requires": { "ajv": "5.5.2", "babel-code-frame": "6.26.0", - "chalk": "2.4.0", + "chalk": "2.4.1", "concat-stream": "1.6.0", "cross-spawn": "5.1.0", "debug": "3.1.0", @@ -1652,15 +1680,15 @@ "file-entry-cache": "2.0.0", "functional-red-black-tree": "1.0.1", "glob": "7.1.2", - "globals": "11.4.0", - "ignore": "3.3.7", + "globals": "11.5.0", + "ignore": "3.3.8", "imurmurhash": "0.1.4", "inquirer": "3.3.0", "is-resolvable": "1.1.0", "js-yaml": "3.11.0", "json-stable-stringify-without-jsonify": "1.0.1", "levn": "0.3.0", - "lodash": "4.17.5", + "lodash": "4.17.10", "minimatch": "3.0.4", "mkdirp": "0.5.1", "natural-compare": "1.4.0", @@ -1762,7 +1790,7 @@ "eslint-import-resolver-node": "0.3.2", "eslint-module-utils": "2.2.0", "has": "1.0.1", - "lodash": "4.17.5", + "lodash": "4.17.10", "minimatch": "3.0.4", "read-pkg-up": "2.0.0" }, @@ -1848,7 +1876,7 @@ "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", "dev": true, "requires": { - "ignore": "3.3.7", + "ignore": "3.3.8", "minimatch": "3.0.4", "resolve": "1.7.1", "semver": "5.5.0" @@ -2163,6 +2191,12 @@ "mime-types": "2.1.18" } }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, "fs-extra": { "version": "0.30.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", @@ -2339,9 +2373,9 @@ } }, "globals": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz", - "integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA==", + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", + "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", "dev": true }, "globby": { @@ -2365,7 +2399,7 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.5", + "lodash": "4.17.10", "minimatch": "3.0.4" } }, @@ -2491,9 +2525,9 @@ } }, "ignore": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", - "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", + "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==", "dev": true }, "imurmurhash": { @@ -2536,12 +2570,12 @@ "dev": true, "requires": { "ansi-escapes": "3.1.0", - "chalk": "2.4.0", + "chalk": "2.4.1", "cli-cursor": "2.1.0", "cli-width": "2.2.0", "external-editor": "2.2.0", "figures": "2.0.0", - "lodash": "4.17.5", + "lodash": "4.17.10", "mute-stream": "0.0.7", "run-async": "2.3.0", "rx-lite": "4.0.8", @@ -2968,7 +3002,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -2979,7 +3013,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -3040,9 +3074,9 @@ } }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" }, "lodash._basecopy": { "version": "3.0.1", @@ -3175,7 +3209,7 @@ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", "dev": true, "requires": { - "chalk": "2.4.0" + "chalk": "2.4.1" } }, "longest": { @@ -3343,7 +3377,7 @@ "bl": "1.2.2", "inherits": "2.0.3", "readable-stream": "2.3.6", - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" }, "dependencies": { "isarray": { @@ -3360,7 +3394,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -3370,7 +3404,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } @@ -3399,9 +3433,9 @@ "dev": true }, "node-abi": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz", - "integrity": "sha512-zwm6vU3SsVgw3e9fu48JBaRBCJGIvAgysDsqtf5+vEexFE71bEOtaMWb5zr/zODZNzTPtQlqUUpC79k68Hspow==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.0.tgz", + "integrity": "sha512-hRUz0vG+eJfSqwU6rOgW6wNyX85ec8OEE9n4A+u+eoiE8oTePhCkUFTNmwQ+86Kyu429PCLNNyI2P2jL9qKXhw==", "dev": true, "requires": { "semver": "5.5.0" @@ -3531,7 +3565,7 @@ "minimatch": "3.0.4", "msgpack5": "4.0.2", "pino": "4.10.4", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "swagger-client": "3.4.11", "uuid": "3.2.1", "ws": "3.3.3", @@ -3627,7 +3661,7 @@ "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==", "dev": true, "requires": { - "chalk": "2.4.0", + "chalk": "2.4.1", "cli-cursor": "2.1.0", "cli-spinners": "1.3.1", "log-symbols": "2.2.0" @@ -3773,7 +3807,7 @@ "resolved": "https://registry.npmjs.org/pino/-/pino-4.10.4.tgz", "integrity": "sha512-icde8CYdLyHW+wLIlobDAnoyuQrDnrK055AkczNCo3sf6SZbJ0As0Xh1XHlWQ2K6qsWW4BdMv4kikL/NAoLjCQ==", "requires": { - "chalk": "2.4.0", + "chalk": "2.4.1", "fast-json-parse": "1.0.3", "fast-safe-stringify": "1.2.3", "flatstr": "1.0.5", @@ -4024,11 +4058,11 @@ } }, "rc": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz", - "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "requires": { - "deep-extend": "0.4.2", + "deep-extend": "0.5.1", "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" @@ -4126,7 +4160,7 @@ "oauth-sign": "0.8.2", "performance-now": "2.1.0", "qs": "6.5.1", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "stringstream": "0.0.5", "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", @@ -4237,9 +4271,9 @@ } }, "run-parallel": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz", - "integrity": "sha512-e5t1NVhr5VWmD9V9U4KjjSGkf5w6CcTPgw11A3CfIvkkQxlAKzX3usPUp1NUQTmpOOjU+f9QRICU3tMbKwn9ZQ==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", "dev": true }, "rx-lite": { @@ -4267,9 +4301,9 @@ } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safer-buffer": { "version": "2.1.2", @@ -4366,21 +4400,22 @@ } }, "source-map-resolve": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz", - "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", + "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", "dev": true, "requires": { - "atob": "1.1.3", + "atob": "2.1.1", + "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", - "source-map-url": "0.3.0", + "source-map-url": "0.4.0", "urix": "0.1.0" } }, "source-map-url": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz", - "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, "spawn-rx": { @@ -4471,7 +4506,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -4481,7 +4516,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "through2": { @@ -4648,11 +4683,18 @@ "fast-json-patch": "1.2.2", "isomorphic-form-data": "0.0.1", "js-yaml": "3.11.0", - "lodash": "4.17.5", + "lodash": "4.17.10", "qs": "6.5.1", "url": "0.11.0", "utf8-bytes": "0.0.1", "utfstring": "2.0.0" + }, + "dependencies": { + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + } } }, "symbol-observable": { @@ -4669,8 +4711,8 @@ "requires": { "ajv": "5.5.2", "ajv-keywords": "2.1.1", - "chalk": "2.4.0", - "lodash": "4.17.5", + "chalk": "2.4.1", + "lodash": "4.17.10", "slice-ansi": "1.0.0", "string-width": "2.1.1" }, @@ -4752,14 +4794,17 @@ } }, "tar-stream": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz", - "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz", + "integrity": "sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw==", "dev": true, "requires": { "bl": "1.2.2", + "buffer-alloc": "1.1.0", "end-of-stream": "1.4.1", + "fs-constants": "1.0.0", "readable-stream": "2.3.6", + "to-buffer": "1.1.1", "xtend": "4.0.1" }, "dependencies": { @@ -4779,7 +4824,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -4790,7 +4835,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "xtend": { @@ -4854,6 +4899,12 @@ "os-tmpdir": "1.0.2" } }, + "to-buffer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", + "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", + "dev": true + }, "touch": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz", @@ -4907,7 +4958,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -5122,7 +5173,7 @@ "q": "1.5.1", "request": "2.83.0", "rgb2hex": "0.1.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "supports-color": "5.0.1", "url": "0.11.0", "wdio-dot-reporter": "0.0.9", @@ -5173,7 +5224,7 @@ "oauth-sign": "0.8.2", "performance-now": "2.1.0", "qs": "6.5.1", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "stringstream": "0.0.5", "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", @@ -5285,7 +5336,7 @@ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "requires": { "async-limiter": "1.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "ultron": "1.1.1" } }, @@ -5382,7 +5433,7 @@ "requires": { "archiver-utils": "1.3.0", "compress-commons": "1.2.2", - "lodash": "4.17.5", + "lodash": "4.17.10", "readable-stream": "2.3.6" }, "dependencies": { @@ -5402,7 +5453,7 @@ "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } @@ -5413,7 +5464,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } } } diff --git a/package.json b/package.json index 1b80836..0be2c69 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oak", - "version": "4.2.2", + "version": "4.2.3", "description": "A very opinionated kiosk framework based on Electron", "engines": { "node": "8.11.1" @@ -28,16 +28,16 @@ }, "homepage": "https://github.com/OakLabsInc/oak", "dependencies": { - "commander": "~2.15.0", - "electron": "1.8.4", + "commander": "^2.15.0", + "electron": "1.8.6", "eventemitter2": "~5.0.1", - "lodash": "~4.17.5", + "lodash": "~4.17.10", "minimatch": "~3.0.4", "oak-tools": "~0.5.6", "uuid": "~3.2.1" }, "devDependencies": { - "coveralls": "~3.0.0", + "coveralls": "~3.0.1", "dockerfile-template": "~0.1.0", "electron-compile": "~6.4.2", "electron-packager": "~11.1.0", diff --git a/readme.md b/readme.md index ec487ca..76af528 100644 --- a/readme.md +++ b/readme.md @@ -1,8 +1,8 @@ # Oak -[![release](https://img.shields.io/badge/release-v4.2.2-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/4.2.2) +[![release](https://img.shields.io/badge/release-v4.2.3-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/4.2.3) [![node](https://img.shields.io/badge/node-v8.11.1-green.svg)](https://github.com/nodejs/node/releases/tag/v8.11.1) -[![electron](https://img.shields.io/badge/electron-v1.8.4-green.svg)](https://github.com/electron/electron/releases/tag/v1.8.4) +[![electron](https://img.shields.io/badge/electron-v1.8.6-green.svg)](https://github.com/electron/electron/releases/tag/v1.8.6) [![Coverage Status](https://coveralls.io/repos/github/OakLabsInc/oak/badge.svg?t=zYcBU6)](https://coveralls.io/github/OakLabsInc/oak) [![Standard - JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-green.svg)](http://standardjs.com/)