From b0962780c1ed828651c2ea4a79baada7e8420fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 11:31:58 +0800 Subject: [PATCH 01/60] Build(deps): Bump @typescript-eslint/typescript-estree from 5.16.0 to 5.17.0 (#12570) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/package.json b/package.json index 504975e16..94ce282de 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@babel/parser": "7.17.8", "@glimmer/syntax": "0.84.1", "@iarna/toml": "2.2.5", - "@typescript-eslint/typescript-estree": "5.16.0", + "@typescript-eslint/typescript-estree": "5.17.0", "acorn": "8.7.0", "acorn-jsx": "5.3.2", "angular-estree-parser": "2.5.0", diff --git a/yarn.lock b/yarn.lock index 647685d14..53f6dd550 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1737,29 +1737,11 @@ debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee" - integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g== - "@typescript-eslint/types@5.17.0": version "5.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f" integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw== -"@typescript-eslint/typescript-estree@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz#32259459ec62f5feddca66adc695342f30101f61" - integrity sha512-SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ== - dependencies: - "@typescript-eslint/types" "5.16.0" - "@typescript-eslint/visitor-keys" "5.16.0" - debug "^4.3.2" - globby "^11.0.4" - is-glob "^4.0.3" - semver "^7.3.5" - tsutils "^3.21.0" - "@typescript-eslint/typescript-estree@5.17.0": version "5.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488" @@ -1785,14 +1767,6 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz#f27dc3b943e6317264c7492e390c6844cd4efbbb" - integrity sha512-jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g== - dependencies: - "@typescript-eslint/types" "5.16.0" - eslint-visitor-keys "^3.0.0" - "@typescript-eslint/visitor-keys@5.17.0": version "5.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128" From 703e56023001a1cb44d536320f8621dcf46387f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 14:02:12 +0800 Subject: [PATCH 02/60] Build(deps): Bump flow-parser from 0.174.1 to 0.175.0 (#12572) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 94ce282de..66e1c1ea7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "fast-glob": "3.2.11", "fast-json-stable-stringify": "2.1.0", "find-parent-dir": "0.3.1", - "flow-parser": "0.174.1", + "flow-parser": "0.175.0", "get-stdin": "8.0.0", "graphql": "15.6.1", "html-element-attributes": "3.1.0", diff --git a/yarn.lock b/yarn.lock index 53f6dd550..468a8d718 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3371,10 +3371,10 @@ flatten@^1.0.2: resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== -flow-parser@0.174.1: - version "0.174.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.174.1.tgz#bb81e17fe45a1e64d9752090e819a6744a539fa0" - integrity sha512-nDMOvlFR+4doLpB3OJpseHZ7uEr3ENptlF6qMas/kzQmNcLzMwfQeFX0gGJ/+em7UdldB/nGsk55tDTOvjbCuw== +flow-parser@0.175.0: + version "0.175.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.175.0.tgz#622c2e1dadeed0cc3d25779b143a0935bf515983" + integrity sha512-9XG5JGOjhODF+OQF5ufCw8XiGi+8B46scjr3Q49JxN7IDRdT2W+1AOuvKKd6j766/5E7qSuCn/dsq1y3hihntg== form-data@^3.0.0: version "3.0.1" From bf148376fad31635e6fc65b07bb1bb8632870b82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 14:02:39 +0800 Subject: [PATCH 03/60] Build(deps): Bump html-tag-names from 1.1.5 to 2.0.0 (#10612) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- scripts/vendors/vendor-meta.json | 440 ++++++++++++---------- scripts/vendors/vendors.mjs | 11 +- src/language-html/utils/html-tag-names.js | 2 +- vendors/html-tag-names.json | 152 ++++++++ yarn.lock | 8 +- 6 files changed, 398 insertions(+), 217 deletions(-) create mode 100644 vendors/html-tag-names.json diff --git a/package.json b/package.json index 66e1c1ea7..3f0813796 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "graphql": "15.6.1", "html-element-attributes": "3.1.0", "html-styles": "1.0.0", - "html-tag-names": "1.1.5", + "html-tag-names": "2.0.1", "html-void-elements": "2.0.1", "ignore": "5.2.0", "jest-docblock": "27.5.1", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 8a3901417..4068b86ed 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -1,159 +1,16 @@ { "licenses": [ { - "name": "ansi-regex", - "maintainers": [], - "version": "6.0.1", - "description": "Regular expression for matching ANSI escape codes", - "repository": "chalk/ansi-regex", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "strip-ansi", - "maintainers": [], - "version": "7.0.1", - "description": "Strip ANSI escape codes from a string", - "repository": "chalk/strip-ansi", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "is-fullwidth-code-point", - "maintainers": [], - "version": "4.0.0", - "description": "Check if the character represented by a given Unicode code point is fullwidth", - "repository": "sindresorhus/is-fullwidth-code-point", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "emoji-regex", - "maintainers": [], - "version": "9.2.2", - "description": "A regular expression to match all Emoji-only symbols as per the Unicode Standard.", - "repository": { - "type": "git", - "url": "https://github.com/mathiasbynens/emoji-regex.git" - }, - "homepage": "https://mths.be/emoji-regex", - "private": false, - "license": "MIT", - "licenseText": "Copyright Mathias Bynens \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Mathias Bynens", - "email": null, - "url": "https://mathiasbynens.be/" - }, - "contributors": [] - }, - { - "name": "string-width", + "name": "chalk", "maintainers": [], "version": "5.0.1", - "description": "Get the visual width of a string - the number of columns required to display it", - "repository": "sindresorhus/string-width", + "description": "Terminal string styling done right", + "repository": "chalk/chalk", "homepage": null, "private": false, "license": "MIT", "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "mimic-fn", - "maintainers": [], - "version": "4.0.0", - "description": "Make a function mimic another one", - "repository": "sindresorhus/mimic-fn", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "p-defer", - "maintainers": [], - "version": "1.0.0", - "description": "Create a deferred promise", - "repository": "sindresorhus/p-defer", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "The MIT License (MIT)\n\nCopyright (c) Sindre Sorhus (sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "map-age-cleaner", - "maintainers": [], - "version": "0.1.3", - "description": "Automatically cleanup expired items in a Map", - "repository": "SamVerschueren/map-age-cleaner", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sam Verschueren (github.com/SamVerschueren)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sam Verschueren", - "email": "sam.verschueren@gmail.com", - "url": "github.com/SamVerschueren" - }, - "contributors": [] - }, - { - "name": "mem", - "maintainers": [], - "version": "9.0.2", - "description": "Memoize functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input", - "repository": "sindresorhus/mem", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, + "author": null, "contributors": [] }, { @@ -440,6 +297,236 @@ }, "contributors": [] }, + { + "name": "html-element-attributes", + "maintainers": [], + "version": "3.1.0", + "description": "Map of HTML elements to allowed attributes", + "repository": "wooorm/html-element-attributes", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + } + ] + }, + { + "name": "html-tag-names", + "maintainers": [], + "version": "2.0.1", + "description": "List of known HTML tag names", + "repository": "wooorm/html-tag-names", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + { + "name": "Valerio Coltrè", + "email": "mister.gamer@gmail.com", + "url": null + } + ] + }, + { + "name": "html-void-elements", + "maintainers": [], + "version": "2.0.1", + "description": "List of HTML void tag names", + "repository": "wooorm/html-void-elements", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + } + ] + }, + { + "name": "mimic-fn", + "maintainers": [], + "version": "4.0.0", + "description": "Make a function mimic another one", + "repository": "sindresorhus/mimic-fn", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "p-defer", + "maintainers": [], + "version": "1.0.0", + "description": "Create a deferred promise", + "repository": "sindresorhus/p-defer", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) Sindre Sorhus (sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "map-age-cleaner", + "maintainers": [], + "version": "0.1.3", + "description": "Automatically cleanup expired items in a Map", + "repository": "SamVerschueren/map-age-cleaner", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sam Verschueren (github.com/SamVerschueren)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sam Verschueren", + "email": "sam.verschueren@gmail.com", + "url": "github.com/SamVerschueren" + }, + "contributors": [] + }, + { + "name": "mem", + "maintainers": [], + "version": "9.0.2", + "description": "Memoize functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input", + "repository": "sindresorhus/mem", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "ansi-regex", + "maintainers": [], + "version": "6.0.1", + "description": "Regular expression for matching ANSI escape codes", + "repository": "chalk/ansi-regex", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "strip-ansi", + "maintainers": [], + "version": "7.0.1", + "description": "Strip ANSI escape codes from a string", + "repository": "chalk/strip-ansi", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "is-fullwidth-code-point", + "maintainers": [], + "version": "4.0.0", + "description": "Check if the character represented by a given Unicode code point is fullwidth", + "repository": "sindresorhus/is-fullwidth-code-point", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "emoji-regex", + "maintainers": [], + "version": "9.2.2", + "description": "A regular expression to match all Emoji-only symbols as per the Unicode Standard.", + "repository": { + "type": "git", + "url": "https://github.com/mathiasbynens/emoji-regex.git" + }, + "homepage": "https://mths.be/emoji-regex", + "private": false, + "license": "MIT", + "licenseText": "Copyright Mathias Bynens \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Mathias Bynens", + "email": null, + "url": "https://mathiasbynens.be/" + }, + "contributors": [] + }, + { + "name": "string-width", + "maintainers": [], + "version": "5.0.1", + "description": "Get the visual width of a string - the number of columns required to display it", + "repository": "sindresorhus/string-width", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "crypto-random-string", "maintainers": [], @@ -1478,65 +1565,6 @@ "url": "https://sindresorhus.com" }, "contributors": [] - }, - { - "name": "chalk", - "maintainers": [], - "version": "5.0.1", - "description": "Terminal string styling done right", - "repository": "chalk/chalk", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": null, - "contributors": [] - }, - { - "name": "html-void-elements", - "maintainers": [], - "version": "2.0.1", - "description": "List of HTML void tag names", - "repository": "wooorm/html-void-elements", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - }, - "contributors": [ - { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - } - ] - }, - { - "name": "html-element-attributes", - "maintainers": [], - "version": "3.1.0", - "description": "Map of HTML elements to allowed attributes", - "repository": "wooorm/html-element-attributes", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - }, - "contributors": [ - { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - } - ] } ] } diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index ebe67db76..1f32ae64b 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -1,11 +1,12 @@ const vendors = [ - "string-width", - "mem", - "execa", - "tempy", "chalk", - "html-void-elements", + "execa", "html-element-attributes", + "html-tag-names", + "html-void-elements", + "mem", + "string-width", + "tempy", ]; export default vendors; diff --git a/src/language-html/utils/html-tag-names.js b/src/language-html/utils/html-tag-names.js index 286e4e23b..8d6ff3ebc 100644 --- a/src/language-html/utils/html-tag-names.js +++ b/src/language-html/utils/html-tag-names.js @@ -1,6 +1,6 @@ "use strict"; -const htmlTagNames = require("html-tag-names"); +const { htmlTagNames } = require("../../../vendors/html-tag-names.json"); const arrayToMap = require("./array-to-map.js"); const HTML_TAGS = arrayToMap(htmlTagNames); diff --git a/vendors/html-tag-names.json b/vendors/html-tag-names.json new file mode 100644 index 000000000..9089e7a7c --- /dev/null +++ b/vendors/html-tag-names.json @@ -0,0 +1,152 @@ +{ + "htmlTagNames": [ + "a", + "abbr", + "acronym", + "address", + "applet", + "area", + "article", + "aside", + "audio", + "b", + "base", + "basefont", + "bdi", + "bdo", + "bgsound", + "big", + "blink", + "blockquote", + "body", + "br", + "button", + "canvas", + "caption", + "center", + "cite", + "code", + "col", + "colgroup", + "command", + "content", + "data", + "datalist", + "dd", + "del", + "details", + "dfn", + "dialog", + "dir", + "div", + "dl", + "dt", + "element", + "em", + "embed", + "fieldset", + "figcaption", + "figure", + "font", + "footer", + "form", + "frame", + "frameset", + "h1", + "h2", + "h3", + "h4", + "h5", + "h6", + "head", + "header", + "hgroup", + "hr", + "html", + "i", + "iframe", + "image", + "img", + "input", + "ins", + "isindex", + "kbd", + "keygen", + "label", + "legend", + "li", + "link", + "listing", + "main", + "map", + "mark", + "marquee", + "math", + "menu", + "menuitem", + "meta", + "meter", + "multicol", + "nav", + "nextid", + "nobr", + "noembed", + "noframes", + "noscript", + "object", + "ol", + "optgroup", + "option", + "output", + "p", + "param", + "picture", + "plaintext", + "pre", + "progress", + "q", + "rb", + "rbc", + "rp", + "rt", + "rtc", + "ruby", + "s", + "samp", + "script", + "section", + "select", + "shadow", + "slot", + "small", + "source", + "spacer", + "span", + "strike", + "strong", + "style", + "sub", + "summary", + "sup", + "svg", + "table", + "tbody", + "td", + "template", + "textarea", + "tfoot", + "th", + "thead", + "time", + "title", + "tr", + "track", + "tt", + "u", + "ul", + "var", + "video", + "wbr", + "xmp" + ] +} diff --git a/yarn.lock b/yarn.lock index 468a8d718..75d3093a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3613,10 +3613,10 @@ html-styles@1.0.0: resolved "https://registry.yarnpkg.com/html-styles/-/html-styles-1.0.0.tgz#a18061fd651f99c6b75c45c8e0549a3bc3e01a75" integrity sha1-oYBh/WUfmca3XEXI4FSaO8PgGnU= -html-tag-names@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-1.1.5.tgz#f537420c16769511283f8ae1681785fbc89ee0a9" - integrity sha512-aI5tKwNTBzOZApHIynaAwecLBv8TlZTEy/P4Sj2SzzAhBrGuI8yGZ0UIXVPQzOHGS+to2mjb04iy6VWt/8+d8A== +html-tag-names@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-2.0.1.tgz#5626263e7d7b15789fa35a9f816234156901adc6" + integrity sha512-PX8KyLG7dwsjis3NPj1u+/EJf2CgH2d+qzekQpnlCOPQ6Uu6T8+F2ZqQg+wtsP+WKhxK3QMN9Garcwr7fCRhxA== html-void-elements@2.0.1: version "2.0.1" From 06038499ba585316e532cba75b72a742280343a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 07:02:10 +0000 Subject: [PATCH 04/60] Build(deps-dev): Bump cspell from 5.19.3 to 5.19.5 (#12579) --- package.json | 2 +- yarn.lock | 101 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 3f0813796..a90490972 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "browserslist-to-esbuild": "1.1.1", "core-js": "3.21.1", "cross-env": "7.0.3", - "cspell": "5.19.3", + "cspell": "5.19.5", "enquirer": "2.3.6", "esbuild": "0.14.29", "esbuild-visualizer": "0.3.1", diff --git a/yarn.lock b/yarn.lock index 75d3093a7..b5fbdcdfb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -947,10 +947,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cspell/cspell-bundled-dicts@^5.19.3": - version "5.19.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.3.tgz#826e166eb56f193c2d770575adfbb1557816f1af" - integrity sha512-YAz68AgXTFFtrBUhNJlOQ7KOjUE6ncYt578/esa2GStMJHgJoUtPnOZsE41hh+cVWXqO5yRRI+Qkwub99zLMgQ== +"@cspell/cspell-bundled-dicts@^5.19.5": + version "5.19.5" + resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.5.tgz#09906e24a13dd919ba9e19d0b7a93e9ef2383d28" + integrity sha512-qXW99H+S/529cTOtRBTPiTV1Ay+I2+kcF5lfVblSRsij7fBM6d99dB3Fg6oL0i6okRwOUNFAV4qbxgg7zxA3wA== dependencies: "@cspell/dict-ada" "^2.0.0" "@cspell/dict-aws" "^2.0.0" @@ -992,15 +992,15 @@ "@cspell/dict-typescript" "^2.0.0" "@cspell/dict-vue" "^2.0.2" -"@cspell/cspell-pipe@^5.19.3": - version "5.19.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.3.tgz#af818c0362786f61ac8741947e1819f94b55ec3b" - integrity sha512-3RKntgGRxYYzoxoH3VBPvnNMYkHKPq0U+U7qogcWxDkgAUgKXlBP0oc2mw96grJQ4HIzOL1vBnaVAWAqteY9Kw== +"@cspell/cspell-pipe@^5.19.5": + version "5.19.5" + resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.5.tgz#e780d22523d94317f0462683ba61c39a486919a8" + integrity sha512-dNCMYDgjeWKw7KIptjxHu17UfeT3oiqQk6LkSyi3BewUxpnlLLO7EsxR6GRW+RVU/MrPXe7BF9WgF0gO8m+8cQ== -"@cspell/cspell-types@^5.19.3": - version "5.19.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.3.tgz#37a64db00e33a1c8bb8aa3bf86d503689b3afbf5" - integrity sha512-tub7PW/I6qB6o+ZtlahAZjm5O5cnzj88HRiC8nAbJFpa7q0mrdpFMYhd7ksWtyFLlNbuDkCsfzXGamAhIQnnIw== +"@cspell/cspell-types@^5.19.5": + version "5.19.5" + resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.5.tgz#10801d6298f60539d244f3256ad5b5e26f3ea5d3" + integrity sha512-tOzCzuQQ4DdgfnI6+FGBPOVL/1JbH0pWtoOinPoU93/pH29XOKGW2I24HLeESzgskfoZGK274wMFQfGp6oJw9g== "@cspell/dict-ada@^2.0.0": version "2.0.0" @@ -2441,41 +2441,41 @@ crypto-random-string@^4.0.0: dependencies: type-fest "^1.0.1" -cspell-gitignore@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.19.3.tgz#c27780dc1b43cb48705dc3695c3875f001d7b038" - integrity sha512-Q67uHcf0qNgOoanRLhatapjWpLiftT+MuLIyAaSLe5eNVzQurQIc+UnXhtaslkVyOTqQt4NJFqLgtf5ZSGz1bg== +cspell-gitignore@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.19.5.tgz#42e1fbdeabb7bfce073a111d1d77f22dd31253d7" + integrity sha512-Wj16pnPmx7PGd2PcVAEsxWnTtfY4qNzUBtfTqo5VEd23WME6SgEtffxm4eSRpHYZmmDclir+Tbb9yQAsZajDeQ== dependencies: - cspell-glob "^5.19.3" + cspell-glob "^5.19.5" find-up "^5.0.0" -cspell-glob@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.3.tgz#f6b423523a0c2d77d244ecfc7c48ef320f4d122a" - integrity sha512-qp2Oe/euzTu3e0zZrQxHuTrqRo418tYfh4CnCa+DKU6lWKKcF4zCEhOGJHPsYak8SFIXZ4ZE360wHFxB/JDutQ== +cspell-glob@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.5.tgz#a25ef16ed91b876bd9764dbedf5ac3ae101bf071" + integrity sha512-fnrUNLNY9CMsr5J1wRPoGpx7aastD05wEZ/NL+Xd7uEmuU+R7gViOjyOPlUMFH+YARwY0youHRiobkl7pJNngw== dependencies: - micromatch "^4.0.4" + micromatch "^4.0.5" -cspell-io@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.3.tgz#89ab249dc53206651a7833399a83b04a7d8a8a63" - integrity sha512-dE9eBvHgIJ11DelWtyehMU3W3bCpcB+0nS6uOZJ2d8fDu13m5BebpLrXZ2dKfY4cjksJUhRPatt14uwQSeUp2A== +cspell-io@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.5.tgz#e44eeda1b8083b666f4ab9940e0d167b4fa2040a" + integrity sha512-R6q1Dor6mfs1VBpuXVlcm/Vvr96GclO/BtNDK/8ppcm22Ct1VF24MG2itoYO7296dOgR1H4HkndvvEgx3p8fzw== -cspell-lib@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.3.tgz#6efc9ee5620d427e2f20c000b60a3b3d0ce6cd4c" - integrity sha512-peMJggwJpxCXKZZ0DuHyDtZmf66POKaHf5Im8LGEyMKFARUIq6O2WvaUGggYjyRe3Ng/f5G+EYTcIHbF9pZYcg== +cspell-lib@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.5.tgz#653242ec9b06005f478d8f8f0fdb00f4c6c1dadd" + integrity sha512-6HOJ7O+vDYzJs49fHZI5xzsL5TxeR7WsfjWvx1BwgRs1rHdA9/8KFZFX2DJazKRGm+kL1kBO0VJlaF0tvVsjzw== dependencies: - "@cspell/cspell-bundled-dicts" "^5.19.3" - "@cspell/cspell-pipe" "^5.19.3" - "@cspell/cspell-types" "^5.19.3" + "@cspell/cspell-bundled-dicts" "^5.19.5" + "@cspell/cspell-pipe" "^5.19.5" + "@cspell/cspell-types" "^5.19.5" clear-module "^4.1.2" comment-json "^4.2.2" configstore "^5.0.1" cosmiconfig "^7.0.1" - cspell-glob "^5.19.3" - cspell-io "^5.19.3" - cspell-trie-lib "^5.19.3" + cspell-glob "^5.19.5" + cspell-io "^5.19.5" + cspell-trie-lib "^5.19.5" fast-equals "^3.0.0" find-up "^5.0.0" fs-extra "^10.0.1" @@ -2486,27 +2486,26 @@ cspell-lib@^5.19.3: vscode-languageserver-textdocument "^1.0.4" vscode-uri "^3.0.3" -cspell-trie-lib@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.3.tgz#0a0f8d9300f95188f2f2b1831bd7fea2e9c9d6ee" - integrity sha512-Io8EB7E1pmttHzZvgvPEF0b87qlq8G5uA4B+sbqCxrUf5l4JDcK/UYLih0+rekLTbv4Q68zqgCTASvqxgqnoAg== +cspell-trie-lib@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.5.tgz#e18125c3f56b280109face14c28f7137b3469895" + integrity sha512-yNOmd7uzLiu5UDpbIfJlORx8rJZltLz/ebostAV7UC3wzrOIQgS8xKoFfqiE0iWxIMwmV9eyydVcyzh5grx0gg== dependencies: - "@cspell/cspell-pipe" "^5.19.3" + "@cspell/cspell-pipe" "^5.19.5" fs-extra "^10.0.1" gensequence "^3.1.1" -cspell@5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.19.3.tgz#0f2c6cf529fb3f0b721b380f81b04e9c22272c05" - integrity sha512-JJBH8iqtHYmxqLQZ+7GAMTVvc6SAoHVgn1tdYknOI2/uxAbZVH29eaxINY7JfjwPuxPPVAvttRetBAIRiu6ZYw== +cspell@5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.19.5.tgz#5f3bad212d11509534982a1d64c6bf6592be2ee8" + integrity sha512-LFKWBBOY6s1SYJcMlWmFP2ml3kxgzUcUCOY4JYDCAzA088gbBEiSN8sM0X6MhobsMJx4MchxjwveXFRP+1umyA== dependencies: - "@cspell/cspell-pipe" "^5.19.3" + "@cspell/cspell-pipe" "^5.19.5" chalk "^4.1.2" commander "^9.1.0" - comment-json "^4.2.2" - cspell-gitignore "^5.19.3" - cspell-glob "^5.19.3" - cspell-lib "^5.19.3" + cspell-gitignore "^5.19.5" + cspell-glob "^5.19.5" + cspell-lib "^5.19.5" fast-json-stable-stringify "^2.1.0" file-entry-cache "^6.0.1" fs-extra "^10.0.1" @@ -4835,7 +4834,7 @@ meriyah@4.2.0: resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.0.tgz#29d28c37ac7b67f8b9aaa92df0b8ac12469fe98b" integrity sha512-fCVh5GB9YT53Bq14l00HLYE3i9DywrY0JVZxbk0clXWDuMsUKKwluvC5sY0bMBqHbnIbpIjfSSIsnrzbauA8Yw== -micromatch@4.0.5, micromatch@^4.0.4: +micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== From 32480b621bb8a9fa8238666ade03045403079408 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 15:18:41 +0800 Subject: [PATCH 05/60] Build(deps-dev): Bump eslint-plugin-unicorn from 41.0.1 to 42.0.0 (#12580) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a90490972..8c8fb3df9 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "eslint-plugin-prettier-internal-rules": "2.0.1", "eslint-plugin-react": "7.29.4", "eslint-plugin-regexp": "1.6.0", - "eslint-plugin-unicorn": "41.0.1", + "eslint-plugin-unicorn": "42.0.0", "esm-utils": "3.0.0", "execa": "6.1.0", "jest": "27.5.1", diff --git a/yarn.lock b/yarn.lock index b5fbdcdfb..5c325856b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3048,10 +3048,10 @@ eslint-plugin-regexp@1.6.0: regexpp "^3.2.0" scslre "^0.1.6" -eslint-plugin-unicorn@41.0.1: - version "41.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-41.0.1.tgz#b49205b38e71e227d21fb5776f8d078a1dc637ca" - integrity sha512-gF5vo2dIj0YdNMQ/IMegiBkQdQ22GBFFVpdkJP+0og3w7XD4ypea0xQVRv6iofkLVR2w0phAdikcnU01ybd4Ow== +eslint-plugin-unicorn@42.0.0: + version "42.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-42.0.0.tgz#47d60c00c263ad743403b052db689e39acbacff1" + integrity sha512-ixBsbhgWuxVaNlPTT8AyfJMlhyC5flCJFjyK3oKE8TRrwBnaHvUbuIkCM1lqg8ryYrFStL/T557zfKzX4GKSlg== dependencies: "@babel/helper-validator-identifier" "^7.15.7" ci-info "^3.3.0" From afd0220dea4fdf2bfac14d3d8e2d33e5dc0fa233 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 2 Apr 2022 16:14:32 +0800 Subject: [PATCH 06/60] Move some bundle test code into `tests/` (#12577) --- scripts/build/build.mjs | 12 -------- tests/config/require-standalone.js | 33 ++++------------------ tests/config/utils/create-sandbox.js | 14 ++++++++++ tests/integration/__tests__/bundle.js | 40 +++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 40 deletions(-) create mode 100644 tests/config/utils/create-sandbox.js diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index ee3526106..48500511d 100644 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -63,8 +63,6 @@ const clear = () => { }; async function createBundle(bundleConfig, options) { - const { target } = bundleConfig; - try { for await (const { name, @@ -89,16 +87,6 @@ async function createBundle(bundleConfig, options) { continue; } - // Files including U+FFEE can't load in Chrome Extension - // `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension - // details https://github.com/prettier/prettier/pull/8534 - if (target === "universal") { - const content = await fs.readFile(absolutePath, "utf8"); - if (content.includes("\ufffe")) { - throw new Error("Bundled umd file should not have U+FFFE character."); - } - } - const sizeMessages = []; if (options.printSize) { diff --git a/tests/config/require-standalone.js b/tests/config/require-standalone.js index 215244d67..3b32cbebe 100644 --- a/tests/config/require-standalone.js +++ b/tests/config/require-standalone.js @@ -1,37 +1,14 @@ "use strict"; - -const fs = require("fs"); const vm = require("vm"); const fastGlob = require("fast-glob"); +const createSandBox = require("./utils/create-sandbox.js"); -const sandbox = vm.createContext(); - -const source = fastGlob - .sync(["standalone.js", "parser-*.js"], { +const sandbox = createSandBox({ + files: fastGlob.sync(["standalone.js", "parser-*.js"], { cwd: process.env.PRETTIER_DIR, absolute: true, - }) - .map((file) => fs.readFileSync(file, "utf8")) - .join(";"); - -vm.runInContext(source, sandbox); - -const allowedGlobalObjects = new Set(["prettier", "prettierPlugins"]); -const globalObjects = Object.keys(sandbox).filter( - (property) => !allowedGlobalObjects.has(property) -); -if (globalObjects.length > 0) { - throw new Error( - `Global ${globalObjects - .map( - (property) => - `"${property}"(${Object.prototype.toString - .call(sandbox[property]) - .slice(8, -1)})` - ) - .join(", ")} should not be exposed.` - ); -} + }), +}); // TODO: maybe expose (and write tests) for `format`, `utils`, and // `__debug` methods diff --git a/tests/config/utils/create-sandbox.js b/tests/config/utils/create-sandbox.js new file mode 100644 index 000000000..903b53c00 --- /dev/null +++ b/tests/config/utils/create-sandbox.js @@ -0,0 +1,14 @@ +"use strict"; +const vm = require("vm"); +const fs = require("fs"); + +function createSandBox({ files }) { + const source = files.map((file) => fs.readFileSync(file, "utf8")).join(";"); + const sandbox = vm.createContext(); + + vm.runInContext(source, sandbox); + + return sandbox; +} + +module.exports = createSandBox; diff --git a/tests/integration/__tests__/bundle.js b/tests/integration/__tests__/bundle.js index 4748f787f..dacaf2edd 100644 --- a/tests/integration/__tests__/bundle.js +++ b/tests/integration/__tests__/bundle.js @@ -1,8 +1,10 @@ "use strict"; const path = require("path"); +const fs = require("fs"); const fastGlob = require("fast-glob"); const { projectRoot } = require("../env.js"); +const createSandBox = require("../../config/utils/create-sandbox.js"); const coreOptions = require("../../../src/main/core-options.js"); const codeSamples = require("../../../website/playground/codeSamples.js").default; @@ -12,6 +14,21 @@ const parserNames = coreOptions.options.parser.choices.map( ); const distDirectory = path.join(projectRoot, "dist"); +// Files including U+FFEE can't load in Chrome Extension +// `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension +// details https://github.com/prettier/prettier/pull/8534 +test("code", async () => { + const files = await fastGlob(["**/*"], { + cwd: distDirectory, + absolute: true, + }); + + for (const file of files) { + const text = await fs.promises.readFile(file, "utf8"); + expect(text.includes("\ufffe")).toBe(false); + } +}); + describe("standalone", () => { const standalone = require(path.join(distDirectory, "standalone.js")); const plugins = fastGlob @@ -47,3 +64,26 @@ describe("standalone", () => { }); } }); + +test("global objects", async () => { + const files = await fastGlob(["standalone.js", "parser-*.js"], { + cwd: distDirectory, + absolute: true, + }); + + const allowedGlobalObjects = new Set(["prettier", "prettierPlugins"]); + const getGlobalObjects = (file) => { + const sandbox = createSandBox({ files: [file] }); + return Object.fromEntries( + Object.entries(sandbox).filter( + ([property]) => !allowedGlobalObjects.has(property) + ) + ); + }; + + for (const file of files) { + const globalObjects = getGlobalObjects(file); + + expect(globalObjects).toStrictEqual({}); + } +}); From 445d8703e558a41bcd4731313116b036c201c9b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 08:41:53 +0000 Subject: [PATCH 07/60] Build(deps-dev): Bump esbuild from 0.14.29 to 0.14.30 (#12581) --- package.json | 2 +- yarn.lock | 208 +++++++++++++++++++++++++-------------------------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index 8c8fb3df9..f939cdca7 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "cross-env": "7.0.3", "cspell": "5.19.5", "enquirer": "2.3.6", - "esbuild": "0.14.29", + "esbuild": "0.14.30", "esbuild-visualizer": "0.3.1", "eslint": "8.12.0", "eslint-config-prettier": "8.5.0", diff --git a/yarn.lock b/yarn.lock index 5c325856b..5341aade4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2770,90 +2770,90 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.29.tgz#c0960c84c9b832bade20831515e89d32549d4769" - integrity sha512-tJuaN33SVZyiHxRaVTo1pwW+rn3qetJX/SRuc/83rrKYtyZG0XfsQ1ao1nEudIt9w37ZSNXR236xEfm2C43sbw== +esbuild-android-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.30.tgz#9efcdb3d826b9c67705a0c518d361ab44ae4cc5b" + integrity sha512-vdJ7t8A8msPfKpYUGUV/KaTQRiZ0vDa2XSTlzXVkGGVHLKPeb85PBUtYJcEgw3htW3IdX5i1t1IMdQCwJJgNAg== -esbuild-android-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.29.tgz#8eceb3abe5abde5489d6a5cbe6a7c1044f71115f" - integrity sha512-D74dCv6yYnMTlofVy1JKiLM5JdVSQd60/rQfJSDP9qvRAI0laPXIG/IXY1RG6jobmFMUfL38PbFnCqyI/6fPXg== +esbuild-android-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.30.tgz#7b90fa7578b94da047e0bf3da477cb5775b58664" + integrity sha512-BdgGfxeA5hBQNErLr7BWJUA8xjflEfyaARICy8e0OJYNSAwDbEzOf8LyiKWSrDcgV129mWhi3VpbNQvOIDEHcg== -esbuild-darwin-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.29.tgz#26f3f14102310ecb8f2d9351c5b7a47a60d2cc8a" - integrity sha512-+CJaRvfTkzs9t+CjGa0Oa28WoXa7EeLutQhxus+fFcu0MHhsBhlmeWHac3Cc/Sf/xPi1b2ccDFfzGYJCfV0RrA== +esbuild-darwin-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.30.tgz#275e40eb100286b868d4cd664e6447b53400f7ff" + integrity sha512-VRaOXMMrsG5n53pl4qFZQdXy2+E0NoLP/QH3aDUI0+bQP+ZHDmbINKcDy2IX7GVFI9kqPS18iJNAs5a6/G2LZg== -esbuild-darwin-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.29.tgz#6d2d89dfd937992649239711ed5b86e51b13bd89" - integrity sha512-5Wgz/+zK+8X2ZW7vIbwoZ613Vfr4A8HmIs1XdzRmdC1kG0n5EG5fvKk/jUxhNlrYPx1gSY7XadQ3l4xAManPSw== +esbuild-darwin-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.30.tgz#c2b8fe03fb0dcee1d227b226c9c921de71e4d411" + integrity sha512-qDez+fHMOrO9Oc9qjt/x+sy09RJVh62kik5tVybKRLmezeV4qczM9/sAYY57YN0aWLdHbcCj2YqJUWYJNsgKnw== -esbuild-freebsd-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.29.tgz#2cb41a0765d0040f0838280a213c81bbe62d6394" - integrity sha512-VTfS7Bm9QA12JK1YXF8+WyYOfvD7WMpbArtDj6bGJ5Sy5xp01c/q70Arkn596aGcGj0TvQRplaaCIrfBG1Wdtg== +esbuild-freebsd-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.30.tgz#328bb272ce6cfcae202b6e0a06c240036335cc91" + integrity sha512-mec1jENcImVVagddZlGWsdAUwBnzR5cgnhzCxv+9fSMxKbx1uZYLLUAnLPp8m/i934zrumR1xGjJ5VoWdPlI2w== -esbuild-freebsd-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.29.tgz#e1b79fbb63eaeff324cf05519efa7ff12ce4586a" - integrity sha512-WP5L4ejwLWWvd3Fo2J5mlXvG3zQHaw5N1KxFGnUc4+2ZFZknP0ST63i0IQhpJLgEJwnQpXv2uZlU1iWZjFqEIg== +esbuild-freebsd-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.30.tgz#49ce79fa7d7087a941e27432da46bafb5b35a979" + integrity sha512-cpjbTs6Iok/AfeB0JgTzyUJTMStC1SQULmany5nHx6S4GTkSgaAHuJzZO0GcVWqghI4e0YL/bjXAhN5Mn6feNw== -esbuild-linux-32@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.29.tgz#a4a5a0b165b15081bc3227986e10dd4943edb7d6" - integrity sha512-4myeOvFmQBWdI2U1dEBe2DCSpaZyjdQtmjUY11Zu2eQg4ynqLb8Y5mNjNU9UN063aVsCYYfbs8jbken/PjyidA== +esbuild-linux-32@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.30.tgz#c473299f5291130f6d4436808603b529ccbfa785" + integrity sha512-liIONVT4F2kZmOMwtwASqZ8WkIjb5HHBR9HUffdHiuotSTF3CyZO+EJf+Og+SYYuuVIvt0qHNSFjBA/iSESteQ== -esbuild-linux-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.29.tgz#4c450088c84f8bfd22c51d116f59416864b85481" - integrity sha512-iaEuLhssReAKE7HMwxwFJFn7D/EXEs43fFy5CJeA4DGmU6JHh0qVJD2p/UP46DvUXLRKXsXw0i+kv5TdJ1w5pg== +esbuild-linux-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.30.tgz#b4be59f0665a44574a7617c9db673943da6061f8" + integrity sha512-LUnpzoMpRqFON5En4qEj6NWiyH6a1K+Y2qYNKrCy5qPTjDoG/EWeqMz69n8Uv7pRuvDKl3FNGJ1dufTrA5i0sw== -esbuild-linux-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.29.tgz#d1a23993b26cb1f63f740329b2fc09218e498bd1" - integrity sha512-KYf7s8wDfUy+kjKymW3twyGT14OABjGHRkm9gPJ0z4BuvqljfOOUbq9qT3JYFnZJHOgkr29atT//hcdD0Pi7Mw== +esbuild-linux-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.30.tgz#78485a9f49858ea69ced85c3dd0fe58d354f20f8" + integrity sha512-DHZHn6FK5q/KL0fpNT/0jE38Nnyk2rXxKE9WENi95EXtqfOLPgE8tzjTZQNgpr61R95QX4ymQU26ni3IZk8buQ== -esbuild-linux-arm@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.29.tgz#a7e2fea558525eab812b1fe27d7a2659cd1bb723" - integrity sha512-OXa9D9QL1hwrAnYYAHt/cXAuSCmoSqYfTW/0CEY0LgJNyTxJKtqc5mlwjAZAvgyjmha0auS/sQ0bXfGf2wAokQ== +esbuild-linux-arm@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.30.tgz#00392bbe04ac687dd6d9849ecee302bc27f984f2" + integrity sha512-97T+bbXnpqf7mfIG49UR7ZSJFGgvc22byn74qw3Kx2GDCBSQoVFjyWuKOHGXp8nXk3XYrdFF+mQ8yQ7aNsgQvg== -esbuild-linux-mips64le@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.29.tgz#e708c527f0785574e400828cdbed3d9b17b5ddff" - integrity sha512-05jPtWQMsZ1aMGfHOvnR5KrTvigPbU35BtuItSSWLI2sJu5VrM8Pr9Owym4wPvA4153DFcOJ1EPN/2ujcDt54g== +esbuild-linux-mips64le@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.30.tgz#cf48a292037c3a9ca3ca84ec0ae4f47bf1247ab4" + integrity sha512-fLUzTFZ7uknC0aPTk7/lM7NmaG/9ZqE3SaHEphcaM009SZK/mDOvZugWi1ss6WGNhk13dUrhkfHcc4FSb9hYhg== -esbuild-linux-ppc64le@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.29.tgz#0137d1b38beae36a57176ef45e90740e734df502" - integrity sha512-FYhBqn4Ir9xG+f6B5VIQVbRuM4S6qwy29dDNYFPoxLRnwTEKToIYIUESN1qHyUmIbfO0YB4phG2JDV2JDN9Kgw== +esbuild-linux-ppc64le@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.30.tgz#8e448a54e7040829ee9ecfc68dab0f3a039b1cff" + integrity sha512-2Oudm2WEfj0dNU9bzIl5L/LrsMEmHWsOsYgJJqu8fDyUDgER+J1d33qz3cUdjsJk7gAENayIxDSpsuCszx0w3A== -esbuild-linux-riscv64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.29.tgz#a2f73235347a58029dcacf0fb91c9eb8bebc8abb" - integrity sha512-eqZMqPehkb4nZcffnuOpXJQdGURGd6GXQ4ZsDHSWyIUaA+V4FpMBe+5zMPtXRD2N4BtyzVvnBko6K8IWWr36ew== +esbuild-linux-riscv64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.30.tgz#118af007f21adb00c4362d5eda3f004290f4d0ef" + integrity sha512-RPMucPW47rV4t2jlelaE948iCRtbZf5RhifxSwzlpM1Mqdyu99MMNK0w4jFreGTmLN+oGomxIOxD6n+2E/XqHw== -esbuild-linux-s390x@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.29.tgz#0f7310ff1daec463ead9b9e26b7aa083a9f9f1ee" - integrity sha512-o7EYajF1rC/4ho7kpSG3gENVx0o2SsHm7cJ5fvewWB/TEczWU7teDgusGSujxCYcMottE3zqa423VTglNTYhjg== +esbuild-linux-s390x@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.30.tgz#e0649e26d8791bf6265685842dcef732de59b49b" + integrity sha512-OZ68r7ok6qO7hdwrwQn2p5jbIRRcUcVaAykB7e0uCA0ODwfeGunILM6phJtq2Oz4dlEEFvd+tSuma3paQKwt+A== -esbuild-netbsd-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.29.tgz#ba9a0d9cb8aed73b684825126927f75d4fe44ff9" - integrity sha512-/esN6tb6OBSot6+JxgeOZeBk6P8V/WdR3GKBFeFpSqhgw4wx7xWUqPrdx4XNpBVO7X4Ipw9SAqgBrWHlXfddww== +esbuild-netbsd-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.30.tgz#7653db21ab4379a1b557f338b040e3493ff5006c" + integrity sha512-iyejQUKn0TzpPkufq8pSCxOg9NheycQbMbPCmjefTe9wYuUlBt1TcHvdoJnYbQzsAhAh1BNq+s0ycRsIJFZzaQ== -esbuild-openbsd-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.29.tgz#36dbe2c32d899106791b5f3af73f359213f71b8a" - integrity sha512-jUTdDzhEKrD0pLpjmk0UxwlfNJNg/D50vdwhrVcW/D26Vg0hVbthMfb19PJMatzclbK7cmgk1Nu0eNS+abzoHw== +esbuild-openbsd-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.30.tgz#3fad1699cb2ca7a060585356e2881df7b3fa5bb1" + integrity sha512-UyK1MTMcy4j5fH260fsE1o6MVgWNhb62eCK2yCKCRazZv8Nqdc2WiP9ygjWidmEdCDS+A6MuVp9ozk9uoQtQpA== -esbuild-sunos-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.29.tgz#e5f857c121441ec63bf9b399a2131409a7d344e5" - integrity sha512-EfhQN/XO+TBHTbkxwsxwA7EfiTHFe+MNDfxcf0nj97moCppD9JHPq48MLtOaDcuvrTYOcrMdJVeqmmeQ7doTcg== +esbuild-sunos-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.30.tgz#2306a178dc2362cf32fc182327c21b49b78ca1a3" + integrity sha512-aQRtRTNKHB4YuG+xXATe5AoRTNY48IJg5vjE8ElxfmjO9+KdX7MHFkTLhlKevCD6rNANtB3qOlSIeAiXTwHNqw== esbuild-visualizer@0.3.1: version "0.3.1" @@ -2864,46 +2864,46 @@ esbuild-visualizer@0.3.1: open "^7.4.2" yargs "^16.2.0" -esbuild-windows-32@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.29.tgz#9c2f1ab071a828f3901d1d79d205982a74bdda6e" - integrity sha512-uoyb0YAJ6uWH4PYuYjfGNjvgLlb5t6b3zIaGmpWPOjgpr1Nb3SJtQiK4YCPGhONgfg2v6DcJgSbOteuKXhwqAw== +esbuild-windows-32@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.30.tgz#ea17b2a9468e346734f926a7edd49de3cc81d12f" + integrity sha512-9/fb1tPtpacMqxAXp3fGHowUDg/l9dVch5hKmCLEZC6PdGljh6h372zMdJwYfH0Bd5CCPT0Wx95uycBLJiqpXA== -esbuild-windows-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.29.tgz#85fbce7c2492521896451b98d649a7db93e52667" - integrity sha512-X9cW/Wl95QjsH8WUyr3NqbmfdU72jCp71cH3pwPvI4CgBM2IeOUDdbt6oIGljPu2bf5eGDIo8K3Y3vvXCCTd8A== +esbuild-windows-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.30.tgz#266147f1f45974ac61dece10ab32bc916050dcc2" + integrity sha512-DHgITeUhPAnN9I5O6QBa1GVyPOhiYCn4S4TtQr7sO4+X0LNyqnlmA1M0qmGkUdDC1QQfjI8uQ4G/whdWb2pWIQ== -esbuild-windows-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.29.tgz#0aa7a9a1bc43a63350bcf574d94b639176f065b5" - integrity sha512-+O/PI+68fbUZPpl3eXhqGHTGK7DjLcexNnyJqtLZXOFwoAjaXlS5UBCvVcR3o2va+AqZTj8o6URaz8D2K+yfQQ== +esbuild-windows-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.30.tgz#8e5e9c2455bffaf3e1a387eee4841f5c3797b8a8" + integrity sha512-F1kLyQH7zSgjh5eLxogGZN7C9+KNs9m+s7Q6WZoMmCWT/6j998zlaoECHyM8izJRRfsvw2eZlEa1jO6/IOU1AQ== -esbuild@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.29.tgz#24ad09c0674cbcb4aa2fe761485524eb1f6b1419" - integrity sha512-SQS8cO8xFEqevYlrHt6exIhK853Me4nZ4aMW6ieysInLa0FMAL+AKs87HYNRtR2YWRcEIqoXAHh+Ytt5/66qpg== +esbuild@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.30.tgz#8bf6501a58f71e622e7485aeada79c764c1affe4" + integrity sha512-wCecQSBkIjp2xjuXY+wcXS/PpOQo9rFh4NAKPh4Pm9f3fuLcnxkR0rDzA+mYP88FtXIUcXUyYmaIgfrzRl55jA== optionalDependencies: - esbuild-android-64 "0.14.29" - esbuild-android-arm64 "0.14.29" - esbuild-darwin-64 "0.14.29" - esbuild-darwin-arm64 "0.14.29" - esbuild-freebsd-64 "0.14.29" - esbuild-freebsd-arm64 "0.14.29" - esbuild-linux-32 "0.14.29" - esbuild-linux-64 "0.14.29" - esbuild-linux-arm "0.14.29" - esbuild-linux-arm64 "0.14.29" - esbuild-linux-mips64le "0.14.29" - esbuild-linux-ppc64le "0.14.29" - esbuild-linux-riscv64 "0.14.29" - esbuild-linux-s390x "0.14.29" - esbuild-netbsd-64 "0.14.29" - esbuild-openbsd-64 "0.14.29" - esbuild-sunos-64 "0.14.29" - esbuild-windows-32 "0.14.29" - esbuild-windows-64 "0.14.29" - esbuild-windows-arm64 "0.14.29" + esbuild-android-64 "0.14.30" + esbuild-android-arm64 "0.14.30" + esbuild-darwin-64 "0.14.30" + esbuild-darwin-arm64 "0.14.30" + esbuild-freebsd-64 "0.14.30" + esbuild-freebsd-arm64 "0.14.30" + esbuild-linux-32 "0.14.30" + esbuild-linux-64 "0.14.30" + esbuild-linux-arm "0.14.30" + esbuild-linux-arm64 "0.14.30" + esbuild-linux-mips64le "0.14.30" + esbuild-linux-ppc64le "0.14.30" + esbuild-linux-riscv64 "0.14.30" + esbuild-linux-s390x "0.14.30" + esbuild-netbsd-64 "0.14.30" + esbuild-openbsd-64 "0.14.30" + esbuild-sunos-64 "0.14.30" + esbuild-windows-32 "0.14.30" + esbuild-windows-64 "0.14.30" + esbuild-windows-arm64 "0.14.30" escalade@^3.1.1: version "3.1.1" From 237e681936fc533c27d7ce8577d3fc98838a3314 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 18:34:21 +0800 Subject: [PATCH 08/60] Build(deps): Bump escape-string-regexp from 4.0.0 to 5.0.0 (#10725) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- scripts/vendors/vendor-meta.json | 17 ++++++++++++++++ scripts/vendors/vendors.mjs | 1 + src/common/util.js | 4 +++- vendors/escape-string-regexp.d.ts | 3 +++ vendors/escape-string-regexp.js | 34 +++++++++++++++++++++++++++++++ yarn.lock | 13 ++++++++---- 7 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 vendors/escape-string-regexp.d.ts create mode 100644 vendors/escape-string-regexp.js diff --git a/package.json b/package.json index f939cdca7..c0b782bca 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "diff": "5.0.0", "editorconfig": "0.15.3", "editorconfig-to-prettier": "0.2.0", - "escape-string-regexp": "4.0.0", + "escape-string-regexp": "5.0.0", "espree": "9.3.1", "esutils": "2.0.3", "fast-glob": "3.2.11", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 4068b86ed..0631c4c21 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -13,6 +13,23 @@ "author": null, "contributors": [] }, + { + "name": "escape-string-regexp", + "maintainers": [], + "version": "5.0.0", + "description": "Escape RegExp special characters", + "repository": "sindresorhus/escape-string-regexp", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "isexe", "maintainers": [], diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index 1f32ae64b..dc00c233c 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -1,5 +1,6 @@ const vendors = [ "chalk", + "escape-string-regexp", "execa", "html-element-attributes", "html-tag-names", diff --git a/src/common/util.js b/src/common/util.js index 4acfb14d9..b395ab3e8 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -1,6 +1,8 @@ "use strict"; -const escapeStringRegexp = require("escape-string-regexp"); +const { + default: escapeStringRegexp, +} = require("../../vendors/escape-string-regexp.js"); const getLast = require("../utils/get-last.js"); const { getSupportInfo } = require("../main/support.js"); const isNonEmptyArray = require("../utils/is-non-empty-array.js"); diff --git a/vendors/escape-string-regexp.d.ts b/vendors/escape-string-regexp.d.ts new file mode 100644 index 000000000..91dfbd94b --- /dev/null +++ b/vendors/escape-string-regexp.d.ts @@ -0,0 +1,3 @@ +// This file is generated automatically. +export {default} from "escape-string-regexp"; +export * from "escape-string-regexp"; diff --git a/vendors/escape-string-regexp.js b/vendors/escape-string-regexp.js new file mode 100644 index 000000000..52534604c --- /dev/null +++ b/vendors/escape-string-regexp.js @@ -0,0 +1,34 @@ +// @ts-nocheck +// This file is generated automatically +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; +}; +var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + +// node_modules/escape-string-regexp/index.js +var escape_string_regexp_exports = {}; +__export(escape_string_regexp_exports, { + default: () => escapeStringRegexp +}); +module.exports = __toCommonJS(escape_string_regexp_exports); +function escapeStringRegexp(string) { + if (typeof string !== "string") { + throw new TypeError("Expected a string"); + } + return string.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d"); +} +// Annotate the CommonJS export names for ESM import in node: +0 && (module.exports = {}); diff --git a/yarn.lock b/yarn.lock index 5341aade4..4c944df49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2910,10 +2910,10 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escape-string-regexp@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" + integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== escape-string-regexp@^1.0.5: version "1.0.5" @@ -2925,6 +2925,11 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" From 4d1b9e9716650ba2a8ecbef4286ecfb41df3780c Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 2 Apr 2022 19:01:07 +0800 Subject: [PATCH 09/60] Refactor: Add a wrapped `normalizeCliOptions` version for CLI usage (#12573) --- src/cli/options/get-options-for-file.js | 8 +++----- src/cli/options/normalize-cli-options.js | 16 ++++++++++++++++ src/cli/options/parse-cli-arguments.js | 13 ++----------- tsconfig.json | 1 + 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 src/cli/options/normalize-cli-options.js diff --git a/src/cli/options/get-options-for-file.js b/src/cli/options/get-options-for-file.js index 93778c46a..3a031b462 100644 --- a/src/cli/options/get-options-for-file.js +++ b/src/cli/options/get-options-for-file.js @@ -1,14 +1,12 @@ "use strict"; const dashify = require("dashify"); -const leven = require("leven"); -// eslint-disable-next-line no-restricted-modules -const { default: chalk } = require("../../../vendors/chalk.js"); // eslint-disable-next-line no-restricted-modules const prettier = require("../../index.js"); const { optionsNormalizer } = require("../prettier-internal.js"); const minimist = require("./minimist.js"); const createMinimistOptions = require("./create-minimist-options.js"); +const normalizeCliOptions = require("./normalize-cli-options.js"); function getOptions(argv, detailedOptions) { return Object.fromEntries( @@ -45,14 +43,14 @@ function parseArgsToOptions(context, overrideDefaults) { context.detailedOptions ); return getOptions( - optionsNormalizer.normalizeCliOptions( + normalizeCliOptions( minimist(context.rawArguments, { string: minimistOptions.string, boolean: minimistOptions.boolean, default: cliifyOptions(overrideDefaults, apiDetailedOptionMap), }), context.detailedOptions, - { logger: false, colorsModule: chalk, levenshteinDistance: leven } + { logger: false } ), context.detailedOptions ); diff --git a/src/cli/options/normalize-cli-options.js b/src/cli/options/normalize-cli-options.js new file mode 100644 index 000000000..6e063f69e --- /dev/null +++ b/src/cli/options/normalize-cli-options.js @@ -0,0 +1,16 @@ +"use strict"; + +const leven = require("leven"); +const { optionsNormalizer } = require("../prettier-internal.js"); +// eslint-disable-next-line no-restricted-modules +const { default: chalk } = require("../../../vendors/chalk.js"); + +function normalizeCliOptions(options, optionInfos, opts) { + return optionsNormalizer.normalizeCliOptions(options, optionInfos, { + colorsModule: chalk, + levenshteinDistance: leven, + ...opts, + }); +} + +module.exports = normalizeCliOptions; diff --git a/src/cli/options/parse-cli-arguments.js b/src/cli/options/parse-cli-arguments.js index cd6db20d2..66433266e 100644 --- a/src/cli/options/parse-cli-arguments.js +++ b/src/cli/options/parse-cli-arguments.js @@ -1,15 +1,10 @@ "use strict"; const pick = require("lodash/pick"); const camelCase = require("camelcase"); -const leven = require("leven"); -// eslint-disable-next-line no-restricted-modules -const { default: chalk } = require("../../../vendors/chalk.js"); -const { - optionsNormalizer: { normalizeCliOptions }, -} = require("../prettier-internal.js"); const getContextOptions = require("./get-context-options.js"); const minimist = require("./minimist.js"); const createMinimistOptions = require("./create-minimist-options.js"); +const normalizeCliOptions = require("./normalize-cli-options.js"); function parseArgv(rawArguments, detailedOptions, logger, keys) { const minimistOptions = createMinimistOptions(detailedOptions); @@ -26,11 +21,7 @@ function parseArgv(rawArguments, detailedOptions, logger, keys) { argv = pick(argv, keys); } - const normalized = normalizeCliOptions(argv, detailedOptions, { - logger, - colorsModule: chalk, - levenshteinDistance: leven, - }); + const normalized = normalizeCliOptions(argv, detailedOptions, { logger }); return { ...Object.fromEntries( diff --git a/tsconfig.json b/tsconfig.json index f81038f5a..d2fab7aa0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,6 +33,7 @@ "src/cli/options/get-options-for-file.js", "src/cli/options/option-map.js", "src/cli/options/parse-cli-arguments.js", + "src/cli/options/normalize-cli-options.js", "src/cli/usage.js", "src/cli/constant.js", "src/cli/prettier-internal.js", From b1e96cde954816c5a22c460d9e552a46c90ddb74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 20:13:21 +0900 Subject: [PATCH 10/60] Build(deps): Bump meriyah from 4.2.0 to 4.2.1 (#12567) * Build(deps): Bump meriyah from 4.2.0 to 4.2.1 Bumps [meriyah](https://github.com/meriyah/meriyah) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/meriyah/meriyah/releases) - [Changelog](https://github.com/meriyah/meriyah/blob/master/CHANGELOG.md) - [Commits](https://github.com/meriyah/meriyah/compare/v4.2.0...v4.2.1) --- updated-dependencies: - dependency-name: meriyah dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Add test for https://github.com/meriyah/meriyah/commit/6de707a0efb3053767deaa36b1ed6979b0d3f873 * Test https://github.com/meriyah/meriyah/commit/37c63613771e5bc6e23b7da2d92e992c60dafc5a * Test https://github.com/meriyah/meriyah/commit/d757c6b20ae4f6f4e55a77179726db36cf2bd50b * Add changelog Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- changelog_unreleased/javascript/12567.md | 23 +++++ package.json | 2 +- .../classes/__snapshots__/jsfmt.spec.js.snap | 22 +++++ tests/format/js/classes/super.js | 5 ++ .../js/regex/__snapshots__/jsfmt.spec.js.snap | 16 ++++ tests/format/js/regex/multiple-flags.js | 2 + .../__snapshots__/jsfmt.spec.js.snap | 16 ++++ .../js/top-level-await/in-expression.js | 3 + .../jsx/jsx/__snapshots__/jsfmt.spec.js.snap | 88 +++++++++++++++++++ tests/format/jsx/jsx/regex.js | 4 + yarn.lock | 8 +- 11 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 changelog_unreleased/javascript/12567.md create mode 100644 tests/format/js/classes/super.js create mode 100644 tests/format/js/regex/multiple-flags.js create mode 100644 tests/format/js/top-level-await/in-expression.js create mode 100644 tests/format/jsx/jsx/regex.js diff --git a/changelog_unreleased/javascript/12567.md b/changelog_unreleased/javascript/12567.md new file mode 100644 index 000000000..4e3b7a8d9 --- /dev/null +++ b/changelog_unreleased/javascript/12567.md @@ -0,0 +1,23 @@ +#### Update `meriyah` to fix several bugs (#12567 by @fisker, fixes in [`meriyah`](https://github.com/meriyah/meriyah/) by @3cp) + +Fixes bugs when parsing following valid code: + +```js +foo(await bar()); +``` + +```js +const regex = /.*/ms; +``` + +```js +const element =

{/w/.test(s)}

; +``` + +```js +class A extends B { + #privateMethod() { + super.method(); + } +} +``` diff --git a/package.json b/package.json index c0b782bca..7a7339dc1 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "linguist-languages": "7.15.0", "lodash": "4.17.21", "mem": "9.0.2", - "meriyah": "4.2.0", + "meriyah": "4.2.1", "micromatch": "4.0.5", "minimist": "1.2.6", "n-readlines": "1.0.1", diff --git a/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap index fbcbf12d7..0587ffe17 100644 --- a/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap @@ -325,6 +325,28 @@ class B { ================================================================================ `; +exports[`super.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "flow", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +class A extends B { + #a() { + super.x(); + } +} + +=====================================output===================================== +class A extends B { + #a() { + super.x(); + } +} + +================================================================================ +`; + exports[`ternary.js format 1`] = ` ====================================options===================================== parsers: ["babel", "flow", "typescript"] diff --git a/tests/format/js/classes/super.js b/tests/format/js/classes/super.js new file mode 100644 index 000000000..03eadf541 --- /dev/null +++ b/tests/format/js/classes/super.js @@ -0,0 +1,5 @@ +class A extends B { + #a() { + super.x(); + } +} diff --git a/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap index 3413b6890..aa295e37c 100644 --- a/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap @@ -28,6 +28,22 @@ printWidth: 80 ================================================================================ `; +exports[`multiple-flags.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "flow", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +/.*/ms; +/.*/my; + +=====================================output===================================== +/.*/ms; +/.*/my; + +================================================================================ +`; + exports[`test.js format 1`] = ` ====================================options===================================== parsers: ["babel", "flow", "typescript"] diff --git a/tests/format/js/regex/multiple-flags.js b/tests/format/js/regex/multiple-flags.js new file mode 100644 index 000000000..f5a04f859 --- /dev/null +++ b/tests/format/js/regex/multiple-flags.js @@ -0,0 +1,2 @@ +/.*/ms; +/.*/my; diff --git a/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap index 04b2cd75c..249b632a6 100644 --- a/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap @@ -13,3 +13,19 @@ await something(); ================================================================================ `; + +exports[`in-expression.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +call( +await something() +) + +=====================================output===================================== +call(await something()); + +================================================================================ +`; diff --git a/tests/format/js/top-level-await/in-expression.js b/tests/format/js/top-level-await/in-expression.js new file mode 100644 index 000000000..d70f91522 --- /dev/null +++ b/tests/format/js/top-level-await/in-expression.js @@ -0,0 +1,3 @@ +call( +await something() +) diff --git a/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap index 764b7cf2e..e8776bdc0 100644 --- a/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap @@ -5076,6 +5076,94 @@ singleQuote: true ================================================================================ `; +exports[`regex.js - {"singleQuote":false,"jsxSingleQuote":false} format 1`] = ` +====================================options===================================== +jsxSingleQuote: false +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: false + | printWidth +=====================================input====================================== +x =
one
,
two
; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
one
), (
two
); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + +exports[`regex.js - {"singleQuote":false,"jsxSingleQuote":true} format 1`] = ` +====================================options===================================== +jsxSingleQuote: true +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: false + | printWidth +=====================================input====================================== +x =
one
,
two
; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
one
), (
two
); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + +exports[`regex.js - {"singleQuote":true,"jsxSingleQuote":false} format 1`] = ` +====================================options===================================== +jsxSingleQuote: false +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: true + | printWidth +=====================================input====================================== +x =
one
,
two
; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
one
), (
two
); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + +exports[`regex.js - {"singleQuote":true,"jsxSingleQuote":true} format 1`] = ` +====================================options===================================== +jsxSingleQuote: true +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: true + | printWidth +=====================================input====================================== +x =
one
,
two
; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
one
), (
two
); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + exports[`return-statement.js - {"singleQuote":false,"jsxSingleQuote":false} format 1`] = ` ====================================options===================================== jsxSingleQuote: false diff --git a/tests/format/jsx/jsx/regex.js b/tests/format/jsx/jsx/regex.js new file mode 100644 index 000000000..9f92918c6 --- /dev/null +++ b/tests/format/jsx/jsx/regex.js @@ -0,0 +1,4 @@ +x =
one
,
two
; +x = {} +x = {1/2} +x = {/w/.test(s)} diff --git a/yarn.lock b/yarn.lock index 4c944df49..ab96c6c90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4834,10 +4834,10 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -meriyah@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.0.tgz#29d28c37ac7b67f8b9aaa92df0b8ac12469fe98b" - integrity sha512-fCVh5GB9YT53Bq14l00HLYE3i9DywrY0JVZxbk0clXWDuMsUKKwluvC5sY0bMBqHbnIbpIjfSSIsnrzbauA8Yw== +meriyah@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.1.tgz#2a5c9ac2f4a16673afa31af1266ce491a8973bb4" + integrity sha512-Uv5sWsmjFNC6IszEmHo5bzJLL+kqjQ/VrEj9Agqsqtx7B6dcxHnHLew1ioJD19HNXrxrRZltPi+NVh12I8RLXA== micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" From f4d4dc1177c04fee0b6e3a7728d4d2ebd699543c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 11:24:18 +0000 Subject: [PATCH 11/60] Build(deps): Bump strip-ansi from 6.0.0 to 7.0.0 (#10731) --- package.json | 2 +- scripts/vendors/vendor-meta.json | 34 +++++++++++++++++++ scripts/vendors/vendors.mjs | 1 + src/cli/logger.js | 3 +- tests/integration/__tests__/loglevel.js | 2 +- tests/integration/run-prettier.js | 2 +- vendors/string-width.js | 4 +-- vendors/strip-ansi.d.ts | 3 ++ vendors/strip-ansi.js | 45 +++++++++++++++++++++++++ yarn.lock | 19 ++++------- 10 files changed, 96 insertions(+), 19 deletions(-) create mode 100644 vendors/strip-ansi.d.ts create mode 100644 vendors/strip-ansi.js diff --git a/package.json b/package.json index 7a7339dc1..4f2c91b6f 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "resolve": "1.22.0", "semver": "7.3.5", "string-width": "5.0.1", - "strip-ansi": "6.0.0", + "strip-ansi": "7.0.1", "typescript": "4.6.3", "unicode-regex": "3.0.0", "unified": "9.2.1", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 0631c4c21..c47e5d343 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -544,6 +544,40 @@ }, "contributors": [] }, + { + "name": "ansi-regex", + "maintainers": [], + "version": "6.0.1", + "description": "Regular expression for matching ANSI escape codes", + "repository": "chalk/ansi-regex", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "strip-ansi", + "maintainers": [], + "version": "7.0.1", + "description": "Strip ANSI escape codes from a string", + "repository": "chalk/strip-ansi", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "crypto-random-string", "maintainers": [], diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index dc00c233c..f1c43d4eb 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -7,6 +7,7 @@ const vendors = [ "html-void-elements", "mem", "string-width", + "strip-ansi", "tempy", ]; diff --git a/src/cli/logger.js b/src/cli/logger.js index 350e91309..3e1331bc0 100644 --- a/src/cli/logger.js +++ b/src/cli/logger.js @@ -1,9 +1,10 @@ "use strict"; const readline = require("readline"); -const stripAnsi = require("strip-ansi"); const wcwidth = require("wcwidth"); +// eslint-disable-next-line no-restricted-modules +const { default: stripAnsi } = require("../../vendors/strip-ansi.js"); // eslint-disable-next-line no-restricted-modules const { default: chalk } = require("../../vendors/chalk.js"); diff --git a/tests/integration/__tests__/loglevel.js b/tests/integration/__tests__/loglevel.js index 53ad29937..3fe029ca2 100644 --- a/tests/integration/__tests__/loglevel.js +++ b/tests/integration/__tests__/loglevel.js @@ -1,6 +1,6 @@ "use strict"; -const stripAnsi = require("strip-ansi"); +const { default: stripAnsi } = require("../../../vendors/strip-ansi.js"); const runPrettier = require("../run-prettier.js"); test("do not show logs with --loglevel silent", async () => { diff --git a/tests/integration/run-prettier.js b/tests/integration/run-prettier.js index 68cde716e..441b14025 100644 --- a/tests/integration/run-prettier.js +++ b/tests/integration/run-prettier.js @@ -2,7 +2,7 @@ const fs = require("fs"); const path = require("path"); -const stripAnsi = require("strip-ansi"); +const { default: stripAnsi } = require("../../vendors/strip-ansi.js"); const { prettierCli, thirdParty } = require("./env.js"); async function run(dir, args, options) { diff --git a/vendors/string-width.js b/vendors/string-width.js index bed36dfd4..384d4a261 100644 --- a/vendors/string-width.js +++ b/vendors/string-width.js @@ -41,7 +41,7 @@ __export(string_width_exports, { }); module.exports = __toCommonJS(string_width_exports); -// node_modules/string-width/node_modules/ansi-regex/index.js +// node_modules/strip-ansi/node_modules/ansi-regex/index.js function ansiRegex({ onlyFirst = false } = {}) { const pattern = [ "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", @@ -50,7 +50,7 @@ function ansiRegex({ onlyFirst = false } = {}) { return new RegExp(pattern, onlyFirst ? void 0 : "g"); } -// node_modules/string-width/node_modules/strip-ansi/index.js +// node_modules/strip-ansi/index.js function stripAnsi(string) { if (typeof string !== "string") { throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``); diff --git a/vendors/strip-ansi.d.ts b/vendors/strip-ansi.d.ts new file mode 100644 index 000000000..07389334c --- /dev/null +++ b/vendors/strip-ansi.d.ts @@ -0,0 +1,3 @@ +// This file is generated automatically. +export {default} from "strip-ansi"; +export * from "strip-ansi"; diff --git a/vendors/strip-ansi.js b/vendors/strip-ansi.js new file mode 100644 index 000000000..1c3a4e564 --- /dev/null +++ b/vendors/strip-ansi.js @@ -0,0 +1,45 @@ +// @ts-nocheck +// This file is generated automatically +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; +}; +var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + +// node_modules/strip-ansi/index.js +var strip_ansi_exports = {}; +__export(strip_ansi_exports, { + default: () => stripAnsi +}); +module.exports = __toCommonJS(strip_ansi_exports); + +// node_modules/strip-ansi/node_modules/ansi-regex/index.js +function ansiRegex({ onlyFirst = false } = {}) { + const pattern = [ + "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", + "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))" + ].join("|"); + return new RegExp(pattern, onlyFirst ? void 0 : "g"); +} + +// node_modules/strip-ansi/index.js +function stripAnsi(string) { + if (typeof string !== "string") { + throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``); + } + return string.replace(ansiRegex(), ""); +} +// Annotate the CommonJS export names for ESM import in node: +0 && (module.exports = {}); diff --git a/yarn.lock b/yarn.lock index ab96c6c90..7578148be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1870,7 +1870,7 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0, ansi-regex@^5.0.1: +ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -6067,12 +6067,12 @@ strip-ansi@5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@7.0.1, strip-ansi@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^6.0.1" strip-ansi@^4.0.0: version "4.0.0" @@ -6088,13 +6088,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" From c23e24ee114d5fc86c3f09cdf026e71e22e726a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 11:47:46 +0000 Subject: [PATCH 12/60] Build(deps): Bump leven from 3.1.0 to 4.0.0 (#11349) --- package.json | 2 +- scripts/vendors/vendor-meta.json | 17 ++++++ scripts/vendors/vendors.mjs | 1 + src/cli/options/normalize-cli-options.js | 5 +- vendors/leven.d.ts | 3 + vendors/leven.js | 76 ++++++++++++++++++++++++ yarn.lock | 13 ++-- 7 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 vendors/leven.d.ts create mode 100644 vendors/leven.js diff --git a/package.json b/package.json index 4f2c91b6f..7ab1eebba 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "ignore": "5.2.0", "jest-docblock": "27.5.1", "json5": "2.2.1", - "leven": "3.1.0", + "leven": "4.0.0", "lines-and-columns": "2.0.3", "linguist-languages": "7.15.0", "lodash": "4.17.21", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index c47e5d343..7d95829af 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -388,6 +388,23 @@ } ] }, + { + "name": "leven", + "maintainers": [], + "version": "4.0.0", + "description": "Measure the difference between two strings using the Levenshtein distance algorithm", + "repository": "sindresorhus/leven", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "mimic-fn", "maintainers": [], diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index f1c43d4eb..bea6f7929 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -5,6 +5,7 @@ const vendors = [ "html-element-attributes", "html-tag-names", "html-void-elements", + "leven", "mem", "string-width", "strip-ansi", diff --git a/src/cli/options/normalize-cli-options.js b/src/cli/options/normalize-cli-options.js index 6e063f69e..b0a9d378d 100644 --- a/src/cli/options/normalize-cli-options.js +++ b/src/cli/options/normalize-cli-options.js @@ -1,9 +1,10 @@ "use strict"; -const leven = require("leven"); -const { optionsNormalizer } = require("../prettier-internal.js"); // eslint-disable-next-line no-restricted-modules const { default: chalk } = require("../../../vendors/chalk.js"); +// eslint-disable-next-line no-restricted-modules +const { default: leven } = require("../../../vendors/leven.js"); +const { optionsNormalizer } = require("../prettier-internal.js"); function normalizeCliOptions(options, optionInfos, opts) { return optionsNormalizer.normalizeCliOptions(options, optionInfos, { diff --git a/vendors/leven.d.ts b/vendors/leven.d.ts new file mode 100644 index 000000000..31a132da6 --- /dev/null +++ b/vendors/leven.d.ts @@ -0,0 +1,3 @@ +// This file is generated automatically. +export {default} from "leven"; +export * from "leven"; diff --git a/vendors/leven.js b/vendors/leven.js new file mode 100644 index 000000000..b22ff5a59 --- /dev/null +++ b/vendors/leven.js @@ -0,0 +1,76 @@ +// @ts-nocheck +// This file is generated automatically +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; +}; +var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + +// node_modules/leven/index.js +var leven_exports = {}; +__export(leven_exports, { + default: () => leven +}); +module.exports = __toCommonJS(leven_exports); +var array = []; +var characterCodeCache = []; +function leven(first, second) { + if (first === second) { + return 0; + } + const swap = first; + if (first.length > second.length) { + first = second; + second = swap; + } + let firstLength = first.length; + let secondLength = second.length; + while (firstLength > 0 && first.charCodeAt(~-firstLength) === second.charCodeAt(~-secondLength)) { + firstLength--; + secondLength--; + } + let start = 0; + while (start < firstLength && first.charCodeAt(start) === second.charCodeAt(start)) { + start++; + } + firstLength -= start; + secondLength -= start; + if (firstLength === 0) { + return secondLength; + } + let bCharacterCode; + let result; + let temporary; + let temporary2; + let index = 0; + let index2 = 0; + while (index < firstLength) { + characterCodeCache[index] = first.charCodeAt(start + index); + array[index] = ++index; + } + while (index2 < secondLength) { + bCharacterCode = second.charCodeAt(start + index2); + temporary = index2++; + result = index2; + for (index = 0; index < firstLength; index++) { + temporary2 = bCharacterCode === characterCodeCache[index] ? temporary : temporary + 1; + temporary = array[index]; + result = array[index] = temporary > result ? temporary2 > result ? result + 1 : temporary2 : temporary2 > temporary ? temporary + 1 : temporary2; + } + } + return result; +} +// Annotate the CommonJS export names for ESM import in node: +0 && (module.exports = {}); diff --git a/yarn.lock b/yarn.lock index 7578148be..f455f95df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4663,16 +4663,21 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -leven@3.1.0, leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== +leven@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-4.0.0.tgz#b9c39c803f835950fabef9e122a9b47b95708710" + integrity sha512-puehA3YKku3osqPlNuzGDUHq8WpwXupUg1V6NXdV38G+gr+gkBwFC8g1b/+YcIvp8gnqVIus+eJCH/eGsRmJNw== leven@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA= +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" From 6d7c8ac3874a98058c3409b2f806951198a0b606 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 2 Apr 2022 21:46:14 +0900 Subject: [PATCH 13/60] Add new workflow to prevent updating `users.yml` (#11784) Co-authored-by: fisker Cheung --- .github/workflows/prevent-file-change.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/prevent-file-change.yml diff --git a/.github/workflows/prevent-file-change.yml b/.github/workflows/prevent-file-change.yml new file mode 100644 index 000000000..da740ab60 --- /dev/null +++ b/.github/workflows/prevent-file-change.yml @@ -0,0 +1,17 @@ +name: Prevent File change + +on: + pull_request: + paths: + - "website/data/users.yml" + +jobs: + prevent-add-users: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Prevent file change + uses: xalvarez/prevent-file-change-action@v1 + with: + githubToken: ${{ secrets.GITHUB_TOKEN }} + pattern: website/data/users.yml From 97bdc6e2f40b7916caa4f9d1cda4a000cc706d65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 09:56:34 +0000 Subject: [PATCH 14/60] Build(deps): Bump typescript from 4.6.2 to 4.6.3 (#12549) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 702a7a52c..f45dd9c6e 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "semver": "7.3.5", "string-width": "5.0.1", "strip-ansi": "6.0.0", - "typescript": "4.6.2", + "typescript": "4.6.3", "unicode-regex": "3.0.0", "unified": "9.2.1", "vnopts": "1.0.2", diff --git a/yarn.lock b/yarn.lock index 1ea57dbd6..9733e0c74 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6336,10 +6336,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typescript@4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" - integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== +typescript@4.6.3: + version "4.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" + integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== unbox-primitive@^1.0.1: version "1.0.1" From ff21ad2e80a9c59c51928760685fae9c093fa65b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 09:56:52 +0000 Subject: [PATCH 15/60] Build(deps-dev): Bump eslint from 8.11.0 to 8.12.0 (#12548) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f45dd9c6e..0c5d2f739 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "enquirer": "2.3.6", "esbuild": "0.14.27", "esbuild-visualizer": "0.3.1", - "eslint": "8.11.0", + "eslint": "8.12.0", "eslint-config-prettier": "8.5.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "4.0.2", diff --git a/yarn.lock b/yarn.lock index 9733e0c74..958f1cd41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3102,10 +3102,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" - integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== +eslint@8.12.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e" + integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q== dependencies: "@eslint/eslintrc" "^1.2.1" "@humanwhocodes/config-array" "^0.9.2" From c2161c13f102ba54b5c515019f4a9bfebbb5209a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 09:57:10 +0000 Subject: [PATCH 16/60] Build(deps-dev): Bump eslint-plugin-jest from 26.1.2 to 26.1.3 (#12547) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0c5d2f739..b952fa8c0 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "eslint-formatter-friendly": "7.0.0", "eslint-plugin-compat": "4.0.2", "eslint-plugin-import": "2.25.4", - "eslint-plugin-jest": "26.1.2", + "eslint-plugin-jest": "26.1.3", "eslint-plugin-prettier-internal-rules": "2.0.1", "eslint-plugin-react": "7.29.4", "eslint-plugin-regexp": "1.6.0", diff --git a/yarn.lock b/yarn.lock index 958f1cd41..69603ab7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3003,10 +3003,10 @@ eslint-plugin-import@2.25.4: resolve "^1.20.0" tsconfig-paths "^3.12.0" -eslint-plugin-jest@26.1.2: - version "26.1.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.2.tgz#0f1a15c62889fffc3f78a773749d672f1bedb15f" - integrity sha512-1bXCoRODPkGN06n9KAMls4Jm0eyS+0Q/LWcIxhqWR2ycV0Z7lnx2c10idk4dtFIJY5xStgiIr5snC6/rxcXpbw== +eslint-plugin-jest@26.1.3: + version "26.1.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.3.tgz#e722e5efeea18aa9dec7c7349987b641db19feb7" + integrity sha512-Pju+T7MFpo5VFhFlwrkK/9jRUu18r2iugvgyrWOnnGRaVTFFmFXp+xFJpHyqmjjLmGJPKLeEFLVTAxezkApcpQ== dependencies: "@typescript-eslint/utils" "^5.10.0" From f8aa431e6554e7e7215186ae80bbd9af1a18049e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 09:57:58 +0000 Subject: [PATCH 17/60] Build(deps-dev): Bump cspell from 5.19.2 to 5.19.3 (#12545) --- package.json | 2 +- yarn.lock | 146 +++++++++++++++++++++++++-------------------------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index b952fa8c0..e7617bdb7 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "browserslist-to-esbuild": "1.1.1", "core-js": "3.21.1", "cross-env": "7.0.3", - "cspell": "5.19.2", + "cspell": "5.19.3", "enquirer": "2.3.6", "esbuild": "0.14.27", "esbuild-visualizer": "0.3.1", diff --git a/yarn.lock b/yarn.lock index 69603ab7f..763f1da84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -947,25 +947,25 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cspell/cspell-bundled-dicts@^5.19.2": - version "5.19.2" - resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.2.tgz#c20d05d0ff5f3850bb62a32a95e05abd94673936" - integrity sha512-R+12xDw5iLCJH3O0n8t1D7acZrO/bjuULU3rs3CEt+i84/85b27shywc3E/vOiOt9613bpFNOL52J27Tu52YPQ== +"@cspell/cspell-bundled-dicts@^5.19.3": + version "5.19.3" + resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.3.tgz#826e166eb56f193c2d770575adfbb1557816f1af" + integrity sha512-YAz68AgXTFFtrBUhNJlOQ7KOjUE6ncYt578/esa2GStMJHgJoUtPnOZsE41hh+cVWXqO5yRRI+Qkwub99zLMgQ== dependencies: "@cspell/dict-ada" "^2.0.0" "@cspell/dict-aws" "^2.0.0" "@cspell/dict-bash" "^2.0.1" - "@cspell/dict-companies" "^2.0.2" + "@cspell/dict-companies" "^2.0.3" "@cspell/dict-cpp" "^2.0.0" "@cspell/dict-cryptocurrencies" "^2.0.0" "@cspell/dict-csharp" "^2.0.1" "@cspell/dict-css" "^2.0.0" "@cspell/dict-dart" "^1.1.0" "@cspell/dict-django" "^2.0.0" - "@cspell/dict-dotnet" "^2.0.0" + "@cspell/dict-dotnet" "^2.0.1" "@cspell/dict-elixir" "^2.0.1" "@cspell/dict-en-gb" "^1.1.33" - "@cspell/dict-en_us" "^2.1.7" + "@cspell/dict-en_us" "^2.2.0" "@cspell/dict-filetypes" "^2.0.1" "@cspell/dict-fonts" "^2.0.0" "@cspell/dict-fullstack" "^2.0.4" @@ -987,20 +987,20 @@ "@cspell/dict-ruby" "^2.0.1" "@cspell/dict-rust" "^2.0.0" "@cspell/dict-scala" "^2.0.0" - "@cspell/dict-software-terms" "^2.1.3" + "@cspell/dict-software-terms" "^2.1.4" "@cspell/dict-swift" "^1.0.2" "@cspell/dict-typescript" "^2.0.0" "@cspell/dict-vue" "^2.0.2" -"@cspell/cspell-pipe@^5.19.2": - version "5.19.2" - resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.2.tgz#40bf46fae7aa0697f9ab9e36d165fe149b9b5f36" - integrity sha512-mFFSn4ZgNgIOM0iBT0+xKBhRTQd/ecrWVvPfJpHxXIFwTt0neD19hqK54RDedLf8Hjds5cBHvS1EjMNARju/bQ== +"@cspell/cspell-pipe@^5.19.3": + version "5.19.3" + resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.3.tgz#af818c0362786f61ac8741947e1819f94b55ec3b" + integrity sha512-3RKntgGRxYYzoxoH3VBPvnNMYkHKPq0U+U7qogcWxDkgAUgKXlBP0oc2mw96grJQ4HIzOL1vBnaVAWAqteY9Kw== -"@cspell/cspell-types@^5.19.2": - version "5.19.2" - resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.2.tgz#faae04c918dca53d6a266d86d00c3bd1682ebe16" - integrity sha512-IkMQpa7IzoFm9NXzRz8Gp38f3aoMZf6xjT7J3FvWtIntPvkIFaY53R1/I9U/gujH/zflf2VmZGxoDuFg1VcD0g== +"@cspell/cspell-types@^5.19.3": + version "5.19.3" + resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.3.tgz#37a64db00e33a1c8bb8aa3bf86d503689b3afbf5" + integrity sha512-tub7PW/I6qB6o+ZtlahAZjm5O5cnzj88HRiC8nAbJFpa7q0mrdpFMYhd7ksWtyFLlNbuDkCsfzXGamAhIQnnIw== "@cspell/dict-ada@^2.0.0": version "2.0.0" @@ -1017,10 +1017,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-bash/-/dict-bash-2.0.1.tgz#76f6be974e9a968235d4e1b04c4ae76b16169057" integrity sha512-pBx3T/5w7fPF8XD5cx3NwtRFvNpQYmYqzM043NKP2hDmlx4uFwbH599Lvt5mwCMZKfIoRXaNUQvq7se2gstQjw== -"@cspell/dict-companies@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-2.0.2.tgz#de315b8315b868f877e6161f9fe70e8efc769931" - integrity sha512-LPKwBMAWRz+p1R8q+TV6E1sGOOTvxJOaJeXNN++CZQ7i6JMn5Rf+BSxagwkeK6z3o9vIC5ZE4AcQ5BMkvyjqGw== +"@cspell/dict-companies@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-2.0.3.tgz#9e0f93a2cc884ff0b98d019123d1dbfb853da872" + integrity sha512-O622rMAaHm85AmqNyMki5je8HB/1XlTKbGOXh2UUhooI5qdgdfrjTQ6VBuHwHrfEfuODBHYTNYXVB2m23XqHCg== "@cspell/dict-cpp@^2.0.0": version "2.0.0" @@ -1052,10 +1052,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-django/-/dict-django-2.0.0.tgz#a5f5f693a686e5873f9dfb547ee3b3142ef760b1" integrity sha512-GkJdJv6cmzrKcmq2/oxTXjKF5uv71r4eTqnFmgPbNBW1t+G4VYpzOf0QrVQrhx2RC4DdW5XfcTf+iS0FxHOTmw== -"@cspell/dict-dotnet@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-2.0.0.tgz#92729d95a71b9f72bf264fbba0c66a7b29f3993a" - integrity sha512-WOHfjwMuLbo76khDsDa1lJvP/dXcwXVwonWwfUFRt82BL/GtyMalh1HEtCWwKDuK/9f8PCEt/EZMkHT3D5ZV3w== +"@cspell/dict-dotnet@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-2.0.1.tgz#8ef56df758b63f0a2ba4d8681a427a6861ed34d5" + integrity sha512-b1n4crJRW0WZVf9Gp/52j/tDtjYiZ3N81fIyfqPlBrjsh/5AivfA697DYwQ2mr8ngNX7RsqRtYNQjealA1rEnQ== "@cspell/dict-elixir@^2.0.1": version "2.0.1" @@ -1067,10 +1067,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-en-gb/-/dict-en-gb-1.1.33.tgz#7f1fd90fc364a5cb77111b5438fc9fcf9cc6da0e" integrity sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g== -"@cspell/dict-en_us@^2.1.7": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-2.1.7.tgz#1acb710b72364898a832b300d3e77211027efac0" - integrity sha512-7IeAHZjXiWSIKFx/3CIlY6misvg2KyJ2KO3tSVSKuAlC3UXHGVOcbcY0kQ95IJeKbB6Ot6aW/Aaw73Nzhuurrg== +"@cspell/dict-en_us@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-2.2.0.tgz#33ee50fac4c42036ce98b9c9925cc86b16b0f2c3" + integrity sha512-IJWu8MI2NdLyPzekrMi9K+v71b0qjDE+z/BccoMA/APnphqgSNM8BDUAzhio6mPKi1AvPRCNUjk79oiUfp+1Gw== "@cspell/dict-filetypes@^2.0.1": version "2.0.1" @@ -1177,10 +1177,10 @@ resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-2.0.0.tgz#b8098103bb03a13406c1c79f1769052353aafac4" integrity sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g== -"@cspell/dict-software-terms@^2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.3.tgz#033f93d4cfa03e21b03ad0861ee74560b204a841" - integrity sha512-JmMfRa9Xl0MCD/z5gYUnY05BNxSMnx25Ky6kO/Cs0gBYZZdYzHZNqrbfnqBMsB9PpOzn2uqrYUmAEusoI1WyMQ== +"@cspell/dict-software-terms@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.4.tgz#4a3e1d62abcaa237b98510638e279bae7712e97f" + integrity sha512-MB2eT9qhbnIEJajGv+ndzzi6S8NCJ9cMyeGJYMoRAiJobTKP6xPrT37VjPzhckRtrHJGG//UgtQ4NsiK5aBITw== "@cspell/dict-swift@^1.0.2": version "1.0.2" @@ -2323,10 +2323,10 @@ commander@^2.19.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.0.0.tgz#86d58f24ee98126568936bd1d3574e0308a99a40" - integrity sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw== +commander@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.1.0.tgz#a6b263b2327f2e188c6402c42623327909f2dbec" + integrity sha512-i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w== comment-json@^4.2.2: version "4.2.2" @@ -2441,41 +2441,41 @@ crypto-random-string@^4.0.0: dependencies: type-fest "^1.0.1" -cspell-gitignore@^5.19.2: - version "5.19.2" - resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.19.2.tgz#8a364a18fbeef7b35356f2537933ea4fc1761063" - integrity sha512-j0iMQoLmq4J/19hM0j0rNUQoHsw1b9Yg1AZMus8WJgABPUPGgk4fRKJChUQu0+ys3wwWT/4vhKt7hU89ScphJQ== +cspell-gitignore@^5.19.3: + version "5.19.3" + resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.19.3.tgz#c27780dc1b43cb48705dc3695c3875f001d7b038" + integrity sha512-Q67uHcf0qNgOoanRLhatapjWpLiftT+MuLIyAaSLe5eNVzQurQIc+UnXhtaslkVyOTqQt4NJFqLgtf5ZSGz1bg== dependencies: - cspell-glob "^5.19.2" + cspell-glob "^5.19.3" find-up "^5.0.0" -cspell-glob@^5.19.2: - version "5.19.2" - resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.2.tgz#57a208bbb583d8385403d35fa2f1a1351b50e883" - integrity sha512-23pgM0KzWsnNv6zwC/xnxdE86MfLU7NWbBqDmn1KixhJjezOhg/LiSjnJuRVUuLR+4qApzjrBRpk+Rj1jzYi6A== +cspell-glob@^5.19.3: + version "5.19.3" + resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.3.tgz#f6b423523a0c2d77d244ecfc7c48ef320f4d122a" + integrity sha512-qp2Oe/euzTu3e0zZrQxHuTrqRo418tYfh4CnCa+DKU6lWKKcF4zCEhOGJHPsYak8SFIXZ4ZE360wHFxB/JDutQ== dependencies: micromatch "^4.0.4" -cspell-io@^5.19.2: - version "5.19.2" - resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.2.tgz#32ae634cccc73c8a0b8f1c83038301fbe137c85f" - integrity sha512-TLlXMmDdZQold3ZsbHEpwKjUIRtYksp7Qr9Z0Rt9JpII6riliUPdB0SMFgtrqAvV1+bhJEPPmSxts8SdtLkdnA== +cspell-io@^5.19.3: + version "5.19.3" + resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.3.tgz#89ab249dc53206651a7833399a83b04a7d8a8a63" + integrity sha512-dE9eBvHgIJ11DelWtyehMU3W3bCpcB+0nS6uOZJ2d8fDu13m5BebpLrXZ2dKfY4cjksJUhRPatt14uwQSeUp2A== -cspell-lib@^5.19.2: - version "5.19.2" - resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.2.tgz#678ade6f3217e0ca3bb12efca55871912d90d2ff" - integrity sha512-x8NhOiXKRj6PHQty9RmaujE8dywzX0ZJr6AlPE/0N8IHmOg0Y8gAs7aN45l3PjFz+vaWfCghPbCIyxE/fdXNaw== +cspell-lib@^5.19.3: + version "5.19.3" + resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.3.tgz#6efc9ee5620d427e2f20c000b60a3b3d0ce6cd4c" + integrity sha512-peMJggwJpxCXKZZ0DuHyDtZmf66POKaHf5Im8LGEyMKFARUIq6O2WvaUGggYjyRe3Ng/f5G+EYTcIHbF9pZYcg== dependencies: - "@cspell/cspell-bundled-dicts" "^5.19.2" - "@cspell/cspell-pipe" "^5.19.2" - "@cspell/cspell-types" "^5.19.2" + "@cspell/cspell-bundled-dicts" "^5.19.3" + "@cspell/cspell-pipe" "^5.19.3" + "@cspell/cspell-types" "^5.19.3" clear-module "^4.1.2" comment-json "^4.2.2" configstore "^5.0.1" cosmiconfig "^7.0.1" - cspell-glob "^5.19.2" - cspell-io "^5.19.2" - cspell-trie-lib "^5.19.2" + cspell-glob "^5.19.3" + cspell-io "^5.19.3" + cspell-trie-lib "^5.19.3" fast-equals "^3.0.0" find-up "^5.0.0" fs-extra "^10.0.1" @@ -2486,27 +2486,27 @@ cspell-lib@^5.19.2: vscode-languageserver-textdocument "^1.0.4" vscode-uri "^3.0.3" -cspell-trie-lib@^5.19.2: - version "5.19.2" - resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.2.tgz#4573f897de9ad1200390c14b73d43066acdf8746" - integrity sha512-JCPBuA6XtIRuMZtIzRAV/nk/NmTQwxcQA4GEAkdxYZ9aUPTpMDItxQkrKrlEvAuqt8hKZkOpE6ZpChdLW7aKsg== +cspell-trie-lib@^5.19.3: + version "5.19.3" + resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.3.tgz#0a0f8d9300f95188f2f2b1831bd7fea2e9c9d6ee" + integrity sha512-Io8EB7E1pmttHzZvgvPEF0b87qlq8G5uA4B+sbqCxrUf5l4JDcK/UYLih0+rekLTbv4Q68zqgCTASvqxgqnoAg== dependencies: - "@cspell/cspell-pipe" "^5.19.2" + "@cspell/cspell-pipe" "^5.19.3" fs-extra "^10.0.1" gensequence "^3.1.1" -cspell@5.19.2: - version "5.19.2" - resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.19.2.tgz#79de5ab9335b089058fb9765fbdf39aebade3aa7" - integrity sha512-HqjwOZ5iJ4WBfl6TfQkGXax0uYVL3SI9XAsstFs7yQW+6/DwjgvR7GFTkGH+rZgN5hdGZPk81NYbfNLm0uyKCQ== +cspell@5.19.3: + version "5.19.3" + resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.19.3.tgz#0f2c6cf529fb3f0b721b380f81b04e9c22272c05" + integrity sha512-JJBH8iqtHYmxqLQZ+7GAMTVvc6SAoHVgn1tdYknOI2/uxAbZVH29eaxINY7JfjwPuxPPVAvttRetBAIRiu6ZYw== dependencies: - "@cspell/cspell-pipe" "^5.19.2" + "@cspell/cspell-pipe" "^5.19.3" chalk "^4.1.2" - commander "^9.0.0" + commander "^9.1.0" comment-json "^4.2.2" - cspell-gitignore "^5.19.2" - cspell-glob "^5.19.2" - cspell-lib "^5.19.2" + cspell-gitignore "^5.19.3" + cspell-glob "^5.19.3" + cspell-lib "^5.19.3" fast-json-stable-stringify "^2.1.0" file-entry-cache "^6.0.1" fs-extra "^10.0.1" From 542e0920598644075b11d0d2a70096cdb55571d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 09:58:37 +0000 Subject: [PATCH 18/60] Build(deps): Bump codemirror-graphql from 1.2.13 to 1.2.14 in /website (#12544) --- website/package.json | 2 +- website/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/website/package.json b/website/package.json index 056a4de5e..e5224f1b1 100644 --- a/website/package.json +++ b/website/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "clipboard": "2.0.10", - "codemirror-graphql": "1.2.13", + "codemirror-graphql": "1.2.14", "lz-string": "1.4.4", "prop-types": "15.8.1", "react": "17.0.2", diff --git a/website/yarn.lock b/website/yarn.lock index 8d9a4b88d..d6c4d409b 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2291,13 +2291,13 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" -codemirror-graphql@1.2.13: - version "1.2.13" - resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-1.2.13.tgz#2525141b2ea8e54b78aea91cc8b85693bbcb17d9" - integrity sha512-7I2qPHxoTndvDNBkaoYYbL2S6A6JAMXBA17ZFcIWAj7A0V/NEg0aPSxhwNRK1yLmC+3XI9OR4BjZTiPxrA2gBA== +codemirror-graphql@1.2.14: + version "1.2.14" + resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-1.2.14.tgz#069df62347a1db5aca6a1a74ad2f933392d2a6b9" + integrity sha512-zt2N0sZgaZZUOp8eTNIy2d364gGKjtAu0PKHMjQqogB2S4KrD/z/wICCjRf0JXskPM8jN/kNqufhHt59UKf6gQ== dependencies: "@codemirror/stream-parser" "^0.19.2" - graphql-language-service "^5.0.0" + graphql-language-service "^5.0.1" coffee-script@^1.12.4: version "1.12.7" @@ -4177,10 +4177,10 @@ graphql-config@^4.1.0: minimatch "3.0.4" string-env-interpolation "1.0.1" -graphql-language-service@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/graphql-language-service/-/graphql-language-service-5.0.0.tgz#52dad53135f06551eee4c4dc57057c61eb10c460" - integrity sha512-3tbJOApOJk8FQFVV+hKSs3gEWqqt3gQ5l3iEOUl7ofhyTmpRlbkYp+/dVLMF/p29iwZ5a8wqSXl+DDnHI6RMXQ== +graphql-language-service@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/graphql-language-service/-/graphql-language-service-5.0.1.tgz#de72d12051fa48deec3883f4980f6ff3475ab8d6" + integrity sha512-DGaGtCyU5ugCJIkTWqFxNESFCqjNEHJGWDhcu2jXY28GcPnTSqfKAk4ryCK4E514AKNFrvX9WwZEB6Csi+xbdQ== dependencies: graphql-config "^4.1.0" nullthrows "^1.0.0" From e7486b705a830288a7bf5a2aa2ca290496e2f0ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 09:58:59 +0000 Subject: [PATCH 19/60] Build(deps-dev): Bump babel-loader from 8.2.3 to 8.2.4 in /website (#12543) --- website/package.json | 2 +- website/yarn.lock | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/website/package.json b/website/package.json index e5224f1b1..c8c69f874 100644 --- a/website/package.json +++ b/website/package.json @@ -16,7 +16,7 @@ "devDependencies": { "@babel/preset-react": "7.16.7", "@sandhose/prettier-animated-logo": "1.0.3", - "babel-loader": "8.2.3", + "babel-loader": "8.2.4", "concurrently": "7.0.0", "docusaurus": "1.14.7", "js-yaml": "4.1.0", diff --git a/website/yarn.lock b/website/yarn.lock index d6c4d409b..e48a3547e 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -1767,13 +1767,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -babel-loader@8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" - integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== +babel-loader@8.2.4: + version "8.2.4" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b" + integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A== dependencies: find-cache-dir "^3.3.1" - loader-utils "^1.4.0" + loader-utils "^2.0.0" make-dir "^3.1.0" schema-utils "^2.6.5" @@ -5038,13 +5038,6 @@ json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - json5@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" @@ -5159,14 +5152,14 @@ loader-utils@2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -loader-utils@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== +loader-utils@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" - json5 "^1.0.1" + json5 "^2.1.2" locate-path@^3.0.0: version "3.0.0" From 70785093e1caf522b7c0df2a6983b86cabc1fc3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 21:49:30 +0800 Subject: [PATCH 20/60] Build(deps-dev): Bump esbuild from 0.14.27 to 0.14.28 (#12546) Bumps [esbuild](https://github.com/evanw/esbuild) from 0.14.27 to 0.14.28. - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/master/CHANGELOG.md) - [Commits](https://github.com/evanw/esbuild/compare/v0.14.27...v0.14.28) --- updated-dependencies: - dependency-name: esbuild dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 208 +++++++++++++++++++++++++-------------------------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index e7617bdb7..89b683aef 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "cross-env": "7.0.3", "cspell": "5.19.3", "enquirer": "2.3.6", - "esbuild": "0.14.27", + "esbuild": "0.14.28", "esbuild-visualizer": "0.3.1", "eslint": "8.12.0", "eslint-config-prettier": "8.5.0", diff --git a/yarn.lock b/yarn.lock index 763f1da84..1112a4989 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2771,90 +2771,90 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.27.tgz#b868bbd9955a92309c69df628d8dd1945478b45c" - integrity sha512-LuEd4uPuj/16Y8j6kqy3Z2E9vNY9logfq8Tq+oTE2PZVuNs3M1kj5Qd4O95ee66yDGb3isaOCV7sOLDwtMfGaQ== +esbuild-android-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.28.tgz#69c7a8a4f4a888eb5584afb035524b0fda7affff" + integrity sha512-A52C3zq+9tNwCqZ+4kVLBxnk/WnrYM8P2+QNvNE9B6d2OVPs214lp3g6UyO+dKDhUdefhfPCuwkP8j2A/+szNA== -esbuild-android-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.27.tgz#e7d6430555e8e9c505fd87266bbc709f25f1825c" - integrity sha512-E8Ktwwa6vX8q7QeJmg8yepBYXaee50OdQS3BFtEHKrzbV45H4foMOeEE7uqdjGQZFBap5VAqo7pvjlyA92wznQ== +esbuild-android-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.28.tgz#110ff82019e75b866b53844c32f19f7933b4ce36" + integrity sha512-sm0fDEGElZhMC3HLZeECI2juE4aG7uPfMBMqNUhy9CeX399Pz8rC6e78OXMXInGjSdEAwQmCOHmfsP7uv3Q8rA== -esbuild-darwin-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.27.tgz#4dc7484127564e89b4445c0a560a3cb50b3d68e1" - integrity sha512-czw/kXl/1ZdenPWfw9jDc5iuIYxqUxgQ/Q+hRd4/3udyGGVI31r29LCViN2bAJgGvQkqyLGVcG03PJPEXQ5i2g== +esbuild-darwin-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.28.tgz#d929ce16035da6047504fe8a71587d2ac9b756ed" + integrity sha512-nzDd7mQ44FvsFHtOafZdBgn3Li5SMsnMnoz1J2MM37xJmR3wGNTFph88KypjHgWqwbxCI7MXS1U+sN4qDeeW6Q== -esbuild-darwin-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.27.tgz#469e59c665f84a8ed323166624c5e7b9b2d22ac1" - integrity sha512-BEsv2U2U4o672oV8+xpXNxN9bgqRCtddQC6WBh4YhXKDcSZcdNh7+6nS+DM2vu7qWIWNA4JbRG24LUUYXysimQ== +esbuild-darwin-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.28.tgz#75e1cb75c2230c541be1707c6751395fee9f6bbd" + integrity sha512-XEq/bLR/glsUl+uGrBimQzOVs/CmwI833fXUhP9xrLI3IJ+rKyrZ5IA8u+1crOEf1LoTn8tV+hInmX6rGjbScw== -esbuild-freebsd-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.27.tgz#895df03bf5f87094a56c9a5815bf92e591903d70" - integrity sha512-7FeiFPGBo+ga+kOkDxtPmdPZdayrSzsV9pmfHxcyLKxu+3oTcajeZlOO1y9HW+t5aFZPiv7czOHM4KNd0tNwCA== +esbuild-freebsd-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.28.tgz#3579fd41f4c090d52e1a9134743e591c6aea49d7" + integrity sha512-rTKLgUj/HEcPeE5XZ7IZwWpFx7IWMfprN7QRk/TUJE1s1Ipb58esboIesUpjirJz/BwrgHq+FDG9ChAI8dZAtQ== -esbuild-freebsd-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.27.tgz#0b72a41a6b8655e9a8c5608f2ec1afdcf6958441" - integrity sha512-8CK3++foRZJluOWXpllG5zwAVlxtv36NpHfsbWS7TYlD8S+QruXltKlXToc/5ZNzBK++l6rvRKELu/puCLc7jA== +esbuild-freebsd-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.28.tgz#de1c102a40005fa9da5160c0242b2de89ffd2d7b" + integrity sha512-sBffxD1UMOsB7aWMoExmipycjcy3HJGwmqE4GQZUTZvdiH4GhjgUiVdtPyt7kSCdL40JqnWQJ4b1l8Y51oCF4Q== -esbuild-linux-32@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.27.tgz#43b8ba3803b0bbe7f051869c6a8bf6de1e95de28" - integrity sha512-qhNYIcT+EsYSBClZ5QhLzFzV5iVsP1YsITqblSaztr3+ZJUI+GoK8aXHyzKd7/CKKuK93cxEMJPpfi1dfsOfdw== +esbuild-linux-32@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.28.tgz#cdb8ac2000df06044450bf33a93b9d63d61bb669" + integrity sha512-+Wxidh3fBEQ9kHcCsD4etlBTMb1n6QY2uXv3rFhVn88CY/JP782MhA57/ipLMY4kOLeSKEuFGN4rtjHuhmRMig== -esbuild-linux-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.27.tgz#dc8072097327ecfadba1735562824ce8c05dd0bd" - integrity sha512-ESjck9+EsHoTaKWlFKJpPZRN26uiav5gkI16RuI8WBxUdLrrAlYuYSndxxKgEn1csd968BX/8yQZATYf/9+/qg== +esbuild-linux-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.28.tgz#b1e961d42af89dab8c3c0ce86420a7657765f0ae" + integrity sha512-7+xgsC4LvR6cnzaBdiljNnPDjbkwzahogN+S9uy9AoYw7ZjPnnXc6sjQAVCbqGb7MEgrWdpa6u/Tao79i4lWxg== -esbuild-linux-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.27.tgz#c52b58cbe948426b1559910f521b0a3f396f10b8" - integrity sha512-no6Mi17eV2tHlJnqBHRLekpZ2/VYx+NfGxKcBE/2xOMYwctsanCaXxw4zapvNrGE9X38vefVXLz6YCF8b1EHiQ== +esbuild-linux-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.28.tgz#f69e6ace792a4985b9760b443dbf627e5e3d2126" + integrity sha512-EjRHgwg+kgXABzyoPGPOPg4d5wZqRnZ/ZAxBDzLY+i6DS8OUfTSlZHWIOZzU4XF7125WxRBg9ULbrFJBl+57Eg== -esbuild-linux-arm@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.27.tgz#df869dbd67d4ee3a04b3c7273b6bd2b233e78a18" - integrity sha512-JnnmgUBdqLQO9hoNZQqNHFWlNpSX82vzB3rYuCJMhtkuaWQEmQz6Lec1UIxJdC38ifEghNTBsF9bbe8dFilnCw== +esbuild-linux-arm@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.28.tgz#9c2fa45578686370a5d782314f321a2c6b641270" + integrity sha512-L5isjmlLbh9E0WVllXiVETbScgMbth/+XkXQii1WwgO1RvLIfaGrVFz8d2n6EH/ImtgYxPYGx+OcvIKQBc91Rg== -esbuild-linux-mips64le@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.27.tgz#a2b646d9df368b01aa970a7b8968be6dd6b01d19" - integrity sha512-NolWP2uOvIJpbwpsDbwfeExZOY1bZNlWE/kVfkzLMsSgqeVcl5YMen/cedRe9mKnpfLli+i0uSp7N+fkKNU27A== +esbuild-linux-mips64le@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.28.tgz#99d78f0380640aa7faa2c4c49ac21229bdf33c7c" + integrity sha512-krx9SSg7yfiUKk64EmjefOyiEF6nv2bRE4um/LiTaQ6Y/6FP4UF3/Ou/AxZVyR154uSRq63xejcAsmswXAYRsw== -esbuild-linux-ppc64le@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.27.tgz#9a21af766a0292578a3009c7408b8509cac7cefd" - integrity sha512-/7dTjDvXMdRKmsSxKXeWyonuGgblnYDn0MI1xDC7J1VQXny8k1qgNp6VmrlsawwnsymSUUiThhkJsI+rx0taNA== +esbuild-linux-ppc64le@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.28.tgz#7388fa0c76033b4ca85b74071cb793d41ae77642" + integrity sha512-LD0Xxu9g+DNuhsEBV5QuVZ4uKVBMup0xPIruLweuAf9/mHXFnaCuNXUBF5t0DxKl7GQ5MSioKtnb92oMo+QXEw== -esbuild-linux-riscv64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.27.tgz#344a27f91568056a5903ad5841b447e00e78d740" - integrity sha512-D+aFiUzOJG13RhrSmZgrcFaF4UUHpqj7XSKrIiCXIj1dkIkFqdrmqMSOtSs78dOtObWiOrFCDDzB24UyeEiNGg== +esbuild-linux-riscv64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.28.tgz#99e4a8afe4762e927ebe02009e1927e38f3256ab" + integrity sha512-L/DWfRh2P0vxq4Y+qieSNXKGdMg+e9Qe8jkbN2/8XSGYDTPzO2OcAxSujob4qIh7iSl+cknbXV+BvH0YFR0jbg== -esbuild-linux-s390x@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.27.tgz#73a7309bd648a07ef58f069658f989a5096130db" - integrity sha512-CD/D4tj0U4UQjELkdNlZhQ8nDHU5rBn6NGp47Hiz0Y7/akAY5i0oGadhEIg0WCY/HYVXFb3CsSPPwaKcTOW3bg== +esbuild-linux-s390x@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.28.tgz#38a625399ffc78f3b8b555ebe2013347256a9a8a" + integrity sha512-rrgxmsbmL8QQknWGnAL9bGJRQYLOi2AzXy5OTwfhxnj9eqjo5mSVbJXjgiq5LPUAMQZGdPH5yaNK0obAXS81Zw== -esbuild-netbsd-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.27.tgz#482a587cdbd18a6c264a05136596927deb46c30a" - integrity sha512-h3mAld69SrO1VoaMpYl3a5FNdGRE/Nqc+E8VtHOag4tyBwhCQXxtvDDOAKOUQexBGca0IuR6UayQ4ntSX5ij1Q== +esbuild-netbsd-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.28.tgz#fdc09dd69313f42be034276cc780bf60c09266b6" + integrity sha512-h8wntIyOR8/xMVVM6TvJxxWKh4AjmLK87IPKpuVi8Pq0kyk0RMA+eo4PFGk5j2XK0D7dj8PcSF5NSlP9kN/j0A== -esbuild-openbsd-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.27.tgz#e99f8cdc63f1628747b63edd124d53cf7796468d" - integrity sha512-xwSje6qIZaDHXWoPpIgvL+7fC6WeubHHv18tusLYMwL+Z6bEa4Pbfs5IWDtQdHkArtfxEkIZz77944z8MgDxGw== +esbuild-openbsd-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.28.tgz#9d7b0ca421ae580ab945c69c33eabd793262a84c" + integrity sha512-HBv18rVapbuDx52/fhZ/c/w6TXyaQAvRxiDDn5Hz/pBcwOs3cdd2WxeIKlWmDoqm2JMx5EVlq4IWgoaRX9mVkw== -esbuild-sunos-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.27.tgz#8611d825bcb8239c78d57452e83253a71942f45c" - integrity sha512-/nBVpWIDjYiyMhuqIqbXXsxBc58cBVH9uztAOIfWShStxq9BNBik92oPQPJ57nzWXRNKQUEFWr4Q98utDWz7jg== +esbuild-sunos-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.28.tgz#5b82807ebe435519a2689e1a4d50b8a3cc5c64c0" + integrity sha512-zlIxePhZxKYheR2vBCgPVvTixgo/ozOfOMoP6RZj8dxzquU1NgeyhjkcRXucbLCtmoNJ+i4PtWwPZTLuDd3bGg== esbuild-visualizer@0.3.1: version "0.3.1" @@ -2865,46 +2865,46 @@ esbuild-visualizer@0.3.1: open "^7.4.2" yargs "^16.2.0" -esbuild-windows-32@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.27.tgz#c06374206d4d92dd31d4fda299b09f51a35e82f6" - integrity sha512-Q9/zEjhZJ4trtWhFWIZvS/7RUzzi8rvkoaS9oiizkHTTKd8UxFwn/Mm2OywsAfYymgUYm8+y2b+BKTNEFxUekw== +esbuild-windows-32@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.28.tgz#5cf740782fadc865c00aa0d8388e42012bcf496e" + integrity sha512-am9DIJxXlld1BOAY/VlvBQHMUCPL7S3gB/lnXIY3M4ys0gfuRqPf4EvMwZMzYUbFKBY+/Qb8SRgPRRGhwnJ8Kg== -esbuild-windows-64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.27.tgz#756631c1d301dfc0d1a887deed2459ce4079582f" - integrity sha512-b3y3vTSl5aEhWHK66ngtiS/c6byLf6y/ZBvODH1YkBM+MGtVL6jN38FdHUsZasCz9gFwYs/lJMVY9u7GL6wfYg== +esbuild-windows-64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.28.tgz#6e3ec1b0225d668a2da21e2ffeff2353b5c9a567" + integrity sha512-78PhySDnmRZlsPNp/W/5Fim8iivlBQQxfhBFIqR7xwvfDmCFUSByyMKP7LCHgNtb04yNdop8nJJkJaQ8Xnwgiw== -esbuild-windows-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.27.tgz#ad7e187193dcd18768b16065a950f4441d7173f4" - integrity sha512-I/reTxr6TFMcR5qbIkwRGvldMIaiBu2+MP0LlD7sOlNXrfqIl9uNjsuxFPGEG4IRomjfQ5q8WT+xlF/ySVkqKg== +esbuild-windows-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.28.tgz#c527d52ec7d1f868259d0f74ecc4003e8475125d" + integrity sha512-VhXGBTo6HELD8zyHXynV6+L2jWx0zkKnGx4TmEdSBK7UVFACtOyfUqpToG0EtnYyRZ0HESBhzPSVpP781ovmvA== -esbuild@0.14.27: - version "0.14.27" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.27.tgz#41fe0f1b6b68b9f77cac025009bc54bb96e616f1" - integrity sha512-MZQt5SywZS3hA9fXnMhR22dv0oPGh6QtjJRIYbgL1AeqAoQZE+Qn5ppGYQAoHv/vq827flj4tIJ79Mrdiwk46Q== +esbuild@0.14.28: + version "0.14.28" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.28.tgz#7738635d2ea19e446bd319d83a1802545e6aebb8" + integrity sha512-YLNprkCcMVKQ5sekmCKEQ3Obu/L7s6+iij38xNKyBeSmSsTWur4Ky/9zB3XIGT8SCJITG/bZwAR2l7YOAXch4Q== optionalDependencies: - esbuild-android-64 "0.14.27" - esbuild-android-arm64 "0.14.27" - esbuild-darwin-64 "0.14.27" - esbuild-darwin-arm64 "0.14.27" - esbuild-freebsd-64 "0.14.27" - esbuild-freebsd-arm64 "0.14.27" - esbuild-linux-32 "0.14.27" - esbuild-linux-64 "0.14.27" - esbuild-linux-arm "0.14.27" - esbuild-linux-arm64 "0.14.27" - esbuild-linux-mips64le "0.14.27" - esbuild-linux-ppc64le "0.14.27" - esbuild-linux-riscv64 "0.14.27" - esbuild-linux-s390x "0.14.27" - esbuild-netbsd-64 "0.14.27" - esbuild-openbsd-64 "0.14.27" - esbuild-sunos-64 "0.14.27" - esbuild-windows-32 "0.14.27" - esbuild-windows-64 "0.14.27" - esbuild-windows-arm64 "0.14.27" + esbuild-android-64 "0.14.28" + esbuild-android-arm64 "0.14.28" + esbuild-darwin-64 "0.14.28" + esbuild-darwin-arm64 "0.14.28" + esbuild-freebsd-64 "0.14.28" + esbuild-freebsd-arm64 "0.14.28" + esbuild-linux-32 "0.14.28" + esbuild-linux-64 "0.14.28" + esbuild-linux-arm "0.14.28" + esbuild-linux-arm64 "0.14.28" + esbuild-linux-mips64le "0.14.28" + esbuild-linux-ppc64le "0.14.28" + esbuild-linux-riscv64 "0.14.28" + esbuild-linux-s390x "0.14.28" + esbuild-netbsd-64 "0.14.28" + esbuild-openbsd-64 "0.14.28" + esbuild-sunos-64 "0.14.28" + esbuild-windows-32 "0.14.28" + esbuild-windows-64 "0.14.28" + esbuild-windows-arm64 "0.14.28" escalade@^3.1.1: version "3.1.1" From 1e119adf299f1a21aa5af0498dc01989193c8e43 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sun, 27 Mar 2022 21:52:17 +0800 Subject: [PATCH 21/60] Minor tweak to the website (#12522) Co-authored-by: Alexander Kachkaev --- cspell.json | 1 + website/pages/en/index.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cspell.json b/cspell.json index d9f69aeb1..794d6089d 100644 --- a/cspell.json +++ b/cspell.json @@ -265,6 +265,7 @@ "Raghuvir", "Rasmus", "Rattray", + "raquo", "rattrayalex", "readline", "readlines", diff --git a/website/pages/en/index.js b/website/pages/en/index.js index 00127fbd8..a0ffe46c7 100755 --- a/website/pages/en/index.js +++ b/website/pages/en/index.js @@ -100,7 +100,12 @@ const TldrSection = ({ language }) => (
  • No need to discuss style in code review
  • Saves you time and energy
  • - And more + + And more » +
    • From 4f984f06c1d9d11d595ee0153dd147af59ca0985 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Mar 2022 21:52:37 +0800 Subject: [PATCH 22/60] Build(deps): Bump minimist from 1.2.5 to 1.2.6 in /scripts/release (#12551) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- scripts/release/package.json | 2 +- scripts/release/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/release/package.json b/scripts/release/package.json index 607c9172c..ea33a56c3 100644 --- a/scripts/release/package.json +++ b/scripts/release/package.json @@ -8,7 +8,7 @@ "chalk": "4.1.2", "enquirer": "2.3.6", "execa": "6.1.0", - "minimist": "1.2.5", + "minimist": "1.2.6", "node-fetch": "3.2.3", "outdent": "0.8.0", "semver": "7.3.5", diff --git a/scripts/release/yarn.lock b/scripts/release/yarn.lock index 21467141e..96914c343 100644 --- a/scripts/release/yarn.lock +++ b/scripts/release/yarn.lock @@ -1993,10 +1993,10 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@1.2.5, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@1.2.6, minimist@^1.2.5: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== ms@2.1.2: version "2.1.2" From 3901509f83cf83819e4879b4a2808943aa6d3c75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 02:18:16 +0900 Subject: [PATCH 23/60] Build(deps): Bump micromatch from 4.0.4 to 4.0.5 (#12550) * Build(deps): Bump micromatch from 4.0.4 to 4.0.5 Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: micromatch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Build(deps): Bump micromatch from 4.0.4 to 4.0.5 Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: micromatch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update vendors Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sosuke Suzuki --- package.json | 2 +- scripts/vendors/vendor-meta.json | 2 +- vendors/tempy.js | 4 ++-- yarn.lock | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 89b683aef..dd4b8d486 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "lodash": "4.17.21", "mem": "9.0.2", "meriyah": "4.2.0", - "micromatch": "4.0.4", + "micromatch": "4.0.5", "minimist": "1.2.6", "n-readlines": "1.0.1", "outdent": "0.8.0", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index afd900a37..7002ff55c 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -803,7 +803,7 @@ { "name": "micromatch", "maintainers": [], - "version": "4.0.4", + "version": "4.0.5", "description": "Glob matching for javascript/node.js. A replacement and faster alternative to minimatch and multimatch.", "repository": "micromatch/micromatch", "homepage": "https://github.com/micromatch/micromatch", diff --git a/vendors/tempy.js b/vendors/tempy.js index bf5ffee1f..6d047a07f 100644 --- a/vendors/tempy.js +++ b/vendors/tempy.js @@ -3042,9 +3042,9 @@ var require_micromatch = __commonJS({ options.onResult(state); items.push(state.output); }; - let matches = micromatch(list, patterns, __spreadProps(__spreadValues({}, options), { onResult })); + let matches = new Set(micromatch(list, patterns, __spreadProps(__spreadValues({}, options), { onResult }))); for (let item of items) { - if (!matches.includes(item)) { + if (!matches.has(item)) { result.add(item); } } diff --git a/yarn.lock b/yarn.lock index 1112a4989..e316f1695 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2093,7 +2093,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1: +braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -4835,13 +4835,13 @@ meriyah@4.2.0: resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.0.tgz#29d28c37ac7b67f8b9aaa92df0b8ac12469fe98b" integrity sha512-fCVh5GB9YT53Bq14l00HLYE3i9DywrY0JVZxbk0clXWDuMsUKKwluvC5sY0bMBqHbnIbpIjfSSIsnrzbauA8Yw== -micromatch@4.0.4, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== +micromatch@4.0.5, micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" mime-db@1.51.0: version "1.51.0" @@ -5311,7 +5311,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== From 857014036cced4bb0eb348f51fed8171942dc621 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Tue, 29 Mar 2022 20:44:28 +0800 Subject: [PATCH 24/60] Fix less/scss format error (#12536) --- changelog_unreleased/less/12536.md | 29 ++++++++++++++ src/language-css/printer-postcss.js | 17 +++++---- tests/format/less/parens/2.less | 12 ++++++ .../parens/__snapshots__/jsfmt.spec.js.snap | 34 +++++++++++++++++ tests/format/scss/parens/2.scss | 15 ++++++++ .../parens/__snapshots__/jsfmt.spec.js.snap | 38 +++++++++++++++++++ 6 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 changelog_unreleased/less/12536.md create mode 100644 tests/format/less/parens/2.less create mode 100644 tests/format/scss/parens/2.scss diff --git a/changelog_unreleased/less/12536.md b/changelog_unreleased/less/12536.md new file mode 100644 index 000000000..e73796d3a --- /dev/null +++ b/changelog_unreleased/less/12536.md @@ -0,0 +1,29 @@ +#### Fix LESS/SCSS format error (#12536 by @fisker) + + +```less +// Input +.background-gradient(@cut) { + background: linear-gradient( + to right, + @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} + +// Prettier stable +TypeError: Cannot read properties of undefined (reading 'endOffset') + +// Prettier main +.background-gradient(@cut) { + background: linear-gradient( + to right, + @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} +``` diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js index 3f69fd812..d4de2f191 100644 --- a/src/language-css/printer-postcss.js +++ b/src/language-css/printer-postcss.js @@ -924,15 +924,16 @@ function genericPrint(path, options, print) { if ( !isLast && child.type === "value-comma_group" && - child.groups && - child.groups[0].type !== "value-paren_group" && - isNextLineEmpty( - options.originalText, - getLast(child.groups), - locEnd - ) + isNonEmptyArray(child.groups) ) { - printed.push(hardline); + const last = getLast(child.groups); + if ( + // `value-paren_group` missing location info + last.source && + isNextLineEmpty(options.originalText, last, locEnd) + ) { + printed.push(hardline); + } } return printed; diff --git a/tests/format/less/parens/2.less b/tests/format/less/parens/2.less new file mode 100644 index 000000000..4f008166a --- /dev/null +++ b/tests/format/less/parens/2.less @@ -0,0 +1,12 @@ +.background-gradient(@cut) { + background: linear-gradient( + to right, + + + /* Should preserve empty lines */ + @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} diff --git a/tests/format/less/parens/__snapshots__/jsfmt.spec.js.snap b/tests/format/less/parens/__snapshots__/jsfmt.spec.js.snap index a0a9d2b86..46f778ccb 100644 --- a/tests/format/less/parens/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/less/parens/__snapshots__/jsfmt.spec.js.snap @@ -1,5 +1,39 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`2.less format 1`] = ` +====================================options===================================== +parsers: ["less"] +printWidth: 80 + | printWidth +=====================================input====================================== +.background-gradient(@cut) { + background: linear-gradient( + to right, + + + /* Should preserve empty lines */ + @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} + +=====================================output===================================== +.background-gradient(@cut) { + background: linear-gradient( + to right, + + /* Should preserve empty lines */ @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} + +================================================================================ +`; + exports[`parens.less format 1`] = ` ====================================options===================================== parsers: ["less"] diff --git a/tests/format/scss/parens/2.scss b/tests/format/scss/parens/2.scss new file mode 100644 index 000000000..78ab1c32e --- /dev/null +++ b/tests/format/scss/parens/2.scss @@ -0,0 +1,15 @@ +$icons: ( + cal-day-group: + ( + left: 253, + top: 73, + ), + + + /* Should preserve empty lines */ + cal-week-group: + ( + left: 1, + top: 169, + ) +); diff --git a/tests/format/scss/parens/__snapshots__/jsfmt.spec.js.snap b/tests/format/scss/parens/__snapshots__/jsfmt.spec.js.snap index 04daff232..5a8c9e105 100644 --- a/tests/format/scss/parens/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/scss/parens/__snapshots__/jsfmt.spec.js.snap @@ -1,5 +1,43 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`2.scss format 1`] = ` +====================================options===================================== +parsers: ["scss"] +printWidth: 80 + | printWidth +=====================================input====================================== +$icons: ( + cal-day-group: + ( + left: 253, + top: 73, + ), + + + /* Should preserve empty lines */ + cal-week-group: + ( + left: 1, + top: 169, + ) +); + +=====================================output===================================== +$icons: ( + cal-day-group: ( + left: 253, + top: 73, + ), + /* Should preserve empty lines */ cal-week-group: + ( + left: 1, + top: 169, + ), +); + +================================================================================ +`; + exports[`parens.scss format 1`] = ` ====================================options===================================== parsers: ["scss"] From f75a7b957ff115cbe78689a9b1c4e8528491aecc Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Wed, 30 Mar 2022 15:54:01 +0800 Subject: [PATCH 25/60] Fix `.prettierrc` (#12558) --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index af25a135e..865c74b2a 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,4 @@ overrides: - - files: "**/*.{js,mjs}" + - files: "**/*.{js,mjs,cjs}" options: parser: meriyah From 56b49d094994ae3efce19686f122e7e0091c5f00 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Thu, 31 Mar 2022 21:04:12 +0800 Subject: [PATCH 26/60] Refactor: Simplify `printSequence()` (#12535) --- src/language-graphql/printer-graphql.js | 77 +++++-------------------- 1 file changed, 15 insertions(+), 62 deletions(-) diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js index 883927577..8bce63a78 100644 --- a/src/language-graphql/printer-graphql.js +++ b/src/language-graphql/printer-graphql.js @@ -91,13 +91,7 @@ function genericPrint(path, options, print) { "{", indent([ hardline, - join( - hardline, - path.call( - (selectionsPath) => printSequence(selectionsPath, options, print), - "selections" - ) - ), + join(hardline, printSequence(path, options, print, "selections")), ]), hardline, "}", @@ -114,10 +108,7 @@ function genericPrint(path, options, print) { softline, join( [ifBreak("", ", "), softline], - path.call( - (argsPath) => printSequence(argsPath, options, print), - "arguments" - ) + printSequence(path, options, print, "arguments") ), ]), softline, @@ -205,10 +196,7 @@ function genericPrint(path, options, print) { softline, join( [ifBreak("", ", "), softline], - path.call( - (argsPath) => printSequence(argsPath, options, print), - "arguments" - ) + printSequence(path, options, print, "arguments") ), ]), softline, @@ -249,13 +237,7 @@ function genericPrint(path, options, print) { " {", indent([ hardline, - join( - hardline, - path.call( - (fieldsPath) => printSequence(fieldsPath, options, print), - "fields" - ) - ), + join(hardline, printSequence(path, options, print, "fields")), ]), hardline, "}", @@ -276,10 +258,7 @@ function genericPrint(path, options, print) { softline, join( [ifBreak("", ", "), softline], - path.call( - (argsPath) => printSequence(argsPath, options, print), - "arguments" - ) + printSequence(path, options, print, "arguments") ), ]), softline, @@ -306,10 +285,7 @@ function genericPrint(path, options, print) { softline, join( [ifBreak("", ", "), softline], - path.call( - (argsPath) => printSequence(argsPath, options, print), - "arguments" - ) + printSequence(path, options, print, "arguments") ), ]), softline, @@ -337,13 +313,7 @@ function genericPrint(path, options, print) { " {", indent([ hardline, - join( - hardline, - path.call( - (valuesPath) => printSequence(valuesPath, options, print), - "values" - ) - ), + join(hardline, printSequence(path, options, print, "values")), ]), hardline, "}", @@ -387,13 +357,7 @@ function genericPrint(path, options, print) { " {", indent([ hardline, - join( - hardline, - path.call( - (fieldsPath) => printSequence(fieldsPath, options, print), - "fields" - ) - ), + join(hardline, printSequence(path, options, print, "fields")), ]), hardline, "}", @@ -414,10 +378,7 @@ function genericPrint(path, options, print) { hardline, join( hardline, - path.call( - (opsPath) => printSequence(opsPath, options, print), - "operationTypes" - ) + printSequence(path, options, print, "operationTypes") ), ]) : "", @@ -447,13 +408,7 @@ function genericPrint(path, options, print) { " {", indent([ hardline, - join( - hardline, - path.call( - (fieldsPath) => printSequence(fieldsPath, options, print), - "fields" - ) - ), + join(hardline, printSequence(path, options, print, "fields")), ]), hardline, "}", @@ -543,21 +498,19 @@ function printDirectives(path, print, node) { return [" ", group(indent([softline, printed]))]; } -function printSequence(sequencePath, options, print) { - const count = sequencePath.getValue().length; - - return sequencePath.map((path, i) => { +function printSequence(path, options, print, property) { + return path.map((path, index, sequence) => { const printed = print(); if ( - isNextLineEmpty(options.originalText, path.getValue(), locEnd) && - i < count - 1 + index < sequence.length - 1 && + isNextLineEmpty(options.originalText, path.getValue(), locEnd) ) { return [printed, hardline]; } return printed; - }); + }, property); } function canAttachComment(node) { From 875694e3a9a44b5c34d89d50a84db93009f76900 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 31 Mar 2022 22:50:48 +0900 Subject: [PATCH 27/60] Install dependencies for website (#12566) --- scripts/release/steps/install-dependencies.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/release/steps/install-dependencies.js b/scripts/release/steps/install-dependencies.js index 02d0d61da..106d879d9 100644 --- a/scripts/release/steps/install-dependencies.js +++ b/scripts/release/steps/install-dependencies.js @@ -5,6 +5,9 @@ async function install() { await execa("rm", ["-rf", "node_modules"]); await runYarn(["install"]); + await execa("rm", ["-rf", "node_modules"], { cwd: "./website" }); + await runYarn(["install"], { cwd: "./website" }); + const { stdout: status } = await runGit(["ls-files", "-m"]); if (status) { throw new Error( From e88adfb9fab1b694bc33cf563d2809290fbe38e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 22:21:37 +0800 Subject: [PATCH 28/60] Build(deps): Bump html-void-elements from 1.0.5 to 2.0.0 (#10623) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- scripts/vendors/bundle-vendors.mjs | 33 ++++++++++++++++++++++-------- scripts/vendors/vendor-meta.json | 23 +++++++++++++++++++++ scripts/vendors/vendors.mjs | 9 +++++++- src/language-handlebars/utils.js | 2 +- vendors/html-void-elements.json | 27 ++++++++++++++++++++++++ yarn.lock | 8 ++++---- 7 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 vendors/html-void-elements.json diff --git a/package.json b/package.json index dd4b8d486..bc7731ce2 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "html-element-attributes": "2.3.0", "html-styles": "1.0.0", "html-tag-names": "1.1.5", - "html-void-elements": "1.0.5", + "html-void-elements": "2.0.1", "ignore": "5.2.0", "jest-docblock": "27.5.1", "json5": "2.2.1", diff --git a/scripts/vendors/bundle-vendors.mjs b/scripts/vendors/bundle-vendors.mjs index 992ca3ce3..8b17a9583 100644 --- a/scripts/vendors/bundle-vendors.mjs +++ b/scripts/vendors/bundle-vendors.mjs @@ -1,11 +1,12 @@ #!/usr/bin/env node import fs from "node:fs/promises"; +import assert from "node:assert"; import { fileURLToPath } from "node:url"; import createEsmUtils from "esm-utils"; import esbuild from "esbuild"; import { outdent } from "outdent"; -import { PROJECT_ROOT } from "../utils/index.mjs"; +import { PROJECT_ROOT, writeJson } from "../utils/index.mjs"; import esbuildPluginLicense from "../build/esbuild-plugins/license.mjs"; import vendors from "./vendors.mjs"; import { vendorMetaFile, saveVendorLicenses } from "./utils.mjs"; @@ -16,8 +17,18 @@ const rootDir = new URL("../../", import.meta.url); // prettier/vendors const vendorsDir = new URL("./vendors/", rootDir); // prettier/vendors/*.js -const getVendorFilePath = (vendorName) => - fileURLToPath(new URL(`./${vendorName}.js`, vendorsDir)); +const getVendorFilePath = (vendorName, extension = "js") => + fileURLToPath(new URL(`./${vendorName}.${extension}`, vendorsDir)); + +// Unsafe, but good enough for now. +const isJson = (value) => { + try { + assert.deepStrictEqual(JSON.parse(JSON.stringify(value)), { ...value }); + return true; + } catch { + return false; + } +}; async function clean() { for (const directoryOrFile of [vendorsDir, vendorMetaFile]) { @@ -29,10 +40,8 @@ async function clean() { } } -async function generateDts(vendor) { - const hasDefault = await import(vendor).then((module) => - Boolean(module.default) - ); +async function generateDts({ vendor, module }) { + const hasDefault = Boolean(module.default); await fs.writeFile( new URL(`${vendor}.d.ts`, vendorsDir), [ @@ -70,7 +79,15 @@ async function bundle(vendor, options) { }; await esbuild.build(esbuildOption); - await generateDts(vendor); + // Still running esbuild, because we want collect license + const module = await import(vendor); + if (isJson(module)) { + await fs.rm(outfile); + await writeJson(getVendorFilePath(vendor, "json"), module); + return; + } + + await generateDts({ vendor, module }); } async function main() { diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 7002ff55c..4cae144b2 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -1491,6 +1491,29 @@ "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", "author": null, "contributors": [] + }, + { + "name": "html-void-elements", + "maintainers": [], + "version": "2.0.1", + "description": "List of HTML void tag names", + "repository": "wooorm/html-void-elements", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + } + ] } ] } diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index 46a67f445..26f75ad0f 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -1,3 +1,10 @@ -const vendors = ["string-width", "mem", "execa", "tempy", "chalk"]; +const vendors = [ + "string-width", + "mem", + "execa", + "tempy", + "chalk", + "html-void-elements", +]; export default vendors; diff --git a/src/language-handlebars/utils.js b/src/language-handlebars/utils.js index abcf1a968..b6bc2f57f 100644 --- a/src/language-handlebars/utils.js +++ b/src/language-handlebars/utils.js @@ -1,6 +1,6 @@ "use strict"; -const htmlVoidElements = require("html-void-elements"); +const { htmlVoidElements } = require("../../vendors/html-void-elements.json"); const getLast = require("../utils/get-last.js"); function isLastNodeOfSiblings(path) { diff --git a/vendors/html-void-elements.json b/vendors/html-void-elements.json new file mode 100644 index 000000000..f20eebfdf --- /dev/null +++ b/vendors/html-void-elements.json @@ -0,0 +1,27 @@ +{ + "htmlVoidElements": [ + "area", + "base", + "basefont", + "bgsound", + "br", + "col", + "command", + "embed", + "frame", + "hr", + "image", + "img", + "input", + "isindex", + "keygen", + "link", + "menuitem", + "meta", + "nextid", + "param", + "source", + "track", + "wbr" + ] +} diff --git a/yarn.lock b/yarn.lock index e316f1695..eba705f9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3618,10 +3618,10 @@ html-tag-names@1.1.5: resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-1.1.5.tgz#f537420c16769511283f8ae1681785fbc89ee0a9" integrity sha512-aI5tKwNTBzOZApHIynaAwecLBv8TlZTEy/P4Sj2SzzAhBrGuI8yGZ0UIXVPQzOHGS+to2mjb04iy6VWt/8+d8A== -html-void-elements@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" - integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w== +html-void-elements@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.1.tgz#29459b8b05c200b6c5ee98743c41b979d577549f" + integrity sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A== http-proxy-agent@^4.0.1: version "4.0.1" From 2a5f2ac4e9bfe6a79021ec5011248cc2cafa9525 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 09:39:29 +0800 Subject: [PATCH 29/60] Build(deps): Bump html-element-attributes from 2.3.0 to 3.0.0 (#10617) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- scripts/vendors/vendor-meta.json | 23 + scripts/vendors/vendors.mjs | 1 + .../utils/html-elements-attributes.js | 4 +- vendors/html-element-attributes.json | 575 ++++++++++++++++++ yarn.lock | 8 +- 6 files changed, 607 insertions(+), 6 deletions(-) create mode 100644 vendors/html-element-attributes.json diff --git a/package.json b/package.json index bc7731ce2..b4667bd2a 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "flow-parser": "0.174.1", "get-stdin": "8.0.0", "graphql": "15.6.1", - "html-element-attributes": "2.3.0", + "html-element-attributes": "3.1.0", "html-styles": "1.0.0", "html-tag-names": "1.1.5", "html-void-elements": "2.0.1", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 4cae144b2..8a3901417 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -1514,6 +1514,29 @@ "url": "https://wooorm.com" } ] + }, + { + "name": "html-element-attributes", + "maintainers": [], + "version": "3.1.0", + "description": "Map of HTML elements to allowed attributes", + "repository": "wooorm/html-element-attributes", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + } + ] } ] } diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index 26f75ad0f..ebe67db76 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -5,6 +5,7 @@ const vendors = [ "tempy", "chalk", "html-void-elements", + "html-element-attributes", ]; export default vendors; diff --git a/src/language-html/utils/html-elements-attributes.js b/src/language-html/utils/html-elements-attributes.js index c62a07632..b104ff3e0 100644 --- a/src/language-html/utils/html-elements-attributes.js +++ b/src/language-html/utils/html-elements-attributes.js @@ -1,6 +1,8 @@ "use strict"; -const htmlElementAttributes = require("html-element-attributes"); +const { + htmlElementAttributes, +} = require("../../../vendors/html-element-attributes.json"); const mapObject = require("./map-object.js"); const arrayToMap = require("./array-to-map.js"); diff --git a/vendors/html-element-attributes.json b/vendors/html-element-attributes.json new file mode 100644 index 000000000..a35506d79 --- /dev/null +++ b/vendors/html-element-attributes.json @@ -0,0 +1,575 @@ +{ + "htmlElementAttributes": { + "*": [ + "accesskey", + "autocapitalize", + "autofocus", + "class", + "contenteditable", + "dir", + "draggable", + "enterkeyhint", + "hidden", + "id", + "inputmode", + "is", + "itemid", + "itemprop", + "itemref", + "itemscope", + "itemtype", + "lang", + "nonce", + "slot", + "spellcheck", + "style", + "tabindex", + "title", + "translate" + ], + "a": [ + "charset", + "coords", + "download", + "href", + "hreflang", + "name", + "ping", + "referrerpolicy", + "rel", + "rev", + "shape", + "target", + "type" + ], + "applet": [ + "align", + "alt", + "archive", + "code", + "codebase", + "height", + "hspace", + "name", + "object", + "vspace", + "width" + ], + "area": [ + "alt", + "coords", + "download", + "href", + "hreflang", + "nohref", + "ping", + "referrerpolicy", + "rel", + "shape", + "target", + "type" + ], + "audio": [ + "autoplay", + "controls", + "crossorigin", + "loop", + "muted", + "preload", + "src" + ], + "base": [ + "href", + "target" + ], + "basefont": [ + "color", + "face", + "size" + ], + "blockquote": [ + "cite" + ], + "body": [ + "alink", + "background", + "bgcolor", + "link", + "text", + "vlink" + ], + "br": [ + "clear" + ], + "button": [ + "disabled", + "form", + "formaction", + "formenctype", + "formmethod", + "formnovalidate", + "formtarget", + "name", + "type", + "value" + ], + "canvas": [ + "height", + "width" + ], + "caption": [ + "align" + ], + "col": [ + "align", + "char", + "charoff", + "span", + "valign", + "width" + ], + "colgroup": [ + "align", + "char", + "charoff", + "span", + "valign", + "width" + ], + "data": [ + "value" + ], + "del": [ + "cite", + "datetime" + ], + "details": [ + "open" + ], + "dialog": [ + "open" + ], + "dir": [ + "compact" + ], + "div": [ + "align" + ], + "dl": [ + "compact" + ], + "embed": [ + "height", + "src", + "type", + "width" + ], + "fieldset": [ + "disabled", + "form", + "name" + ], + "font": [ + "color", + "face", + "size" + ], + "form": [ + "accept", + "accept-charset", + "action", + "autocomplete", + "enctype", + "method", + "name", + "novalidate", + "target" + ], + "frame": [ + "frameborder", + "longdesc", + "marginheight", + "marginwidth", + "name", + "noresize", + "scrolling", + "src" + ], + "frameset": [ + "cols", + "rows" + ], + "h1": [ + "align" + ], + "h2": [ + "align" + ], + "h3": [ + "align" + ], + "h4": [ + "align" + ], + "h5": [ + "align" + ], + "h6": [ + "align" + ], + "head": [ + "profile" + ], + "hr": [ + "align", + "noshade", + "size", + "width" + ], + "html": [ + "manifest", + "version" + ], + "iframe": [ + "align", + "allow", + "allowfullscreen", + "allowpaymentrequest", + "allowusermedia", + "frameborder", + "height", + "loading", + "longdesc", + "marginheight", + "marginwidth", + "name", + "referrerpolicy", + "sandbox", + "scrolling", + "src", + "srcdoc", + "width" + ], + "img": [ + "align", + "alt", + "border", + "crossorigin", + "decoding", + "height", + "hspace", + "ismap", + "loading", + "longdesc", + "name", + "referrerpolicy", + "sizes", + "src", + "srcset", + "usemap", + "vspace", + "width" + ], + "input": [ + "accept", + "align", + "alt", + "autocomplete", + "checked", + "dirname", + "disabled", + "form", + "formaction", + "formenctype", + "formmethod", + "formnovalidate", + "formtarget", + "height", + "ismap", + "list", + "max", + "maxlength", + "min", + "minlength", + "multiple", + "name", + "pattern", + "placeholder", + "readonly", + "required", + "size", + "src", + "step", + "type", + "usemap", + "value", + "width" + ], + "ins": [ + "cite", + "datetime" + ], + "isindex": [ + "prompt" + ], + "label": [ + "for", + "form" + ], + "legend": [ + "align" + ], + "li": [ + "type", + "value" + ], + "link": [ + "as", + "charset", + "color", + "crossorigin", + "disabled", + "href", + "hreflang", + "imagesizes", + "imagesrcset", + "integrity", + "media", + "referrerpolicy", + "rel", + "rev", + "sizes", + "target", + "type" + ], + "map": [ + "name" + ], + "menu": [ + "compact" + ], + "meta": [ + "charset", + "content", + "http-equiv", + "media", + "name", + "scheme" + ], + "meter": [ + "high", + "low", + "max", + "min", + "optimum", + "value" + ], + "object": [ + "align", + "archive", + "border", + "classid", + "codebase", + "codetype", + "data", + "declare", + "form", + "height", + "hspace", + "name", + "standby", + "type", + "typemustmatch", + "usemap", + "vspace", + "width" + ], + "ol": [ + "compact", + "reversed", + "start", + "type" + ], + "optgroup": [ + "disabled", + "label" + ], + "option": [ + "disabled", + "label", + "selected", + "value" + ], + "output": [ + "for", + "form", + "name" + ], + "p": [ + "align" + ], + "param": [ + "name", + "type", + "value", + "valuetype" + ], + "pre": [ + "width" + ], + "progress": [ + "max", + "value" + ], + "q": [ + "cite" + ], + "script": [ + "async", + "charset", + "crossorigin", + "defer", + "integrity", + "language", + "nomodule", + "referrerpolicy", + "src", + "type" + ], + "select": [ + "autocomplete", + "disabled", + "form", + "multiple", + "name", + "required", + "size" + ], + "slot": [ + "name" + ], + "source": [ + "height", + "media", + "sizes", + "src", + "srcset", + "type", + "width" + ], + "style": [ + "media", + "type" + ], + "table": [ + "align", + "bgcolor", + "border", + "cellpadding", + "cellspacing", + "frame", + "rules", + "summary", + "width" + ], + "tbody": [ + "align", + "char", + "charoff", + "valign" + ], + "td": [ + "abbr", + "align", + "axis", + "bgcolor", + "char", + "charoff", + "colspan", + "headers", + "height", + "nowrap", + "rowspan", + "scope", + "valign", + "width" + ], + "textarea": [ + "autocomplete", + "cols", + "dirname", + "disabled", + "form", + "maxlength", + "minlength", + "name", + "placeholder", + "readonly", + "required", + "rows", + "wrap" + ], + "tfoot": [ + "align", + "char", + "charoff", + "valign" + ], + "th": [ + "abbr", + "align", + "axis", + "bgcolor", + "char", + "charoff", + "colspan", + "headers", + "height", + "nowrap", + "rowspan", + "scope", + "valign", + "width" + ], + "thead": [ + "align", + "char", + "charoff", + "valign" + ], + "time": [ + "datetime" + ], + "tr": [ + "align", + "bgcolor", + "char", + "charoff", + "valign" + ], + "track": [ + "default", + "kind", + "label", + "src", + "srclang" + ], + "ul": [ + "compact", + "type" + ], + "video": [ + "autoplay", + "controls", + "crossorigin", + "height", + "loop", + "muted", + "playsinline", + "poster", + "preload", + "src", + "width" + ] + } +} diff --git a/yarn.lock b/yarn.lock index eba705f9a..c9dde1cec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3591,10 +3591,10 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -html-element-attributes@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/html-element-attributes/-/html-element-attributes-2.3.0.tgz#a192ac90a457be9f1e2cc9ab69000ee89be74aa6" - integrity sha512-RJv2v3BBaYSc0ODHwT0sqWI+2lFs6DATBvCRnW20BDmULxoAWvfT6r28uL8LcW1a9/eqUl+1DccUOJzw00qVXQ== +html-element-attributes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-element-attributes/-/html-element-attributes-3.1.0.tgz#07869037b9020bec3bb1897263e97dd65829d15b" + integrity sha512-cHM9qM06tyWHwvGqDqVEBwoYtGgyq7X/GQt3dor38M1hYMZw1yVadaDQrwwQer6NefiYAoHaqFARI8ETMCAOYA== html-encoding-sniffer@^2.0.1: version "2.0.1" From df9f2755f7d0acb0561c236d849d8bf461ddb4ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 09:50:46 +0800 Subject: [PATCH 30/60] Build(deps-dev): Bump esbuild from 0.14.28 to 0.14.29 (#12571) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 208 +++++++++++++++++++++++++-------------------------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index b4667bd2a..afa9a4f74 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "cross-env": "7.0.3", "cspell": "5.19.3", "enquirer": "2.3.6", - "esbuild": "0.14.28", + "esbuild": "0.14.29", "esbuild-visualizer": "0.3.1", "eslint": "8.12.0", "eslint-config-prettier": "8.5.0", diff --git a/yarn.lock b/yarn.lock index c9dde1cec..8bcdedede 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2771,90 +2771,90 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.28.tgz#69c7a8a4f4a888eb5584afb035524b0fda7affff" - integrity sha512-A52C3zq+9tNwCqZ+4kVLBxnk/WnrYM8P2+QNvNE9B6d2OVPs214lp3g6UyO+dKDhUdefhfPCuwkP8j2A/+szNA== +esbuild-android-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.29.tgz#c0960c84c9b832bade20831515e89d32549d4769" + integrity sha512-tJuaN33SVZyiHxRaVTo1pwW+rn3qetJX/SRuc/83rrKYtyZG0XfsQ1ao1nEudIt9w37ZSNXR236xEfm2C43sbw== -esbuild-android-arm64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.28.tgz#110ff82019e75b866b53844c32f19f7933b4ce36" - integrity sha512-sm0fDEGElZhMC3HLZeECI2juE4aG7uPfMBMqNUhy9CeX399Pz8rC6e78OXMXInGjSdEAwQmCOHmfsP7uv3Q8rA== +esbuild-android-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.29.tgz#8eceb3abe5abde5489d6a5cbe6a7c1044f71115f" + integrity sha512-D74dCv6yYnMTlofVy1JKiLM5JdVSQd60/rQfJSDP9qvRAI0laPXIG/IXY1RG6jobmFMUfL38PbFnCqyI/6fPXg== -esbuild-darwin-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.28.tgz#d929ce16035da6047504fe8a71587d2ac9b756ed" - integrity sha512-nzDd7mQ44FvsFHtOafZdBgn3Li5SMsnMnoz1J2MM37xJmR3wGNTFph88KypjHgWqwbxCI7MXS1U+sN4qDeeW6Q== +esbuild-darwin-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.29.tgz#26f3f14102310ecb8f2d9351c5b7a47a60d2cc8a" + integrity sha512-+CJaRvfTkzs9t+CjGa0Oa28WoXa7EeLutQhxus+fFcu0MHhsBhlmeWHac3Cc/Sf/xPi1b2ccDFfzGYJCfV0RrA== -esbuild-darwin-arm64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.28.tgz#75e1cb75c2230c541be1707c6751395fee9f6bbd" - integrity sha512-XEq/bLR/glsUl+uGrBimQzOVs/CmwI833fXUhP9xrLI3IJ+rKyrZ5IA8u+1crOEf1LoTn8tV+hInmX6rGjbScw== +esbuild-darwin-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.29.tgz#6d2d89dfd937992649239711ed5b86e51b13bd89" + integrity sha512-5Wgz/+zK+8X2ZW7vIbwoZ613Vfr4A8HmIs1XdzRmdC1kG0n5EG5fvKk/jUxhNlrYPx1gSY7XadQ3l4xAManPSw== -esbuild-freebsd-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.28.tgz#3579fd41f4c090d52e1a9134743e591c6aea49d7" - integrity sha512-rTKLgUj/HEcPeE5XZ7IZwWpFx7IWMfprN7QRk/TUJE1s1Ipb58esboIesUpjirJz/BwrgHq+FDG9ChAI8dZAtQ== +esbuild-freebsd-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.29.tgz#2cb41a0765d0040f0838280a213c81bbe62d6394" + integrity sha512-VTfS7Bm9QA12JK1YXF8+WyYOfvD7WMpbArtDj6bGJ5Sy5xp01c/q70Arkn596aGcGj0TvQRplaaCIrfBG1Wdtg== -esbuild-freebsd-arm64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.28.tgz#de1c102a40005fa9da5160c0242b2de89ffd2d7b" - integrity sha512-sBffxD1UMOsB7aWMoExmipycjcy3HJGwmqE4GQZUTZvdiH4GhjgUiVdtPyt7kSCdL40JqnWQJ4b1l8Y51oCF4Q== +esbuild-freebsd-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.29.tgz#e1b79fbb63eaeff324cf05519efa7ff12ce4586a" + integrity sha512-WP5L4ejwLWWvd3Fo2J5mlXvG3zQHaw5N1KxFGnUc4+2ZFZknP0ST63i0IQhpJLgEJwnQpXv2uZlU1iWZjFqEIg== -esbuild-linux-32@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.28.tgz#cdb8ac2000df06044450bf33a93b9d63d61bb669" - integrity sha512-+Wxidh3fBEQ9kHcCsD4etlBTMb1n6QY2uXv3rFhVn88CY/JP782MhA57/ipLMY4kOLeSKEuFGN4rtjHuhmRMig== +esbuild-linux-32@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.29.tgz#a4a5a0b165b15081bc3227986e10dd4943edb7d6" + integrity sha512-4myeOvFmQBWdI2U1dEBe2DCSpaZyjdQtmjUY11Zu2eQg4ynqLb8Y5mNjNU9UN063aVsCYYfbs8jbken/PjyidA== -esbuild-linux-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.28.tgz#b1e961d42af89dab8c3c0ce86420a7657765f0ae" - integrity sha512-7+xgsC4LvR6cnzaBdiljNnPDjbkwzahogN+S9uy9AoYw7ZjPnnXc6sjQAVCbqGb7MEgrWdpa6u/Tao79i4lWxg== +esbuild-linux-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.29.tgz#4c450088c84f8bfd22c51d116f59416864b85481" + integrity sha512-iaEuLhssReAKE7HMwxwFJFn7D/EXEs43fFy5CJeA4DGmU6JHh0qVJD2p/UP46DvUXLRKXsXw0i+kv5TdJ1w5pg== -esbuild-linux-arm64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.28.tgz#f69e6ace792a4985b9760b443dbf627e5e3d2126" - integrity sha512-EjRHgwg+kgXABzyoPGPOPg4d5wZqRnZ/ZAxBDzLY+i6DS8OUfTSlZHWIOZzU4XF7125WxRBg9ULbrFJBl+57Eg== +esbuild-linux-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.29.tgz#d1a23993b26cb1f63f740329b2fc09218e498bd1" + integrity sha512-KYf7s8wDfUy+kjKymW3twyGT14OABjGHRkm9gPJ0z4BuvqljfOOUbq9qT3JYFnZJHOgkr29atT//hcdD0Pi7Mw== -esbuild-linux-arm@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.28.tgz#9c2fa45578686370a5d782314f321a2c6b641270" - integrity sha512-L5isjmlLbh9E0WVllXiVETbScgMbth/+XkXQii1WwgO1RvLIfaGrVFz8d2n6EH/ImtgYxPYGx+OcvIKQBc91Rg== +esbuild-linux-arm@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.29.tgz#a7e2fea558525eab812b1fe27d7a2659cd1bb723" + integrity sha512-OXa9D9QL1hwrAnYYAHt/cXAuSCmoSqYfTW/0CEY0LgJNyTxJKtqc5mlwjAZAvgyjmha0auS/sQ0bXfGf2wAokQ== -esbuild-linux-mips64le@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.28.tgz#99d78f0380640aa7faa2c4c49ac21229bdf33c7c" - integrity sha512-krx9SSg7yfiUKk64EmjefOyiEF6nv2bRE4um/LiTaQ6Y/6FP4UF3/Ou/AxZVyR154uSRq63xejcAsmswXAYRsw== +esbuild-linux-mips64le@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.29.tgz#e708c527f0785574e400828cdbed3d9b17b5ddff" + integrity sha512-05jPtWQMsZ1aMGfHOvnR5KrTvigPbU35BtuItSSWLI2sJu5VrM8Pr9Owym4wPvA4153DFcOJ1EPN/2ujcDt54g== -esbuild-linux-ppc64le@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.28.tgz#7388fa0c76033b4ca85b74071cb793d41ae77642" - integrity sha512-LD0Xxu9g+DNuhsEBV5QuVZ4uKVBMup0xPIruLweuAf9/mHXFnaCuNXUBF5t0DxKl7GQ5MSioKtnb92oMo+QXEw== +esbuild-linux-ppc64le@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.29.tgz#0137d1b38beae36a57176ef45e90740e734df502" + integrity sha512-FYhBqn4Ir9xG+f6B5VIQVbRuM4S6qwy29dDNYFPoxLRnwTEKToIYIUESN1qHyUmIbfO0YB4phG2JDV2JDN9Kgw== -esbuild-linux-riscv64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.28.tgz#99e4a8afe4762e927ebe02009e1927e38f3256ab" - integrity sha512-L/DWfRh2P0vxq4Y+qieSNXKGdMg+e9Qe8jkbN2/8XSGYDTPzO2OcAxSujob4qIh7iSl+cknbXV+BvH0YFR0jbg== +esbuild-linux-riscv64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.29.tgz#a2f73235347a58029dcacf0fb91c9eb8bebc8abb" + integrity sha512-eqZMqPehkb4nZcffnuOpXJQdGURGd6GXQ4ZsDHSWyIUaA+V4FpMBe+5zMPtXRD2N4BtyzVvnBko6K8IWWr36ew== -esbuild-linux-s390x@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.28.tgz#38a625399ffc78f3b8b555ebe2013347256a9a8a" - integrity sha512-rrgxmsbmL8QQknWGnAL9bGJRQYLOi2AzXy5OTwfhxnj9eqjo5mSVbJXjgiq5LPUAMQZGdPH5yaNK0obAXS81Zw== +esbuild-linux-s390x@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.29.tgz#0f7310ff1daec463ead9b9e26b7aa083a9f9f1ee" + integrity sha512-o7EYajF1rC/4ho7kpSG3gENVx0o2SsHm7cJ5fvewWB/TEczWU7teDgusGSujxCYcMottE3zqa423VTglNTYhjg== -esbuild-netbsd-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.28.tgz#fdc09dd69313f42be034276cc780bf60c09266b6" - integrity sha512-h8wntIyOR8/xMVVM6TvJxxWKh4AjmLK87IPKpuVi8Pq0kyk0RMA+eo4PFGk5j2XK0D7dj8PcSF5NSlP9kN/j0A== +esbuild-netbsd-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.29.tgz#ba9a0d9cb8aed73b684825126927f75d4fe44ff9" + integrity sha512-/esN6tb6OBSot6+JxgeOZeBk6P8V/WdR3GKBFeFpSqhgw4wx7xWUqPrdx4XNpBVO7X4Ipw9SAqgBrWHlXfddww== -esbuild-openbsd-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.28.tgz#9d7b0ca421ae580ab945c69c33eabd793262a84c" - integrity sha512-HBv18rVapbuDx52/fhZ/c/w6TXyaQAvRxiDDn5Hz/pBcwOs3cdd2WxeIKlWmDoqm2JMx5EVlq4IWgoaRX9mVkw== +esbuild-openbsd-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.29.tgz#36dbe2c32d899106791b5f3af73f359213f71b8a" + integrity sha512-jUTdDzhEKrD0pLpjmk0UxwlfNJNg/D50vdwhrVcW/D26Vg0hVbthMfb19PJMatzclbK7cmgk1Nu0eNS+abzoHw== -esbuild-sunos-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.28.tgz#5b82807ebe435519a2689e1a4d50b8a3cc5c64c0" - integrity sha512-zlIxePhZxKYheR2vBCgPVvTixgo/ozOfOMoP6RZj8dxzquU1NgeyhjkcRXucbLCtmoNJ+i4PtWwPZTLuDd3bGg== +esbuild-sunos-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.29.tgz#e5f857c121441ec63bf9b399a2131409a7d344e5" + integrity sha512-EfhQN/XO+TBHTbkxwsxwA7EfiTHFe+MNDfxcf0nj97moCppD9JHPq48MLtOaDcuvrTYOcrMdJVeqmmeQ7doTcg== esbuild-visualizer@0.3.1: version "0.3.1" @@ -2865,46 +2865,46 @@ esbuild-visualizer@0.3.1: open "^7.4.2" yargs "^16.2.0" -esbuild-windows-32@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.28.tgz#5cf740782fadc865c00aa0d8388e42012bcf496e" - integrity sha512-am9DIJxXlld1BOAY/VlvBQHMUCPL7S3gB/lnXIY3M4ys0gfuRqPf4EvMwZMzYUbFKBY+/Qb8SRgPRRGhwnJ8Kg== +esbuild-windows-32@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.29.tgz#9c2f1ab071a828f3901d1d79d205982a74bdda6e" + integrity sha512-uoyb0YAJ6uWH4PYuYjfGNjvgLlb5t6b3zIaGmpWPOjgpr1Nb3SJtQiK4YCPGhONgfg2v6DcJgSbOteuKXhwqAw== -esbuild-windows-64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.28.tgz#6e3ec1b0225d668a2da21e2ffeff2353b5c9a567" - integrity sha512-78PhySDnmRZlsPNp/W/5Fim8iivlBQQxfhBFIqR7xwvfDmCFUSByyMKP7LCHgNtb04yNdop8nJJkJaQ8Xnwgiw== +esbuild-windows-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.29.tgz#85fbce7c2492521896451b98d649a7db93e52667" + integrity sha512-X9cW/Wl95QjsH8WUyr3NqbmfdU72jCp71cH3pwPvI4CgBM2IeOUDdbt6oIGljPu2bf5eGDIo8K3Y3vvXCCTd8A== -esbuild-windows-arm64@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.28.tgz#c527d52ec7d1f868259d0f74ecc4003e8475125d" - integrity sha512-VhXGBTo6HELD8zyHXynV6+L2jWx0zkKnGx4TmEdSBK7UVFACtOyfUqpToG0EtnYyRZ0HESBhzPSVpP781ovmvA== +esbuild-windows-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.29.tgz#0aa7a9a1bc43a63350bcf574d94b639176f065b5" + integrity sha512-+O/PI+68fbUZPpl3eXhqGHTGK7DjLcexNnyJqtLZXOFwoAjaXlS5UBCvVcR3o2va+AqZTj8o6URaz8D2K+yfQQ== -esbuild@0.14.28: - version "0.14.28" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.28.tgz#7738635d2ea19e446bd319d83a1802545e6aebb8" - integrity sha512-YLNprkCcMVKQ5sekmCKEQ3Obu/L7s6+iij38xNKyBeSmSsTWur4Ky/9zB3XIGT8SCJITG/bZwAR2l7YOAXch4Q== +esbuild@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.29.tgz#24ad09c0674cbcb4aa2fe761485524eb1f6b1419" + integrity sha512-SQS8cO8xFEqevYlrHt6exIhK853Me4nZ4aMW6ieysInLa0FMAL+AKs87HYNRtR2YWRcEIqoXAHh+Ytt5/66qpg== optionalDependencies: - esbuild-android-64 "0.14.28" - esbuild-android-arm64 "0.14.28" - esbuild-darwin-64 "0.14.28" - esbuild-darwin-arm64 "0.14.28" - esbuild-freebsd-64 "0.14.28" - esbuild-freebsd-arm64 "0.14.28" - esbuild-linux-32 "0.14.28" - esbuild-linux-64 "0.14.28" - esbuild-linux-arm "0.14.28" - esbuild-linux-arm64 "0.14.28" - esbuild-linux-mips64le "0.14.28" - esbuild-linux-ppc64le "0.14.28" - esbuild-linux-riscv64 "0.14.28" - esbuild-linux-s390x "0.14.28" - esbuild-netbsd-64 "0.14.28" - esbuild-openbsd-64 "0.14.28" - esbuild-sunos-64 "0.14.28" - esbuild-windows-32 "0.14.28" - esbuild-windows-64 "0.14.28" - esbuild-windows-arm64 "0.14.28" + esbuild-android-64 "0.14.29" + esbuild-android-arm64 "0.14.29" + esbuild-darwin-64 "0.14.29" + esbuild-darwin-arm64 "0.14.29" + esbuild-freebsd-64 "0.14.29" + esbuild-freebsd-arm64 "0.14.29" + esbuild-linux-32 "0.14.29" + esbuild-linux-64 "0.14.29" + esbuild-linux-arm "0.14.29" + esbuild-linux-arm64 "0.14.29" + esbuild-linux-mips64le "0.14.29" + esbuild-linux-ppc64le "0.14.29" + esbuild-linux-riscv64 "0.14.29" + esbuild-linux-s390x "0.14.29" + esbuild-netbsd-64 "0.14.29" + esbuild-openbsd-64 "0.14.29" + esbuild-sunos-64 "0.14.29" + esbuild-windows-32 "0.14.29" + esbuild-windows-64 "0.14.29" + esbuild-windows-arm64 "0.14.29" escalade@^3.1.1: version "3.1.1" From ef1bde6e1d404fc5239673a0b07a7762303b0806 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Fri, 1 Apr 2022 10:21:44 +0800 Subject: [PATCH 31/60] Refactor format test to async (#12559) --- tests/config/format-test.js | 177 +++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 84 deletions(-) diff --git a/tests/config/format-test.js b/tests/config/format-test.js index f99ef2ab3..743e03ee7 100644 --- a/tests/config/format-test.js +++ b/tests/config/format-test.js @@ -234,9 +234,19 @@ function runSpec(fixtures, parsers, options) { filepath: filename, parser, }; - const mainParserFormatResult = shouldThrowOnFormat(name, formatOptions) - ? { options: formatOptions, error: true } - : format(code, formatOptions); + const shouldThrowOnMainParserFormat = shouldThrowOnFormat( + name, + formatOptions + ); + + let mainParserFormatResult; + if (shouldThrowOnMainParserFormat) { + mainParserFormatResult = { options: formatOptions, error: true }; + } else { + beforeAll(async () => { + mainParserFormatResult = await format(code, formatOptions); + }); + } for (const currentParser of allParsers) { if ( @@ -246,22 +256,31 @@ function runSpec(fixtures, parsers, options) { ) { continue; } - runTest({ - parsers, - name, - filename, - code, - output, - parser: currentParser, - mainParserFormatResult, - mainParserFormatOptions: formatOptions, + + const testTitle = + shouldThrowOnMainParserFormat || + formatOptions.parser !== currentParser + ? `[${currentParser}] format` + : "format"; + + test(testTitle, async () => { + await runTest({ + parsers, + name, + filename, + code, + output, + parser: currentParser, + mainParserFormatResult, + mainParserFormatOptions: formatOptions, + }); }); } }); } } -function runTest({ +async function runTest({ parsers, name, filename, @@ -273,52 +292,46 @@ function runTest({ }) { let formatOptions = mainParserFormatOptions; let formatResult = mainParserFormatResult; - let formatTestTitle = "format"; // Verify parsers or error tests if ( mainParserFormatResult.error || mainParserFormatOptions.parser !== parser ) { - formatTestTitle = `[${parser}] format`; formatOptions = { ...mainParserFormatResult.options, parser }; const runFormat = () => format(code, formatOptions); if (shouldThrowOnFormat(name, formatOptions)) { - test(formatTestTitle, () => { - expect(runFormat).toThrowErrorMatchingSnapshot(); - }); + await expect(runFormat()).rejects.toThrowErrorMatchingSnapshot(); return; } // Verify parsers format result should be the same as main parser output = mainParserFormatResult.outputWithCursor; - formatResult = runFormat(); + formatResult = await runFormat(); } - test(formatTestTitle, () => { - // Make sure output has consistent EOL + // Make sure output has consistent EOL + expect(formatResult.eolVisualizedOutput).toEqual( + visualizeEndOfLine(consistentEndOfLine(formatResult.outputWithCursor)) + ); + + // The result is assert to equals to `output` + if (typeof output === "string") { expect(formatResult.eolVisualizedOutput).toEqual( - visualizeEndOfLine(consistentEndOfLine(formatResult.outputWithCursor)) + visualizeEndOfLine(output) ); + return; + } - // The result is assert to equals to `output` - if (typeof output === "string") { - expect(formatResult.eolVisualizedOutput).toEqual( - visualizeEndOfLine(output) - ); - return; - } - - // All parsers have the same result, only snapshot the result from main parser - expect( - createSnapshot(formatResult, { - parsers, - formatOptions, - CURSOR_PLACEHOLDER, - }) - ).toMatchSnapshot(); - }); + // All parsers have the same result, only snapshot the result from main parser + expect( + createSnapshot(formatResult, { + parsers, + formatOptions, + CURSOR_PLACEHOLDER, + }) + ).toMatchSnapshot(); if (!FULL_TEST) { return; @@ -330,63 +343,58 @@ function runTest({ // No range and cursor formatResult.input === code ) { - test(`[${parser}] second format`, () => { - const { eolVisualizedOutput: firstOutput, output } = formatResult; - const { eolVisualizedOutput: secondOutput } = format( - output, - formatOptions - ); - if (isUnstableTest) { - // To keep eye on failed tests, this assert never supposed to pass, - // if it fails, just remove the file from `unstableTests` - expect(secondOutput).not.toEqual(firstOutput); - } else { - expect(secondOutput).toEqual(firstOutput); - } - }); + const { eolVisualizedOutput: firstOutput, output } = formatResult; + const { eolVisualizedOutput: secondOutput } = await format( + output, + formatOptions + ); + if (isUnstableTest) { + // To keep eye on failed tests, this assert never supposed to pass, + // if it fails, just remove the file from `unstableTests` + expect(secondOutput).not.toEqual(firstOutput); + } else { + expect(secondOutput).toEqual(firstOutput); + } } const isAstUnstableTest = isAstUnstable(filename, formatOptions); // Some parsers skip parsing empty files if (formatResult.changed && code.trim()) { - test(`[${parser}] compare AST`, () => { - const { input, output } = formatResult; - const originalAst = parse(input, formatOptions); - const formattedAst = parse(output, formatOptions); - if (isAstUnstableTest) { - expect(formattedAst).not.toEqual(originalAst); - } else { - expect(formattedAst).toEqual(originalAst); - } - }); + const { input, output } = formatResult; + const originalAst = parse(input, formatOptions); + const formattedAst = parse(output, formatOptions); + if (isAstUnstableTest) { + expect(formattedAst).not.toEqual(originalAst); + } else { + expect(formattedAst).toEqual(originalAst); + } } if (!shouldSkipEolTest(code, formatResult.options)) { for (const eol of ["\r\n", "\r"]) { - test(`[${parser}] EOL ${JSON.stringify(eol)}`, () => { - const output = format( - code.replace(/\n/g, eol), - formatOptions - ).eolVisualizedOutput; - // Only if `endOfLine: "auto"` the result will be different - const expected = - formatOptions.endOfLine === "auto" - ? visualizeEndOfLine( - // All `code` use `LF`, so the `eol` of result is always `LF` - formatResult.outputWithCursor.replace(/\n/g, eol) - ) - : formatResult.eolVisualizedOutput; - expect(output).toEqual(expected); - }); + const { eolVisualizedOutput: output } = await format( + code.replace(/\n/g, eol), + formatOptions + ); + // Only if `endOfLine: "auto"` the result will be different + const expected = + formatOptions.endOfLine === "auto" + ? visualizeEndOfLine( + // All `code` use `LF`, so the `eol` of result is always `LF` + formatResult.outputWithCursor.replace(/\n/g, eol) + ) + : formatResult.eolVisualizedOutput; + expect(output).toEqual(expected); } } if (code.charAt(0) !== BOM) { - test(`[${parser}] BOM`, () => { - const output = format(BOM + code, formatOptions).eolVisualizedOutput; - const expected = BOM + formatResult.eolVisualizedOutput; - expect(output).toEqual(expected); - }); + const { eolVisualizedOutput: output } = await format( + BOM + code, + formatOptions + ); + const expected = BOM + formatResult.eolVisualizedOutput; + expect(output).toEqual(expected); } } @@ -453,7 +461,8 @@ const insertCursor = (text, cursorOffset) => CURSOR_PLACEHOLDER + text.slice(cursorOffset) : text; -function format(originalText, originalOptions) { +// eslint-disable-next-line require-await +async function format(originalText, originalOptions) { const { text: input, options } = replacePlaceholders( originalText, originalOptions From cf76b83eb59c5df700be42c2518b02b1b282bdc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 10:22:32 +0800 Subject: [PATCH 32/60] Build(deps-dev): Bump @typescript-eslint/eslint-plugin from 5.16.0 to 5.17.0 (#12568) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 76 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index afa9a4f74..504975e16 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "@glimmer/reference": "0.84.1", "@types/estree": "0.0.51", "@types/jest": "27.4.1", - "@typescript-eslint/eslint-plugin": "5.16.0", + "@typescript-eslint/eslint-plugin": "5.17.0", "babel-jest": "27.5.1", "benchmark": "2.1.4", "browserslist-to-esbuild": "1.1.1", diff --git a/yarn.lock b/yarn.lock index 8bcdedede..647685d14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1705,14 +1705,14 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.16.0.tgz#78f246dd8d1b528fc5bfca99a8a64d4023a3d86d" - integrity sha512-SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw== +"@typescript-eslint/eslint-plugin@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67" + integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ== dependencies: - "@typescript-eslint/scope-manager" "5.16.0" - "@typescript-eslint/type-utils" "5.16.0" - "@typescript-eslint/utils" "5.16.0" + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/type-utils" "5.17.0" + "@typescript-eslint/utils" "5.17.0" debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" @@ -1720,20 +1720,20 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/scope-manager@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz#7e7909d64bd0c4d8aef629cdc764b9d3e1d3a69a" - integrity sha512-P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ== +"@typescript-eslint/scope-manager@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952" + integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w== dependencies: - "@typescript-eslint/types" "5.16.0" - "@typescript-eslint/visitor-keys" "5.16.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/visitor-keys" "5.17.0" -"@typescript-eslint/type-utils@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.16.0.tgz#b482bdde1d7d7c0c7080f7f2f67ea9580b9e0692" - integrity sha512-SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ== +"@typescript-eslint/type-utils@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672" + integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg== dependencies: - "@typescript-eslint/utils" "5.16.0" + "@typescript-eslint/utils" "5.17.0" debug "^4.3.2" tsutils "^3.21.0" @@ -1742,6 +1742,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee" integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g== +"@typescript-eslint/types@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f" + integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw== + "@typescript-eslint/typescript-estree@5.16.0": version "5.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz#32259459ec62f5feddca66adc695342f30101f61" @@ -1755,15 +1760,28 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.16.0", "@typescript-eslint/utils@^5.10.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.16.0.tgz#42218b459d6d66418a4eb199a382bdc261650679" - integrity sha512-iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ== +"@typescript-eslint/typescript-estree@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488" + integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg== + dependencies: + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/visitor-keys" "5.17.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.17.0", "@typescript-eslint/utils@^5.10.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306" + integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.16.0" - "@typescript-eslint/types" "5.16.0" - "@typescript-eslint/typescript-estree" "5.16.0" + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/typescript-estree" "5.17.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -1775,6 +1793,14 @@ "@typescript-eslint/types" "5.16.0" eslint-visitor-keys "^3.0.0" +"@typescript-eslint/visitor-keys@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128" + integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA== + dependencies: + "@typescript-eslint/types" "5.17.0" + eslint-visitor-keys "^3.0.0" + abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" From 99acd83c8a6747885b1374b0c536ceae14fb7333 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 11:31:58 +0800 Subject: [PATCH 33/60] Build(deps): Bump @typescript-eslint/typescript-estree from 5.16.0 to 5.17.0 (#12570) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/package.json b/package.json index 504975e16..94ce282de 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@babel/parser": "7.17.8", "@glimmer/syntax": "0.84.1", "@iarna/toml": "2.2.5", - "@typescript-eslint/typescript-estree": "5.16.0", + "@typescript-eslint/typescript-estree": "5.17.0", "acorn": "8.7.0", "acorn-jsx": "5.3.2", "angular-estree-parser": "2.5.0", diff --git a/yarn.lock b/yarn.lock index 647685d14..53f6dd550 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1737,29 +1737,11 @@ debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee" - integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g== - "@typescript-eslint/types@5.17.0": version "5.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f" integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw== -"@typescript-eslint/typescript-estree@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz#32259459ec62f5feddca66adc695342f30101f61" - integrity sha512-SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ== - dependencies: - "@typescript-eslint/types" "5.16.0" - "@typescript-eslint/visitor-keys" "5.16.0" - debug "^4.3.2" - globby "^11.0.4" - is-glob "^4.0.3" - semver "^7.3.5" - tsutils "^3.21.0" - "@typescript-eslint/typescript-estree@5.17.0": version "5.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488" @@ -1785,14 +1767,6 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.16.0": - version "5.16.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz#f27dc3b943e6317264c7492e390c6844cd4efbbb" - integrity sha512-jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g== - dependencies: - "@typescript-eslint/types" "5.16.0" - eslint-visitor-keys "^3.0.0" - "@typescript-eslint/visitor-keys@5.17.0": version "5.17.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128" From f7966eb6992ee2daa840b7e927620fd0279c2ad8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 14:02:12 +0800 Subject: [PATCH 34/60] Build(deps): Bump flow-parser from 0.174.1 to 0.175.0 (#12572) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 94ce282de..66e1c1ea7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "fast-glob": "3.2.11", "fast-json-stable-stringify": "2.1.0", "find-parent-dir": "0.3.1", - "flow-parser": "0.174.1", + "flow-parser": "0.175.0", "get-stdin": "8.0.0", "graphql": "15.6.1", "html-element-attributes": "3.1.0", diff --git a/yarn.lock b/yarn.lock index 53f6dd550..468a8d718 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3371,10 +3371,10 @@ flatten@^1.0.2: resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== -flow-parser@0.174.1: - version "0.174.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.174.1.tgz#bb81e17fe45a1e64d9752090e819a6744a539fa0" - integrity sha512-nDMOvlFR+4doLpB3OJpseHZ7uEr3ENptlF6qMas/kzQmNcLzMwfQeFX0gGJ/+em7UdldB/nGsk55tDTOvjbCuw== +flow-parser@0.175.0: + version "0.175.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.175.0.tgz#622c2e1dadeed0cc3d25779b143a0935bf515983" + integrity sha512-9XG5JGOjhODF+OQF5ufCw8XiGi+8B46scjr3Q49JxN7IDRdT2W+1AOuvKKd6j766/5E7qSuCn/dsq1y3hihntg== form-data@^3.0.0: version "3.0.1" From e7aac78d85352e6b5ff186b1bba8aa9c8aab6d5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 14:02:39 +0800 Subject: [PATCH 35/60] Build(deps): Bump html-tag-names from 1.1.5 to 2.0.0 (#10612) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- scripts/vendors/vendor-meta.json | 440 ++++++++++++---------- scripts/vendors/vendors.mjs | 11 +- src/language-html/utils/html-tag-names.js | 2 +- vendors/html-tag-names.json | 152 ++++++++ yarn.lock | 8 +- 6 files changed, 398 insertions(+), 217 deletions(-) create mode 100644 vendors/html-tag-names.json diff --git a/package.json b/package.json index 66e1c1ea7..3f0813796 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "graphql": "15.6.1", "html-element-attributes": "3.1.0", "html-styles": "1.0.0", - "html-tag-names": "1.1.5", + "html-tag-names": "2.0.1", "html-void-elements": "2.0.1", "ignore": "5.2.0", "jest-docblock": "27.5.1", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 8a3901417..4068b86ed 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -1,159 +1,16 @@ { "licenses": [ { - "name": "ansi-regex", - "maintainers": [], - "version": "6.0.1", - "description": "Regular expression for matching ANSI escape codes", - "repository": "chalk/ansi-regex", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "strip-ansi", - "maintainers": [], - "version": "7.0.1", - "description": "Strip ANSI escape codes from a string", - "repository": "chalk/strip-ansi", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "is-fullwidth-code-point", - "maintainers": [], - "version": "4.0.0", - "description": "Check if the character represented by a given Unicode code point is fullwidth", - "repository": "sindresorhus/is-fullwidth-code-point", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "emoji-regex", - "maintainers": [], - "version": "9.2.2", - "description": "A regular expression to match all Emoji-only symbols as per the Unicode Standard.", - "repository": { - "type": "git", - "url": "https://github.com/mathiasbynens/emoji-regex.git" - }, - "homepage": "https://mths.be/emoji-regex", - "private": false, - "license": "MIT", - "licenseText": "Copyright Mathias Bynens \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Mathias Bynens", - "email": null, - "url": "https://mathiasbynens.be/" - }, - "contributors": [] - }, - { - "name": "string-width", + "name": "chalk", "maintainers": [], "version": "5.0.1", - "description": "Get the visual width of a string - the number of columns required to display it", - "repository": "sindresorhus/string-width", + "description": "Terminal string styling done right", + "repository": "chalk/chalk", "homepage": null, "private": false, "license": "MIT", "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "mimic-fn", - "maintainers": [], - "version": "4.0.0", - "description": "Make a function mimic another one", - "repository": "sindresorhus/mimic-fn", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "p-defer", - "maintainers": [], - "version": "1.0.0", - "description": "Create a deferred promise", - "repository": "sindresorhus/p-defer", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "The MIT License (MIT)\n\nCopyright (c) Sindre Sorhus (sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "sindresorhus.com" - }, - "contributors": [] - }, - { - "name": "map-age-cleaner", - "maintainers": [], - "version": "0.1.3", - "description": "Automatically cleanup expired items in a Map", - "repository": "SamVerschueren/map-age-cleaner", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sam Verschueren (github.com/SamVerschueren)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sam Verschueren", - "email": "sam.verschueren@gmail.com", - "url": "github.com/SamVerschueren" - }, - "contributors": [] - }, - { - "name": "mem", - "maintainers": [], - "version": "9.0.2", - "description": "Memoize functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input", - "repository": "sindresorhus/mem", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "https://sindresorhus.com" - }, + "author": null, "contributors": [] }, { @@ -440,6 +297,236 @@ }, "contributors": [] }, + { + "name": "html-element-attributes", + "maintainers": [], + "version": "3.1.0", + "description": "Map of HTML elements to allowed attributes", + "repository": "wooorm/html-element-attributes", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + } + ] + }, + { + "name": "html-tag-names", + "maintainers": [], + "version": "2.0.1", + "description": "List of known HTML tag names", + "repository": "wooorm/html-tag-names", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + { + "name": "Valerio Coltrè", + "email": "mister.gamer@gmail.com", + "url": null + } + ] + }, + { + "name": "html-void-elements", + "maintainers": [], + "version": "2.0.1", + "description": "List of HTML void tag names", + "repository": "wooorm/html-void-elements", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + }, + "contributors": [ + { + "name": "Titus Wormer", + "email": "tituswormer@gmail.com", + "url": "https://wooorm.com" + } + ] + }, + { + "name": "mimic-fn", + "maintainers": [], + "version": "4.0.0", + "description": "Make a function mimic another one", + "repository": "sindresorhus/mimic-fn", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "p-defer", + "maintainers": [], + "version": "1.0.0", + "description": "Create a deferred promise", + "repository": "sindresorhus/p-defer", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "The MIT License (MIT)\n\nCopyright (c) Sindre Sorhus (sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "map-age-cleaner", + "maintainers": [], + "version": "0.1.3", + "description": "Automatically cleanup expired items in a Map", + "repository": "SamVerschueren/map-age-cleaner", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sam Verschueren (github.com/SamVerschueren)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sam Verschueren", + "email": "sam.verschueren@gmail.com", + "url": "github.com/SamVerschueren" + }, + "contributors": [] + }, + { + "name": "mem", + "maintainers": [], + "version": "9.0.2", + "description": "Memoize functions - An optimization used to speed up consecutive function calls by caching the result of calls with identical input", + "repository": "sindresorhus/mem", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "ansi-regex", + "maintainers": [], + "version": "6.0.1", + "description": "Regular expression for matching ANSI escape codes", + "repository": "chalk/ansi-regex", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "strip-ansi", + "maintainers": [], + "version": "7.0.1", + "description": "Strip ANSI escape codes from a string", + "repository": "chalk/strip-ansi", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "is-fullwidth-code-point", + "maintainers": [], + "version": "4.0.0", + "description": "Check if the character represented by a given Unicode code point is fullwidth", + "repository": "sindresorhus/is-fullwidth-code-point", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "emoji-regex", + "maintainers": [], + "version": "9.2.2", + "description": "A regular expression to match all Emoji-only symbols as per the Unicode Standard.", + "repository": { + "type": "git", + "url": "https://github.com/mathiasbynens/emoji-regex.git" + }, + "homepage": "https://mths.be/emoji-regex", + "private": false, + "license": "MIT", + "licenseText": "Copyright Mathias Bynens \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Mathias Bynens", + "email": null, + "url": "https://mathiasbynens.be/" + }, + "contributors": [] + }, + { + "name": "string-width", + "maintainers": [], + "version": "5.0.1", + "description": "Get the visual width of a string - the number of columns required to display it", + "repository": "sindresorhus/string-width", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "crypto-random-string", "maintainers": [], @@ -1478,65 +1565,6 @@ "url": "https://sindresorhus.com" }, "contributors": [] - }, - { - "name": "chalk", - "maintainers": [], - "version": "5.0.1", - "description": "Terminal string styling done right", - "repository": "chalk/chalk", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": null, - "contributors": [] - }, - { - "name": "html-void-elements", - "maintainers": [], - "version": "2.0.1", - "description": "List of HTML void tag names", - "repository": "wooorm/html-void-elements", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - }, - "contributors": [ - { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - } - ] - }, - { - "name": "html-element-attributes", - "maintainers": [], - "version": "3.1.0", - "description": "Map of HTML elements to allowed attributes", - "repository": "wooorm/html-element-attributes", - "homepage": null, - "private": false, - "license": "MIT", - "licenseText": "(The MIT License)\n\nCopyright (c) 2016 Titus Wormer \n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "author": { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - }, - "contributors": [ - { - "name": "Titus Wormer", - "email": "tituswormer@gmail.com", - "url": "https://wooorm.com" - } - ] } ] } diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index ebe67db76..1f32ae64b 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -1,11 +1,12 @@ const vendors = [ - "string-width", - "mem", - "execa", - "tempy", "chalk", - "html-void-elements", + "execa", "html-element-attributes", + "html-tag-names", + "html-void-elements", + "mem", + "string-width", + "tempy", ]; export default vendors; diff --git a/src/language-html/utils/html-tag-names.js b/src/language-html/utils/html-tag-names.js index 286e4e23b..8d6ff3ebc 100644 --- a/src/language-html/utils/html-tag-names.js +++ b/src/language-html/utils/html-tag-names.js @@ -1,6 +1,6 @@ "use strict"; -const htmlTagNames = require("html-tag-names"); +const { htmlTagNames } = require("../../../vendors/html-tag-names.json"); const arrayToMap = require("./array-to-map.js"); const HTML_TAGS = arrayToMap(htmlTagNames); diff --git a/vendors/html-tag-names.json b/vendors/html-tag-names.json new file mode 100644 index 000000000..9089e7a7c --- /dev/null +++ b/vendors/html-tag-names.json @@ -0,0 +1,152 @@ +{ + "htmlTagNames": [ + "a", + "abbr", + "acronym", + "address", + "applet", + "area", + "article", + "aside", + "audio", + "b", + "base", + "basefont", + "bdi", + "bdo", + "bgsound", + "big", + "blink", + "blockquote", + "body", + "br", + "button", + "canvas", + "caption", + "center", + "cite", + "code", + "col", + "colgroup", + "command", + "content", + "data", + "datalist", + "dd", + "del", + "details", + "dfn", + "dialog", + "dir", + "div", + "dl", + "dt", + "element", + "em", + "embed", + "fieldset", + "figcaption", + "figure", + "font", + "footer", + "form", + "frame", + "frameset", + "h1", + "h2", + "h3", + "h4", + "h5", + "h6", + "head", + "header", + "hgroup", + "hr", + "html", + "i", + "iframe", + "image", + "img", + "input", + "ins", + "isindex", + "kbd", + "keygen", + "label", + "legend", + "li", + "link", + "listing", + "main", + "map", + "mark", + "marquee", + "math", + "menu", + "menuitem", + "meta", + "meter", + "multicol", + "nav", + "nextid", + "nobr", + "noembed", + "noframes", + "noscript", + "object", + "ol", + "optgroup", + "option", + "output", + "p", + "param", + "picture", + "plaintext", + "pre", + "progress", + "q", + "rb", + "rbc", + "rp", + "rt", + "rtc", + "ruby", + "s", + "samp", + "script", + "section", + "select", + "shadow", + "slot", + "small", + "source", + "spacer", + "span", + "strike", + "strong", + "style", + "sub", + "summary", + "sup", + "svg", + "table", + "tbody", + "td", + "template", + "textarea", + "tfoot", + "th", + "thead", + "time", + "title", + "tr", + "track", + "tt", + "u", + "ul", + "var", + "video", + "wbr", + "xmp" + ] +} diff --git a/yarn.lock b/yarn.lock index 468a8d718..75d3093a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3613,10 +3613,10 @@ html-styles@1.0.0: resolved "https://registry.yarnpkg.com/html-styles/-/html-styles-1.0.0.tgz#a18061fd651f99c6b75c45c8e0549a3bc3e01a75" integrity sha1-oYBh/WUfmca3XEXI4FSaO8PgGnU= -html-tag-names@1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-1.1.5.tgz#f537420c16769511283f8ae1681785fbc89ee0a9" - integrity sha512-aI5tKwNTBzOZApHIynaAwecLBv8TlZTEy/P4Sj2SzzAhBrGuI8yGZ0UIXVPQzOHGS+to2mjb04iy6VWt/8+d8A== +html-tag-names@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-2.0.1.tgz#5626263e7d7b15789fa35a9f816234156901adc6" + integrity sha512-PX8KyLG7dwsjis3NPj1u+/EJf2CgH2d+qzekQpnlCOPQ6Uu6T8+F2ZqQg+wtsP+WKhxK3QMN9Garcwr7fCRhxA== html-void-elements@2.0.1: version "2.0.1" From 62aacafe11386a392698effb172b57fbcc4e35f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 07:02:10 +0000 Subject: [PATCH 36/60] Build(deps-dev): Bump cspell from 5.19.3 to 5.19.5 (#12579) --- package.json | 2 +- yarn.lock | 101 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 3f0813796..a90490972 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "browserslist-to-esbuild": "1.1.1", "core-js": "3.21.1", "cross-env": "7.0.3", - "cspell": "5.19.3", + "cspell": "5.19.5", "enquirer": "2.3.6", "esbuild": "0.14.29", "esbuild-visualizer": "0.3.1", diff --git a/yarn.lock b/yarn.lock index 75d3093a7..b5fbdcdfb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -947,10 +947,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cspell/cspell-bundled-dicts@^5.19.3": - version "5.19.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.3.tgz#826e166eb56f193c2d770575adfbb1557816f1af" - integrity sha512-YAz68AgXTFFtrBUhNJlOQ7KOjUE6ncYt578/esa2GStMJHgJoUtPnOZsE41hh+cVWXqO5yRRI+Qkwub99zLMgQ== +"@cspell/cspell-bundled-dicts@^5.19.5": + version "5.19.5" + resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.5.tgz#09906e24a13dd919ba9e19d0b7a93e9ef2383d28" + integrity sha512-qXW99H+S/529cTOtRBTPiTV1Ay+I2+kcF5lfVblSRsij7fBM6d99dB3Fg6oL0i6okRwOUNFAV4qbxgg7zxA3wA== dependencies: "@cspell/dict-ada" "^2.0.0" "@cspell/dict-aws" "^2.0.0" @@ -992,15 +992,15 @@ "@cspell/dict-typescript" "^2.0.0" "@cspell/dict-vue" "^2.0.2" -"@cspell/cspell-pipe@^5.19.3": - version "5.19.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.3.tgz#af818c0362786f61ac8741947e1819f94b55ec3b" - integrity sha512-3RKntgGRxYYzoxoH3VBPvnNMYkHKPq0U+U7qogcWxDkgAUgKXlBP0oc2mw96grJQ4HIzOL1vBnaVAWAqteY9Kw== +"@cspell/cspell-pipe@^5.19.5": + version "5.19.5" + resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.19.5.tgz#e780d22523d94317f0462683ba61c39a486919a8" + integrity sha512-dNCMYDgjeWKw7KIptjxHu17UfeT3oiqQk6LkSyi3BewUxpnlLLO7EsxR6GRW+RVU/MrPXe7BF9WgF0gO8m+8cQ== -"@cspell/cspell-types@^5.19.3": - version "5.19.3" - resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.3.tgz#37a64db00e33a1c8bb8aa3bf86d503689b3afbf5" - integrity sha512-tub7PW/I6qB6o+ZtlahAZjm5O5cnzj88HRiC8nAbJFpa7q0mrdpFMYhd7ksWtyFLlNbuDkCsfzXGamAhIQnnIw== +"@cspell/cspell-types@^5.19.5": + version "5.19.5" + resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.19.5.tgz#10801d6298f60539d244f3256ad5b5e26f3ea5d3" + integrity sha512-tOzCzuQQ4DdgfnI6+FGBPOVL/1JbH0pWtoOinPoU93/pH29XOKGW2I24HLeESzgskfoZGK274wMFQfGp6oJw9g== "@cspell/dict-ada@^2.0.0": version "2.0.0" @@ -2441,41 +2441,41 @@ crypto-random-string@^4.0.0: dependencies: type-fest "^1.0.1" -cspell-gitignore@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.19.3.tgz#c27780dc1b43cb48705dc3695c3875f001d7b038" - integrity sha512-Q67uHcf0qNgOoanRLhatapjWpLiftT+MuLIyAaSLe5eNVzQurQIc+UnXhtaslkVyOTqQt4NJFqLgtf5ZSGz1bg== +cspell-gitignore@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.19.5.tgz#42e1fbdeabb7bfce073a111d1d77f22dd31253d7" + integrity sha512-Wj16pnPmx7PGd2PcVAEsxWnTtfY4qNzUBtfTqo5VEd23WME6SgEtffxm4eSRpHYZmmDclir+Tbb9yQAsZajDeQ== dependencies: - cspell-glob "^5.19.3" + cspell-glob "^5.19.5" find-up "^5.0.0" -cspell-glob@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.3.tgz#f6b423523a0c2d77d244ecfc7c48ef320f4d122a" - integrity sha512-qp2Oe/euzTu3e0zZrQxHuTrqRo418tYfh4CnCa+DKU6lWKKcF4zCEhOGJHPsYak8SFIXZ4ZE360wHFxB/JDutQ== +cspell-glob@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.19.5.tgz#a25ef16ed91b876bd9764dbedf5ac3ae101bf071" + integrity sha512-fnrUNLNY9CMsr5J1wRPoGpx7aastD05wEZ/NL+Xd7uEmuU+R7gViOjyOPlUMFH+YARwY0youHRiobkl7pJNngw== dependencies: - micromatch "^4.0.4" + micromatch "^4.0.5" -cspell-io@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.3.tgz#89ab249dc53206651a7833399a83b04a7d8a8a63" - integrity sha512-dE9eBvHgIJ11DelWtyehMU3W3bCpcB+0nS6uOZJ2d8fDu13m5BebpLrXZ2dKfY4cjksJUhRPatt14uwQSeUp2A== +cspell-io@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.19.5.tgz#e44eeda1b8083b666f4ab9940e0d167b4fa2040a" + integrity sha512-R6q1Dor6mfs1VBpuXVlcm/Vvr96GclO/BtNDK/8ppcm22Ct1VF24MG2itoYO7296dOgR1H4HkndvvEgx3p8fzw== -cspell-lib@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.3.tgz#6efc9ee5620d427e2f20c000b60a3b3d0ce6cd4c" - integrity sha512-peMJggwJpxCXKZZ0DuHyDtZmf66POKaHf5Im8LGEyMKFARUIq6O2WvaUGggYjyRe3Ng/f5G+EYTcIHbF9pZYcg== +cspell-lib@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.19.5.tgz#653242ec9b06005f478d8f8f0fdb00f4c6c1dadd" + integrity sha512-6HOJ7O+vDYzJs49fHZI5xzsL5TxeR7WsfjWvx1BwgRs1rHdA9/8KFZFX2DJazKRGm+kL1kBO0VJlaF0tvVsjzw== dependencies: - "@cspell/cspell-bundled-dicts" "^5.19.3" - "@cspell/cspell-pipe" "^5.19.3" - "@cspell/cspell-types" "^5.19.3" + "@cspell/cspell-bundled-dicts" "^5.19.5" + "@cspell/cspell-pipe" "^5.19.5" + "@cspell/cspell-types" "^5.19.5" clear-module "^4.1.2" comment-json "^4.2.2" configstore "^5.0.1" cosmiconfig "^7.0.1" - cspell-glob "^5.19.3" - cspell-io "^5.19.3" - cspell-trie-lib "^5.19.3" + cspell-glob "^5.19.5" + cspell-io "^5.19.5" + cspell-trie-lib "^5.19.5" fast-equals "^3.0.0" find-up "^5.0.0" fs-extra "^10.0.1" @@ -2486,27 +2486,26 @@ cspell-lib@^5.19.3: vscode-languageserver-textdocument "^1.0.4" vscode-uri "^3.0.3" -cspell-trie-lib@^5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.3.tgz#0a0f8d9300f95188f2f2b1831bd7fea2e9c9d6ee" - integrity sha512-Io8EB7E1pmttHzZvgvPEF0b87qlq8G5uA4B+sbqCxrUf5l4JDcK/UYLih0+rekLTbv4Q68zqgCTASvqxgqnoAg== +cspell-trie-lib@^5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.19.5.tgz#e18125c3f56b280109face14c28f7137b3469895" + integrity sha512-yNOmd7uzLiu5UDpbIfJlORx8rJZltLz/ebostAV7UC3wzrOIQgS8xKoFfqiE0iWxIMwmV9eyydVcyzh5grx0gg== dependencies: - "@cspell/cspell-pipe" "^5.19.3" + "@cspell/cspell-pipe" "^5.19.5" fs-extra "^10.0.1" gensequence "^3.1.1" -cspell@5.19.3: - version "5.19.3" - resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.19.3.tgz#0f2c6cf529fb3f0b721b380f81b04e9c22272c05" - integrity sha512-JJBH8iqtHYmxqLQZ+7GAMTVvc6SAoHVgn1tdYknOI2/uxAbZVH29eaxINY7JfjwPuxPPVAvttRetBAIRiu6ZYw== +cspell@5.19.5: + version "5.19.5" + resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.19.5.tgz#5f3bad212d11509534982a1d64c6bf6592be2ee8" + integrity sha512-LFKWBBOY6s1SYJcMlWmFP2ml3kxgzUcUCOY4JYDCAzA088gbBEiSN8sM0X6MhobsMJx4MchxjwveXFRP+1umyA== dependencies: - "@cspell/cspell-pipe" "^5.19.3" + "@cspell/cspell-pipe" "^5.19.5" chalk "^4.1.2" commander "^9.1.0" - comment-json "^4.2.2" - cspell-gitignore "^5.19.3" - cspell-glob "^5.19.3" - cspell-lib "^5.19.3" + cspell-gitignore "^5.19.5" + cspell-glob "^5.19.5" + cspell-lib "^5.19.5" fast-json-stable-stringify "^2.1.0" file-entry-cache "^6.0.1" fs-extra "^10.0.1" @@ -4835,7 +4834,7 @@ meriyah@4.2.0: resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.0.tgz#29d28c37ac7b67f8b9aaa92df0b8ac12469fe98b" integrity sha512-fCVh5GB9YT53Bq14l00HLYE3i9DywrY0JVZxbk0clXWDuMsUKKwluvC5sY0bMBqHbnIbpIjfSSIsnrzbauA8Yw== -micromatch@4.0.5, micromatch@^4.0.4: +micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== From 7d33ed54520486b43e70218a6e152e8d1fc477e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 15:18:41 +0800 Subject: [PATCH 37/60] Build(deps-dev): Bump eslint-plugin-unicorn from 41.0.1 to 42.0.0 (#12580) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a90490972..8c8fb3df9 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "eslint-plugin-prettier-internal-rules": "2.0.1", "eslint-plugin-react": "7.29.4", "eslint-plugin-regexp": "1.6.0", - "eslint-plugin-unicorn": "41.0.1", + "eslint-plugin-unicorn": "42.0.0", "esm-utils": "3.0.0", "execa": "6.1.0", "jest": "27.5.1", diff --git a/yarn.lock b/yarn.lock index b5fbdcdfb..5c325856b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3048,10 +3048,10 @@ eslint-plugin-regexp@1.6.0: regexpp "^3.2.0" scslre "^0.1.6" -eslint-plugin-unicorn@41.0.1: - version "41.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-41.0.1.tgz#b49205b38e71e227d21fb5776f8d078a1dc637ca" - integrity sha512-gF5vo2dIj0YdNMQ/IMegiBkQdQ22GBFFVpdkJP+0og3w7XD4ypea0xQVRv6iofkLVR2w0phAdikcnU01ybd4Ow== +eslint-plugin-unicorn@42.0.0: + version "42.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-42.0.0.tgz#47d60c00c263ad743403b052db689e39acbacff1" + integrity sha512-ixBsbhgWuxVaNlPTT8AyfJMlhyC5flCJFjyK3oKE8TRrwBnaHvUbuIkCM1lqg8ryYrFStL/T557zfKzX4GKSlg== dependencies: "@babel/helper-validator-identifier" "^7.15.7" ci-info "^3.3.0" From e2eac0cb8a33f051cb94d34cf6a0f73256ea4677 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 2 Apr 2022 16:14:32 +0800 Subject: [PATCH 38/60] Move some bundle test code into `tests/` (#12577) --- scripts/build/build.mjs | 12 -------- tests/config/require-standalone.js | 33 ++++------------------ tests/config/utils/create-sandbox.js | 14 ++++++++++ tests/integration/__tests__/bundle.js | 40 +++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 40 deletions(-) create mode 100644 tests/config/utils/create-sandbox.js diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index ee3526106..48500511d 100644 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -63,8 +63,6 @@ const clear = () => { }; async function createBundle(bundleConfig, options) { - const { target } = bundleConfig; - try { for await (const { name, @@ -89,16 +87,6 @@ async function createBundle(bundleConfig, options) { continue; } - // Files including U+FFEE can't load in Chrome Extension - // `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension - // details https://github.com/prettier/prettier/pull/8534 - if (target === "universal") { - const content = await fs.readFile(absolutePath, "utf8"); - if (content.includes("\ufffe")) { - throw new Error("Bundled umd file should not have U+FFFE character."); - } - } - const sizeMessages = []; if (options.printSize) { diff --git a/tests/config/require-standalone.js b/tests/config/require-standalone.js index 215244d67..3b32cbebe 100644 --- a/tests/config/require-standalone.js +++ b/tests/config/require-standalone.js @@ -1,37 +1,14 @@ "use strict"; - -const fs = require("fs"); const vm = require("vm"); const fastGlob = require("fast-glob"); +const createSandBox = require("./utils/create-sandbox.js"); -const sandbox = vm.createContext(); - -const source = fastGlob - .sync(["standalone.js", "parser-*.js"], { +const sandbox = createSandBox({ + files: fastGlob.sync(["standalone.js", "parser-*.js"], { cwd: process.env.PRETTIER_DIR, absolute: true, - }) - .map((file) => fs.readFileSync(file, "utf8")) - .join(";"); - -vm.runInContext(source, sandbox); - -const allowedGlobalObjects = new Set(["prettier", "prettierPlugins"]); -const globalObjects = Object.keys(sandbox).filter( - (property) => !allowedGlobalObjects.has(property) -); -if (globalObjects.length > 0) { - throw new Error( - `Global ${globalObjects - .map( - (property) => - `"${property}"(${Object.prototype.toString - .call(sandbox[property]) - .slice(8, -1)})` - ) - .join(", ")} should not be exposed.` - ); -} + }), +}); // TODO: maybe expose (and write tests) for `format`, `utils`, and // `__debug` methods diff --git a/tests/config/utils/create-sandbox.js b/tests/config/utils/create-sandbox.js new file mode 100644 index 000000000..903b53c00 --- /dev/null +++ b/tests/config/utils/create-sandbox.js @@ -0,0 +1,14 @@ +"use strict"; +const vm = require("vm"); +const fs = require("fs"); + +function createSandBox({ files }) { + const source = files.map((file) => fs.readFileSync(file, "utf8")).join(";"); + const sandbox = vm.createContext(); + + vm.runInContext(source, sandbox); + + return sandbox; +} + +module.exports = createSandBox; diff --git a/tests/integration/__tests__/bundle.js b/tests/integration/__tests__/bundle.js index 4748f787f..dacaf2edd 100644 --- a/tests/integration/__tests__/bundle.js +++ b/tests/integration/__tests__/bundle.js @@ -1,8 +1,10 @@ "use strict"; const path = require("path"); +const fs = require("fs"); const fastGlob = require("fast-glob"); const { projectRoot } = require("../env.js"); +const createSandBox = require("../../config/utils/create-sandbox.js"); const coreOptions = require("../../../src/main/core-options.js"); const codeSamples = require("../../../website/playground/codeSamples.js").default; @@ -12,6 +14,21 @@ const parserNames = coreOptions.options.parser.choices.map( ); const distDirectory = path.join(projectRoot, "dist"); +// Files including U+FFEE can't load in Chrome Extension +// `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension +// details https://github.com/prettier/prettier/pull/8534 +test("code", async () => { + const files = await fastGlob(["**/*"], { + cwd: distDirectory, + absolute: true, + }); + + for (const file of files) { + const text = await fs.promises.readFile(file, "utf8"); + expect(text.includes("\ufffe")).toBe(false); + } +}); + describe("standalone", () => { const standalone = require(path.join(distDirectory, "standalone.js")); const plugins = fastGlob @@ -47,3 +64,26 @@ describe("standalone", () => { }); } }); + +test("global objects", async () => { + const files = await fastGlob(["standalone.js", "parser-*.js"], { + cwd: distDirectory, + absolute: true, + }); + + const allowedGlobalObjects = new Set(["prettier", "prettierPlugins"]); + const getGlobalObjects = (file) => { + const sandbox = createSandBox({ files: [file] }); + return Object.fromEntries( + Object.entries(sandbox).filter( + ([property]) => !allowedGlobalObjects.has(property) + ) + ); + }; + + for (const file of files) { + const globalObjects = getGlobalObjects(file); + + expect(globalObjects).toStrictEqual({}); + } +}); From 5d73acc42d00c869fb4634167037ea79c027048b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 08:41:53 +0000 Subject: [PATCH 39/60] Build(deps-dev): Bump esbuild from 0.14.29 to 0.14.30 (#12581) --- package.json | 2 +- yarn.lock | 208 +++++++++++++++++++++++++-------------------------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index 8c8fb3df9..f939cdca7 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "cross-env": "7.0.3", "cspell": "5.19.5", "enquirer": "2.3.6", - "esbuild": "0.14.29", + "esbuild": "0.14.30", "esbuild-visualizer": "0.3.1", "eslint": "8.12.0", "eslint-config-prettier": "8.5.0", diff --git a/yarn.lock b/yarn.lock index 5c325856b..5341aade4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2770,90 +2770,90 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.29.tgz#c0960c84c9b832bade20831515e89d32549d4769" - integrity sha512-tJuaN33SVZyiHxRaVTo1pwW+rn3qetJX/SRuc/83rrKYtyZG0XfsQ1ao1nEudIt9w37ZSNXR236xEfm2C43sbw== +esbuild-android-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.30.tgz#9efcdb3d826b9c67705a0c518d361ab44ae4cc5b" + integrity sha512-vdJ7t8A8msPfKpYUGUV/KaTQRiZ0vDa2XSTlzXVkGGVHLKPeb85PBUtYJcEgw3htW3IdX5i1t1IMdQCwJJgNAg== -esbuild-android-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.29.tgz#8eceb3abe5abde5489d6a5cbe6a7c1044f71115f" - integrity sha512-D74dCv6yYnMTlofVy1JKiLM5JdVSQd60/rQfJSDP9qvRAI0laPXIG/IXY1RG6jobmFMUfL38PbFnCqyI/6fPXg== +esbuild-android-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.30.tgz#7b90fa7578b94da047e0bf3da477cb5775b58664" + integrity sha512-BdgGfxeA5hBQNErLr7BWJUA8xjflEfyaARICy8e0OJYNSAwDbEzOf8LyiKWSrDcgV129mWhi3VpbNQvOIDEHcg== -esbuild-darwin-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.29.tgz#26f3f14102310ecb8f2d9351c5b7a47a60d2cc8a" - integrity sha512-+CJaRvfTkzs9t+CjGa0Oa28WoXa7EeLutQhxus+fFcu0MHhsBhlmeWHac3Cc/Sf/xPi1b2ccDFfzGYJCfV0RrA== +esbuild-darwin-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.30.tgz#275e40eb100286b868d4cd664e6447b53400f7ff" + integrity sha512-VRaOXMMrsG5n53pl4qFZQdXy2+E0NoLP/QH3aDUI0+bQP+ZHDmbINKcDy2IX7GVFI9kqPS18iJNAs5a6/G2LZg== -esbuild-darwin-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.29.tgz#6d2d89dfd937992649239711ed5b86e51b13bd89" - integrity sha512-5Wgz/+zK+8X2ZW7vIbwoZ613Vfr4A8HmIs1XdzRmdC1kG0n5EG5fvKk/jUxhNlrYPx1gSY7XadQ3l4xAManPSw== +esbuild-darwin-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.30.tgz#c2b8fe03fb0dcee1d227b226c9c921de71e4d411" + integrity sha512-qDez+fHMOrO9Oc9qjt/x+sy09RJVh62kik5tVybKRLmezeV4qczM9/sAYY57YN0aWLdHbcCj2YqJUWYJNsgKnw== -esbuild-freebsd-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.29.tgz#2cb41a0765d0040f0838280a213c81bbe62d6394" - integrity sha512-VTfS7Bm9QA12JK1YXF8+WyYOfvD7WMpbArtDj6bGJ5Sy5xp01c/q70Arkn596aGcGj0TvQRplaaCIrfBG1Wdtg== +esbuild-freebsd-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.30.tgz#328bb272ce6cfcae202b6e0a06c240036335cc91" + integrity sha512-mec1jENcImVVagddZlGWsdAUwBnzR5cgnhzCxv+9fSMxKbx1uZYLLUAnLPp8m/i934zrumR1xGjJ5VoWdPlI2w== -esbuild-freebsd-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.29.tgz#e1b79fbb63eaeff324cf05519efa7ff12ce4586a" - integrity sha512-WP5L4ejwLWWvd3Fo2J5mlXvG3zQHaw5N1KxFGnUc4+2ZFZknP0ST63i0IQhpJLgEJwnQpXv2uZlU1iWZjFqEIg== +esbuild-freebsd-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.30.tgz#49ce79fa7d7087a941e27432da46bafb5b35a979" + integrity sha512-cpjbTs6Iok/AfeB0JgTzyUJTMStC1SQULmany5nHx6S4GTkSgaAHuJzZO0GcVWqghI4e0YL/bjXAhN5Mn6feNw== -esbuild-linux-32@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.29.tgz#a4a5a0b165b15081bc3227986e10dd4943edb7d6" - integrity sha512-4myeOvFmQBWdI2U1dEBe2DCSpaZyjdQtmjUY11Zu2eQg4ynqLb8Y5mNjNU9UN063aVsCYYfbs8jbken/PjyidA== +esbuild-linux-32@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.30.tgz#c473299f5291130f6d4436808603b529ccbfa785" + integrity sha512-liIONVT4F2kZmOMwtwASqZ8WkIjb5HHBR9HUffdHiuotSTF3CyZO+EJf+Og+SYYuuVIvt0qHNSFjBA/iSESteQ== -esbuild-linux-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.29.tgz#4c450088c84f8bfd22c51d116f59416864b85481" - integrity sha512-iaEuLhssReAKE7HMwxwFJFn7D/EXEs43fFy5CJeA4DGmU6JHh0qVJD2p/UP46DvUXLRKXsXw0i+kv5TdJ1w5pg== +esbuild-linux-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.30.tgz#b4be59f0665a44574a7617c9db673943da6061f8" + integrity sha512-LUnpzoMpRqFON5En4qEj6NWiyH6a1K+Y2qYNKrCy5qPTjDoG/EWeqMz69n8Uv7pRuvDKl3FNGJ1dufTrA5i0sw== -esbuild-linux-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.29.tgz#d1a23993b26cb1f63f740329b2fc09218e498bd1" - integrity sha512-KYf7s8wDfUy+kjKymW3twyGT14OABjGHRkm9gPJ0z4BuvqljfOOUbq9qT3JYFnZJHOgkr29atT//hcdD0Pi7Mw== +esbuild-linux-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.30.tgz#78485a9f49858ea69ced85c3dd0fe58d354f20f8" + integrity sha512-DHZHn6FK5q/KL0fpNT/0jE38Nnyk2rXxKE9WENi95EXtqfOLPgE8tzjTZQNgpr61R95QX4ymQU26ni3IZk8buQ== -esbuild-linux-arm@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.29.tgz#a7e2fea558525eab812b1fe27d7a2659cd1bb723" - integrity sha512-OXa9D9QL1hwrAnYYAHt/cXAuSCmoSqYfTW/0CEY0LgJNyTxJKtqc5mlwjAZAvgyjmha0auS/sQ0bXfGf2wAokQ== +esbuild-linux-arm@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.30.tgz#00392bbe04ac687dd6d9849ecee302bc27f984f2" + integrity sha512-97T+bbXnpqf7mfIG49UR7ZSJFGgvc22byn74qw3Kx2GDCBSQoVFjyWuKOHGXp8nXk3XYrdFF+mQ8yQ7aNsgQvg== -esbuild-linux-mips64le@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.29.tgz#e708c527f0785574e400828cdbed3d9b17b5ddff" - integrity sha512-05jPtWQMsZ1aMGfHOvnR5KrTvigPbU35BtuItSSWLI2sJu5VrM8Pr9Owym4wPvA4153DFcOJ1EPN/2ujcDt54g== +esbuild-linux-mips64le@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.30.tgz#cf48a292037c3a9ca3ca84ec0ae4f47bf1247ab4" + integrity sha512-fLUzTFZ7uknC0aPTk7/lM7NmaG/9ZqE3SaHEphcaM009SZK/mDOvZugWi1ss6WGNhk13dUrhkfHcc4FSb9hYhg== -esbuild-linux-ppc64le@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.29.tgz#0137d1b38beae36a57176ef45e90740e734df502" - integrity sha512-FYhBqn4Ir9xG+f6B5VIQVbRuM4S6qwy29dDNYFPoxLRnwTEKToIYIUESN1qHyUmIbfO0YB4phG2JDV2JDN9Kgw== +esbuild-linux-ppc64le@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.30.tgz#8e448a54e7040829ee9ecfc68dab0f3a039b1cff" + integrity sha512-2Oudm2WEfj0dNU9bzIl5L/LrsMEmHWsOsYgJJqu8fDyUDgER+J1d33qz3cUdjsJk7gAENayIxDSpsuCszx0w3A== -esbuild-linux-riscv64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.29.tgz#a2f73235347a58029dcacf0fb91c9eb8bebc8abb" - integrity sha512-eqZMqPehkb4nZcffnuOpXJQdGURGd6GXQ4ZsDHSWyIUaA+V4FpMBe+5zMPtXRD2N4BtyzVvnBko6K8IWWr36ew== +esbuild-linux-riscv64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.30.tgz#118af007f21adb00c4362d5eda3f004290f4d0ef" + integrity sha512-RPMucPW47rV4t2jlelaE948iCRtbZf5RhifxSwzlpM1Mqdyu99MMNK0w4jFreGTmLN+oGomxIOxD6n+2E/XqHw== -esbuild-linux-s390x@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.29.tgz#0f7310ff1daec463ead9b9e26b7aa083a9f9f1ee" - integrity sha512-o7EYajF1rC/4ho7kpSG3gENVx0o2SsHm7cJ5fvewWB/TEczWU7teDgusGSujxCYcMottE3zqa423VTglNTYhjg== +esbuild-linux-s390x@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.30.tgz#e0649e26d8791bf6265685842dcef732de59b49b" + integrity sha512-OZ68r7ok6qO7hdwrwQn2p5jbIRRcUcVaAykB7e0uCA0ODwfeGunILM6phJtq2Oz4dlEEFvd+tSuma3paQKwt+A== -esbuild-netbsd-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.29.tgz#ba9a0d9cb8aed73b684825126927f75d4fe44ff9" - integrity sha512-/esN6tb6OBSot6+JxgeOZeBk6P8V/WdR3GKBFeFpSqhgw4wx7xWUqPrdx4XNpBVO7X4Ipw9SAqgBrWHlXfddww== +esbuild-netbsd-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.30.tgz#7653db21ab4379a1b557f338b040e3493ff5006c" + integrity sha512-iyejQUKn0TzpPkufq8pSCxOg9NheycQbMbPCmjefTe9wYuUlBt1TcHvdoJnYbQzsAhAh1BNq+s0ycRsIJFZzaQ== -esbuild-openbsd-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.29.tgz#36dbe2c32d899106791b5f3af73f359213f71b8a" - integrity sha512-jUTdDzhEKrD0pLpjmk0UxwlfNJNg/D50vdwhrVcW/D26Vg0hVbthMfb19PJMatzclbK7cmgk1Nu0eNS+abzoHw== +esbuild-openbsd-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.30.tgz#3fad1699cb2ca7a060585356e2881df7b3fa5bb1" + integrity sha512-UyK1MTMcy4j5fH260fsE1o6MVgWNhb62eCK2yCKCRazZv8Nqdc2WiP9ygjWidmEdCDS+A6MuVp9ozk9uoQtQpA== -esbuild-sunos-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.29.tgz#e5f857c121441ec63bf9b399a2131409a7d344e5" - integrity sha512-EfhQN/XO+TBHTbkxwsxwA7EfiTHFe+MNDfxcf0nj97moCppD9JHPq48MLtOaDcuvrTYOcrMdJVeqmmeQ7doTcg== +esbuild-sunos-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.30.tgz#2306a178dc2362cf32fc182327c21b49b78ca1a3" + integrity sha512-aQRtRTNKHB4YuG+xXATe5AoRTNY48IJg5vjE8ElxfmjO9+KdX7MHFkTLhlKevCD6rNANtB3qOlSIeAiXTwHNqw== esbuild-visualizer@0.3.1: version "0.3.1" @@ -2864,46 +2864,46 @@ esbuild-visualizer@0.3.1: open "^7.4.2" yargs "^16.2.0" -esbuild-windows-32@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.29.tgz#9c2f1ab071a828f3901d1d79d205982a74bdda6e" - integrity sha512-uoyb0YAJ6uWH4PYuYjfGNjvgLlb5t6b3zIaGmpWPOjgpr1Nb3SJtQiK4YCPGhONgfg2v6DcJgSbOteuKXhwqAw== +esbuild-windows-32@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.30.tgz#ea17b2a9468e346734f926a7edd49de3cc81d12f" + integrity sha512-9/fb1tPtpacMqxAXp3fGHowUDg/l9dVch5hKmCLEZC6PdGljh6h372zMdJwYfH0Bd5CCPT0Wx95uycBLJiqpXA== -esbuild-windows-64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.29.tgz#85fbce7c2492521896451b98d649a7db93e52667" - integrity sha512-X9cW/Wl95QjsH8WUyr3NqbmfdU72jCp71cH3pwPvI4CgBM2IeOUDdbt6oIGljPu2bf5eGDIo8K3Y3vvXCCTd8A== +esbuild-windows-64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.30.tgz#266147f1f45974ac61dece10ab32bc916050dcc2" + integrity sha512-DHgITeUhPAnN9I5O6QBa1GVyPOhiYCn4S4TtQr7sO4+X0LNyqnlmA1M0qmGkUdDC1QQfjI8uQ4G/whdWb2pWIQ== -esbuild-windows-arm64@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.29.tgz#0aa7a9a1bc43a63350bcf574d94b639176f065b5" - integrity sha512-+O/PI+68fbUZPpl3eXhqGHTGK7DjLcexNnyJqtLZXOFwoAjaXlS5UBCvVcR3o2va+AqZTj8o6URaz8D2K+yfQQ== +esbuild-windows-arm64@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.30.tgz#8e5e9c2455bffaf3e1a387eee4841f5c3797b8a8" + integrity sha512-F1kLyQH7zSgjh5eLxogGZN7C9+KNs9m+s7Q6WZoMmCWT/6j998zlaoECHyM8izJRRfsvw2eZlEa1jO6/IOU1AQ== -esbuild@0.14.29: - version "0.14.29" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.29.tgz#24ad09c0674cbcb4aa2fe761485524eb1f6b1419" - integrity sha512-SQS8cO8xFEqevYlrHt6exIhK853Me4nZ4aMW6ieysInLa0FMAL+AKs87HYNRtR2YWRcEIqoXAHh+Ytt5/66qpg== +esbuild@0.14.30: + version "0.14.30" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.30.tgz#8bf6501a58f71e622e7485aeada79c764c1affe4" + integrity sha512-wCecQSBkIjp2xjuXY+wcXS/PpOQo9rFh4NAKPh4Pm9f3fuLcnxkR0rDzA+mYP88FtXIUcXUyYmaIgfrzRl55jA== optionalDependencies: - esbuild-android-64 "0.14.29" - esbuild-android-arm64 "0.14.29" - esbuild-darwin-64 "0.14.29" - esbuild-darwin-arm64 "0.14.29" - esbuild-freebsd-64 "0.14.29" - esbuild-freebsd-arm64 "0.14.29" - esbuild-linux-32 "0.14.29" - esbuild-linux-64 "0.14.29" - esbuild-linux-arm "0.14.29" - esbuild-linux-arm64 "0.14.29" - esbuild-linux-mips64le "0.14.29" - esbuild-linux-ppc64le "0.14.29" - esbuild-linux-riscv64 "0.14.29" - esbuild-linux-s390x "0.14.29" - esbuild-netbsd-64 "0.14.29" - esbuild-openbsd-64 "0.14.29" - esbuild-sunos-64 "0.14.29" - esbuild-windows-32 "0.14.29" - esbuild-windows-64 "0.14.29" - esbuild-windows-arm64 "0.14.29" + esbuild-android-64 "0.14.30" + esbuild-android-arm64 "0.14.30" + esbuild-darwin-64 "0.14.30" + esbuild-darwin-arm64 "0.14.30" + esbuild-freebsd-64 "0.14.30" + esbuild-freebsd-arm64 "0.14.30" + esbuild-linux-32 "0.14.30" + esbuild-linux-64 "0.14.30" + esbuild-linux-arm "0.14.30" + esbuild-linux-arm64 "0.14.30" + esbuild-linux-mips64le "0.14.30" + esbuild-linux-ppc64le "0.14.30" + esbuild-linux-riscv64 "0.14.30" + esbuild-linux-s390x "0.14.30" + esbuild-netbsd-64 "0.14.30" + esbuild-openbsd-64 "0.14.30" + esbuild-sunos-64 "0.14.30" + esbuild-windows-32 "0.14.30" + esbuild-windows-64 "0.14.30" + esbuild-windows-arm64 "0.14.30" escalade@^3.1.1: version "3.1.1" From 5e3de4828d6a7ac0fdf94a82ba36a20d7c190b8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 18:34:21 +0800 Subject: [PATCH 40/60] Build(deps): Bump escape-string-regexp from 4.0.0 to 5.0.0 (#10725) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- package.json | 2 +- scripts/vendors/vendor-meta.json | 17 ++++++++++++++++ scripts/vendors/vendors.mjs | 1 + src/common/util.js | 4 +++- vendors/escape-string-regexp.d.ts | 3 +++ vendors/escape-string-regexp.js | 34 +++++++++++++++++++++++++++++++ yarn.lock | 13 ++++++++---- 7 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 vendors/escape-string-regexp.d.ts create mode 100644 vendors/escape-string-regexp.js diff --git a/package.json b/package.json index f939cdca7..c0b782bca 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "diff": "5.0.0", "editorconfig": "0.15.3", "editorconfig-to-prettier": "0.2.0", - "escape-string-regexp": "4.0.0", + "escape-string-regexp": "5.0.0", "espree": "9.3.1", "esutils": "2.0.3", "fast-glob": "3.2.11", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 4068b86ed..0631c4c21 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -13,6 +13,23 @@ "author": null, "contributors": [] }, + { + "name": "escape-string-regexp", + "maintainers": [], + "version": "5.0.0", + "description": "Escape RegExp special characters", + "repository": "sindresorhus/escape-string-regexp", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "isexe", "maintainers": [], diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index 1f32ae64b..dc00c233c 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -1,5 +1,6 @@ const vendors = [ "chalk", + "escape-string-regexp", "execa", "html-element-attributes", "html-tag-names", diff --git a/src/common/util.js b/src/common/util.js index 4acfb14d9..b395ab3e8 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -1,6 +1,8 @@ "use strict"; -const escapeStringRegexp = require("escape-string-regexp"); +const { + default: escapeStringRegexp, +} = require("../../vendors/escape-string-regexp.js"); const getLast = require("../utils/get-last.js"); const { getSupportInfo } = require("../main/support.js"); const isNonEmptyArray = require("../utils/is-non-empty-array.js"); diff --git a/vendors/escape-string-regexp.d.ts b/vendors/escape-string-regexp.d.ts new file mode 100644 index 000000000..91dfbd94b --- /dev/null +++ b/vendors/escape-string-regexp.d.ts @@ -0,0 +1,3 @@ +// This file is generated automatically. +export {default} from "escape-string-regexp"; +export * from "escape-string-regexp"; diff --git a/vendors/escape-string-regexp.js b/vendors/escape-string-regexp.js new file mode 100644 index 000000000..52534604c --- /dev/null +++ b/vendors/escape-string-regexp.js @@ -0,0 +1,34 @@ +// @ts-nocheck +// This file is generated automatically +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; +}; +var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + +// node_modules/escape-string-regexp/index.js +var escape_string_regexp_exports = {}; +__export(escape_string_regexp_exports, { + default: () => escapeStringRegexp +}); +module.exports = __toCommonJS(escape_string_regexp_exports); +function escapeStringRegexp(string) { + if (typeof string !== "string") { + throw new TypeError("Expected a string"); + } + return string.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d"); +} +// Annotate the CommonJS export names for ESM import in node: +0 && (module.exports = {}); diff --git a/yarn.lock b/yarn.lock index 5341aade4..4c944df49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2910,10 +2910,10 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escape-string-regexp@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" + integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== escape-string-regexp@^1.0.5: version "1.0.5" @@ -2925,6 +2925,11 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" From 9400c893a3226cf19b03538cd6ae42a280cfddb1 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Sat, 2 Apr 2022 19:01:07 +0800 Subject: [PATCH 41/60] Refactor: Add a wrapped `normalizeCliOptions` version for CLI usage (#12573) --- src/cli/options/get-options-for-file.js | 8 +++----- src/cli/options/normalize-cli-options.js | 16 ++++++++++++++++ src/cli/options/parse-cli-arguments.js | 13 ++----------- tsconfig.json | 1 + 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 src/cli/options/normalize-cli-options.js diff --git a/src/cli/options/get-options-for-file.js b/src/cli/options/get-options-for-file.js index 93778c46a..3a031b462 100644 --- a/src/cli/options/get-options-for-file.js +++ b/src/cli/options/get-options-for-file.js @@ -1,14 +1,12 @@ "use strict"; const dashify = require("dashify"); -const leven = require("leven"); -// eslint-disable-next-line no-restricted-modules -const { default: chalk } = require("../../../vendors/chalk.js"); // eslint-disable-next-line no-restricted-modules const prettier = require("../../index.js"); const { optionsNormalizer } = require("../prettier-internal.js"); const minimist = require("./minimist.js"); const createMinimistOptions = require("./create-minimist-options.js"); +const normalizeCliOptions = require("./normalize-cli-options.js"); function getOptions(argv, detailedOptions) { return Object.fromEntries( @@ -45,14 +43,14 @@ function parseArgsToOptions(context, overrideDefaults) { context.detailedOptions ); return getOptions( - optionsNormalizer.normalizeCliOptions( + normalizeCliOptions( minimist(context.rawArguments, { string: minimistOptions.string, boolean: minimistOptions.boolean, default: cliifyOptions(overrideDefaults, apiDetailedOptionMap), }), context.detailedOptions, - { logger: false, colorsModule: chalk, levenshteinDistance: leven } + { logger: false } ), context.detailedOptions ); diff --git a/src/cli/options/normalize-cli-options.js b/src/cli/options/normalize-cli-options.js new file mode 100644 index 000000000..6e063f69e --- /dev/null +++ b/src/cli/options/normalize-cli-options.js @@ -0,0 +1,16 @@ +"use strict"; + +const leven = require("leven"); +const { optionsNormalizer } = require("../prettier-internal.js"); +// eslint-disable-next-line no-restricted-modules +const { default: chalk } = require("../../../vendors/chalk.js"); + +function normalizeCliOptions(options, optionInfos, opts) { + return optionsNormalizer.normalizeCliOptions(options, optionInfos, { + colorsModule: chalk, + levenshteinDistance: leven, + ...opts, + }); +} + +module.exports = normalizeCliOptions; diff --git a/src/cli/options/parse-cli-arguments.js b/src/cli/options/parse-cli-arguments.js index cd6db20d2..66433266e 100644 --- a/src/cli/options/parse-cli-arguments.js +++ b/src/cli/options/parse-cli-arguments.js @@ -1,15 +1,10 @@ "use strict"; const pick = require("lodash/pick"); const camelCase = require("camelcase"); -const leven = require("leven"); -// eslint-disable-next-line no-restricted-modules -const { default: chalk } = require("../../../vendors/chalk.js"); -const { - optionsNormalizer: { normalizeCliOptions }, -} = require("../prettier-internal.js"); const getContextOptions = require("./get-context-options.js"); const minimist = require("./minimist.js"); const createMinimistOptions = require("./create-minimist-options.js"); +const normalizeCliOptions = require("./normalize-cli-options.js"); function parseArgv(rawArguments, detailedOptions, logger, keys) { const minimistOptions = createMinimistOptions(detailedOptions); @@ -26,11 +21,7 @@ function parseArgv(rawArguments, detailedOptions, logger, keys) { argv = pick(argv, keys); } - const normalized = normalizeCliOptions(argv, detailedOptions, { - logger, - colorsModule: chalk, - levenshteinDistance: leven, - }); + const normalized = normalizeCliOptions(argv, detailedOptions, { logger }); return { ...Object.fromEntries( diff --git a/tsconfig.json b/tsconfig.json index f81038f5a..d2fab7aa0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,6 +33,7 @@ "src/cli/options/get-options-for-file.js", "src/cli/options/option-map.js", "src/cli/options/parse-cli-arguments.js", + "src/cli/options/normalize-cli-options.js", "src/cli/usage.js", "src/cli/constant.js", "src/cli/prettier-internal.js", From 1bfb08f2895dd12c256f663b3f6c00ab0cc4ecde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 20:13:21 +0900 Subject: [PATCH 42/60] Build(deps): Bump meriyah from 4.2.0 to 4.2.1 (#12567) * Build(deps): Bump meriyah from 4.2.0 to 4.2.1 Bumps [meriyah](https://github.com/meriyah/meriyah) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/meriyah/meriyah/releases) - [Changelog](https://github.com/meriyah/meriyah/blob/master/CHANGELOG.md) - [Commits](https://github.com/meriyah/meriyah/compare/v4.2.0...v4.2.1) --- updated-dependencies: - dependency-name: meriyah dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Add test for https://github.com/meriyah/meriyah/commit/6de707a0efb3053767deaa36b1ed6979b0d3f873 * Test https://github.com/meriyah/meriyah/commit/37c63613771e5bc6e23b7da2d92e992c60dafc5a * Test https://github.com/meriyah/meriyah/commit/d757c6b20ae4f6f4e55a77179726db36cf2bd50b * Add changelog Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: fisker Cheung --- changelog_unreleased/javascript/12567.md | 23 +++++ package.json | 2 +- .../classes/__snapshots__/jsfmt.spec.js.snap | 22 +++++ tests/format/js/classes/super.js | 5 ++ .../js/regex/__snapshots__/jsfmt.spec.js.snap | 16 ++++ tests/format/js/regex/multiple-flags.js | 2 + .../__snapshots__/jsfmt.spec.js.snap | 16 ++++ .../js/top-level-await/in-expression.js | 3 + .../jsx/jsx/__snapshots__/jsfmt.spec.js.snap | 88 +++++++++++++++++++ tests/format/jsx/jsx/regex.js | 4 + yarn.lock | 8 +- 11 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 changelog_unreleased/javascript/12567.md create mode 100644 tests/format/js/classes/super.js create mode 100644 tests/format/js/regex/multiple-flags.js create mode 100644 tests/format/js/top-level-await/in-expression.js create mode 100644 tests/format/jsx/jsx/regex.js diff --git a/changelog_unreleased/javascript/12567.md b/changelog_unreleased/javascript/12567.md new file mode 100644 index 000000000..4e3b7a8d9 --- /dev/null +++ b/changelog_unreleased/javascript/12567.md @@ -0,0 +1,23 @@ +#### Update `meriyah` to fix several bugs (#12567 by @fisker, fixes in [`meriyah`](https://github.com/meriyah/meriyah/) by @3cp) + +Fixes bugs when parsing following valid code: + +```js +foo(await bar()); +``` + +```js +const regex = /.*/ms; +``` + +```js +const element =

    {/w/.test(s)}

    ; +``` + +```js +class A extends B { + #privateMethod() { + super.method(); + } +} +``` diff --git a/package.json b/package.json index c0b782bca..7a7339dc1 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "linguist-languages": "7.15.0", "lodash": "4.17.21", "mem": "9.0.2", - "meriyah": "4.2.0", + "meriyah": "4.2.1", "micromatch": "4.0.5", "minimist": "1.2.6", "n-readlines": "1.0.1", diff --git a/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap index fbcbf12d7..0587ffe17 100644 --- a/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/classes/__snapshots__/jsfmt.spec.js.snap @@ -325,6 +325,28 @@ class B { ================================================================================ `; +exports[`super.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "flow", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +class A extends B { + #a() { + super.x(); + } +} + +=====================================output===================================== +class A extends B { + #a() { + super.x(); + } +} + +================================================================================ +`; + exports[`ternary.js format 1`] = ` ====================================options===================================== parsers: ["babel", "flow", "typescript"] diff --git a/tests/format/js/classes/super.js b/tests/format/js/classes/super.js new file mode 100644 index 000000000..03eadf541 --- /dev/null +++ b/tests/format/js/classes/super.js @@ -0,0 +1,5 @@ +class A extends B { + #a() { + super.x(); + } +} diff --git a/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap index 3413b6890..aa295e37c 100644 --- a/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/regex/__snapshots__/jsfmt.spec.js.snap @@ -28,6 +28,22 @@ printWidth: 80 ================================================================================ `; +exports[`multiple-flags.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "flow", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +/.*/ms; +/.*/my; + +=====================================output===================================== +/.*/ms; +/.*/my; + +================================================================================ +`; + exports[`test.js format 1`] = ` ====================================options===================================== parsers: ["babel", "flow", "typescript"] diff --git a/tests/format/js/regex/multiple-flags.js b/tests/format/js/regex/multiple-flags.js new file mode 100644 index 000000000..f5a04f859 --- /dev/null +++ b/tests/format/js/regex/multiple-flags.js @@ -0,0 +1,2 @@ +/.*/ms; +/.*/my; diff --git a/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap index 04b2cd75c..249b632a6 100644 --- a/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/js/top-level-await/__snapshots__/jsfmt.spec.js.snap @@ -13,3 +13,19 @@ await something(); ================================================================================ `; + +exports[`in-expression.js format 1`] = ` +====================================options===================================== +parsers: ["babel", "typescript"] +printWidth: 80 + | printWidth +=====================================input====================================== +call( +await something() +) + +=====================================output===================================== +call(await something()); + +================================================================================ +`; diff --git a/tests/format/js/top-level-await/in-expression.js b/tests/format/js/top-level-await/in-expression.js new file mode 100644 index 000000000..d70f91522 --- /dev/null +++ b/tests/format/js/top-level-await/in-expression.js @@ -0,0 +1,3 @@ +call( +await something() +) diff --git a/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap index 764b7cf2e..e8776bdc0 100644 --- a/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/jsx/jsx/__snapshots__/jsfmt.spec.js.snap @@ -5076,6 +5076,94 @@ singleQuote: true ================================================================================ `; +exports[`regex.js - {"singleQuote":false,"jsxSingleQuote":false} format 1`] = ` +====================================options===================================== +jsxSingleQuote: false +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: false + | printWidth +=====================================input====================================== +x =
    one
    ,
    two
    ; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
    one
    ), (
    two
    ); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + +exports[`regex.js - {"singleQuote":false,"jsxSingleQuote":true} format 1`] = ` +====================================options===================================== +jsxSingleQuote: true +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: false + | printWidth +=====================================input====================================== +x =
    one
    ,
    two
    ; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
    one
    ), (
    two
    ); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + +exports[`regex.js - {"singleQuote":true,"jsxSingleQuote":false} format 1`] = ` +====================================options===================================== +jsxSingleQuote: false +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: true + | printWidth +=====================================input====================================== +x =
    one
    ,
    two
    ; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
    one
    ), (
    two
    ); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + +exports[`regex.js - {"singleQuote":true,"jsxSingleQuote":true} format 1`] = ` +====================================options===================================== +jsxSingleQuote: true +parsers: ["flow", "babel", "typescript"] +printWidth: 80 +singleQuote: true + | printWidth +=====================================input====================================== +x =
    one
    ,
    two
    ; +x = {} +x = {1/2} +x = {/w/.test(s)} + +=====================================output===================================== +(x =
    one
    ), (
    two
    ); +x = {}; +x = {1 / 2}; +x = {/w/.test(s)}; + +================================================================================ +`; + exports[`return-statement.js - {"singleQuote":false,"jsxSingleQuote":false} format 1`] = ` ====================================options===================================== jsxSingleQuote: false diff --git a/tests/format/jsx/jsx/regex.js b/tests/format/jsx/jsx/regex.js new file mode 100644 index 000000000..9f92918c6 --- /dev/null +++ b/tests/format/jsx/jsx/regex.js @@ -0,0 +1,4 @@ +x =
    one
    ,
    two
    ; +x = {} +x = {1/2} +x = {/w/.test(s)} diff --git a/yarn.lock b/yarn.lock index 4c944df49..ab96c6c90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4834,10 +4834,10 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -meriyah@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.0.tgz#29d28c37ac7b67f8b9aaa92df0b8ac12469fe98b" - integrity sha512-fCVh5GB9YT53Bq14l00HLYE3i9DywrY0JVZxbk0clXWDuMsUKKwluvC5sY0bMBqHbnIbpIjfSSIsnrzbauA8Yw== +meriyah@4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-4.2.1.tgz#2a5c9ac2f4a16673afa31af1266ce491a8973bb4" + integrity sha512-Uv5sWsmjFNC6IszEmHo5bzJLL+kqjQ/VrEj9Agqsqtx7B6dcxHnHLew1ioJD19HNXrxrRZltPi+NVh12I8RLXA== micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" From 3c96a08176576e038d0088f3209a54642de77077 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 11:24:18 +0000 Subject: [PATCH 43/60] Build(deps): Bump strip-ansi from 6.0.0 to 7.0.0 (#10731) --- package.json | 2 +- scripts/vendors/vendor-meta.json | 34 +++++++++++++++++++ scripts/vendors/vendors.mjs | 1 + src/cli/logger.js | 3 +- tests/integration/__tests__/loglevel.js | 2 +- tests/integration/run-prettier.js | 2 +- vendors/string-width.js | 4 +-- vendors/strip-ansi.d.ts | 3 ++ vendors/strip-ansi.js | 45 +++++++++++++++++++++++++ yarn.lock | 19 ++++------- 10 files changed, 96 insertions(+), 19 deletions(-) create mode 100644 vendors/strip-ansi.d.ts create mode 100644 vendors/strip-ansi.js diff --git a/package.json b/package.json index 7a7339dc1..4f2c91b6f 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "resolve": "1.22.0", "semver": "7.3.5", "string-width": "5.0.1", - "strip-ansi": "6.0.0", + "strip-ansi": "7.0.1", "typescript": "4.6.3", "unicode-regex": "3.0.0", "unified": "9.2.1", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index 0631c4c21..c47e5d343 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -544,6 +544,40 @@ }, "contributors": [] }, + { + "name": "ansi-regex", + "maintainers": [], + "version": "6.0.1", + "description": "Regular expression for matching ANSI escape codes", + "repository": "chalk/ansi-regex", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, + { + "name": "strip-ansi", + "maintainers": [], + "version": "7.0.1", + "description": "Strip ANSI escape codes from a string", + "repository": "chalk/strip-ansi", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "crypto-random-string", "maintainers": [], diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index dc00c233c..f1c43d4eb 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -7,6 +7,7 @@ const vendors = [ "html-void-elements", "mem", "string-width", + "strip-ansi", "tempy", ]; diff --git a/src/cli/logger.js b/src/cli/logger.js index 350e91309..3e1331bc0 100644 --- a/src/cli/logger.js +++ b/src/cli/logger.js @@ -1,9 +1,10 @@ "use strict"; const readline = require("readline"); -const stripAnsi = require("strip-ansi"); const wcwidth = require("wcwidth"); +// eslint-disable-next-line no-restricted-modules +const { default: stripAnsi } = require("../../vendors/strip-ansi.js"); // eslint-disable-next-line no-restricted-modules const { default: chalk } = require("../../vendors/chalk.js"); diff --git a/tests/integration/__tests__/loglevel.js b/tests/integration/__tests__/loglevel.js index 53ad29937..3fe029ca2 100644 --- a/tests/integration/__tests__/loglevel.js +++ b/tests/integration/__tests__/loglevel.js @@ -1,6 +1,6 @@ "use strict"; -const stripAnsi = require("strip-ansi"); +const { default: stripAnsi } = require("../../../vendors/strip-ansi.js"); const runPrettier = require("../run-prettier.js"); test("do not show logs with --loglevel silent", async () => { diff --git a/tests/integration/run-prettier.js b/tests/integration/run-prettier.js index 68cde716e..441b14025 100644 --- a/tests/integration/run-prettier.js +++ b/tests/integration/run-prettier.js @@ -2,7 +2,7 @@ const fs = require("fs"); const path = require("path"); -const stripAnsi = require("strip-ansi"); +const { default: stripAnsi } = require("../../vendors/strip-ansi.js"); const { prettierCli, thirdParty } = require("./env.js"); async function run(dir, args, options) { diff --git a/vendors/string-width.js b/vendors/string-width.js index bed36dfd4..384d4a261 100644 --- a/vendors/string-width.js +++ b/vendors/string-width.js @@ -41,7 +41,7 @@ __export(string_width_exports, { }); module.exports = __toCommonJS(string_width_exports); -// node_modules/string-width/node_modules/ansi-regex/index.js +// node_modules/strip-ansi/node_modules/ansi-regex/index.js function ansiRegex({ onlyFirst = false } = {}) { const pattern = [ "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", @@ -50,7 +50,7 @@ function ansiRegex({ onlyFirst = false } = {}) { return new RegExp(pattern, onlyFirst ? void 0 : "g"); } -// node_modules/string-width/node_modules/strip-ansi/index.js +// node_modules/strip-ansi/index.js function stripAnsi(string) { if (typeof string !== "string") { throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``); diff --git a/vendors/strip-ansi.d.ts b/vendors/strip-ansi.d.ts new file mode 100644 index 000000000..07389334c --- /dev/null +++ b/vendors/strip-ansi.d.ts @@ -0,0 +1,3 @@ +// This file is generated automatically. +export {default} from "strip-ansi"; +export * from "strip-ansi"; diff --git a/vendors/strip-ansi.js b/vendors/strip-ansi.js new file mode 100644 index 000000000..1c3a4e564 --- /dev/null +++ b/vendors/strip-ansi.js @@ -0,0 +1,45 @@ +// @ts-nocheck +// This file is generated automatically +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; +}; +var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + +// node_modules/strip-ansi/index.js +var strip_ansi_exports = {}; +__export(strip_ansi_exports, { + default: () => stripAnsi +}); +module.exports = __toCommonJS(strip_ansi_exports); + +// node_modules/strip-ansi/node_modules/ansi-regex/index.js +function ansiRegex({ onlyFirst = false } = {}) { + const pattern = [ + "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", + "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))" + ].join("|"); + return new RegExp(pattern, onlyFirst ? void 0 : "g"); +} + +// node_modules/strip-ansi/index.js +function stripAnsi(string) { + if (typeof string !== "string") { + throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``); + } + return string.replace(ansiRegex(), ""); +} +// Annotate the CommonJS export names for ESM import in node: +0 && (module.exports = {}); diff --git a/yarn.lock b/yarn.lock index ab96c6c90..7578148be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1870,7 +1870,7 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0, ansi-regex@^5.0.1: +ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -6067,12 +6067,12 @@ strip-ansi@5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@7.0.1, strip-ansi@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^6.0.1" strip-ansi@^4.0.0: version "4.0.0" @@ -6088,13 +6088,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" From 378370a01e00db8da33e7fde030699ffda29730f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 11:47:46 +0000 Subject: [PATCH 44/60] Build(deps): Bump leven from 3.1.0 to 4.0.0 (#11349) --- package.json | 2 +- scripts/vendors/vendor-meta.json | 17 ++++++ scripts/vendors/vendors.mjs | 1 + src/cli/options/normalize-cli-options.js | 5 +- vendors/leven.d.ts | 3 + vendors/leven.js | 76 ++++++++++++++++++++++++ yarn.lock | 13 ++-- 7 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 vendors/leven.d.ts create mode 100644 vendors/leven.js diff --git a/package.json b/package.json index 4f2c91b6f..7ab1eebba 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "ignore": "5.2.0", "jest-docblock": "27.5.1", "json5": "2.2.1", - "leven": "3.1.0", + "leven": "4.0.0", "lines-and-columns": "2.0.3", "linguist-languages": "7.15.0", "lodash": "4.17.21", diff --git a/scripts/vendors/vendor-meta.json b/scripts/vendors/vendor-meta.json index c47e5d343..7d95829af 100644 --- a/scripts/vendors/vendor-meta.json +++ b/scripts/vendors/vendor-meta.json @@ -388,6 +388,23 @@ } ] }, + { + "name": "leven", + "maintainers": [], + "version": "4.0.0", + "description": "Measure the difference between two strings using the Levenshtein distance algorithm", + "repository": "sindresorhus/leven", + "homepage": null, + "private": false, + "license": "MIT", + "licenseText": "MIT License\n\nCopyright (c) Sindre Sorhus (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "author": { + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "https://sindresorhus.com" + }, + "contributors": [] + }, { "name": "mimic-fn", "maintainers": [], diff --git a/scripts/vendors/vendors.mjs b/scripts/vendors/vendors.mjs index f1c43d4eb..bea6f7929 100644 --- a/scripts/vendors/vendors.mjs +++ b/scripts/vendors/vendors.mjs @@ -5,6 +5,7 @@ const vendors = [ "html-element-attributes", "html-tag-names", "html-void-elements", + "leven", "mem", "string-width", "strip-ansi", diff --git a/src/cli/options/normalize-cli-options.js b/src/cli/options/normalize-cli-options.js index 6e063f69e..b0a9d378d 100644 --- a/src/cli/options/normalize-cli-options.js +++ b/src/cli/options/normalize-cli-options.js @@ -1,9 +1,10 @@ "use strict"; -const leven = require("leven"); -const { optionsNormalizer } = require("../prettier-internal.js"); // eslint-disable-next-line no-restricted-modules const { default: chalk } = require("../../../vendors/chalk.js"); +// eslint-disable-next-line no-restricted-modules +const { default: leven } = require("../../../vendors/leven.js"); +const { optionsNormalizer } = require("../prettier-internal.js"); function normalizeCliOptions(options, optionInfos, opts) { return optionsNormalizer.normalizeCliOptions(options, optionInfos, { diff --git a/vendors/leven.d.ts b/vendors/leven.d.ts new file mode 100644 index 000000000..31a132da6 --- /dev/null +++ b/vendors/leven.d.ts @@ -0,0 +1,3 @@ +// This file is generated automatically. +export {default} from "leven"; +export * from "leven"; diff --git a/vendors/leven.js b/vendors/leven.js new file mode 100644 index 000000000..b22ff5a59 --- /dev/null +++ b/vendors/leven.js @@ -0,0 +1,76 @@ +// @ts-nocheck +// This file is generated automatically +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; +}; +var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + +// node_modules/leven/index.js +var leven_exports = {}; +__export(leven_exports, { + default: () => leven +}); +module.exports = __toCommonJS(leven_exports); +var array = []; +var characterCodeCache = []; +function leven(first, second) { + if (first === second) { + return 0; + } + const swap = first; + if (first.length > second.length) { + first = second; + second = swap; + } + let firstLength = first.length; + let secondLength = second.length; + while (firstLength > 0 && first.charCodeAt(~-firstLength) === second.charCodeAt(~-secondLength)) { + firstLength--; + secondLength--; + } + let start = 0; + while (start < firstLength && first.charCodeAt(start) === second.charCodeAt(start)) { + start++; + } + firstLength -= start; + secondLength -= start; + if (firstLength === 0) { + return secondLength; + } + let bCharacterCode; + let result; + let temporary; + let temporary2; + let index = 0; + let index2 = 0; + while (index < firstLength) { + characterCodeCache[index] = first.charCodeAt(start + index); + array[index] = ++index; + } + while (index2 < secondLength) { + bCharacterCode = second.charCodeAt(start + index2); + temporary = index2++; + result = index2; + for (index = 0; index < firstLength; index++) { + temporary2 = bCharacterCode === characterCodeCache[index] ? temporary : temporary + 1; + temporary = array[index]; + result = array[index] = temporary > result ? temporary2 > result ? result + 1 : temporary2 : temporary2 > temporary ? temporary + 1 : temporary2; + } + } + return result; +} +// Annotate the CommonJS export names for ESM import in node: +0 && (module.exports = {}); diff --git a/yarn.lock b/yarn.lock index 7578148be..f455f95df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4663,16 +4663,21 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -leven@3.1.0, leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== +leven@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-4.0.0.tgz#b9c39c803f835950fabef9e122a9b47b95708710" + integrity sha512-puehA3YKku3osqPlNuzGDUHq8WpwXupUg1V6NXdV38G+gr+gkBwFC8g1b/+YcIvp8gnqVIus+eJCH/eGsRmJNw== leven@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA= +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" From 2bca9d65f4e200349a45765a1f3ee1da01456e40 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 2 Apr 2022 21:46:14 +0900 Subject: [PATCH 45/60] Add new workflow to prevent updating `users.yml` (#11784) Co-authored-by: fisker Cheung --- .github/workflows/prevent-file-change.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/prevent-file-change.yml diff --git a/.github/workflows/prevent-file-change.yml b/.github/workflows/prevent-file-change.yml new file mode 100644 index 000000000..da740ab60 --- /dev/null +++ b/.github/workflows/prevent-file-change.yml @@ -0,0 +1,17 @@ +name: Prevent File change + +on: + pull_request: + paths: + - "website/data/users.yml" + +jobs: + prevent-add-users: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Prevent file change + uses: xalvarez/prevent-file-change-action@v1 + with: + githubToken: ${{ secrets.GITHUB_TOKEN }} + pattern: website/data/users.yml From d6f82a024a1f0c4c7418a49a8334862286a63c17 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 3 Apr 2022 01:31:20 +0900 Subject: [PATCH 46/60] Release 2.6.2 --- .github/ISSUE_TEMPLATE/formatting.md | 2 +- .github/ISSUE_TEMPLATE/integration.md | 2 +- CHANGELOG.md | 58 +++++++++++++++++++ docs/browser.md | 26 ++++----- package.json | 2 +- .../versioned_docs/version-stable/browser.md | 26 ++++----- .../integrating-with-linters.md | 3 - .../version-stable/related-projects.md | 6 -- 8 files changed, 87 insertions(+), 38 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md index 933be908f..d1b763348 100644 --- a/.github/ISSUE_TEMPLATE/formatting.md +++ b/.github/ISSUE_TEMPLATE/formatting.md @@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you: --> -**Prettier 2.6.1** +**Prettier 2.6.2** [Playground link](https://prettier.io/playground/#.....) ```sh diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md index be0385ced..9034f876b 100644 --- a/.github/ISSUE_TEMPLATE/integration.md +++ b/.github/ISSUE_TEMPLATE/integration.md @@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE: **Environments:** -- Prettier Version: 2.6.1 +- Prettier Version: 2.6.2 - Running Prettier via: - Runtime: - Operating System: diff --git a/CHANGELOG.md b/CHANGELOG.md index baa01fe21..af8d402c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,61 @@ +# 2.6.2 + +[diff](https://github.com/prettier/prettier/compare/2.6.1...2.6.2) + +#### Fix LESS/SCSS format error ([#12536](https://github.com/prettier/prettier/pull/12536) by [@fisker](https://github.com/fisker)) + + +```less +// Input +.background-gradient(@cut) { + background: linear-gradient( + to right, + @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} + +// Prettier 2.6.1 +TypeError: Cannot read properties of undefined (reading 'endOffset') + +// Prettier 2.6.2 +.background-gradient(@cut) { + background: linear-gradient( + to right, + @white 0%, + @white (@cut - 0.01%), + @portal-background @cut, + @portal-background 100% + ); +} +``` + +#### Update `meriyah` to fix several bugs ([#12567](https://github.com/prettier/prettier/pull/12567) by [@fisker](https://github.com/fisker), fixes in [`meriyah`](https://github.com/meriyah/meriyah/) by [@3cp](https://github.com/3cp)) + +Fixes bugs when parsing following valid code: + +```js +foo(await bar()); +``` + +```js +const regex = /.*/ms; +``` + +```js +const element =

    {/w/.test(s)}

    ; +``` + +```js +class A extends B { + #privateMethod() { + super.method(); + } +} +``` + # 2.6.1 [diff](https://github.com/prettier/prettier/compare/2.6.0...2.6.1) diff --git a/docs/browser.md b/docs/browser.md index 9931cdc79..5e0852d23 100644 --- a/docs/browser.md +++ b/docs/browser.md @@ -32,8 +32,8 @@ See below for examples. ### Global ```html - - + + - + +