From 5843ab5dace70578a0a00f40e7074cfb6ebf12d2 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 18:47:12 +0100 Subject: [PATCH 01/11] test(a6): correct node --- .circleci/config.yml | 33 ++-- e2e/a6/package-lock.json | 360 ++++++--------------------------------- e2e/a6/package.json | 4 +- renovate.json | 10 ++ 4 files changed, 88 insertions(+), 319 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2af50fedf..5cc3f5f41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a6-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a6/package-lock.json" }} - restore_cache: key: a7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a7/package-lock.json" }} - restore_cache: @@ -122,9 +120,6 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a6/node_modules/" ]; then - npm run i:ci:a6 - fi if [ ! -d "e2e/a7/node_modules/" ]; then npm run i:ci:a7 fi @@ -149,10 +144,6 @@ jobs: if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a6-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a6/package-lock.json" }} - paths: - - ./e2e/a6/node_modules - save_cache: key: a7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a7/package-lock.json" }} paths: @@ -185,9 +176,26 @@ jobs: key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} paths: - ./e2e/r7/node_modules + 'Angular 6 Install': + docker: + - image: satantime/puppeteer-node:8.17.0 + steps: + - checkout + - restore_cache: + key: a6-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a6/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a6/node_modules/" ]; then + npm run i:ci:a6 + fi + - save_cache: + key: a6-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a6/package-lock.json" }} + paths: + - ./e2e/a6/node_modules 'Angular 6': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:8.17.0 steps: - checkout - attach_workspace: @@ -530,9 +538,12 @@ workflows: - 'Core IE': requires: - Core + - 'Angular 6 Install': + requires: + - Core - 'Angular 6': requires: - - Install + - Angular 6 Install - 'Angular 7': requires: - Install diff --git a/e2e/a6/package-lock.json b/e2e/a6/package-lock.json index 550f99de5..468ec8a25 100644 --- a/e2e/a6/package-lock.json +++ b/e2e/a6/package-lock.json @@ -446,6 +446,12 @@ "@types/jasmine": "*" } }, + "@types/mime-types": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz", + "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==", + "dev": true + }, "@types/node": { "version": "8.9.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", @@ -464,16 +470,6 @@ "integrity": "sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==", "dev": true }, - "@types/yauzl": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", - "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", - "dev": true, - "optional": true, - "requires": { - "@types/node": "*" - } - }, "@webassemblyjs/ast": { "version": "1.5.13", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz", @@ -1088,6 +1084,12 @@ "dev": true, "optional": true }, + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1357,40 +1359,6 @@ "file-uri-to-path": "1.0.0" } }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "blob": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", @@ -2475,12 +2443,6 @@ "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", "dev": true }, - "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", - "dev": true - }, "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", @@ -3291,51 +3253,15 @@ } }, "extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "dev": true, "requires": { - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } } }, "extsprintf": { @@ -3576,12 +3502,6 @@ "null-check": "^1.0.0" } }, - "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": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -6880,12 +6800,6 @@ "minimist": "^1.2.5" } }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -6975,15 +6889,6 @@ "lower-case": "^1.1.1" } }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } - }, "node-fetch-npm": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz", @@ -8519,71 +8424,53 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", - "dev": true, - "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz", + "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==", + "dev": true, + "requires": { + "@types/mime-types": "^2.1.0", + "debug": "^4.1.0", + "extract-zip": "^1.6.6", + "https-proxy-agent": "^4.0.0", + "mime": "^2.0.3", + "mime-types": "^2.1.25", + "progress": "^2.0.1", + "proxy-from-env": "^1.0.0", + "rimraf": "^2.6.1", + "ws": "^6.1.0" }, "dependencies": { "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", + "dev": true }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", "dev": true, "requires": { - "agent-base": "6", + "agent-base": "5", "debug": "4" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } + "mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true }, "ms": { "version": "2.1.2", @@ -8591,59 +8478,14 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "ws": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "dev": true, "requires": { - "glob": "^7.1.3" + "async-limiter": "~1.0.0" } - }, - "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "dev": true } } }, @@ -10212,56 +10054,6 @@ "inherits": "2" } }, - "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "requires": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - }, - "dependencies": { - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -10375,12 +10167,6 @@ "punycode": "^2.1.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, "tree-kill": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", @@ -10574,28 +10360,6 @@ } } }, - "unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "requires": { - "buffer": "^5.2.1", - "through": "^2.3.8" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - } - } - }, "union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", @@ -10926,12 +10690,6 @@ "selenium-webdriver": "^3.0.1" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, "webpack": { "version": "4.16.4", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.4.tgz", @@ -11362,16 +11120,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "when": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", diff --git a/e2e/a6/package.json b/e2e/a6/package.json index 1fecb41e9..3f868412a 100644 --- a/e2e/a6/package.json +++ b/e2e/a6/package.json @@ -7,7 +7,7 @@ "build": "ng build", "test": "ng test", "e2e": "ng e2e --webdriver-update=false", - "postinstall": "node_modules/protractor/bin/webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "node_modules/protractor/bin/webdriver-manager update --versions.chrome 80.0.3987.106 --gecko=false" }, "private": true, "peerDependencies": { @@ -45,7 +45,7 @@ "karma-jasmine": "1.1.2", "karma-jasmine-html-reporter": "0.2.2", "protractor": "5.4.4", - "puppeteer": "13.1.2", + "puppeteer": "2.1.1", "ts-node": "7.0.1", "typescript": "2.9.2" }, diff --git a/renovate.json b/renovate.json index ee086421e..72f784db4 100644 --- a/renovate.json +++ b/renovate.json @@ -102,6 +102,11 @@ "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, + { + "paths": ["e2e/a6/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^2\\./" + }, { "paths": ["e2e/a6/package.json"], "packageNames": ["ts-node"], @@ -112,6 +117,11 @@ "packageNames": ["typescript"], "allowedVersions": "<=2.9" }, + { + "paths": ["e2e/a6/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a7/package.json"], From 5a8a96cde054f3b82b6c3c6821c405109bdd4fb0 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 18:57:27 +0100 Subject: [PATCH 02/11] test(a7): correct node --- .circleci/config.yml | 35 +++-- e2e/a7/package-lock.json | 323 +++++++-------------------------------- e2e/a7/package.json | 4 +- renovate.json | 19 +++ 4 files changed, 98 insertions(+), 283 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5cc3f5f41..75c13c004 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a7/package-lock.json" }} - restore_cache: key: a8-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a8/package-lock.json" }} - restore_cache: @@ -120,9 +118,6 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a7/node_modules/" ]; then - npm run i:ci:a7 - fi if [ ! -d "e2e/a8/node_modules/" ]; then npm run i:ci:a8 fi @@ -144,10 +139,6 @@ jobs: if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a7/package-lock.json" }} - paths: - - ./e2e/a7/node_modules - save_cache: key: a8-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a8/package-lock.json" }} paths: @@ -217,9 +208,26 @@ jobs: - run: name: Build command: npm run b:a6 + 'Angular 7 Install': + docker: + - image: satantime/puppeteer-node:8.17.0 + steps: + - checkout + - restore_cache: + key: a7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a7/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a7/node_modules/" ]; then + npm run i:ci:a7 + fi + - save_cache: + key: a7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a7/package-lock.json" }} + paths: + - ./e2e/a7/node_modules 'Angular 7': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:8.17.0 steps: - checkout - attach_workspace: @@ -529,7 +537,7 @@ jobs: IE_BIN: 'C:\Program Files\Internet Explorer\iexplore.exe' workflows: version: 2 - build: + Testing: jobs: - Core - Install: @@ -544,9 +552,12 @@ workflows: - 'Angular 6': requires: - Angular 6 Install + - 'Angular 7 Install': + requires: + - Core - 'Angular 7': requires: - - Install + - Angular 7 Install - 'Angular 8': requires: - Install diff --git a/e2e/a7/package-lock.json b/e2e/a7/package-lock.json index e5b9311d3..e45f0397e 100644 --- a/e2e/a7/package-lock.json +++ b/e2e/a7/package-lock.json @@ -533,6 +533,12 @@ "@types/jasmine": "*" } }, + "@types/mime-types": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz", + "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==", + "dev": true + }, "@types/node": { "version": "8.10.66", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", @@ -576,16 +582,6 @@ } } }, - "@types/yauzl": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", - "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", - "dev": true, - "optional": true, - "requires": { - "@types/node": "*" - } - }, "@webassemblyjs/ast": { "version": "1.7.11", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz", @@ -1096,6 +1092,12 @@ "dev": true, "optional": true }, + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1373,40 +1375,6 @@ "file-uri-to-path": "1.0.0" } }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "blob": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", @@ -2587,12 +2555,6 @@ "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", "dev": true }, - "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", - "dev": true - }, "di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", @@ -3289,41 +3251,15 @@ } }, "extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "dev": true, "requires": { - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "extsprintf": { @@ -3561,12 +3497,6 @@ "null-check": "^1.0.0" } }, - "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": "10.0.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", @@ -6654,12 +6584,6 @@ "minimist": "^1.2.5" } }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -6746,15 +6670,6 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } - }, "node-fetch-npm": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz", @@ -8122,71 +8037,53 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", - "dev": true, - "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz", + "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==", + "dev": true, + "requires": { + "@types/mime-types": "^2.1.0", + "debug": "^4.1.0", + "extract-zip": "^1.6.6", + "https-proxy-agent": "^4.0.0", + "mime": "^2.0.3", + "mime-types": "^2.1.25", + "progress": "^2.0.1", + "proxy-from-env": "^1.0.0", + "rimraf": "^2.6.1", + "ws": "^6.1.0" }, "dependencies": { "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", + "dev": true }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", "dev": true, "requires": { - "agent-base": "6", + "agent-base": "5", "debug": "4" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } + "mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true }, "ms": { "version": "2.1.2", @@ -8194,44 +8091,14 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "ws": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "dev": true, "requires": { - "glob": "^7.1.3" + "async-limiter": "~1.0.0" } - }, - "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", - "dev": true } } }, @@ -9746,44 +9613,6 @@ "inherits": "2" } }, - "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "dev": true, - "requires": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, "terser": { "version": "4.6.11", "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz", @@ -9964,12 +9793,6 @@ "punycode": "^2.1.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -10069,28 +9892,6 @@ "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==", "dev": true }, - "unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", - "dev": true, - "requires": { - "buffer": "^5.2.1", - "through": "^2.3.8" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - } - } - }, "union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", @@ -10363,12 +10164,6 @@ "selenium-webdriver": "^3.0.1" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, "webpack": { "version": "4.29.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz", @@ -10773,16 +10568,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "when": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", diff --git a/e2e/a7/package.json b/e2e/a7/package.json index 5e20dc786..b3f5af7fc 100644 --- a/e2e/a7/package.json +++ b/e2e/a7/package.json @@ -7,7 +7,7 @@ "build": "ng build", "test": "ng test", "e2e": "ng e2e --webdriver-update=false", - "postinstall": "webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "webdriver-manager update --versions.chrome 80.0.3987.106 --gecko=false" }, "private": true, "peerDependencies": { @@ -45,7 +45,7 @@ "karma-jasmine": "1.1.2", "karma-jasmine-html-reporter": "0.2.2", "protractor": "5.4.4", - "puppeteer": "13.1.2", + "puppeteer": "2.1.1", "ts-node": "7.0.1", "typescript": "3.2.4" }, diff --git a/renovate.json b/renovate.json index 72f784db4..b410a13a3 100644 --- a/renovate.json +++ b/renovate.json @@ -15,6 +15,15 @@ "enabled": false }, "packageRules": [ + { + "paths": [".circleci/config.yml"], + "packagePatterns": ["satantime/puppeteer-node"], + "major": { + "enabled": false + }, + "additionalBranchPrefix": "root/" + }, + { "paths": [".circleci/config.yml", "Dockerfile", "docker-compose.yml", "docs/package.json", "package.json"], "additionalBranchPrefix": "root/" @@ -203,6 +212,11 @@ "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, + { + "paths": ["e2e/a7/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^2\\./" + }, { "paths": ["e2e/a7/package.json"], "packageNames": ["ts-node"], @@ -213,6 +227,11 @@ "packageNames": ["typescript"], "allowedVersions": "<=3.2" }, + { + "paths": ["e2e/a7/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a8/package.json"], From 61a1de6c6e57d5d96f15252873398c151ec1b9ad Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:03:26 +0100 Subject: [PATCH 03/11] test(a8): correct node --- .circleci/config.yml | 33 ++++++++++++------- e2e/a8/package-lock.json | 70 +++++++++++++++++----------------------- e2e/a8/package.json | 4 +-- renovate.json | 10 ++++++ 4 files changed, 63 insertions(+), 54 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 75c13c004..92aeaf336 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a8-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a8/package-lock.json" }} - restore_cache: key: a9-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a9/package-lock.json" }} - restore_cache: @@ -118,9 +116,6 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a8/node_modules/" ]; then - npm run i:ci:a8 - fi if [ ! -d "e2e/a9/node_modules/" ]; then npm run i:ci:a9 fi @@ -139,10 +134,6 @@ jobs: if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a8-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a8/package-lock.json" }} - paths: - - ./e2e/a8/node_modules - save_cache: key: a9-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a9/package-lock.json" }} paths: @@ -249,9 +240,26 @@ jobs: - run: name: Build command: npm run b:a7 + 'Angular 8 Install': + docker: + - image: satantime/puppeteer-node:10.24.1 + steps: + - checkout + - restore_cache: + key: a8-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a8/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a8/node_modules/" ]; then + npm run i:ci:a8 + fi + - save_cache: + key: a8-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a8/package-lock.json" }} + paths: + - ./e2e/a8/node_modules 'Angular 8': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:10.24.1 steps: - checkout - attach_workspace: @@ -558,9 +566,12 @@ workflows: - 'Angular 7': requires: - Angular 7 Install + - 'Angular 8 Install': + requires: + - Core - 'Angular 8': requires: - - Install + - Angular 8 Install - 'Angular 9 without Ivy': requires: - Install diff --git a/e2e/a8/package-lock.json b/e2e/a8/package-lock.json index 74acc10bb..7dff02b19 100644 --- a/e2e/a8/package-lock.json +++ b/e2e/a8/package-lock.json @@ -5300,9 +5300,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", + "version": "0.0.818844", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz", + "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==", "dev": true }, "dezalgo": { @@ -9733,50 +9733,38 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz", + "integrity": "sha512-OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==", "dev": true, "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", - "extract-zip": "2.0.1", - "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", - "pkg-dir": "4.2.0", - "progress": "2.0.3", - "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "debug": "^4.1.0", + "devtools-protocol": "0.0.818844", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^4.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", + "progress": "^2.0.1", + "proxy-from-env": "^1.0.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" }, "dependencies": { "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "requires": { - "debug": "4" - } - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", + "dev": true }, "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", "dev": true, "requires": { - "agent-base": "6", + "agent-base": "5", "debug": "4" } }, @@ -9790,9 +9778,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", + "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", "dev": true } } diff --git a/e2e/a8/package.json b/e2e/a8/package.json index b5b608980..ab8a45020 100644 --- a/e2e/a8/package.json +++ b/e2e/a8/package.json @@ -7,7 +7,7 @@ "build": "ng build", "test": "ng test", "e2e": "ng e2e --webdriver-update=false", - "postinstall": "webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "webdriver-manager update --versions.chrome 88.0.4324.27 --gecko=false" }, "private": true, "peerDependencies": { @@ -45,7 +45,7 @@ "karma-jasmine": "2.0.1", "karma-jasmine-html-reporter": "1.4.2", "protractor": "5.4.4", - "puppeteer": "13.1.2", + "puppeteer": "5.5.0", "ts-node": "7.0.1", "typescript": "3.5.3" }, diff --git a/renovate.json b/renovate.json index b410a13a3..6684ed747 100644 --- a/renovate.json +++ b/renovate.json @@ -308,6 +308,11 @@ "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, + { + "paths": ["e2e/a8/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^5\\./" + }, { "paths": ["e2e/a8/package.json"], "packageNames": ["ts-node"], @@ -318,6 +323,11 @@ "packageNames": ["typescript"], "allowedVersions": "<=3.5" }, + { + "paths": ["e2e/a8/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a9/package.json"], From aa19bf8e7a7af42c067f2118cf7529442b1b8675 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:11:10 +0100 Subject: [PATCH 04/11] test(a9): correct node --- .circleci/config.yml | 37 +++++++++------ e2e/a9/package-lock.json | 99 ++++++++++++++-------------------------- e2e/a9/package.json | 4 +- renovate.json | 10 ++++ 4 files changed, 70 insertions(+), 80 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92aeaf336..b671cf540 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a9-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a9/package-lock.json" }} - restore_cache: key: a10-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a10/package-lock.json" }} - restore_cache: @@ -116,9 +114,6 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a9/node_modules/" ]; then - npm run i:ci:a9 - fi if [ ! -d "e2e/a10/node_modules/" ]; then npm run i:ci:a10 fi @@ -134,10 +129,6 @@ jobs: if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a9-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a9/package-lock.json" }} - paths: - - ./e2e/a9/node_modules - save_cache: key: a10-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a10/package-lock.json" }} paths: @@ -281,9 +272,26 @@ jobs: - run: name: Build command: npm run b:a8 + 'Angular 9 Install': + docker: + - image: satantime/puppeteer-node:12.22.9 + steps: + - checkout + - restore_cache: + key: a9-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a9/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a9/node_modules/" ]; then + npm run i:ci:a9 + fi + - save_cache: + key: a9-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a9/package-lock.json" }} + paths: + - ./e2e/a9/node_modules 'Angular 9 without Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -307,7 +315,7 @@ jobs: command: npm run b:a9:off 'Angular 9 with Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -572,12 +580,15 @@ workflows: - 'Angular 8': requires: - Angular 8 Install + - 'Angular 9 Install': + requires: + - Core - 'Angular 9 without Ivy': requires: - - Install + - Angular 9 Install - 'Angular 9 with Ivy': requires: - - Install + - Angular 9 Install - 'Angular 10 without Ivy': requires: - Install diff --git a/e2e/a9/package-lock.json b/e2e/a9/package-lock.json index 88beafe51..6249f63ad 100644 --- a/e2e/a9/package-lock.json +++ b/e2e/a9/package-lock.json @@ -4130,9 +4130,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", + "version": "0.0.901419", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz", + "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==", "dev": true }, "dezalgo": { @@ -7443,12 +7443,6 @@ "minimist": "^1.2.5" } }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -7547,13 +7541,10 @@ "dev": true }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true }, "node-fetch-npm": { "version": "2.0.4", @@ -9317,9 +9308,9 @@ "dev": true }, "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", + "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", "dev": true }, "promise": { @@ -9631,23 +9622,23 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-10.4.0.tgz", + "integrity": "sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w==", "dev": true, "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", + "debug": "4.3.1", + "devtools-protocol": "0.0.901419", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", + "node-fetch": "2.6.1", "pkg-dir": "4.2.0", - "progress": "2.0.3", + "progress": "2.0.1", "proxy-from-env": "1.1.0", "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "tar-fs": "2.0.0", + "unbzip2-stream": "1.3.3", + "ws": "7.4.6" }, "dependencies": { "agent-base": { @@ -9660,9 +9651,9 @@ } }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -9722,9 +9713,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true } } @@ -11569,15 +11560,15 @@ } }, "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", "dev": true, "requires": { "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", + "mkdirp": "^0.5.1", "pump": "^3.0.0", - "tar-stream": "^2.1.4" + "tar-stream": "^2.0.0" } }, "tar-stream": { @@ -11881,12 +11872,6 @@ "punycode": "^2.1.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -11967,9 +11952,9 @@ "dev": true }, "unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", + "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", "dev": true, "requires": { "buffer": "^5.2.1", @@ -12658,12 +12643,6 @@ "selenium-webdriver": "^3.0.1" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, "webpack": { "version": "4.42.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz", @@ -13403,16 +13382,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "when": { "version": "3.6.4", "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", diff --git a/e2e/a9/package.json b/e2e/a9/package.json index 3dec9894c..b127c7b7d 100644 --- a/e2e/a9/package.json +++ b/e2e/a9/package.json @@ -13,7 +13,7 @@ "e2e": "npm run e2e:ivy-on && npm run e2e:ivy-off", "e2e:ivy-on": "ng e2e --webdriver-update=false --configuration ivy-on", "e2e:ivy-off": "ng e2e --webdriver-update=false --configuration ivy-off", - "postinstall": "webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "webdriver-manager update --versions.chrome 93.0.4577.63 --gecko=false" }, "private": true, "peerDependencies": { @@ -51,7 +51,7 @@ "karma-jasmine": "2.0.1", "karma-jasmine-html-reporter": "1.5.4", "protractor": "5.4.4", - "puppeteer": "13.1.2", + "puppeteer": "10.4.0", "ts-node": "8.10.2", "typescript": "3.7.7" }, diff --git a/renovate.json b/renovate.json index 6684ed747..1da3a7829 100644 --- a/renovate.json +++ b/renovate.json @@ -404,6 +404,11 @@ "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, + { + "paths": ["e2e/a9/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^10\\./" + }, { "paths": ["e2e/a9/package.json"], "packageNames": ["ts-node"], @@ -414,6 +419,11 @@ "packageNames": ["typescript"], "allowedVersions": "<=3.7" }, + { + "paths": ["e2e/a9/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a10/package.json"], From 9c3ec5e35e9498f7f4dbf99ff6d70aae583df60d Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:15:35 +0100 Subject: [PATCH 05/11] test(a10): correct node --- .circleci/config.yml | 39 +++++++++----- e2e/a10/package-lock.json | 104 ++++++++++++-------------------------- e2e/a10/package.json | 4 +- renovate.json | 10 ++++ 4 files changed, 68 insertions(+), 89 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b671cf540..b4d063741 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a10-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a10/package-lock.json" }} - restore_cache: key: a11-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a11/package-lock.json" }} - restore_cache: @@ -114,9 +112,6 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a10/node_modules/" ]; then - npm run i:ci:a10 - fi if [ ! -d "e2e/a11/node_modules/" ]; then npm run i:ci:a11 fi @@ -129,10 +124,6 @@ jobs: if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a10-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a10/package-lock.json" }} - paths: - - ./e2e/a10/node_modules - save_cache: key: a11-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a11/package-lock.json" }} paths: @@ -337,9 +328,26 @@ jobs: - run: name: Build command: npm run b:a9:on + 'Angular 10 Install': + docker: + - image: satantime/puppeteer-node:12.22.9 + steps: + - checkout + - restore_cache: + key: a10-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a10/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a10/node_modules/" ]; then + npm run i:ci:a10 + fi + - save_cache: + key: a10-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a10/package-lock.json" }} + paths: + - ./e2e/a10/node_modules 'Angular 10 without Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -363,7 +371,7 @@ jobs: command: npm run b:a10:off 'Angular 10 with Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -589,15 +597,18 @@ workflows: - 'Angular 9 with Ivy': requires: - Angular 9 Install + - 'Angular 10 Install': + requires: + - Core - 'Angular 10 without Ivy': requires: - - Install + - Angular 10 Install - 'Angular 10 with Ivy': requires: - - Install + - Angular 10 Install - 'Angular 11 without Ivy': requires: - - Install + - Angular 10 Install - 'Angular 11 with Ivy': requires: - Install diff --git a/e2e/a10/package-lock.json b/e2e/a10/package-lock.json index 4e5354c27..c399e810d 100644 --- a/e2e/a10/package-lock.json +++ b/e2e/a10/package-lock.json @@ -4163,9 +4163,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", + "version": "0.0.901419", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz", + "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==", "dev": true }, "dezalgo": { @@ -7830,12 +7830,6 @@ "minimist": "^1.2.5" } }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -7947,37 +7941,10 @@ "dev": true }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - }, - "dependencies": { - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - } - } + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true }, "node-fetch-npm": { "version": "2.0.4", @@ -9632,9 +9599,9 @@ "dev": true }, "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", + "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", "dev": true }, "promise-inflight": { @@ -10111,23 +10078,23 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-10.4.0.tgz", + "integrity": "sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w==", "dev": true, "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", + "debug": "4.3.1", + "devtools-protocol": "0.0.901419", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", + "node-fetch": "2.6.1", "pkg-dir": "4.2.0", - "progress": "2.0.3", + "progress": "2.0.1", "proxy-from-env": "1.1.0", "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "tar-fs": "2.0.0", + "unbzip2-stream": "1.3.3", + "ws": "7.4.6" }, "dependencies": { "agent-base": { @@ -10139,15 +10106,6 @@ "debug": "4" } }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -10202,9 +10160,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true } } @@ -12122,15 +12080,15 @@ } }, "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", "dev": true, "requires": { "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", + "mkdirp": "^0.5.1", "pump": "^3.0.0", - "tar-stream": "^2.1.4" + "tar-stream": "^2.0.0" }, "dependencies": { "chownr": { @@ -12454,9 +12412,9 @@ } }, "unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", + "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", "dev": true, "requires": { "buffer": "^5.2.1", diff --git a/e2e/a10/package.json b/e2e/a10/package.json index e67103746..b32bc830b 100644 --- a/e2e/a10/package.json +++ b/e2e/a10/package.json @@ -13,7 +13,7 @@ "e2e": "npm run e2e:ivy-on && npm run e2e:ivy-off", "e2e:ivy-on": "ng e2e --webdriver-update=false --configuration ivy-on", "e2e:ivy-off": "ng e2e --webdriver-update=false --configuration ivy-off", - "postinstall": "webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "webdriver-manager update --versions.chrome 93.0.4577.63 --gecko=false" }, "private": true, "peerDependencies": { @@ -50,7 +50,7 @@ "karma-jasmine": "3.3.1", "karma-jasmine-html-reporter": "1.5.4", "protractor": "7.0.0", - "puppeteer": "13.1.2", + "puppeteer": "10.4.0", "ts-node": "8.10.2", "typescript": "3.9.10" }, diff --git a/renovate.json b/renovate.json index 1da3a7829..d57cb27a4 100644 --- a/renovate.json +++ b/renovate.json @@ -500,6 +500,11 @@ "packageNames": ["protractor"], "allowedVersions": "<=7.0" }, + { + "paths": ["e2e/a10/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^10\\./" + }, { "paths": ["e2e/a10/package.json"], "packageNames": ["ts-node"], @@ -510,6 +515,11 @@ "packageNames": ["typescript"], "allowedVersions": "<=3.9" }, + { + "paths": ["e2e/a10/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a11/package.json"], From 99eeb2dc341395e14a11888928e70b29643332d7 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:20:05 +0100 Subject: [PATCH 06/11] test(a11): correct node --- .circleci/config.yml | 37 ++++++++----- e2e/a11/package-lock.json | 108 +++++++++++++++----------------------- e2e/a11/package.json | 4 +- renovate.json | 10 ++++ 4 files changed, 79 insertions(+), 80 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4d063741..f064fba58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a11-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a11/package-lock.json" }} - restore_cache: key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} - restore_cache: @@ -112,9 +110,6 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a11/node_modules/" ]; then - npm run i:ci:a11 - fi if [ ! -d "e2e/a12/node_modules/" ]; then npm run i:ci:a12 fi @@ -124,10 +119,6 @@ jobs: if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a11-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a11/package-lock.json" }} - paths: - - ./e2e/a11/node_modules - save_cache: key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} paths: @@ -393,9 +384,26 @@ jobs: - run: name: Build command: npm run b:a10:on + 'Angular 11 Install': + docker: + - image: satantime/puppeteer-node:12.22.9 + steps: + - checkout + - restore_cache: + key: a11-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a11/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a11/node_modules/" ]; then + npm run i:ci:a11 + fi + - save_cache: + key: a11-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a11/package-lock.json" }} + paths: + - ./e2e/a11/node_modules 'Angular 11 without Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -419,7 +427,7 @@ jobs: command: npm run b:a11:off 'Angular 11 with Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -606,12 +614,15 @@ workflows: - 'Angular 10 with Ivy': requires: - Angular 10 Install + - 'Angular 11 Install': + requires: + - Core - 'Angular 11 without Ivy': requires: - - Angular 10 Install + - Angular 11 Install - 'Angular 11 with Ivy': requires: - - Install + - Angular 11 Install - 'Angular 12 without Ivy': requires: - Install diff --git a/e2e/a11/package-lock.json b/e2e/a11/package-lock.json index d6f1354a8..d58d65011 100644 --- a/e2e/a11/package-lock.json +++ b/e2e/a11/package-lock.json @@ -5716,9 +5716,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", + "version": "0.0.901419", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz", + "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==", "dev": true }, "di": { @@ -9144,12 +9144,6 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -9287,13 +9281,10 @@ "dev": true }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true }, "node-forge": { "version": "0.10.0", @@ -10474,9 +10465,9 @@ "dev": true }, "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", + "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", "dev": true }, "promise-inflight": { @@ -10942,23 +10933,23 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-10.4.0.tgz", + "integrity": "sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w==", "dev": true, "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", + "debug": "4.3.1", + "devtools-protocol": "0.0.901419", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", + "node-fetch": "2.6.1", "pkg-dir": "4.2.0", - "progress": "2.0.3", + "progress": "2.0.1", "proxy-from-env": "1.1.0", "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "tar-fs": "2.0.0", + "unbzip2-stream": "1.3.3", + "ws": "7.4.6" }, "dependencies": { "agent-base": { @@ -10971,9 +10962,9 @@ } }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -10990,9 +10981,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true } } @@ -12789,15 +12780,15 @@ } }, "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", "dev": true, "requires": { "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", + "mkdirp": "^0.5.1", "pump": "^3.0.0", - "tar-stream": "^2.1.4" + "tar-stream": "^2.0.0" }, "dependencies": { "chownr": { @@ -12805,6 +12796,15 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } } } }, @@ -13035,12 +13035,6 @@ "punycode": "^2.1.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -13127,9 +13121,9 @@ "dev": true }, "unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", + "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", "dev": true, "requires": { "buffer": "^5.2.1", @@ -13667,12 +13661,6 @@ "selenium-webdriver": "^3.0.1" } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, "webpack": { "version": "4.44.2", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", @@ -14487,16 +14475,6 @@ "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", diff --git a/e2e/a11/package.json b/e2e/a11/package.json index 767dfec09..5c3a1c844 100644 --- a/e2e/a11/package.json +++ b/e2e/a11/package.json @@ -13,7 +13,7 @@ "e2e": "npm run e2e:ivy-on && npm run e2e:ivy-off", "e2e:ivy-on": "ng e2e --webdriver-update=false --configuration ivy-on", "e2e:ivy-off": "ng e2e --webdriver-update=false --configuration ivy-off", - "postinstall": "webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "webdriver-manager update --versions.chrome 93.0.4577.63 --gecko=false" }, "private": true, "peerDependencies": { @@ -50,7 +50,7 @@ "karma-jasmine": "4.0.1", "karma-jasmine-html-reporter": "1.5.4", "protractor": "7.0.0", - "puppeteer": "13.1.2", + "puppeteer": "10.4.0", "ts-node": "8.10.2", "typescript": "4.0.8" }, diff --git a/renovate.json b/renovate.json index d57cb27a4..42e00f075 100644 --- a/renovate.json +++ b/renovate.json @@ -596,6 +596,11 @@ "packageNames": ["protractor"], "allowedVersions": "<=7.0" }, + { + "paths": ["e2e/a11/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^10\\./" + }, { "paths": ["e2e/a11/package.json"], "packageNames": ["ts-node"], @@ -606,6 +611,11 @@ "packageNames": ["typescript"], "allowedVersions": "<=4.0" }, + { + "paths": ["e2e/a11/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a12/package.json"], From 94318dd9cb5dddc6affe472242704d79d427a7e2 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:23:33 +0100 Subject: [PATCH 07/11] test(a12): correct node --- .circleci/config.yml | 37 ++++++++----- e2e/a12/package-lock.json | 113 ++++++++++++++------------------------ e2e/a12/package.json | 4 +- renovate.json | 10 ++++ 4 files changed, 76 insertions(+), 88 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f064fba58..d47a1d7a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,8 +101,6 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} - restore_cache: key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }} - restore_cache: @@ -110,19 +108,12 @@ jobs: - run: name: NPM Install command: | - if [ ! -d "e2e/a12/node_modules/" ]; then - npm run i:ci:a12 - fi if [ ! -d "e2e/a13/node_modules/" ]; then npm run i:ci:a13 fi if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} - paths: - - ./e2e/a12/node_modules - save_cache: key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }} paths: @@ -449,9 +440,26 @@ jobs: - run: name: Build command: npm run b:a11:on + 'Angular 12 Install': + docker: + - image: satantime/puppeteer-node:12.22.9 + steps: + - checkout + - restore_cache: + key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a12/node_modules/" ]; then + npm run i:ci:a12 + fi + - save_cache: + key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} + paths: + - ./e2e/a12/node_modules 'Angular 12 without Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -475,7 +483,7 @@ jobs: command: npm run b:a12:off 'Angular 12 with Ivy': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -623,12 +631,15 @@ workflows: - 'Angular 11 with Ivy': requires: - Angular 11 Install + - 'Angular 12 Install': + requires: + - Core - 'Angular 12 without Ivy': requires: - - Install + - Angular 12 Install - 'Angular 12 with Ivy': requires: - - Install + - Angular 12 Install - 'Angular 13': requires: - Install diff --git a/e2e/a12/package-lock.json b/e2e/a12/package-lock.json index 9cc1c55b1..70f5aa7ac 100644 --- a/e2e/a12/package-lock.json +++ b/e2e/a12/package-lock.json @@ -6083,9 +6083,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", + "version": "0.0.901419", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz", + "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==", "dev": true }, "di": { @@ -9252,12 +9252,6 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, - "mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -9379,13 +9373,10 @@ "optional": true }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "requires": { - "whatwg-url": "^5.0.0" - } + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "dev": true }, "node-forge": { "version": "0.10.0", @@ -11593,9 +11584,9 @@ "dev": true }, "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", + "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", "dev": true }, "promise-inflight": { @@ -11860,34 +11851,23 @@ "dev": true }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-10.4.0.tgz", + "integrity": "sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w==", "dev": true, "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", + "debug": "4.3.1", + "devtools-protocol": "0.0.901419", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", + "node-fetch": "2.6.1", "pkg-dir": "4.2.0", - "progress": "2.0.3", + "progress": "2.0.1", "proxy-from-env": "1.1.0", "rimraf": "3.0.2", - "tar-fs": "2.1.1", - "unbzip2-stream": "1.4.3", - "ws": "8.2.3" - }, - "dependencies": { - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - } + "tar-fs": "2.0.0", + "unbzip2-stream": "1.3.3", + "ws": "7.4.6" } }, "q": { @@ -13322,15 +13302,15 @@ } }, "tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", "dev": true, "requires": { "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", + "mkdirp": "^0.5.1", "pump": "^3.0.0", - "tar-stream": "^2.1.4" + "tar-stream": "^2.0.0" }, "dependencies": { "chownr": { @@ -13338,6 +13318,15 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } } } }, @@ -13520,12 +13509,6 @@ "punycode": "^2.1.1" } }, - "tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true - }, "tree-kill": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", @@ -13601,9 +13584,9 @@ "dev": true }, "unbzip2-stream": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", - "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", + "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==", "dev": true, "requires": { "buffer": "^5.2.1", @@ -14013,12 +13996,6 @@ } } }, - "webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", - "dev": true - }, "webpack": { "version": "5.50.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.50.0.tgz", @@ -14758,16 +14735,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", - "dev": true, - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -14842,9 +14809,9 @@ "dev": true }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true }, "xml2js": { diff --git a/e2e/a12/package.json b/e2e/a12/package.json index efc8f3643..0e70c7600 100644 --- a/e2e/a12/package.json +++ b/e2e/a12/package.json @@ -13,7 +13,7 @@ "e2e": "npm run e2e:ivy-on && npm run e2e:ivy-off", "e2e:ivy-on": "ng e2e --webdriver-update=false --configuration ivy-on", "e2e:ivy-off": "ng e2e --webdriver-update=false --configuration ivy-off", - "postinstall": "webdriver-manager update --versions.chrome 97.0.4692.71 --gecko=false" + "postinstall": "webdriver-manager update --versions.chrome 93.0.4577.63 --gecko=false" }, "private": true, "peerDependencies": { @@ -50,7 +50,7 @@ "karma-jasmine": "4.0.1", "karma-jasmine-html-reporter": "1.7.0", "protractor": "7.0.0", - "puppeteer": "13.1.2", + "puppeteer": "10.4.0", "ts-node": "10.4.0", "typescript": "4.2.4" }, diff --git a/renovate.json b/renovate.json index 42e00f075..4bae1efb1 100644 --- a/renovate.json +++ b/renovate.json @@ -695,6 +695,11 @@ "packageNames": ["protractor"], "allowedVersions": "/^7\\.0\\./" }, + { + "paths": ["e2e/a12/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^10\\./" + }, { "paths": ["e2e/a12/package.json"], "packageNames": ["ts-node"], @@ -705,6 +710,11 @@ "packageNames": ["typescript"], "allowedVersions": "/^4\\.2\\./" }, + { + "paths": ["e2e/a12/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "paths": ["e2e/a13/package.json"], From 745eea1cc2e73cafe0679ccfe70aaab486dd1c20 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:26:38 +0100 Subject: [PATCH 08/11] test(a13): correct node --- .circleci/config.yml | 33 ++++++++++++++++++++++----------- renovate.json | 10 ++++++++++ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d47a1d7a0..1ad2f5c1e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,23 +101,14 @@ jobs: - image: satantime/puppeteer-node:16.13.2-buster steps: - checkout - - restore_cache: - key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }} - restore_cache: key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} - run: name: NPM Install command: | - if [ ! -d "e2e/a13/node_modules/" ]; then - npm run i:ci:a13 - fi if [ ! -d "e2e/r7/node_modules/" ]; then npm run i:ci:r7 fi - - save_cache: - key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }} - paths: - - ./e2e/a13/node_modules - save_cache: key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} paths: @@ -505,9 +496,26 @@ jobs: - run: name: Build command: npm run b:a12:on + 'Angular 13 Install': + docker: + - image: satantime/puppeteer-node:12.22.9 + steps: + - checkout + - restore_cache: + key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/a13/node_modules/" ]; then + npm run i:ci:a13 + fi + - save_cache: + key: a13-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a13/package-lock.json" }} + paths: + - ./e2e/a13/node_modules 'Angular 13': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:12.22.9 steps: - checkout - attach_workspace: @@ -640,9 +648,12 @@ workflows: - 'Angular 12 with Ivy': requires: - Angular 12 Install + - 'Angular 13 Install': + requires: + - Core - 'Angular 13': requires: - - Install + - Angular 13 Install - 'React Redux 7': requires: - Install diff --git a/renovate.json b/renovate.json index 4bae1efb1..9d2780b58 100644 --- a/renovate.json +++ b/renovate.json @@ -799,6 +799,11 @@ "packageNames": ["protractor"], "allowedVersions": "/^7\\.0\\./" }, + { + "paths": ["e2e/a13/package.json"], + "packageNames": ["puppeteer"], + "allowedVersions": "/^13\\./" + }, { "paths": ["e2e/a13/package.json"], "packageNames": ["ts-node"], @@ -809,6 +814,11 @@ "packageNames": ["typescript"], "allowedVersions": "/^4\\.5\\./" }, + { + "paths": ["e2e/a13/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, { "packagePatterns": ["npm"], From 60b8d5eca74803b2be0d44f450e2e88137da918e Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 19:42:33 +0100 Subject: [PATCH 09/11] test(r7): correct node --- .circleci/config.yml | 46 ++++----- .prettierignore | 1 + renovate.json | 241 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 264 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ad2f5c1e..6872f82c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ parameters: jobs: Core: docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:14.18.3 steps: - checkout - restore_cache: @@ -96,23 +96,6 @@ jobs: root: dist paths: - . - 'Install': - docker: - - image: satantime/puppeteer-node:16.13.2-buster - steps: - - checkout - - restore_cache: - key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} - - run: - name: NPM Install - command: | - if [ ! -d "e2e/r7/node_modules/" ]; then - npm run i:ci:r7 - fi - - save_cache: - key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} - paths: - - ./e2e/r7/node_modules 'Angular 6 Install': docker: - image: satantime/puppeteer-node:8.17.0 @@ -537,9 +520,26 @@ jobs: - run: name: Build command: npm run b:a13 + 'React Redux 7 Install': + docker: + - image: satantime/puppeteer-node:14.18.3 + steps: + - checkout + - restore_cache: + key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} + - run: + name: NPM Install + command: | + if [ ! -d "e2e/r7/node_modules/" ]; then + npm run i:ci:r7 + fi + - save_cache: + key: r7-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/r7/package-lock.json" }} + paths: + - ./e2e/r7/node_modules 'React Redux 7': docker: - - image: satantime/puppeteer-node:16.13.2-buster + - image: satantime/puppeteer-node:14.18.3 steps: - checkout - attach_workspace: @@ -588,9 +588,6 @@ workflows: Testing: jobs: - Core - - Install: - requires: - - Core - 'Core IE': requires: - Core @@ -654,6 +651,9 @@ workflows: - 'Angular 13': requires: - Angular 13 Install + - 'React Redux 7 Install': + requires: + - Core - 'React Redux 7': requires: - - Install + - React Redux 7 Install diff --git a/.prettierignore b/.prettierignore index f8564d0dc..cc9273ef3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ +.angular .browserslistrc .editorconfig .gitignore diff --git a/renovate.json b/renovate.json index 9d2780b58..5688ef10b 100644 --- a/renovate.json +++ b/renovate.json @@ -7,7 +7,7 @@ "separateMajorMinor": true, "separateMinorPatch": true, "separateMultipleMajor": true, - "includeForks": true, + "includeForks": false, "ignoreDeprecated": false, "semanticCommitScope": "{{#if baseDir}}{{baseDir}}{{else}}deps{{/if}}", "additionalBranchPrefix": "{{#if baseDir}}{{baseDir}}/{{else}}root/{{/if}}", @@ -37,789 +37,1028 @@ }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "<=6" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "<=6" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["core-js"], "allowedVersions": "<=2.5" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["rxjs"], "allowedVersions": "<=6.2" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["zone.js"], "allowedVersions": "<=0.8" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "<=0.8" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "<=2.8" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["@types/node"], "allowedVersions": "<=8.9" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "<=4.2" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["karma"], "allowedVersions": "<=3.1" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "<=2.2" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "<=1.1" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "<=0.2" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^2\\./" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["ts-node"], "allowedVersions": "<=7" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["typescript"], "allowedVersions": "<=2.9" }, { + "additionalBranchPrefix": "e2e/a6/", "paths": ["e2e/a6/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "<=7" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "<=7" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["core-js"], "allowedVersions": "<=2.6" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["rxjs"], "allowedVersions": "<=6.3" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["tslib"], "allowedVersions": "<=1" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["zone.js"], "allowedVersions": "<=0.8" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "<=0.13" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "<=2.8" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["@types/node"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "<=4.2" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["karma"], "allowedVersions": "<=4.4" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "<=2.2" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "<=1.1" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "<=0.2" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^2\\./" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["ts-node"], "allowedVersions": "<=7" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["typescript"], "allowedVersions": "<=3.2" }, { + "additionalBranchPrefix": "e2e/a7/", "paths": ["e2e/a7/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["rxjs"], "allowedVersions": "<=6.4" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["tslib"], "allowedVersions": "<=1" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["zone.js"], "allowedVersions": "<=0.9" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "<0.900" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "<=3.4" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["@types/node"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "<=4.2" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["karma"], "allowedVersions": "<=4.4" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "<=2.2" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "<=1.4" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^5\\./" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["ts-node"], "allowedVersions": "<=7" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["typescript"], "allowedVersions": "<=3.5" }, { + "additionalBranchPrefix": "e2e/a8/", "paths": ["e2e/a8/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "<=9" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "<=9" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["rxjs"], "allowedVersions": "<=6.5" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["tslib"], "allowedVersions": "<=1" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["zone.js"], "allowedVersions": "<=0.10" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "<0.1000" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "<=3.5" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["@types/node"], "allowedVersions": "<=12" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "<=4.2" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["karma"], "allowedVersions": "<=4.4" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "<=3.1" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "<=1.5" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["protractor"], "allowedVersions": "<=5.4" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^10\\./" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["ts-node"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["typescript"], "allowedVersions": "<=3.7" }, { + "additionalBranchPrefix": "e2e/a9/", "paths": ["e2e/a9/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "<=10" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "<=10" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["rxjs"], "allowedVersions": "<=6.5" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["tslib"], "allowedVersions": "<=2" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["zone.js"], "allowedVersions": "<=0.10" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "<0.1100" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "<=3.5" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["@types/node"], "allowedVersions": "<=12" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "<=5.0" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["karma"], "allowedVersions": "<=5.2" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "<=3.1" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "<=3.1" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "<=1.5" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["protractor"], "allowedVersions": "<=7.0" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^10\\./" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["ts-node"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["typescript"], "allowedVersions": "<=3.9" }, { + "additionalBranchPrefix": "e2e/a10/", "paths": ["e2e/a10/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "<=11" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "<=11" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["rxjs"], "allowedVersions": "<=6.5" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["tslib"], "allowedVersions": "<=2" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["zone.js"], "allowedVersions": "<=0.10" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "<0.1200" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "<=3.6" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "<=2.0" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["@types/node"], "allowedVersions": "<=12" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "<=5.0" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["karma"], "allowedVersions": "<=5.2" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "<=3.1" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "<=4.0" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "<=1.5" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["protractor"], "allowedVersions": "<=7.0" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^10\\./" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["ts-node"], "allowedVersions": "<=8" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["typescript"], "allowedVersions": "<=4.0" }, { + "additionalBranchPrefix": "e2e/a11/", "paths": ["e2e/a11/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "/^12\\./", "ignoreUnstable": false }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "/^12\\./", "ignoreUnstable": false }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["rxjs"], "allowedVersions": "/^6\\.6\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["tslib"], "allowedVersions": "/^2\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["zone.js"], "allowedVersions": "/^0\\.11\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "/^12\\./", "ignoreUnstable": false }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["@types/jasmine", "jasmine-core"], "allowedVersions": "/^3\\.7\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "/^2\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["@types/node"], "allowedVersions": "/^12\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "/^5\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["karma"], "allowedVersions": "/^6\\.3\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "/^3\\.1\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "/^4\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "/^1\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["protractor"], "allowedVersions": "/^7\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^10\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["ts-node"], "allowedVersions": "/^10\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["typescript"], "allowedVersions": "/^4\\.2\\./" }, { + "additionalBranchPrefix": "e2e/a12/", "paths": ["e2e/a12/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packagePatterns": ["^@angular/"], "allowedVersions": "/^13\\./", "ignoreUnstable": false }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packagePatterns": ["^@ngrx/"], "allowedVersions": "/^13\\./", "ignoreUnstable": false }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["rxjs"], "allowedVersions": "/^7\\.5\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["tslib"], "allowedVersions": "/^2\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["zone.js"], "allowedVersions": "/^0\\.11\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["@angular-devkit/build-angular"], "allowedVersions": "/^13\\./", "ignoreUnstable": false }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["@types/jasmine"], "allowedVersions": "/^3\\.10\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["jasmine-core"], "allowedVersions": "/^4\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["@types/jasminewd2"], "allowedVersions": "/^2\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["@types/node"], "allowedVersions": "/^12\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["jasmine-spec-reporter"], "allowedVersions": "/^5\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["karma"], "allowedVersions": "/^6\\.3\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["karma-chrome-launcher"], "allowedVersions": "/^3\\.1\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["karma-jasmine"], "allowedVersions": "/^4\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["karma-jasmine-html-reporter"], "allowedVersions": "/^1\\.7\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["protractor"], "allowedVersions": "/^7\\.0\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["puppeteer"], "allowedVersions": "/^13\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["ts-node"], "allowedVersions": "/^10\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["typescript"], "allowedVersions": "/^4\\.5\\./" }, { + "additionalBranchPrefix": "e2e/a13/", "paths": ["e2e/a13/package.json"], "packageNames": ["npm"], "allowedVersions": "/^6\\./" }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@reduxjs/toolkit"], + "allowedVersions": "/^1\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@testing-library/jest-dom"], + "allowedVersions": "/^5\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@testing-library/react"], + "allowedVersions": "/^12\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@testing-library/user-event"], + "allowedVersions": "/^12\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@types/jest"], + "allowedVersions": "/^27\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@types/node"], + "allowedVersions": "/^14\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@types/react", "react"], + "allowedVersions": "/^17\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@types/react-dom", "react-dom"], + "allowedVersions": "/^17\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@types/react-redux", "react-redux"], + "allowedVersions": "/^7\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["@types/redux", "redux"], + "allowedVersions": "/^[34]\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["react-scripts"], + "allowedVersions": "/^5\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["typescript"], + "allowedVersions": "/^4\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["web-vitals"], + "allowedVersions": "/^2\\./" + }, + { + "additionalBranchPrefix": "e2e/r7/", + "paths": ["e2e/r7/package.json"], + "packageNames": ["npm"], + "allowedVersions": "/^6\\./" + }, + { "packagePatterns": ["npm"], "allowedVersions": "/^6\\./" From 623f50c09773c8b33cf889d2b99317866907cc32 Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 20:11:06 +0100 Subject: [PATCH 10/11] test(a7): correct node --- e2e/a7/package-lock.json | 692 ++++++++++++++++++--------------------- e2e/a7/package.json | 2 +- 2 files changed, 322 insertions(+), 372 deletions(-) diff --git a/e2e/a7/package-lock.json b/e2e/a7/package-lock.json index e45f0397e..40471956b 100644 --- a/e2e/a7/package-lock.json +++ b/e2e/a7/package-lock.json @@ -1332,12 +1332,24 @@ } } }, + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, "base64-js": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", "dev": true }, + "base64id": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", + "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", + "dev": true + }, "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -1353,6 +1365,15 @@ "tweetnacl": "^0.14.3" } }, + "better-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", + "dev": true, + "requires": { + "callsite": "1.0.0" + } + }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -1758,6 +1779,12 @@ "caller-callsite": "^2.0.0" } }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", + "dev": true + }, "callsites": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", @@ -2356,9 +2383,9 @@ } }, "date-format": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz", - "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", + "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", "dev": true }, "debug": { @@ -2718,90 +2745,59 @@ } }, "engine.io": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz", - "integrity": "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", + "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", "dev": true, "requires": { "accepts": "~1.3.4", - "base64id": "2.0.0", - "cookie": "~0.4.1", - "debug": "~4.1.0", - "engine.io-parser": "~2.2.0", - "ws": "~7.4.2" + "base64id": "1.0.0", + "cookie": "0.3.1", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" }, "dependencies": { - "base64-arraybuffer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", - "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", - "dev": true - }, - "base64id": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", - "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", - "dev": true - }, "cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "dev": true }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "engine.io-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz", - "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.4", - "blob": "0.0.5", - "has-binary2": "~1.0.2" + "ms": "2.0.0" } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true } } }, "engine.io-client": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", - "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", + "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", "dev": true, "requires": { - "component-emitter": "~1.3.0", + "component-emitter": "1.2.1", "component-inherit": "0.0.3", "debug": "~3.1.0", - "engine.io-parser": "~2.2.0", + "engine.io-parser": "~2.1.1", "has-cors": "1.1.0", "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "ws": "~7.4.2", - "xmlhttprequest-ssl": "~1.6.2", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" }, "dependencies": { - "base64-arraybuffer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", - "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "dev": true }, "debug": { @@ -2812,40 +2808,22 @@ "requires": { "ms": "2.0.0" } - }, - "engine.io-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz", - "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==", - "dev": true, - "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.4", - "blob": "0.0.5", - "has-binary2": "~1.0.2" - } - }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", - "dev": true - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", - "dev": true - }, - "xmlhttprequest-ssl": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz", - "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==", - "dev": true } } }, + "engine.io-parser": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", + "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + "dev": true, + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" + } + }, "enhanced-resolve": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", @@ -3498,32 +3476,14 @@ } }, "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "dependencies": { - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - } + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs-minipass": { @@ -5163,6 +5123,12 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, + "isbinaryfile": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", + "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", + "dev": true + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -5363,6 +5329,15 @@ "minimist": "^1.2.0" } }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -5394,9 +5369,9 @@ } }, "karma": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.8.tgz", - "integrity": "sha512-n0iQ66to2YivGTw202ReC5I33F7/BaiQRBEP6MNRex//3ckblNcEDV5T5CL+2W/wdjPc479IxDkMtBoOZ/4PnA==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.7.tgz", + "integrity": "sha512-I24X7rAXZ96AeJEpaJqGcaPsTbjt1f89MudxhJVPYCLXMevZjW0By4FwnjGoEN7hV/T0A3L/iaF3ezQlts3SUw==", "dev": true, "requires": { "body-parser": "^1.19.0", @@ -5412,13 +5387,13 @@ "http-proxy": "^1.18.0", "isbinaryfile": "^4.0.6", "lodash": "^4.17.15", - "log4js": "^6.2.1", + "log4js": "^4.0.0", "mime": "^2.4.5", "minimatch": "^3.0.4", "qjobs": "^1.2.0", "range-parser": "^1.2.1", "rimraf": "^3.0.2", - "socket.io": "^2.3.0", + "socket.io": "2.1.1", "source-map": "^0.6.1", "tmp": "0.2.1", "ua-parser-js": "0.7.21", @@ -5426,9 +5401,9 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -5441,9 +5416,9 @@ } }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -5451,9 +5426,9 @@ } }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "braces": { @@ -5472,19 +5447,19 @@ "dev": true }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" + "readdirp": "~3.6.0" } }, "cliui": { @@ -5519,19 +5494,6 @@ "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", "dev": true }, - "date-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz", - "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==" - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "requires": { - "ms": "2.1.2" - } - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5557,18 +5519,10 @@ "path-exists": "^4.0.0" } }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0" - } - }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -5579,9 +5533,9 @@ "dev": true }, "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -5593,18 +5547,19 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" } }, "graceful-fs": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", - "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", + "dev": true }, "is-binary-path": { "version": "2.1.0", @@ -5627,18 +5582,6 @@ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - }, - "isbinaryfile": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", - "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", - "dev": true - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -5649,16 +5592,11 @@ } }, "mime": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz", - "integrity": "sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", "dev": true }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -5674,18 +5612,6 @@ "p-limit": "^2.2.0" } }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", - "dev": true - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", - "dev": true - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -5693,9 +5619,9 @@ "dev": true }, "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -5716,147 +5642,30 @@ "glob": "^7.1.3" } }, - "socket.io": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz", - "integrity": "sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==", - "dev": true, - "requires": { - "debug": "~4.1.0", - "engine.io": "~3.5.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.4.0", - "socket.io-parser": "~3.4.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "socket.io-client": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", - "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", - "dev": true, - "requires": { - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "engine.io-client": "~3.5.0", - "has-binary2": "~1.0.2", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "socket.io-parser": "~3.3.0", - "to-array": "0.1.4" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", - "dev": true, - "requires": { - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "isarray": "2.0.1" - } - } - } - }, - "socket.io-parser": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", - "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", - "dev": true, - "requires": { - "component-emitter": "1.2.1", - "debug": "~4.1.0", - "isarray": "2.0.1" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "streamroller": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz", - "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==", - "requires": { - "date-format": "^2.1.0", - "debug": "^4.1.1", - "fs-extra": "^8.1.0" - }, - "dependencies": { - "date-format": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==" - } - } - }, "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "tmp": { @@ -6120,16 +5929,16 @@ "dev": true }, "log4js": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz", - "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz", + "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==", "dev": true, "requires": { - "date-format": "^4.0.3", - "debug": "^4.3.3", - "flatted": "^3.2.4", - "rfdc": "^1.3.0", - "streamroller": "^3.0.2" + "date-format": "^2.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.0", + "rfdc": "^1.1.4", + "streamroller": "^1.0.6" }, "dependencies": { "debug": { @@ -6141,23 +5950,11 @@ "ms": "2.1.2" } }, - "flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true - }, - "rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", - "dev": true } } }, @@ -6981,6 +6778,12 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, + "object-component": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", + "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", + "dev": true + }, "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", @@ -7385,6 +7188,24 @@ "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "dev": true, + "requires": { + "better-assert": "~1.0.0" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "dev": true, + "requires": { + "better-assert": "~1.0.0" + } + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -7488,9 +7309,9 @@ "dev": true }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, "pify": { @@ -8480,6 +8301,12 @@ "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", "dev": true }, + "rfdc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", + "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", + "dev": true + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -9004,12 +8831,110 @@ } } }, + "socket.io": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", + "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", + "dev": true, + "requires": { + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", + "socket.io-client": "2.1.1", + "socket.io-parser": "~3.2.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, "socket.io-adapter": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", "dev": true }, + "socket.io-client": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", + "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", + "dev": true, + "requires": { + "backo2": "1.0.2", + "base64-arraybuffer": "0.1.5", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "socket.io-parser": "~3.2.0", + "to-array": "0.1.4" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "socket.io-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", + "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "isarray": "2.0.1" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", + "dev": true + } + } + }, "sockjs": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", @@ -9396,29 +9321,31 @@ "dev": true }, "streamroller": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz", - "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", + "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", "dev": true, "requires": { - "date-format": "^4.0.3", - "debug": "^4.1.1", - "fs-extra": "^10.0.0" + "async": "^2.6.2", + "date-format": "^2.0.0", + "debug": "^3.2.6", + "fs-extra": "^7.0.1", + "lodash": "^4.17.14" }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { - "ms": "2.1.2" + "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==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true } } @@ -9892,6 +9819,12 @@ "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==", "dev": true }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true + }, "union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", @@ -9922,6 +9855,12 @@ "imurmurhash": "^0.1.4" } }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -10626,10 +10565,15 @@ "dev": true }, "ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "dev": true + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" + } }, "xml2js": { "version": "0.4.23", @@ -10655,6 +10599,12 @@ "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "dev": true }, + "xmlhttprequest-ssl": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", + "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", + "dev": true + }, "xregexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", diff --git a/e2e/a7/package.json b/e2e/a7/package.json index b3f5af7fc..26b1a8f95 100644 --- a/e2e/a7/package.json +++ b/e2e/a7/package.json @@ -40,7 +40,7 @@ "@types/node": "8.10.66", "jasmine-core": "2.8.0", "jasmine-spec-reporter": "4.2.1", - "karma": "5.0.8", + "karma": "5.0.7", "karma-chrome-launcher": "2.2.0", "karma-jasmine": "1.1.2", "karma-jasmine-html-reporter": "0.2.2", From 95708aa666204493259c67f50ab8e0a94f30c89e Mon Sep 17 00:00:00 2001 From: satanTime Date: Sun, 30 Jan 2022 20:22:08 +0100 Subject: [PATCH 11/11] test(a12): removing no ivy mode --- .circleci/config.yml | 37 ++----------- e2e/a12/angular.json | 49 ++++-------------- e2e/a12/e2e/protractor.ivy-off.js | 41 --------------- .../{protractor.ivy-on.js => protractor.js} | 2 +- e2e/a12/e2e/tsconfig.ivy-off.json | 7 --- .../{tsconfig.ivy-on.json => tsconfig.json} | 2 +- e2e/a12/package.json | 12 ++--- e2e/a12/src/assets/.gitkeep | 0 e2e/a12/src/environments/environment.prod.ts | 3 -- e2e/a12/src/environments/environment.ts | 16 ------ e2e/a12/src/favicon.ico | Bin 948 -> 0 bytes e2e/a12/src/main.ts | 6 +-- e2e/a12/src/styles.css | 1 - e2e/a12/tsconfig.ivy-off.json | 6 --- e2e/a12/tsconfig.ivy-on.json | 6 --- package.json | 12 ++--- 16 files changed, 23 insertions(+), 177 deletions(-) delete mode 100644 e2e/a12/e2e/protractor.ivy-off.js rename e2e/a12/e2e/{protractor.ivy-on.js => protractor.js} (93%) delete mode 100644 e2e/a12/e2e/tsconfig.ivy-off.json rename e2e/a12/e2e/{tsconfig.ivy-on.json => tsconfig.json} (72%) delete mode 100644 e2e/a12/src/assets/.gitkeep delete mode 100644 e2e/a12/src/environments/environment.prod.ts delete mode 100644 e2e/a12/src/environments/environment.ts delete mode 100644 e2e/a12/src/favicon.ico delete mode 100644 e2e/a12/src/styles.css delete mode 100644 e2e/a12/tsconfig.ivy-off.json delete mode 100644 e2e/a12/tsconfig.ivy-on.json diff --git a/.circleci/config.yml b/.circleci/config.yml index 6872f82c3..63d07ea64 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -431,7 +431,7 @@ jobs: key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} paths: - ./e2e/a12/node_modules - 'Angular 12 without Ivy': + 'Angular 12': docker: - image: satantime/puppeteer-node:12.22.9 steps: @@ -448,37 +448,13 @@ jobs: command: npm run s:test:a12 - run: name: UT - command: npm run test:a12:off + command: npm run test:a12 - run: name: E2E - command: npm run e2e:a12:off + command: npm run e2e:a12 - run: name: Build - command: npm run b:a12:off - 'Angular 12 with Ivy': - docker: - - image: satantime/puppeteer-node:12.22.9 - steps: - - checkout - - attach_workspace: - at: dist - - restore_cache: - key: a12-<< pipeline.parameters.lockindex >>-{{ arch }}-{{ checksum "e2e/a12/package-lock.json" }} - - run: - name: Spreading Build - command: npm run s:a12 - - run: - name: Spreading Tests - command: npm run s:test:a12 - - run: - name: UT - command: npm run test:a12:on - - run: - name: E2E - command: npm run e2e:a12:on - - run: - name: Build - command: npm run b:a12:on + command: npm run b:a12 'Angular 13 Install': docker: - image: satantime/puppeteer-node:12.22.9 @@ -639,10 +615,7 @@ workflows: - 'Angular 12 Install': requires: - Core - - 'Angular 12 without Ivy': - requires: - - Angular 12 Install - - 'Angular 12 with Ivy': + - 'Angular 12': requires: - Angular 12 Install - 'Angular 13 Install': diff --git a/e2e/a12/angular.json b/e2e/a12/angular.json index eb48a75ad..c913969b1 100644 --- a/e2e/a12/angular.json +++ b/e2e/a12/angular.json @@ -18,65 +18,34 @@ "builder": "@angular-devkit/build-angular:browser", "options": { "outputPath": "dist/a12", + "tsConfig": "tsconfig.json", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", "aot": true, - "progress": false, - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.css"], - "scripts": [] - }, - "configurations": { - "ivy-on": { - "tsConfig": "tsconfig.ivy-on.json" - }, - "ivy-off": { - "tsConfig": "tsconfig.ivy-off.json" - } + "progress": false } }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", - "configurations": { - "ivy-on": { - "browserTarget": "a12:build:ivy-on" - }, - "ivy-off": { - "browserTarget": "a12:build:ivy-off" - } + "options": { + "browserTarget": "a12:build" } }, "test": { "builder": "@angular-devkit/build-angular:karma", "options": { + "tsConfig": "tsconfig.json", "main": "src/test.ts", "polyfills": "src/polyfills.ts", - "karmaConfig": "karma.conf.js", - "assets": ["src/favicon.ico", "src/assets"], - "styles": ["src/styles.css"], - "scripts": [] - }, - "configurations": { - "ivy-on": { - "tsConfig": "tsconfig.ivy-on.json" - }, - "ivy-off": { - "tsConfig": "tsconfig.ivy-off.json" - } + "karmaConfig": "karma.conf.js" } }, "e2e": { "builder": "@angular-devkit/build-angular:protractor", - "configurations": { - "ivy-on": { - "devServerTarget": "a12:serve:ivy-on", - "protractorConfig": "e2e/protractor.ivy-on.js" - }, - "ivy-off": { - "devServerTarget": "a12:serve:ivy-off", - "protractorConfig": "e2e/protractor.ivy-off.js" - } + "options": { + "devServerTarget": "a12:serve", + "protractorConfig": "e2e/protractor.js" } } } diff --git a/e2e/a12/e2e/protractor.ivy-off.js b/e2e/a12/e2e/protractor.ivy-off.js deleted file mode 100644 index d02ea785f..000000000 --- a/e2e/a12/e2e/protractor.ivy-off.js +++ /dev/null @@ -1,41 +0,0 @@ -// @ts-check -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const {SpecReporter, StacktraceOption} = require('jasmine-spec-reporter'); - -/** - * @type { import("protractor").Config } - */ -exports.config = { - allScriptsTimeout: 11000, - specs: ['./src/**/*.e2e-spec.ts'], - capabilities: { - browserName: 'chrome', - chromeOptions: { - args: ['--headless', '--disable-gpu', '--window-size=800,600', '--no-sandbox', '--disable-dev-shm-usage'], - binary: require('puppeteer').executablePath(), - }, - }, - directConnect: true, - SELENIUM_PROMISE_MANAGER: false, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function () {}, - }, - onPrepare() { - require('ts-node').register({ - project: require('path').join(__dirname, 'tsconfig.ivy-off.json'), - }); - jasmine.getEnv().addReporter( - new SpecReporter({ - spec: { - displayStacktrace: StacktraceOption.PRETTY, - }, - }), - ); - }, -}; diff --git a/e2e/a12/e2e/protractor.ivy-on.js b/e2e/a12/e2e/protractor.js similarity index 93% rename from e2e/a12/e2e/protractor.ivy-on.js rename to e2e/a12/e2e/protractor.js index a3cd4581e..3fdbce25a 100644 --- a/e2e/a12/e2e/protractor.ivy-on.js +++ b/e2e/a12/e2e/protractor.js @@ -28,7 +28,7 @@ exports.config = { }, onPrepare() { require('ts-node').register({ - project: require('path').join(__dirname, 'tsconfig.ivy-on.json'), + project: require('path').join(__dirname, 'tsconfig.json'), }); jasmine.getEnv().addReporter( new SpecReporter({ diff --git a/e2e/a12/e2e/tsconfig.ivy-off.json b/e2e/a12/e2e/tsconfig.ivy-off.json deleted file mode 100644 index 00596caed..000000000 --- a/e2e/a12/e2e/tsconfig.ivy-off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../tsconfig.ivy-off.json", - "compilerOptions": { - "module": "commonjs", - "types": ["jasmine", "jasminewd2", "node"] - } -} diff --git a/e2e/a12/e2e/tsconfig.ivy-on.json b/e2e/a12/e2e/tsconfig.json similarity index 72% rename from e2e/a12/e2e/tsconfig.ivy-on.json rename to e2e/a12/e2e/tsconfig.json index 45e4179b4..4b515f6ca 100644 --- a/e2e/a12/e2e/tsconfig.ivy-on.json +++ b/e2e/a12/e2e/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.ivy-on.json", + "extends": "../tsconfig.json", "compilerOptions": { "module": "commonjs", "types": ["jasmine", "jasminewd2", "node"] diff --git a/e2e/a12/package.json b/e2e/a12/package.json index 0e70c7600..8e6130e62 100644 --- a/e2e/a12/package.json +++ b/e2e/a12/package.json @@ -4,15 +4,9 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "npm run build:ivy-on && npm run build:ivy-off", - "build:ivy-on": "ng build --configuration ivy-on", - "build:ivy-off": "ng build --configuration ivy-off", - "test": "npm run test:ivy-on && npm run test:ivy-off", - "test:ivy-on": "ng test --configuration ivy-on", - "test:ivy-off": "ng test --configuration ivy-off", - "e2e": "npm run e2e:ivy-on && npm run e2e:ivy-off", - "e2e:ivy-on": "ng e2e --webdriver-update=false --configuration ivy-on", - "e2e:ivy-off": "ng e2e --webdriver-update=false --configuration ivy-off", + "build": "ng build", + "test": "ng test", + "e2e": "ng e2e --webdriver-update=false", "postinstall": "webdriver-manager update --versions.chrome 93.0.4577.63 --gecko=false" }, "private": true, diff --git a/e2e/a12/src/assets/.gitkeep b/e2e/a12/src/assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/e2e/a12/src/environments/environment.prod.ts b/e2e/a12/src/environments/environment.prod.ts deleted file mode 100644 index da7c84f63..000000000 --- a/e2e/a12/src/environments/environment.prod.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const environment = { - production: true, -}; diff --git a/e2e/a12/src/environments/environment.ts b/e2e/a12/src/environments/environment.ts deleted file mode 100644 index d16857364..000000000 --- a/e2e/a12/src/environments/environment.ts +++ /dev/null @@ -1,16 +0,0 @@ -// This file can be replaced during build by using the `fileReplacements` array. -// `ng build` replaces `environment.ts` with `environment.prod.ts`. -// The list of file replacements can be found in `angular.json`. - -export const environment = { - production: false, -}; - -/* - * For easier debugging in development mode, you can import the following file - * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. - * - * This import should be commented out in production mode because it will have a negative impact - * on performance if an error is thrown. - */ -// import 'zone.js/plugins/zone-error'; // Included with Angular CLI. diff --git a/e2e/a12/src/favicon.ico b/e2e/a12/src/favicon.ico deleted file mode 100644 index 997406ad22c29aae95893fb3d666c30258a09537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 948 zcmV;l155mgP)CBYU7IjCFmI-B}4sMJt3^s9NVg!P0 z6hDQy(L`XWMkB@zOLgN$4KYz;j0zZxq9KKdpZE#5@k0crP^5f9KO};h)ZDQ%ybhht z%t9#h|nu0K(bJ ztIkhEr!*UyrZWQ1k2+YkGqDi8Z<|mIN&$kzpKl{cNP=OQzXHz>vn+c)F)zO|Bou>E z2|-d_=qY#Y+yOu1a}XI?cU}%04)zz%anD(XZC{#~WreV!a$7k2Ug`?&CUEc0EtrkZ zL49MB)h!_K{H(*l_93D5tO0;BUnvYlo+;yss%n^&qjt6fZOa+}+FDO(~2>G z2dx@=JZ?DHP^;b7*Y1as5^uphBsh*s*z&MBd?e@I>-9kU>63PjP&^#5YTOb&x^6Cf z?674rmSHB5Fk!{Gv7rv!?qX#ei_L(XtwVqLX3L}$MI|kJ*w(rhx~tc&L&xP#?cQow zX_|gx$wMr3pRZIIr_;;O|8fAjd;1`nOeu5K(pCu7>^3E&D2OBBq?sYa(%S?GwG&_0-s%_v$L@R!5H_fc)lOb9ZoOO#p`Nn`KU z3LTTBtjwo`7(HA6 z7gmO$yTR!5L>Bsg!X8616{JUngg_@&85%>W=mChTR;x4`P=?PJ~oPuy5 zU-L`C@_!34D21{fD~Y8NVnR3t;aqZI3fIhmgmx}$oc-dKDC6Ap$Gy>a!`A*x2L1v0 WcZ@i?LyX}70000