From 7fbfeba3d514207f76de79faaf8bc1a4595179b3 Mon Sep 17 00:00:00 2001 From: Devon Richards Date: Sat, 4 Nov 2023 19:46:32 +0530 Subject: [PATCH] chore(docker): Fix deployment files. --- .docker/Dockerfile | 7 +- .docker/Dockerfile.jobs | 7 +- .docker/docker-compose.yml | 6 +- flake.lock | 30 ++++- flake.nix | 2 +- server/package.json | 223 ++++++++++++++++++------------------- yarn.lock | 72 +----------- 7 files changed, 149 insertions(+), 198 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 37d66d107..5c6bb1d1b 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,12 +1,13 @@ -FROM node:16.10 +FROM node:20.9 LABEL org.containers.image.url=https://github.com/CubeArtisan/cubeartisan ENV DEBUG=false ENV NODE_ENV=production -RUN curl -sSL https://sdk.cloud.google.com | bash -ENV PATH $PATH:/root/google-cloud-sdk/bin +RUN curl https://sdk.cloud.google.com > install.sh +RUN bash install.sh --disable-prompts --install-dir=/root/ +ENV PATH $PATH:/root/google-cloud-sd --install-dir=/root/k/bin RUN apt-get update && apt-get install -y gcc python3-dev python3-setuptools python3-pip python3-crcmod WORKDIR /CubeArtisan diff --git a/.docker/Dockerfile.jobs b/.docker/Dockerfile.jobs index a3ac31395..d3ffea216 100644 --- a/.docker/Dockerfile.jobs +++ b/.docker/Dockerfile.jobs @@ -1,12 +1,13 @@ -FROM node:16.10 +FROM node:20.9 LABEL org.containers.image.url=https://github.com/CubeArtisan/cubeartisan ENV DEBUG=false ENV NODE_ENV=production -RUN curl -sSL https://sdk.cloud.google.com | bash -ENV PATH $PATH:/root/google-cloud-sdk/bin +RUN curl https://sdk.cloud.google.com > install.sh +RUN bash install.sh --disable-prompts --install-dir=/root/ +ENV PATH $PATH:/root/google-cloud-sd --install-dir=/root/k/bin RUN apt-get update && apt-get install -y gcc python3-dev python3-setuptools python3-pip python3-crcmod WORKDIR /CubeArtisan diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 5582b50b0..9d698d6d0 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: cubeartisan-mongodb: - image: 'mongo:4.4.10' + image: 'mongo:6.0.5' volumes: - cubeartisan-mongodb-volume:/data/db ports: @@ -10,7 +10,7 @@ services: build: dockerfile: .docker/Dockerfile.jobs context: ../ - cache_from: + cache_from: - ${REPOSITORY}/cubeartisan-jobs:latest image: ${REPOSITORY}/cubeartisan-jobs:${TAG} depends_on: @@ -19,7 +19,7 @@ services: build: dockerfile: .docker/Dockerfile context: ../ - cache_from: + cache_from: - ${REPOSITORY}/cubeartisan-jobs:${TAG} args: REPOSITORY: ${REPOSITORY} diff --git a/flake.lock b/flake.lock index 0482f9a94..3afe54ec2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1636798009, - "narHash": "sha256-TALPXFghk+V7GMYYlHMKXRHFR/7TdWL7i/dbtdU6dfA=", + "lastModified": 1699065553, + "narHash": "sha256-j8UmH8fqXcOgL6WrlMcvV2m2XQ6OzU0IBucyuJ0vnyQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9cae36cff14bfb48f9903143d393762b21357c33", + "rev": "8ab9c53eee434651ce170dee1d9727b974e9a6b6", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index af7825c1d..ccf711793 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ let pkgs = nixpkgs.legacyPackages.${system}; drv = with pkgs; pkgs.mkShell { name = "shell"; - buildInputs = [nodejs-16_x pkg-config cairo pango libpng libjpeg giflib gcc libuuid.out yarn docker-compose]; + buildInputs = [nodejs_20 pkg-config cairo pango libpng libjpeg giflib gcc libuuid.out yarn docker-compose]; shellHook = '' export LD_LIBRARY_PATH=${libuuid.out}/lib:$LD_LIBRARY_PATH ''; diff --git a/server/package.json b/server/package.json index ca1b0d1b3..859f87e1d 100644 --- a/server/package.json +++ b/server/package.json @@ -1,114 +1,113 @@ { - "name": "@cubeartisan/server", - "version": "0.1.0", - "main": "routes/index.js", - "license": "AGPL-3.0-only", - "type": "module", - "scripts": { - "list-files": "git ls-files '*.js' '*.cjs' '*.mjs' '*.jsx'", - "list-files:all": "git ls-files '../client/*.js' '../client/*.jsx' '../client/*.mjs' '../client/*.cjs' '*.js' '*.jsx' '*.cjs' '*.mjs' '../markdown/*.js'", - "node-options": "echo '--experimental-loader @node-loader/babel --require dotenv/config --max-old-space-size=4096 --experimental-json-modules --enable-source-maps --es-module-specifier-resolution=node'", - "cards": "node --max-old-space-size=4096 `yarn --silent node-options` scripts/force_update.js", - "lint": "eslint_d --quiet `yarn --silent list-files`", - "lint:loud": "eslint_d `yarn --silent list-files`", - "lint:fix": "eslint_d --fix `yarn --silent list-files`", - "server": "node `yarn --silent node-options` routes/index.js", - "nodemon": "nodemon -x 'node' --ignore public --ignore private --ignore __tests__ --ignore __mocks__ --ignore ../client/__tests__ --ignore '*.json' `printf ' -w %s' \\`yarn --silent list-files:all\\`` -w ../client/generated -- `yarn --silent node-options` routes/index.js", - "start": "yarn nodemon", - "test:loud": "jest --detectOpenHandles --coverage", - "test": "yarn test:loud --silent", - "test:watch": "yarn test:loud --watch --verbose false" - }, - "dependencies": { - "@babel/core": "^7.14.6", - "@babel/node": "^7.14.7", - "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/preset-react": "^7.14.5", - "@cubeartisan/client": "^0.1.0", - "@cubeartisan/markdown": "^0.1.0", - "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.13.0", - "@google-cloud/opentelemetry-cloud-trace-exporter": "^1.0.0", - "@node-loader/babel": "^1.1.0", - "@opentelemetry/api": "^1.0.3", - "@opentelemetry/instrumentation": "^0.26.0", - "@opentelemetry/instrumentation-dns": "^0.27.1", - "@opentelemetry/instrumentation-express": "^0.28.0", - "@opentelemetry/instrumentation-http": "^0.27.0", - "@opentelemetry/instrumentation-mongodb": "^0.28.0", - "@opentelemetry/instrumentation-winston": "^0.27.1", - "@opentelemetry/sdk-node": "^0.26.0", - "JSONStream": "^1.3.5", - "axios": "^0.26.0", - "babel-plugin-styled-components": "^1.13.2", - "bad-words": "^3.0.3", - "bcryptjs": "^2.4.3", - "body-parser": "^1.19.0", - "cheerio": "^1.0.0-rc.3", - "compression": "^1.7.4", - "connect-flash": "^0.1.1", - "connect-mongodb-session": "^3.1.1", - "core-js": "^3.21.1", - "core-js-pure": "^3.15.2", - "csurf": "^1.10.0", - "dotenv": "^8.2.0", - "email-templates": "^8.0.7", - "event-stream": "^4.0.1", - "express": "^4.17.1", - "express-fileupload": "^1.1.9", - "express-messages": "^1.0.1", - "express-rate-limit": "^5.1.3", - "express-session": "^1.17.0", - "express-validator": "^6.4.0", - "glob": "^7.1.6", - "mongodb": "^4.3.1", - "mongodb-client-encryption": "^1.2.6", - "mongoose": "^5.12.10", - "mongoose-seed": "^0.6.0", - "node-cache": "^5.1.2", - "node-fetch": "^2.6.1", - "node-schedule": "^1.3.2", - "nodemailer": "^6.4.16", - "on-finished": "^2.3.0", - "opentelemetry-instrumentation-socket.io": "^0.26.0", - "papaparse": "^5.2.0", - "passport": "^0.5.2", - "passport-local": "^1.0.0", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "rimraf": "^3.0.2", - "rss": "^1.2.2", - "rss-parser": "^3.9.0", - "sanitize-html": "^2.3.2", - "seedrandom": "^3.0.5", - "serialize-javascript": "^6.0.0", - "sharp": "^0.29.1", - "shuffle-seed": "^1.1.6", - "sinon": "^11.1.1", - "socket.io": "^4.1.3", - "styled-components": "^5.3.0", - "supertest": "^6.1.3", - "uuid": "^3.4.0", - "winston": "^3.3.3" - }, - "devDependencies": { - "@babel/eslint-parser": "^7.14.7", - "@cubeartisan/server": "^0.1.0", - "@types/express": "^4.17.13", - "eslint": "^7.30.0", - "eslint-config-airbnb": "^18.0.1", - "eslint-config-prettier": "^6.11.0", - "eslint-plugin-array-func": "^3.1.7", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-jest": "^23.9.0", - "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-promise": "^5.1.0", - "eslint_d": "^11.1.1", - "jest": "26.x.x", - "mongodb-memory-server": "^8.3.0", - "nodemon": "^2.0.2", - "prettier": "^2.3.0", - "webpack": "^5.42.0", - "webpack-merge": "^4.2.2" - } + "name": "@cubeartisan/server", + "version": "0.1.0", + "main": "routes/index.js", + "license": "AGPL-3.0-only", + "type": "module", + "scripts": { + "list-files": "git ls-files '*.js' '*.cjs' '*.mjs' '*.jsx'", + "list-files:all": "git ls-files '../client/*.js' '../client/*.jsx' '../client/*.mjs' '../client/*.cjs' '*.js' '*.jsx' '*.cjs' '*.mjs' '../markdown/*.js'", + "node-options": "echo '--experimental-loader @node-loader/babel --require dotenv/config --max-old-space-size=4096 --experimental-json-modules --enable-source-maps --es-module-specifier-resolution=node'", + "cards": "node --max-old-space-size=4096 `yarn --silent node-options` scripts/force_update.js", + "lint": "eslint_d --quiet `yarn --silent list-files`", + "lint:loud": "eslint_d `yarn --silent list-files`", + "lint:fix": "eslint_d --fix `yarn --silent list-files`", + "server": "node `yarn --silent node-options` routes/index.js", + "nodemon": "nodemon -x 'node' --ignore public --ignore private --ignore __tests__ --ignore __mocks__ --ignore ../client/__tests__ --ignore '*.json' `printf ' -w %s' \\`yarn --silent list-files:all\\`` -w ../client/generated -- `yarn --silent node-options` routes/index.js", + "start": "yarn nodemon", + "test:loud": "jest --detectOpenHandles --coverage", + "test": "yarn test:loud --silent", + "test:watch": "yarn test:loud --watch --verbose false" + }, + "dependencies": { + "@babel/core": "^7.14.6", + "@babel/node": "^7.14.7", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/preset-react": "^7.14.5", + "@cubeartisan/client": "^0.1.0", + "@cubeartisan/markdown": "^0.1.0", + "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.13.0", + "@google-cloud/opentelemetry-cloud-trace-exporter": "^1.0.0", + "@node-loader/babel": "^2.0.1", + "@opentelemetry/api": "^1.0.3", + "@opentelemetry/instrumentation": "^0.26.0", + "@opentelemetry/instrumentation-dns": "^0.27.1", + "@opentelemetry/instrumentation-express": "^0.28.0", + "@opentelemetry/instrumentation-http": "^0.27.0", + "@opentelemetry/instrumentation-mongodb": "^0.28.0", + "@opentelemetry/instrumentation-winston": "^0.27.1", + "@opentelemetry/sdk-node": "^0.26.0", + "JSONStream": "^1.3.5", + "axios": "^0.26.0", + "babel-plugin-styled-components": "^1.13.2", + "bad-words": "^3.0.3", + "bcryptjs": "^2.4.3", + "body-parser": "^1.19.0", + "cheerio": "^1.0.0-rc.3", + "compression": "^1.7.4", + "connect-flash": "^0.1.1", + "connect-mongodb-session": "^3.1.1", + "core-js": "^3.21.1", + "core-js-pure": "^3.15.2", + "csurf": "^1.10.0", + "dotenv": "^8.2.0", + "email-templates": "^8.0.7", + "event-stream": "^4.0.1", + "express": "^4.17.1", + "express-fileupload": "^1.1.9", + "express-messages": "^1.0.1", + "express-rate-limit": "^5.1.3", + "express-session": "^1.17.0", + "express-validator": "^6.4.0", + "glob": "^7.1.6", + "mongodb": "^4.3.1", + "mongoose": "^5.12.10", + "mongoose-seed": "^0.6.0", + "node-cache": "^5.1.2", + "node-fetch": "^2.6.1", + "node-schedule": "^1.3.2", + "nodemailer": "^6.4.16", + "on-finished": "^2.3.0", + "opentelemetry-instrumentation-socket.io": "^0.26.0", + "papaparse": "^5.2.0", + "passport": "^0.5.2", + "passport-local": "^1.0.0", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "rimraf": "^3.0.2", + "rss": "^1.2.2", + "rss-parser": "^3.9.0", + "sanitize-html": "^2.3.2", + "seedrandom": "^3.0.5", + "serialize-javascript": "^6.0.0", + "sharp": "^0.29.1", + "shuffle-seed": "^1.1.6", + "sinon": "^11.1.1", + "socket.io": "^4.1.3", + "styled-components": "^5.3.0", + "supertest": "^6.1.3", + "uuid": "^3.4.0", + "winston": "^3.3.3" + }, + "devDependencies": { + "@babel/eslint-parser": "^7.14.7", + "@cubeartisan/server": "^0.1.0", + "@types/express": "^4.17.13", + "eslint": "^7.30.0", + "eslint-config-airbnb": "^18.0.1", + "eslint-config-prettier": "^6.11.0", + "eslint-plugin-array-func": "^3.1.7", + "eslint-plugin-import": "^2.20.2", + "eslint-plugin-jest": "^23.9.0", + "eslint-plugin-jsx-a11y": "^6.2.3", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-promise": "^5.1.0", + "eslint_d": "^11.1.1", + "jest": "26.x.x", + "mongodb-memory-server": "^8.3.0", + "nodemon": "^2.0.2", + "prettier": "^2.3.0", + "webpack": "^5.42.0", + "webpack-merge": "^4.2.2" + } } diff --git a/yarn.lock b/yarn.lock index 6da6b9152..ff8da3950 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1764,11 +1764,6 @@ prop-types "^15.7.2" react-is "^17.0.2" -"@node-loader/babel@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@node-loader/babel/-/babel-1.1.0.tgz#cfd4fc23304ff8a56790702587c0e9eb1a1a022e" - integrity sha512-U2nxEuRh6id3GnyoPQZyVBGmLD2VCc7ppGykroIvMG88iDrCCPketK2aopahxQFlxg/R60I12z9BC4mfBzYCUg== - "@node-loader/babel@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@node-loader/babel/-/babel-2.0.1.tgz#a04d7535b5ade12e3987de04fc5ffe204f26c64c" @@ -4493,13 +4488,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -8783,11 +8771,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - mimic-response@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" @@ -8852,16 +8835,6 @@ moment-timezone@^0.5.31: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== -mongodb-client-encryption@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/mongodb-client-encryption/-/mongodb-client-encryption-1.2.7.tgz#1c90097008a4fbf03c7a73764cb06f84bc5455c2" - integrity sha512-cDm1sIhrQq+AvegHH6PbfzPAF3wJ9Fu5IOlsSkJQqCSqP7hh4WoW47SeQ2FIJDDdEyU/FekLqcxgEAhjDqJg1g== - dependencies: - bindings "^1.5.0" - bl "^2.2.1" - nan "^2.14.2" - prebuild-install "6.1.2" - mongodb-client-encryption@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mongodb-client-encryption/-/mongodb-client-encryption-2.0.0.tgz#837b3a9037ea710a8124a752cc10e0e29a97cdb2" @@ -9060,7 +9033,7 @@ mustache@^4.0.1: resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== -nan@^2.12.1, nan@^2.14.2: +nan@^2.12.1: version "2.15.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== @@ -9154,13 +9127,6 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-abi@^2.21.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== - dependencies: - semver "^5.4.1" - node-abi@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" @@ -9281,11 +9247,6 @@ nodemon@^2.0.2: undefsafe "^2.0.5" update-notifier "^5.1.0" -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" @@ -9962,26 +9923,6 @@ postcss@^8.3.11: picocolors "^1.0.0" source-map-js "^1.0.1" -prebuild-install@6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.2.tgz#6ce5fc5978feba5d3cbffedca0682b136a0b5bff" - integrity sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.21.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - prebuild-install@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.0.tgz#3c5ce3902f1cb9d6de5ae94ca53575e4af0c1574" @@ -11223,7 +11164,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -11415,15 +11356,6 @@ simple-concat@^1.0.0: resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - simple-get@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675"