From ae4daf74cf9ab030d04867d0f9e86d74434af426 Mon Sep 17 00:00:00 2001 From: Tan Li Hau Date: Wed, 21 Jul 2021 12:19:00 +0800 Subject: [PATCH 1/3] update code-red@0.2.2 --- package-lock.json | 346 +++++----------------------------------------- package.json | 2 +- 2 files changed, 36 insertions(+), 312 deletions(-) diff --git a/package-lock.json b/package-lock.json index d90c33bcb267..8969bbcf794f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -947,60 +947,39 @@ } }, "code-red": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.2.1.tgz", - "integrity": "sha512-qn8UyXkRqHJnWkrgc5AGDjkgoqlK5BtelIykSCl89HOV/HMtVxZw2GTwD2A7uMbLgGmch4/KyJX+mcWuPpqCtg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.2.2.tgz", + "integrity": "sha512-CvM8mK6RkLCwMNt+/TBLmqC6eKcbky9AOR+jC+0ClSh4Mk2Ix7+sPqUEIAbJzT822oCu3D469prC7155657n2A==", "dev": true, "requires": { - "@types/estree": "^0.0.45", + "@types/estree": "^0.0.50", "acorn": "^8.0.5", - "estree-walker": "^0.9.0", - "is-reference": "^2.0.0", - "periscopic": "^2.0.1", + "estree-walker": "^3.0.0", + "is-reference": "^3.0.0", + "periscopic": "^3.0.4", "sourcemap-codec": "^1.4.8" }, "dependencies": { + "@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", + "dev": true + }, "estree-walker": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.9.0.tgz", - "integrity": "sha512-12U47o7XHUX329+x3FzNVjCx3SHEzMF0nkDv7r/HnBzX/xNTKxajBk6gyygaxrAFtLj39219oMfbtxv4KpaOiA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.0.tgz", + "integrity": "sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==", "dev": true }, "is-reference": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-2.0.0.tgz", - "integrity": "sha512-kgaeJVq59jasPrhlGK/K61muTjLxMOZf4oMwI4X94nDWqkqLxDWVWrecCSP5c6OR8JF7Yul0X7h59lB1ho0epQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.0.tgz", + "integrity": "sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==", "dev": true, "requires": { "@types/estree": "*" } - }, - "periscopic": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-2.0.3.tgz", - "integrity": "sha512-FuCZe61mWxQOJAQFEfmt9FjzebRlcpFz8sFPbyaCKtdusPkMEbA9ey0eARnRav5zAhmXznhaQkKGFAPn7X9NUw==", - "dev": true, - "requires": { - "estree-walker": "^2.0.2", - "is-reference": "^1.1.4" - }, - "dependencies": { - "estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true - }, - "is-reference": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", - "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", - "dev": true, - "requires": { - "@types/estree": "*" - } - } - } } } }, @@ -3138,8 +3117,7 @@ "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 + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "mz": { "version": "2.7.0", @@ -3358,14 +3336,6 @@ "prelude-ls": "~1.1.2", "type-check": "~0.3.2", "wordwrap": "~1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } } }, "os-locale": { @@ -3500,22 +3470,10 @@ "dev": true }, "periscopic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.0.3.tgz", - "integrity": "sha512-8wX0FcHlCndaln004f0tLr3tHLLpSQQHqVAiunx859Fz1jZ75OG5Hpt5F9DLmM0YnfGuDZPJC3Yh0w9eCngj/g==", - "dev": true, - "requires": { - "estree-walker": "^3.0.0", - "is-reference": "^1.1.4" - }, - "dependencies": { - "estree-walker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.0.tgz", - "integrity": "sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==", - "dev": true - } - } + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.0.4.tgz", + "integrity": "sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg==", + "dev": true }, "picomatch": { "version": "2.2.2", @@ -4120,184 +4078,9 @@ "es-abstract": "^1.17.5" }, "dependencies": { - "es-abstract": { - "version": "1.17.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", - "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true - }, - "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - } - } - }, - "string.prototype.trimleft": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", - "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5", - "string.prototype.trimstart": "^1.0.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", - "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true - }, - "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - } - } - }, - "string.prototype.trimright": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", - "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5", - "string.prototype.trimend": "^1.0.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", - "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true - }, - "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } + "version": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" } } }, @@ -4311,56 +4094,9 @@ "es-abstract": "^1.17.5" }, "dependencies": { - "es-abstract": { - "version": "1.17.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", - "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true - }, - "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } + "version": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" } } }, @@ -4476,30 +4212,12 @@ "uuid": "^3.3.2" }, "dependencies": { - "agent-base": { - "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.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "version": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, "requires": { "ms": "^2.1.1" } - }, - "https-proxy-agent": { - "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": "5", - "debug": "4" - } } } }, @@ -4835,6 +4553,12 @@ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", "dev": true }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + }, "wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", diff --git a/package.json b/package.json index 495893a91dc2..16ec9558b5f4 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "acorn": "^8.4.1", "agadoo": "^1.1.0", "c8": "^5.0.1", - "code-red": "^0.2.1", + "code-red": "^0.2.2", "codecov": "^3.5.0", "css-tree": "^1.1.2", "eslint": "^7.15.0", From 998c9a9e7a3e0be08c3c34a4895c24ae3525161d Mon Sep 17 00:00:00 2001 From: Tan Li Hau Date: Wed, 21 Jul 2021 12:31:46 +0800 Subject: [PATCH 2/3] update code-red, estree-walker, is-reference --- package-lock.json | 56 ++++++++----------- package.json | 4 +- src/compiler/compile/Component.ts | 10 ++-- src/compiler/compile/nodes/shared/Context.ts | 4 +- .../compile/utils/is_used_as_reference.ts | 3 +- 5 files changed, 34 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8969bbcf794f..a6691a6babe0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -143,6 +143,15 @@ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", "dev": true + }, + "is-reference": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", + "dev": true, + "requires": { + "@types/estree": "*" + } } } }, @@ -244,9 +253,9 @@ "dev": true }, "@types/estree": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz", - "integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==", + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", "dev": true }, "@types/is-windows": { @@ -958,29 +967,6 @@ "is-reference": "^3.0.0", "periscopic": "^3.0.4", "sourcemap-codec": "^1.4.8" - }, - "dependencies": { - "@types/estree": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", - "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", - "dev": true - }, - "estree-walker": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.0.tgz", - "integrity": "sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==", - "dev": true - }, - "is-reference": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.0.tgz", - "integrity": "sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==", - "dev": true, - "requires": { - "@types/estree": "*" - } - } } }, "codecov": { @@ -1927,9 +1913,9 @@ "dev": true }, "estree-walker": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.0.tgz", - "integrity": "sha512-vY6xMN2j47HfQfVWGRqHshr1olf+XS1Y488NoqjDP1c8E1TcoZr/D3eSGa6akBs76WL1X9nluWjgBsCKdt/qKg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.0.tgz", + "integrity": "sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==", "dev": true }, "esutils": { @@ -2582,9 +2568,9 @@ "dev": true }, "is-reference": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", - "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.0.tgz", + "integrity": "sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==", "dev": true, "requires": { "@types/estree": "*" @@ -3473,7 +3459,11 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.0.4.tgz", "integrity": "sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg==", - "dev": true + "dev": true, + "requires": { + "estree-walker": "^3.0.0", + "is-reference": "^3.0.0" + } }, "picomatch": { "version": "2.2.2", diff --git a/package.json b/package.json index 16ec9558b5f4..3fb7a5b83461 100644 --- a/package.json +++ b/package.json @@ -121,8 +121,8 @@ "eslint": "^7.15.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-svelte3": "^2.7.3", - "estree-walker": "^1.0.0", - "is-reference": "^1.1.4", + "estree-walker": "^3.0.0", + "is-reference": "^3.0.0", "jsdom": "^15.2.1", "kleur": "^3.0.3", "locate-character": "^2.0.5", diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts index c7fd3481dd78..ab4800e42bc0 100644 --- a/src/compiler/compile/Component.ts +++ b/src/compiler/compile/Component.ts @@ -19,7 +19,7 @@ import error from '../utils/error'; import get_code_frame from '../utils/get_code_frame'; import flatten_reference from './utils/flatten_reference'; import is_used_as_reference from './utils/is_used_as_reference'; -import is_reference from 'is-reference'; +import is_reference, { NodeWithPropertyDefinition } from 'is-reference'; import TemplateScope from './nodes/shared/TemplateScope'; import fuzzymatch from '../utils/fuzzymatch'; import get_object from './utils/get_object'; @@ -734,7 +734,7 @@ export default class Component { let generator_count = 0; walk(content, { - enter(node: Node, parent, prop, index) { + enter(node: Node, parent: Node, prop, index) { if ((node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') && node.generator === true) { generator_count++; } @@ -862,7 +862,7 @@ export default class Component { this.warn(node as any, compiler_warnings.non_top_level_reactive_declaration); } - if (is_reference(node, parent)) { + if (is_reference(node as NodeWithPropertyDefinition, parent as NodeWithPropertyDefinition)) { const object = get_object(node); const { name } = object; @@ -1098,7 +1098,7 @@ export default class Component { scope = map.get(node); } - if (is_reference(node as Node, parent as Node)) { + if (is_reference(node as NodeWithPropertyDefinition, parent as NodeWithPropertyDefinition)) { const { name } = flatten_reference(node); const owner = scope.find_owner(name); @@ -1220,7 +1220,7 @@ export default class Component { } else if (node.type === 'UpdateExpression') { const identifier = get_object(node.argument); assignees.add(identifier.name); - } else if (is_reference(node as Node, parent as Node)) { + } else if (is_reference(node as NodeWithPropertyDefinition, parent as NodeWithPropertyDefinition)) { const identifier = get_object(node); if (!assignee_nodes.has(identifier)) { const { name } = identifier; diff --git a/src/compiler/compile/nodes/shared/Context.ts b/src/compiler/compile/nodes/shared/Context.ts index dbcdada58757..6cc5a4358e9c 100644 --- a/src/compiler/compile/nodes/shared/Context.ts +++ b/src/compiler/compile/nodes/shared/Context.ts @@ -1,7 +1,7 @@ import { x } from 'code-red'; import { Node, Identifier, Expression } from 'estree'; import { walk } from 'estree-walker'; -import is_reference from 'is-reference'; +import is_reference, { NodeWithPropertyDefinition } from 'is-reference'; import { clone } from '../../../utils/clone'; export interface Context { @@ -85,7 +85,7 @@ function update_reference(contexts: Context[], n: number, expression: Expression expression = clone(expression) as Expression; walk(expression, { enter(node, parent: Node) { - if (is_reference(node, parent)) { + if (is_reference(node as NodeWithPropertyDefinition, parent as NodeWithPropertyDefinition)) { this.replace(find_from_context(node as Identifier)); this.skip(); } diff --git a/src/compiler/compile/utils/is_used_as_reference.ts b/src/compiler/compile/utils/is_used_as_reference.ts index 3ea3d2f242dc..468135a82d38 100644 --- a/src/compiler/compile/utils/is_used_as_reference.ts +++ b/src/compiler/compile/utils/is_used_as_reference.ts @@ -1,11 +1,12 @@ import { Node } from 'estree'; import is_reference from 'is-reference'; +import { NodeWithPropertyDefinition } from 'is-reference'; export default function is_used_as_reference( node: Node, parent: Node ): boolean { - if (!is_reference(node, parent)) { + if (!is_reference(node as NodeWithPropertyDefinition, parent as NodeWithPropertyDefinition)) { return false; } if (!parent) { From 129a39fb1179ccb6975ff404be4d4ce7c35adb32 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 20 Jul 2021 22:17:20 -0700 Subject: [PATCH 3/3] Upgrade lint config --- package-lock.json | 4 ++-- package.json | 2 +- src/compiler/compile/nodes/InlineComponent.ts | 4 ++-- src/compiler/compile/render_dom/wrappers/EachBlock.ts | 2 +- src/compiler/compile/render_ssr/handlers/Element.ts | 2 +- src/compiler/compile/utils/is_used_as_reference.ts | 3 +-- src/compiler/preprocess/index.ts | 2 +- src/compiler/preprocess/replace_in_code.ts | 2 +- src/compiler/utils/clone.ts | 6 +++--- src/compiler/utils/mapped_code.ts | 4 ++-- test/sourcemaps/samples/attached-sourcemap/_config.js | 2 +- 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index a6691a6babe0..156fd01a899f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -242,8 +242,8 @@ } }, "@sveltejs/eslint-config": { - "version": "git+ssh://git@github.com/sveltejs/eslint-config.git#cca8177349dd5a02b19a5865afc4a7066921409a", - "from": "@sveltejs/eslint-config@github:sveltejs/eslint-config#v5.6.0", + "version": "github:sveltejs/eslint-config#31fd4faeea88990069502460b023698b1c9c2d13", + "from": "github:sveltejs/eslint-config#v5.7.0", "dev": true }, "@tootallnate/once": { diff --git a/package.json b/package.json index 3fb7a5b83461..36a025fa975d 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@rollup/plugin-sucrase": "^3.1.0", "@rollup/plugin-typescript": "^2.0.1", "@rollup/plugin-virtual": "^2.0.0", - "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.6.0", + "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.7.0", "@types/mocha": "^7.0.0", "@types/node": "^8.10.53", "@typescript-eslint/eslint-plugin": "^4.9.0", diff --git a/src/compiler/compile/nodes/InlineComponent.ts b/src/compiler/compile/nodes/InlineComponent.ts index f3c0eb29ef3f..a7bc986e9b95 100644 --- a/src/compiler/compile/nodes/InlineComponent.ts +++ b/src/compiler/compile/nodes/InlineComponent.ts @@ -101,7 +101,7 @@ export default class InlineComponent extends Node { }); const children = []; - for (let i=info.children.length - 1; i >= 0; i--) { + for (let i = info.children.length - 1; i >= 0; i--) { const child = info.children[i]; if (child.type === 'SlotTemplate') { children.push(child); @@ -117,7 +117,7 @@ export default class InlineComponent extends Node { }; // transfer attributes - for (let i=child.attributes.length - 1; i >= 0; i--) { + for (let i = child.attributes.length - 1; i >= 0; i--) { const attribute = child.attributes[i]; if (attribute.type === 'Let') { slot_template.attributes.push(attribute); diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts index 134976ca6543..bdea8460a248 100644 --- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts +++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts @@ -346,7 +346,7 @@ export default class EachBlockWrapper extends Wrapper { this.else.fragment.render(this.else.block, null, x`#nodes` as Identifier); } - this.context_props = this.node.contexts.map(prop => b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`list[i]`), name => renderer.context_lookup.has(name) ? x`child_ctx[${renderer.context_lookup.get(name).index}]`: { type: 'Identifier', name })};`); + this.context_props = this.node.contexts.map(prop => b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`list[i]`), name => renderer.context_lookup.has(name) ? x`child_ctx[${renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name })};`); if (this.node.has_binding) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.vars.each_block_value.name).index}] = list;`); if (this.node.has_binding || this.node.has_index_binding || this.node.index) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.index_name.name).index}] = i;`); diff --git a/src/compiler/compile/render_ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts index 35a15aff6358..c0bf826a8ecc 100644 --- a/src/compiler/compile/render_ssr/handlers/Element.ts +++ b/src/compiler/compile/render_ssr/handlers/Element.ts @@ -115,7 +115,7 @@ export default function(node: Element, renderer: Renderer, options: RenderOption const value = get_attribute_expression(value_attribute); const type = node.get_static_attribute_value('type'); const bound = expression.node; - const condition = type === 'checkbox' ? x`~${bound}.indexOf(${value})`: x`${value} === ${bound}`; + const condition = type === 'checkbox' ? x`~${bound}.indexOf(${value})` : x`${value} === ${bound}`; renderer.add_expression(x`${condition} ? @add_attribute("checked", true, 1) : ""`); } } else if (contenteditable && (name === 'textContent' || name === 'innerHTML')) { diff --git a/src/compiler/compile/utils/is_used_as_reference.ts b/src/compiler/compile/utils/is_used_as_reference.ts index 468135a82d38..cccb6658e89e 100644 --- a/src/compiler/compile/utils/is_used_as_reference.ts +++ b/src/compiler/compile/utils/is_used_as_reference.ts @@ -1,6 +1,5 @@ import { Node } from 'estree'; -import is_reference from 'is-reference'; -import { NodeWithPropertyDefinition } from 'is-reference'; +import is_reference, { NodeWithPropertyDefinition } from 'is-reference'; export default function is_used_as_reference( node: Node, diff --git a/src/compiler/preprocess/index.ts b/src/compiler/preprocess/index.ts index e66fb4ba14a1..10771603d76e 100644 --- a/src/compiler/preprocess/index.ts +++ b/src/compiler/preprocess/index.ts @@ -124,7 +124,7 @@ function parse_tag_attributes(str: string) { .filter(Boolean) .reduce((attrs, attr) => { const i = attr.indexOf('='); - const [key, value] = i > 0 ? [attr.slice(0, i), attr.slice(i+1)] : [attr]; + const [key, value] = i > 0 ? [attr.slice(0, i), attr.slice(i + 1)] : [attr]; const [, unquoted] = (value && value.match(/^['"](.*)['"]$/)) || []; return { ...attrs, [key]: unquoted ?? value ?? true }; diff --git a/src/compiler/preprocess/replace_in_code.ts b/src/compiler/preprocess/replace_in_code.ts index 9f49abb0f86e..cf0207afc38b 100644 --- a/src/compiler/preprocess/replace_in_code.ts +++ b/src/compiler/preprocess/replace_in_code.ts @@ -32,7 +32,7 @@ function calculate_replacements( get_replacement(...match).then( replacement => { const matched_string = match[0]; - const offset = match[match.length-2]; + const offset = match[match.length - 2]; return ({ offset, length: matched_string.length, replacement }); } diff --git a/src/compiler/utils/clone.ts b/src/compiler/utils/clone.ts index 74b6cfa0a168..f11ed9496799 100644 --- a/src/compiler/utils/clone.ts +++ b/src/compiler/utils/clone.ts @@ -7,8 +7,8 @@ export function clone(val) { let k, out, tmp; if (Array.isArray(val)) { - out = Array(k=val.length); - while (k--) out[k] = (tmp=val[k]) && typeof tmp === 'object' ? clone(tmp) : tmp; + out = Array(k = val.length); + while (k--) out[k] = (tmp = val[k]) && typeof tmp === 'object' ? clone(tmp) : tmp; return out; } @@ -23,7 +23,7 @@ export function clone(val) { writable: true }); } else if (typeof val[k] !== 'function') { // MODIFICATION: skip functions - out[k] = (tmp=val[k]) && typeof tmp === 'object' ? clone(tmp) : tmp; + out[k] = (tmp = val[k]) && typeof tmp === 'object' ? clone(tmp) : tmp; } } return out; diff --git a/src/compiler/utils/mapped_code.ts b/src/compiler/utils/mapped_code.ts index d0cab9f49fbf..12a3ce1d162a 100644 --- a/src/compiler/utils/mapped_code.ts +++ b/src/compiler/utils/mapped_code.ts @@ -295,8 +295,8 @@ export function apply_preprocessor_sourcemap(filename: string, svelte_map: Sourc export function parse_attached_sourcemap(processed: Processed, tag_name: 'script' | 'style'): void { const r_in = '[#@]\\s*sourceMappingURL\\s*=\\s*(\\S*)'; const regex = (tag_name == 'script') - ? new RegExp('(?://'+r_in+')|(?:/\\*'+r_in+'\\s*\\*/)$') - : new RegExp('/\\*'+r_in+'\\s*\\*/$'); + ? new RegExp('(?://' + r_in + ')|(?:/\\*' + r_in + '\\s*\\*/)$') + : new RegExp('/\\*' + r_in + '\\s*\\*/$'); function log_warning(message) { // code_start: help to find preprocessor const code_start = processed.code.length < 100 ? processed.code : (processed.code.slice(0, 100) + ' [...]'); diff --git a/test/sourcemaps/samples/attached-sourcemap/_config.js b/test/sourcemaps/samples/attached-sourcemap/_config.js index 6d9786f6b068..86498caebad3 100644 --- a/test/sourcemaps/samples/attached-sourcemap/_config.js +++ b/test/sourcemaps/samples/attached-sourcemap/_config.js @@ -14,7 +14,7 @@ function get_processor(tag_name, search, replace) { // change line + column const indent = Array.from({ length: indent_size }).join(' '); - ms.prependLeft(idx, '\n'+indent); + ms.prependLeft(idx, '\n' + indent); const map_opts = { source: filename, hires: true, includeContent: false }; const map = ms.generateMap(map_opts);