From c6d210442657bb3ae61365a4f4de429cccedb684 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Oct 2020 18:05:41 +0100 Subject: [PATCH 1/7] Bump workbox-webpack-plugin from 5.1.3 to 5.1.4 (#1420) Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 5.1.3 to 5.1.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v5.1.3...v5.1.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 178 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 72 deletions(-) diff --git a/yarn.lock b/yarn.lock index f26cf47e8..7bd1e72f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12503,7 +12503,7 @@ rollup-plugin-babel@^4.3.3: "@babel/helper-module-imports" "^7.0.0" rollup-pluginutils "^2.8.1" -rollup-plugin-terser@^5.2.0: +rollup-plugin-terser@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz#8c650062c22a8426c64268548957463bf981b413" integrity sha512-1pkwkervMJQGFYvM9nscrUoncPwiKR/K+bHdjv6PFgRo3cgPHoRT83y2Aa3GvINj4539S15t/tpFPb775TDs6w== @@ -14833,24 +14833,24 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -workbox-background-sync@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-5.1.3.tgz#121c5cf439b627f6320ff490be65fd2bd440c6ea" - integrity sha512-V/R95aPxYjbKCaVzUTihrZ9ObGOnzoA5n60r0DQ747p8Pj15/dDTYixonKhhlvavTiNezUrp+wTQBvZvcd/ETA== +workbox-background-sync@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-5.1.4.tgz#5ae0bbd455f4e9c319e8d827c055bb86c894fd12" + integrity sha512-AH6x5pYq4vwQvfRDWH+vfOePfPIYQ00nCEB7dJRU1e0n9+9HMRyvI63FlDvtFT2AvXVRsXvUt7DNMEToyJLpSA== dependencies: - workbox-core "^5.1.3" + workbox-core "^5.1.4" -workbox-broadcast-update@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-5.1.3.tgz#312e0f065f06a6fb04a050143c84aa6ba0ed8add" - integrity sha512-HJ7FDmgweRcYp8fMiFbkmhaTjMYhMByURe5+TempnCi7cT5NNbyaG4T+rg8NWYxAeumSAB3JQF6XD/z34vRRHA== +workbox-broadcast-update@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-5.1.4.tgz#0eeb89170ddca7f6914fa3523fb14462891f2cfc" + integrity sha512-HTyTWkqXvHRuqY73XrwvXPud/FN6x3ROzkfFPsRjtw/kGZuZkPzfeH531qdUGfhtwjmtO/ZzXcWErqVzJNdXaA== dependencies: - workbox-core "^5.1.3" + workbox-core "^5.1.4" -workbox-build@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-5.1.3.tgz#ec0dbcb7e260ad792c49407d063f4bcc8a8f08b8" - integrity sha512-cssa2cKAi/FNp2P2m2DjF/UsXlVX6b1HgkXOjBTraFkIeyZEKxN1F1DnxOpGkdM/bPPRa7y5OmUvjOpgOd9apA== +workbox-build@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-5.1.4.tgz#23d17ed5c32060c363030c8823b39d0eabf4c8c7" + integrity sha512-xUcZn6SYU8usjOlfLb9Y2/f86Gdo+fy1fXgH8tJHjxgpo53VVsqRX0lUDw8/JuyzNmXuo8vXX14pXX2oIm9Bow== dependencies: "@babel/core" "^7.8.4" "@babel/preset-env" "^7.8.4" @@ -14867,27 +14867,27 @@ workbox-build@^5.1.3: pretty-bytes "^5.3.0" rollup "^1.31.1" rollup-plugin-babel "^4.3.3" - rollup-plugin-terser "^5.2.0" + rollup-plugin-terser "^5.3.1" source-map "^0.7.3" source-map-url "^0.4.0" stringify-object "^3.3.0" strip-comments "^1.0.2" tempy "^0.3.0" upath "^1.2.0" - workbox-background-sync "^5.1.3" - workbox-broadcast-update "^5.1.3" - workbox-cacheable-response "^5.1.3" - workbox-core "^5.1.3" - workbox-expiration "^5.1.3" - workbox-google-analytics "^5.1.3" - workbox-navigation-preload "^5.1.3" - workbox-precaching "^5.1.3" - workbox-range-requests "^5.1.3" - workbox-routing "^5.1.3" - workbox-strategies "^5.1.3" - workbox-streams "^5.1.3" - workbox-sw "^5.1.3" - workbox-window "^5.1.3" + workbox-background-sync "^5.1.4" + workbox-broadcast-update "^5.1.4" + workbox-cacheable-response "^5.1.4" + workbox-core "^5.1.4" + workbox-expiration "^5.1.4" + workbox-google-analytics "^5.1.4" + workbox-navigation-preload "^5.1.4" + workbox-precaching "^5.1.4" + workbox-range-requests "^5.1.4" + workbox-routing "^5.1.4" + workbox-strategies "^5.1.4" + workbox-streams "^5.1.4" + workbox-sw "^5.1.4" + workbox-window "^5.1.4" workbox-cacheable-response@^5.1.3: version "5.1.3" @@ -14896,34 +14896,46 @@ workbox-cacheable-response@^5.1.3: dependencies: workbox-core "^5.1.3" +workbox-cacheable-response@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-5.1.4.tgz#9ff26e1366214bdd05cf5a43da9305b274078a54" + integrity sha512-0bfvMZs0Of1S5cdswfQK0BXt6ulU5kVD4lwer2CeI+03czHprXR3V4Y8lPTooamn7eHP8Iywi5QjyAMjw0qauA== + dependencies: + workbox-core "^5.1.4" + workbox-core@^5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.3.tgz#0607acd0018c149162777fe4aae08553bd1559f5" integrity sha512-TFSIPxxciX9sFaj0FDiohBeIKpwMcCyNduydi9i3LChItcndDS6TJpErxybv8aBWeCMraXt33TWtF6kKuIObNw== -workbox-expiration@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-5.1.3.tgz#c793eef17513de86c9c1b8254eb2c9ba3ed17568" - integrity sha512-8YhpmIHqIx+xmtxONADc+di4a3zzCsvVHLiKq6T3vJZUPnqV2jzx+51+UHMUh3T5w5Z5SFC14l0V/jesRbuMKg== +workbox-core@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" + integrity sha512-+4iRQan/1D8I81nR2L5vcbaaFskZC2CL17TLbvWVzQ4qiF/ytOGF6XeV54pVxAvKUtkLANhk8TyIUMtiMw2oDg== + +workbox-expiration@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-5.1.4.tgz#92b5df461e8126114943a3b15c55e4ecb920b163" + integrity sha512-oDO/5iC65h2Eq7jctAv858W2+CeRW5e0jZBMNRXpzp0ZPvuT6GblUiHnAsC5W5lANs1QS9atVOm4ifrBiYY7AQ== dependencies: - workbox-core "^5.1.3" + workbox-core "^5.1.4" -workbox-google-analytics@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-5.1.3.tgz#dba0cadcf438d14389f2f2da0fd9c8cb605d35e6" - integrity sha512-ouK6xIJa+raFcO29TgwKFU/Hv1ejqSYzCzH9lI2B/4z/Wdnb8maL6mMIojQ8j5SohwKswMZmLDl0Az2PCmX11w== +workbox-google-analytics@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-5.1.4.tgz#b3376806b1ac7d7df8418304d379707195fa8517" + integrity sha512-0IFhKoEVrreHpKgcOoddV+oIaVXBFKXUzJVBI+nb0bxmcwYuZMdteBTp8AEDJacENtc9xbR0wa9RDCnYsCDLjA== dependencies: - workbox-background-sync "^5.1.3" - workbox-core "^5.1.3" - workbox-routing "^5.1.3" - workbox-strategies "^5.1.3" + workbox-background-sync "^5.1.4" + workbox-core "^5.1.4" + workbox-routing "^5.1.4" + workbox-strategies "^5.1.4" -workbox-navigation-preload@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-5.1.3.tgz#8e49b935aaef16ac614d06db4a0677cbd59f9cae" - integrity sha512-29SPQMAccOgbq3BT9Gz7k+ydy0mcKKR0Rmkmd46tnujutiL4ooE57fBhwsA+c6OlLcYdisvilKlV2YWEtKWfgQ== +workbox-navigation-preload@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-5.1.4.tgz#30d1b720d26a05efc5fa11503e5cc1ed5a78902a" + integrity sha512-Wf03osvK0wTflAfKXba//QmWC5BIaIZARU03JIhAEO2wSB2BDROWI8Q/zmianf54kdV7e1eLaIEZhth4K4MyfQ== dependencies: - workbox-core "^5.1.3" + workbox-core "^5.1.4" workbox-precaching@^5.1.3: version "5.1.3" @@ -14932,12 +14944,19 @@ workbox-precaching@^5.1.3: dependencies: workbox-core "^5.1.3" -workbox-range-requests@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-5.1.3.tgz#f0fc6370ea549d002af1fe902b4ee94bfef6e006" - integrity sha512-uUvEoyEUx86LJc7mtmy/6U8xuK0guXU2FnPimt17zDbsC8FSOaPxc92rxtD6xmDSYrI4FqIebypBCjgIe+sfxA== +workbox-precaching@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-5.1.4.tgz#874f7ebdd750dd3e04249efae9a1b3f48285fe6b" + integrity sha512-gCIFrBXmVQLFwvAzuGLCmkUYGVhBb7D1k/IL7pUJUO5xacjLcFUaLnnsoVepBGAiKw34HU1y/YuqvTKim9qAZA== dependencies: - workbox-core "^5.1.3" + workbox-core "^5.1.4" + +workbox-range-requests@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-5.1.4.tgz#7066a12c121df65bf76fdf2b0868016aa2bab859" + integrity sha512-1HSujLjgTeoxHrMR2muDW2dKdxqCGMc1KbeyGcmjZZAizJTFwu7CWLDmLv6O1ceWYrhfuLFJO+umYMddk2XMhw== + dependencies: + workbox-core "^5.1.4" workbox-routing@^5.1.3: version "5.1.3" @@ -14946,6 +14965,13 @@ workbox-routing@^5.1.3: dependencies: workbox-core "^5.1.3" +workbox-routing@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.4.tgz#3e8cd86bd3b6573488d1a2ce7385e547b547e970" + integrity sha512-8ljknRfqE1vEQtnMtzfksL+UXO822jJlHTIR7+BtJuxQ17+WPZfsHqvk1ynR/v0EHik4x2+826Hkwpgh4GKDCw== + dependencies: + workbox-core "^5.1.4" + workbox-strategies@^5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.3.tgz#220cc9f5519ed76f2452ccb9407a5fd967c37110" @@ -14954,37 +14980,45 @@ workbox-strategies@^5.1.3: workbox-core "^5.1.3" workbox-routing "^5.1.3" -workbox-streams@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-5.1.3.tgz#8f381d395ea2e57106b7b6542b9ffcd769a3047b" - integrity sha512-8kt70eBd1RXL0qenxEnch3Cd7VyW3O0CkeGBN4Bikt307nIV5Q0JciLA5o0CRteijawYOiTq0/px4GDBv1obgQ== +workbox-strategies@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.4.tgz#96b1418ccdfde5354612914964074d466c52d08c" + integrity sha512-VVS57LpaJTdjW3RgZvPwX0NlhNmscR7OQ9bP+N/34cYMDzXLyA6kqWffP6QKXSkca1OFo/v6v7hW7zrrguo6EA== dependencies: - workbox-core "^5.1.3" - workbox-routing "^5.1.3" + workbox-core "^5.1.4" + workbox-routing "^5.1.4" -workbox-sw@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-5.1.3.tgz#7bffbf034f2f5b58e1734b5b86d240019a5332bb" - integrity sha512-Syk6RhYr/8VdFwXrxo5IpVz8Og2xapHTWJhqsZRF+TbxSvlaJs8hrvVPd7edn5ZiiVdPhE9NTeOTOg1+D+FGoA== +workbox-streams@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-5.1.4.tgz#05754e5e3667bdc078df2c9315b3f41210d8cac0" + integrity sha512-xU8yuF1hI/XcVhJUAfbQLa1guQUhdLMPQJkdT0kn6HP5CwiPOGiXnSFq80rAG4b1kJUChQQIGPrq439FQUNVrw== + dependencies: + workbox-core "^5.1.4" + workbox-routing "^5.1.4" + +workbox-sw@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-5.1.4.tgz#2bb34c9f7381f90d84cef644816d45150011d3db" + integrity sha512-9xKnKw95aXwSNc8kk8gki4HU0g0W6KXu+xks7wFuC7h0sembFnTrKtckqZxbSod41TDaGh+gWUA5IRXrL0ECRA== workbox-webpack-plugin@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.3.tgz#a7070e3ea0eedb6f87e11fd916ec5d4430a6e348" - integrity sha512-gxSkZ9GFLrMNC/8DGNRjcMhrt8iu+MMXhH/Fpo3wo9rKaSMsI7esGq0klTH/UloP9pNvBizVydysrB52eRhI7w== + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz#7bfe8c16e40fe9ed8937080ac7ae9c8bde01e79c" + integrity sha512-PZafF4HpugZndqISi3rZ4ZK4A4DxO8rAqt2FwRptgsDx7NF8TVKP86/huHquUsRjMGQllsNdn4FNl8CD/UvKmQ== dependencies: "@babel/runtime" "^7.5.5" fast-json-stable-stringify "^2.0.0" source-map-url "^0.4.0" upath "^1.1.2" webpack-sources "^1.3.0" - workbox-build "^5.1.3" + workbox-build "^5.1.4" -workbox-window@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-5.1.3.tgz#24a2acb2903b0ff2789a4ce32f355621e769eb23" - integrity sha512-oYvfVtPLET7FUrhOzbk0R+aATVmpdQBkmDqwyFH4W2dfVqJXTvTXzuGP5Pn9oZ8jMTB3AYW43yhYBlLYM3mYyg== +workbox-window@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-5.1.4.tgz#2740f7dea7f93b99326179a62f1cc0ca2c93c863" + integrity sha512-vXQtgTeMCUq/4pBWMfQX8Ee7N2wVC4Q7XYFqLnfbXJ2hqew/cU1uMTD2KqGEgEpE4/30luxIxgE+LkIa8glBYw== dependencies: - workbox-core "^5.1.3" + workbox-core "^5.1.4" worker-farm@^1.6.0, worker-farm@^1.7.0: version "1.7.0" From ceacb189b3cfeea7796656e1745c22893ff251b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Oct 2020 18:45:52 +0100 Subject: [PATCH 2/7] Bump sass-loader from 9.0.3 to 10.0.4 (#1452) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/cli/package.json | 2 +- yarn.lock | 41 ++++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index fbe413c5a..4b65a3133 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -60,7 +60,7 @@ "preact-render-to-string": "^5.0.6", "preact-router": "^3.0.1", "puppeteer": "^5.0.0", - "sass-loader": "^9.0.2", + "sass-loader": "^10.0.4", "shelljs": "^0.8.3", "sirv": "^1.0.0-next.2" }, diff --git a/yarn.lock b/yarn.lock index 7bd1e72f1..89827549e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2486,7 +2486,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/json-schema@^7.0.5": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.6" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== @@ -2884,6 +2884,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -8749,10 +8759,10 @@ kleur@^4.0.2: resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.1.tgz#80b49dd7d1afeba41b8dcdf4ecfff9252205fc52" integrity sha512-BsNhM6T/yTWFG580CRnYhT3LfUuPK7Hwrm+W2H0G8lK/nogalP5Nsrh/cHjxVVkzl0sFm7z8b8rNcZCfKxeoxA== -klona@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/klona/-/klona-1.1.2.tgz#a79e292518a5a5412ec8d097964bff1571a64db0" - integrity sha512-xf88rTeHiXk+XE2Vhi6yj8Wm3gMZrygGdKjJqN8HkV+PwF/t50/LdAKHoHpPcxFAlmQszTZ1CugrK25S7qDRLA== +klona@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" + integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== last-call-webpack-plugin@^3.0.0: version "3.0.0" @@ -12613,15 +12623,15 @@ sass-graph@2.2.5: scss-tokenizer "^0.2.3" yargs "^13.3.2" -sass-loader@^9.0.2: - version "9.0.3" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-9.0.3.tgz#086adcf0bfdcc9d920413e2cdc3ba3321373d547" - integrity sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg== +sass-loader@^10.0.4: + version "10.0.4" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.4.tgz#ec7181096947d078d60a1d76d527f47c19b151d8" + integrity sha512-zhdZ8qvZM4iL5XjLVEjJLvKWvC+MB+hHgzL2x/Nf7UHpUNmPYsJvypW79bW39g4LZ603dH/dRSsRYzJJIljtdA== dependencies: - klona "^1.1.2" + klona "^2.0.4" loader-utils "^2.0.0" neo-async "^2.6.2" - schema-utils "^2.7.0" + schema-utils "^3.0.0" semver "^7.3.2" sax@^1.2.1, sax@~1.2.4: @@ -12661,6 +12671,15 @@ schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0, schema-utils@^2.7 ajv "^6.12.4" ajv-keywords "^3.5.2" +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + dependencies: + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" From cb082578284bb7ebf08bfe70fefff9183dcf8013 Mon Sep 17 00:00:00 2001 From: Leah Date: Fri, 30 Oct 2020 20:30:23 +0100 Subject: [PATCH 3/7] chore: run prettier over the project (#1462) --- .github/dependabot.yml | 6 +- .prettierrc.json | 1 + package.json | 12 +- packages/async-loader/async-legacy.js | 2 +- packages/async-loader/async.js | 11 +- packages/async-loader/legacy.js | 2 +- packages/async-loader/utils.js | 2 +- packages/cli/CHANGELOG.md | 5 +- packages/cli/babel/index.js | 2 +- packages/cli/lib/commands/build.js | 2 +- packages/cli/lib/commands/create.js | 2 +- packages/cli/lib/commands/list.js | 2 +- packages/cli/lib/index.js | 4 +- packages/cli/lib/lib/entry.js | 4 +- packages/cli/lib/lib/logo.js | 2 +- packages/cli/lib/lib/output-hooks.js | 2 +- packages/cli/lib/lib/setup.js | 6 +- packages/cli/lib/lib/webpack/dummy-loader.js | 2 +- packages/cli/lib/lib/webpack/prerender.js | 4 +- .../cli/lib/lib/webpack/render-html-plugin.js | 4 +- packages/cli/lib/lib/webpack/run-webpack.js | 16 +-- .../cli/lib/lib/webpack/transform-config.js | 2 +- .../lib/lib/webpack/webpack-base-config.js | 2 +- .../lib/lib/webpack/webpack-client-config.js | 8 +- .../lib/lib/webpack/webpack-server-config.js | 2 +- packages/cli/lib/resources/sw-debug.js | 4 +- packages/cli/lib/util.js | 18 +-- packages/cli/package.json | 4 +- packages/cli/tests/build.test.js | 6 +- packages/cli/tests/lib/chrome.js | 6 +- packages/cli/tests/lib/cli.js | 6 +- packages/cli/tests/server.js | 4 +- .../subjects/custom-webpack/preact.config.js | 2 +- .../index.js | 2 +- .../prerender-urls.js | 8 +- .../prerender-urls.json | 4 +- .../prerender-urls.promise.js | 8 +- .../preact.config.js | 2 +- .../progressive-hydration/preact.config.js | 2 +- yarn.lock | 120 +++++++++++------- 40 files changed, 165 insertions(+), 138 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 60fa0ee1a..858066dde 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,7 +3,7 @@ version: 2 updates: - - package-ecosystem: "npm" - directory: "/" + - package-ecosystem: 'npm' + directory: '/' schedule: - interval: "daily" + interval: 'daily' diff --git a/.prettierrc.json b/.prettierrc.json index 853efd0b7..1a9fec509 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,5 @@ { + "arrowParens": "avoid", "trailingComma": "es5", "tabWidth": 2, "semi": true, diff --git a/package.json b/package.json index bf6166528..a05b2a698 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,16 @@ "@changesets/changelog-github": "^0.2.7", "@changesets/cli": "^2.10.2", "babel-eslint": "^10.0.1", - "eslint": "^7.1.0", - "eslint-config-prettier": "^6.0.0", + "eslint": "^7.12.1", + "eslint-config-prettier": "^6.15.0", "eslint-plugin-babel": "^5.3.0", "eslint-plugin-prettier": "^3.1.0", - "eslint-plugin-react": "^7.14.3", - "husky": "^4.2.3", + "eslint-plugin-react": "^7.21.5", + "husky": "^4.3.0", "lerna": "^3.16.4", - "lint-staged": "^10.0.7", + "lint-staged": "^10.5.0", "ncp": "^2.0.0", - "prettier": "^2.0.2", + "prettier": "^2.1.2", "rimraf": "^3.0.2" }, "husky": { diff --git a/packages/async-loader/async-legacy.js b/packages/async-loader/async-legacy.js index 860908a32..a408d1273 100644 --- a/packages/async-loader/async-legacy.js +++ b/packages/async-loader/async-legacy.js @@ -1,6 +1,6 @@ import { h, Component } from 'preact'; -export default function(req) { +export default function (req) { function Async() { Component.call(this); diff --git a/packages/async-loader/async.js b/packages/async-loader/async.js index f3fd109e0..66b35c5f9 100644 --- a/packages/async-loader/async.js +++ b/packages/async-loader/async.js @@ -14,9 +14,9 @@ function getPreviousSibling(vnode, inner) { // only search previous children let end = children.indexOf(vnode); if (end === -1) end = children.length; - for (let i=end; i--; ) { + for (let i = end; i--; ) { const child = children[i]; - const dom = child && child.__e || getPreviousSibling(child, true); + const dom = (child && child.__e) || getPreviousSibling(child, true); if (dom) return dom; } } @@ -31,7 +31,7 @@ export default function async(load) { if (!component) { this.componentWillMount = () => { - load((mod) => { + load(mod => { component = (mod && mod.default) || mod; this.setState({}); }); @@ -40,13 +40,14 @@ export default function async(load) { this.shouldComponentUpdate = () => component != null; } - this.render = (props) => { + this.render = props => { if (component) { return h(component, props); } const prev = getPreviousSibling(this.__v); - const me = prev && prev.nextSibling || (this.__P || this._parentDom).firstChild; + const me = + (prev && prev.nextSibling) || (this.__P || this._parentDom).firstChild; return ( me && diff --git a/packages/async-loader/legacy.js b/packages/async-loader/legacy.js index 98b3dc3e8..f77d66c84 100644 --- a/packages/async-loader/legacy.js +++ b/packages/async-loader/legacy.js @@ -3,6 +3,6 @@ const { info } = require('./utils'); info('Detected Preact 8, Loading legacy async-component'); -exports.pitch = function(req) { +exports.pitch = function (req) { return pitch(req, PREACT_LEGACY_MODE); }; diff --git a/packages/async-loader/utils.js b/packages/async-loader/utils.js index 6d4d70db5..765d6aad0 100644 --- a/packages/async-loader/utils.js +++ b/packages/async-loader/utils.js @@ -1,6 +1,6 @@ const { blue } = require('kleur'); -exports.info = function(text, code) { +exports.info = function (text, code) { process.stderr.write('\n' + blue('ℹ INFO: ⚛️ ') + text + '\n'); code && process.exit(code); }; diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index aae3df392..686616e9b 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,12 +1,9 @@ # preact-cli ## 3.0.2 -### Patch Changes - +### Patch Changes - [`07c9a9c`](https://github.com/preactjs/preact-cli/commit/07c9a9c87081d38ecb1729f57091f3984d454428) [#1413](https://github.com/preactjs/preact-cli/pull/1413) Thanks [@JoviDeCroock](https://github.com/JoviDeCroock)! - patch cleanFilename to also fix typescript and jsx files - - - [`ff79f0b`](https://github.com/preactjs/preact-cli/commit/ff79f0b2f6f0f8877001d075947274306884cf89) [#1406](https://github.com/preactjs/preact-cli/pull/1406) Thanks [@ForsakenHarmony](https://github.com/ForsakenHarmony)! - Fix the prefresh integration, using `--refresh` should now correctly enable fast-refresh diff --git a/packages/cli/babel/index.js b/packages/cli/babel/index.js index d703bb320..f1c75d6e8 100644 --- a/packages/cli/babel/index.js +++ b/packages/cli/babel/index.js @@ -25,7 +25,7 @@ module.exports = function preactCli(ctx, userOptions = {}) { }; // user specified options always the strongest - Object.keys(presetOptions).forEach(function(key) { + Object.keys(presetOptions).forEach(function (key) { presetOptions[key] = userOptions[key] || presetOptions[key]; }); diff --git a/packages/cli/lib/commands/build.js b/packages/cli/lib/commands/build.js index 5c9400a6d..f70c36f52 100644 --- a/packages/cli/lib/commands/build.js +++ b/packages/cli/lib/commands/build.js @@ -6,7 +6,7 @@ const runWebpack = require('../lib/webpack/run-webpack'); const toBool = val => val === void 0 || (val === 'false' ? false : val); -module.exports = async function(src, argv) { +module.exports = async function (src, argv) { argv.src = src || argv.src; // add `default:true`s, `--no-*` disables argv.prerender = toBool(argv.prerender); diff --git a/packages/cli/lib/commands/create.js b/packages/cli/lib/commands/create.js index 74bfa3b12..aeffc688e 100644 --- a/packages/cli/lib/commands/create.js +++ b/packages/cli/lib/commands/create.js @@ -163,7 +163,7 @@ async function copyFileToDestination(srcPath, destPath, force = false) { } } -module.exports = async function(repo, dest, argv) { +module.exports = async function (repo, dest, argv) { // Prompt if incomplete data if (!repo || !dest) { const templates = await fetchTemplates(); diff --git a/packages/cli/lib/commands/list.js b/packages/cli/lib/commands/list.js index b11d5581a..b2e39c6cd 100644 --- a/packages/cli/lib/commands/list.js +++ b/packages/cli/lib/commands/list.js @@ -4,7 +4,7 @@ const { error, info } = require('../util'); const REPOS_URL = 'https://api.github.com/users/preactjs-templates/repos'; -module.exports = async function() { +module.exports = async function () { try { const repos = await fetch(REPOS_URL).then(r => r.json()); diff --git a/packages/cli/lib/index.js b/packages/cli/lib/index.js index 86bee372e..6b580ae62 100755 --- a/packages/cli/lib/index.js +++ b/packages/cli/lib/index.js @@ -24,7 +24,7 @@ const commands = require('./commands'); // installHooks(); notifier({ pkg }).notify(); -process.on('unhandledRejection', (err) => { +process.on('unhandledRejection', err => { error(err.stack || err.message); }); @@ -125,7 +125,7 @@ prog ], npmGlobalPackages: ['preact-cli'], }) - .then((info) => process.stdout.write(`${info}\n`)); + .then(info => process.stdout.write(`${info}\n`)); }); prog.parse(process.argv); diff --git a/packages/cli/lib/lib/entry.js b/packages/cli/lib/lib/entry.js index 6cfde8078..92e2d616f 100644 --- a/packages/cli/lib/lib/entry.js +++ b/packages/cli/lib/lib/entry.js @@ -3,9 +3,9 @@ import * as Preact from 'preact'; const { h, render, hydrate } = Preact; -const interopDefault = (m) => (m && m.default ? m.default : m); +const interopDefault = m => (m && m.default ? m.default : m); -const normalizeURL = (url) => (url[url.length - 1] === '/' ? url : url + '/'); +const normalizeURL = url => (url[url.length - 1] === '/' ? url : url + '/'); if (process.env.NODE_ENV === 'development') { // enable preact devtools diff --git a/packages/cli/lib/lib/logo.js b/packages/cli/lib/lib/logo.js index acd7f7597..09f125de4 100644 --- a/packages/cli/lib/lib/logo.js +++ b/packages/cli/lib/lib/logo.js @@ -17,7 +17,7 @@ const color = (color, text) => const PURPLE = 35; -module.exports = function(text, useColor = true) { +module.exports = function (text, useColor = true) { let logo = LOGO; if (text) { diff --git a/packages/cli/lib/lib/output-hooks.js b/packages/cli/lib/lib/output-hooks.js index ef1a3f529..781891f04 100644 --- a/packages/cli/lib/lib/output-hooks.js +++ b/packages/cli/lib/lib/output-hooks.js @@ -31,7 +31,7 @@ function invokeHooks(text) { return text; } -module.exports = function() { +module.exports = function () { let out = wrap(process.stdout, invokeHooks), err = wrap(process.stderr, invokeHooks); return () => { diff --git a/packages/cli/lib/lib/setup.js b/packages/cli/lib/lib/setup.js index 295a9d012..ab2f449b6 100644 --- a/packages/cli/lib/lib/setup.js +++ b/packages/cli/lib/lib/setup.js @@ -3,12 +3,12 @@ const { hasCommand, warn } = require('../util'); const stdio = 'ignore'; -exports.install = function(cwd, isYarn) { +exports.install = function (cwd, isYarn) { let cmd = isYarn ? 'yarn' : 'npm'; return spawn(cmd, ['install'], { cwd, stdio: 'inherit' }); }; -exports.addScripts = async function(obj, cwd, isYarn) { +exports.addScripts = async function (obj, cwd, isYarn) { let cmd = isYarn ? 'yarn' : 'npm'; let args = isYarn ? ['add', '--dev'] : ['install', '--save-dev']; @@ -25,7 +25,7 @@ exports.addScripts = async function(obj, cwd, isYarn) { // Initializes the folder using `git init` and a proper `.gitignore` file // if `git` is present in the $PATH. -exports.initGit = async function(target) { +exports.initGit = async function (target) { let git = hasCommand('git'); if (git) { diff --git a/packages/cli/lib/lib/webpack/dummy-loader.js b/packages/cli/lib/lib/webpack/dummy-loader.js index 7f4bd26e6..de5435e94 100644 --- a/packages/cli/lib/lib/webpack/dummy-loader.js +++ b/packages/cli/lib/lib/webpack/dummy-loader.js @@ -1,3 +1,3 @@ -module.exports = function(source, map) { +module.exports = function (source, map) { this.callback(null, source, map); }; diff --git a/packages/cli/lib/lib/webpack/prerender.js b/packages/cli/lib/lib/webpack/prerender.js index 2c2024325..3568df66a 100644 --- a/packages/cli/lib/lib/webpack/prerender.js +++ b/packages/cli/lib/lib/webpack/prerender.js @@ -5,7 +5,7 @@ const stackTrace = require('stack-trace'); const URL = require('url'); const { SourceMapConsumer } = require('source-map'); -module.exports = function(env, params) { +module.exports = function (env, params) { params = params || {}; let entry = resolve(env.dest, './ssr-build/ssr-bundle.js'); @@ -61,7 +61,7 @@ async function handlePrerenderError(err, env, stack, entry) { column: stack.getColumnNumber(), }); }); - + if (position.source) { position.source = position.source .replace('webpack://', '.') diff --git a/packages/cli/lib/lib/webpack/render-html-plugin.js b/packages/cli/lib/lib/webpack/render-html-plugin.js index a9c63641b..9fb4444c4 100644 --- a/packages/cli/lib/lib/webpack/render-html-plugin.js +++ b/packages/cli/lib/lib/webpack/render-html-plugin.js @@ -15,7 +15,7 @@ function read(path) { return readFileSync(resolve(__dirname, path), 'utf-8'); } -module.exports = async function(config) { +module.exports = async function (config) { const { cwd, dest, isProd, src } = config; const inProjectTemplatePath = resolve(src, 'template.html'); let template = defaultTemplate; @@ -93,7 +93,7 @@ module.exports = async function(config) { return config.prerender ? prerender({ cwd, dest, src }, values) : ''; }, scriptLoading: 'defer', - CLI_DATA: { preRenderData: { url, ...routeData } } + CLI_DATA: { preRenderData: { url, ...routeData } }, }); }; diff --git a/packages/cli/lib/lib/webpack/run-webpack.js b/packages/cli/lib/lib/webpack/run-webpack.js index 6e200786f..430c9ed40 100644 --- a/packages/cli/lib/lib/webpack/run-webpack.js +++ b/packages/cli/lib/lib/webpack/run-webpack.js @@ -29,7 +29,7 @@ async function devBuild(env) { // ...tell webpack to watch node_modules recursively until they appear. if ( Array.from(missingDeps).some( - (file) => file.indexOf(nodeModulesPath) !== -1 + file => file.indexOf(nodeModulesPath) !== -1 ) ) { compilation.contextDependencies.push(nodeModulesPath); @@ -38,7 +38,7 @@ async function devBuild(env) { callback(); }); - compiler.hooks.done.tap('CliDevPlugin', (stats) => { + compiler.hooks.done.tap('CliDevPlugin', stats => { let devServer = config.devServer; let protocol = process.env.HTTPS || devServer.https ? 'https' : 'http'; let host = process.env.HOST || devServer.host || 'localhost'; @@ -98,7 +98,7 @@ async function prodBuild(env) { let stats = await runCompiler(clientCompiler); // Timeout for plugins that work on `after-emit` event of webpack - await new Promise((r) => setTimeout(r, 20)); + await new Promise(r => setTimeout(r, 20)); return showStats(stats, true); } catch (err) { @@ -126,13 +126,13 @@ function showStats(stats, isProd) { if (stats.hasErrors()) { allFields(stats, 'errors') .map(stripLoaderPrefix) - .forEach((msg) => error(msg, isProd ? 1 : 0)); + .forEach(msg => error(msg, isProd ? 1 : 0)); } if (stats.hasWarnings()) { allFields(stats, 'warnings') .map(stripLoaderPrefix) - .forEach((msg) => { + .forEach(msg => { if ( msg.match( /Conflict: Multiple assets emit different content to the same filename .*\.(css|map)/ @@ -162,7 +162,7 @@ function writeJsonStats(stats) { function strip(stats) { stats.modules.forEach(stripLoaderFromModuleNames); - stats.chunks.forEach((c) => { + stats.chunks.forEach(c => { ( c.modules || (c.mapModules != null ? c.mapModules(Object) : c.getModules()) @@ -189,7 +189,7 @@ function allFields(stats, field, fields = [], name = null) { warnings: false, errorDetails: false, }); - const addCompilerPrefix = (msg) => + const addCompilerPrefix = msg => name ? bold(magenta(name + ': ')) + msg : msg; if (field === 'errors' && stats.hasErrors()) { fields = fields.concat(info.errors.map(addCompilerPrefix)); @@ -271,7 +271,7 @@ module.exports = function (env, watch = false) { env.src = isDir(src) ? src : env.cwd; // attach sourcing helper - env.source = (dir) => resolve(env.src, dir); + env.source = dir => resolve(env.src, dir); // determine build-type to run return (watch ? devBuild : prodBuild)(env); diff --git a/packages/cli/lib/lib/webpack/transform-config.js b/packages/cli/lib/lib/webpack/transform-config.js index ac5a7ae54..c7b5f6975 100644 --- a/packages/cli/lib/lib/webpack/transform-config.js +++ b/packages/cli/lib/lib/webpack/transform-config.js @@ -90,7 +90,7 @@ function parseConfig(config) { return transformers; } -module.exports = async function(env, webpackConfig, isServer = false) { +module.exports = async function (env, webpackConfig, isServer = false) { const { configFile, isDefault } = env.config !== 'preact.config.js' ? { configFile: env.config, isDefault: false } diff --git a/packages/cli/lib/lib/webpack/webpack-base-config.js b/packages/cli/lib/lib/webpack/webpack-base-config.js index 95eee591f..1b6923ffb 100644 --- a/packages/cli/lib/lib/webpack/webpack-base-config.js +++ b/packages/cli/lib/lib/webpack/webpack-base-config.js @@ -330,7 +330,7 @@ module.exports = function (env) { patterns: [ { regex: /throw\s+(new\s+)?(Type|Reference)?Error\s*\(/g, - value: (s) => `return;${Array(s.length - 7).join(' ')}(`, + value: s => `return;${Array(s.length - 7).join(' ')}(`, }, ], }), diff --git a/packages/cli/lib/lib/webpack/webpack-client-config.js b/packages/cli/lib/lib/webpack/webpack-client-config.js index 5a99326a4..8b43029a5 100644 --- a/packages/cli/lib/lib/webpack/webpack-client-config.js +++ b/packages/cli/lib/lib/webpack/webpack-client-config.js @@ -19,7 +19,7 @@ const CompressionPlugin = require('compression-webpack-plugin'); const RefreshPlugin = require('@prefresh/webpack'); const { normalizePath, warn } = require('../../util'); -const cleanFilename = (name) => +const cleanFilename = name => name.replace( /(^\/(routes|components\/(routes|async))\/|(\/index)?\.[jt]sx?$)/g, '' @@ -119,7 +119,7 @@ function getBabelEsmPlugin(config) { excludedPlugins: ['BabelEsmPlugin', 'InjectManifest'], beforeStartExecution: (plugins, newConfig) => { const babelPlugins = newConfig.plugins; - newConfig.plugins = babelPlugins.filter((plugin) => { + newConfig.plugins = babelPlugins.filter(plugin => { if ( Array.isArray(plugin) && plugin[0].indexOf('fast-async') !== -1 @@ -128,7 +128,7 @@ function getBabelEsmPlugin(config) { } return true; }); - plugins.forEach((plugin) => { + plugins.forEach(plugin => { if ( plugin.constructor.name === 'DefinePlugin' && plugin.definitions @@ -184,7 +184,7 @@ function isProd(config) { 'process.env.ESM': config.esm, 'process.env.PRERENDER': config.prerender, }), - new SizePlugin() + new SizePlugin(), ], optimization: { diff --git a/packages/cli/lib/lib/webpack/webpack-server-config.js b/packages/cli/lib/lib/webpack/webpack-server-config.js index 1a1b6815f..5ad3b735e 100644 --- a/packages/cli/lib/lib/webpack/webpack-server-config.js +++ b/packages/cli/lib/lib/webpack/webpack-server-config.js @@ -26,6 +26,6 @@ function serverConfig(env) { }; } -module.exports = function(env) { +module.exports = function (env) { return merge(baseConfig(env), serverConfig(env)); }; diff --git a/packages/cli/lib/resources/sw-debug.js b/packages/cli/lib/resources/sw-debug.js index 5a18b263b..74628026c 100644 --- a/packages/cli/lib/resources/sw-debug.js +++ b/packages/cli/lib/resources/sw-debug.js @@ -1,7 +1,7 @@ -self.addEventListener('fetch', function(event) { +self.addEventListener('fetch', function (event) { var isPostRequest = event.request.method === 'POST'; event.respondWith( - fetch(event.request).catch(function(err) { + fetch(event.request).catch(function (err) { if (err instanceof TypeError) { if (isPostRequest) { // eslint-disable-next-line diff --git a/packages/cli/lib/util.js b/packages/cli/lib/util.js index a0ca18251..f7c3f5150 100644 --- a/packages/cli/lib/util.js +++ b/packages/cli/lib/util.js @@ -4,11 +4,11 @@ const { statSync, existsSync } = require('fs'); const symbols = require('./symbols'); const which = require('which'); -exports.isDir = function(str) { +exports.isDir = function (str) { return existsSync(str) && statSync(str).isDirectory(); }; -exports.dirExists = function(workingDir, destDir) { +exports.dirExists = function (workingDir, destDir) { if (workingDir && destDir) { const target = resolve(workingDir, destDir); return exports.isDir(target); @@ -16,34 +16,34 @@ exports.dirExists = function(workingDir, destDir) { return false; }; -exports.hasCommand = function(str) { +exports.hasCommand = function (str) { return !!which.sync(str, { nothrow: true }); }; -exports.trim = function(str) { +exports.trim = function (str) { return str.trim().replace(/^\t+/gm, ''); }; -exports.info = function(text, code) { +exports.info = function (text, code) { process.stderr.write(symbols.info + blue(' INFO ') + text + '\n'); code && process.exit(code); }; -exports.warn = function(text, code) { +exports.warn = function (text, code) { process.stdout.write(symbols.warning + yellow(' WARN ') + text + '\n'); code && process.exit(code); }; -exports.error = function(text, code = 1) { +exports.error = function (text, code = 1) { process.stderr.write(symbols.error + red(' ERROR ') + text + '\n'); code && process.exit(code); }; -exports.normalizePath = function(str) { +exports.normalizePath = function (str) { return normalize(str).replace(/\\/g, '/'); }; -exports.normalizeTemplatesResponse = function(repos = []) { +exports.normalizeTemplatesResponse = function (repos = []) { return repos.map(repo => ({ title: repo.name || '', value: repo.full_name || '', diff --git a/packages/cli/package.json b/packages/cli/package.json index 4b65a3133..a3cb85e39 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -45,11 +45,11 @@ "bugs": "https://github.com/preactjs/preact-cli/issues", "homepage": "https://github.com/preactjs/preact-cli", "devDependencies": { - "eslint": "^7.1.0", + "eslint": "^7.12.1", "html-looks-like": "^1.0.2", "jest": "^26.0.1", "lerna": "^3.16.4", - "lint-staged": "^10.0.7", + "lint-staged": "^10.5.0", "mkdirp": "^1.0.3", "ncp": "^2.0.0", "node-sass": "^4.12.0", diff --git a/packages/cli/tests/build.test.js b/packages/cli/tests/build.test.js index 2b76c5b60..37631ef33 100644 --- a/packages/cli/tests/build.test.js +++ b/packages/cli/tests/build.test.js @@ -50,7 +50,7 @@ function testMatch(src, tar) { } describe('preact build', () => { - ours.forEach((key) => { + ours.forEach(key => { it(`builds the '${key}' output`, async () => { let dir = await create(key); @@ -95,7 +95,7 @@ describe('preact build', () => { expect(transpiledChunk.includes('=>setTimeout')).toBe(true); }); - prerenderUrlFiles.forEach((prerenderUrls) => { + prerenderUrlFiles.forEach(prerenderUrls => { it(`should prerender the routes provided with '${prerenderUrls}'`, async () => { let dir = await subject('multiple-prerendering'); await build(dir, { prerenderUrls }); @@ -130,7 +130,7 @@ describe('preact build', () => { }); }); - prerenderUrlFiles.forEach((prerenderUrls) => { + prerenderUrlFiles.forEach(prerenderUrls => { it(`should prerender the routes with data provided with '${prerenderUrls}' via provider`, async () => { let dir = await subject('multiple-prerendering-with-provider'); await build(dir, { prerenderUrls }); diff --git a/packages/cli/tests/lib/chrome.js b/packages/cli/tests/lib/chrome.js index d1077f568..1f9d34f9c 100644 --- a/packages/cli/tests/lib/chrome.js +++ b/packages/cli/tests/lib/chrome.js @@ -1,11 +1,11 @@ const puppeteer = require('puppeteer'); const { log, waitUntil } = require('./utils'); -module.exports = async function() { +module.exports = async function () { return await puppeteer.launch(); }; -module.exports.waitUntilExpression = async function(page, expression) { +module.exports.waitUntilExpression = async function (page, expression) { let evaluate = async () => { let { result } = await log( () => page.evaluate(expression), @@ -18,7 +18,7 @@ module.exports.waitUntilExpression = async function(page, expression) { await waitUntil(evaluate, `Waiting for ${expression} timed out!`); }; -module.exports.loadPage = async function(chrome, url) { +module.exports.loadPage = async function (chrome, url) { let page = await chrome.newPage(); await log(() => page.goto(url), `Navigating to ${url}`); return page; diff --git a/packages/cli/tests/lib/cli.js b/packages/cli/tests/lib/cli.js index 5c0a78ca2..b2d3b39b2 100644 --- a/packages/cli/tests/lib/cli.js +++ b/packages/cli/tests/lib/cli.js @@ -20,7 +20,7 @@ const argv = { 'inline-css': true, }; -exports.create = async function(template, name) { +exports.create = async function (template, name) { let dest = tmpDir(); name = name || `test-${template}`; @@ -35,7 +35,7 @@ exports.create = async function(template, name) { return dest; }; -exports.build = function(cwd, options, installNodeModules = false) { +exports.build = function (cwd, options, installNodeModules = false) { if (!installNodeModules) { mkdirp.sync(join(cwd, 'node_modules')); // ensure exists, avoid exit() linkPackage('preact', root, cwd); @@ -48,7 +48,7 @@ exports.build = function(cwd, options, installNodeModules = false) { return cmd.build(argv.src, Object.assign({}, opts, options)); }; -exports.watch = function(cwd, port, host = '127.0.0.1') { +exports.watch = function (cwd, port, host = '127.0.0.1') { let opts = Object.assign({ cwd, host, port, https: false }, argv); return cmd.watch(argv.src, opts); }; diff --git a/packages/cli/tests/server.js b/packages/cli/tests/server.js index b57476695..b0fbef8a3 100644 --- a/packages/cli/tests/server.js +++ b/packages/cli/tests/server.js @@ -6,7 +6,5 @@ exports.getServer = (dir, port = 3000) => { maxAge: 0, single: true, }; - return polka() - .use(sirv(dir, opts)) - .listen(port); + return polka().use(sirv(dir, opts)).listen(port); }; diff --git a/packages/cli/tests/subjects/custom-webpack/preact.config.js b/packages/cli/tests/subjects/custom-webpack/preact.config.js index 156b1dc76..511c808ad 100644 --- a/packages/cli/tests/subjects/custom-webpack/preact.config.js +++ b/packages/cli/tests/subjects/custom-webpack/preact.config.js @@ -1,6 +1,6 @@ const path = require('path'); -module.exports = function(config, env, helpers) { +module.exports = function (config, env, helpers) { if (env.ssr) return; let { plugin } = helpers.getPluginsByName(config, 'HtmlWebpackPlugin')[0]; plugin.options.template = `!!ejs-loader!${path.resolve( diff --git a/packages/cli/tests/subjects/multiple-prerendering-with-provider/index.js b/packages/cli/tests/subjects/multiple-prerendering-with-provider/index.js index 223afdf4f..1ef9c567d 100644 --- a/packages/cli/tests/subjects/multiple-prerendering-with-provider/index.js +++ b/packages/cli/tests/subjects/multiple-prerendering-with-provider/index.js @@ -22,7 +22,7 @@ export default class App extends Component { - + diff --git a/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.js b/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.js index 848d1ca5e..6b823fdce 100644 --- a/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.js +++ b/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.js @@ -18,10 +18,10 @@ const data = [ myProp: 'It worked with hook!', }, { - url: "/htmlsafe", - title: "HtmlSafe", - myProp: "" - } + url: '/htmlsafe', + title: 'HtmlSafe', + myProp: '', + }, ]; module.exports = () => data; diff --git a/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.json b/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.json index 0b0faffd5..5b44aba8f 100644 --- a/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.json +++ b/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.json @@ -16,8 +16,8 @@ "url": "/customhook", "title": "CustomHook", "myProp": "It worked with hook!" - }, - { + }, + { "url": "/htmlsafe", "title": "HtmlSafe", "myProp": "" diff --git a/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.promise.js b/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.promise.js index 3630f1627..7e6d075c3 100644 --- a/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.promise.js +++ b/packages/cli/tests/subjects/multiple-prerendering-with-provider/prerender-urls.promise.js @@ -18,10 +18,10 @@ const data = [ myProp: 'It worked with hook!', }, { - url: "/htmlsafe", - title: "HtmlSafe", - myProp: "" - } + url: '/htmlsafe', + title: 'HtmlSafe', + myProp: '', + }, ]; module.exports = () => new Promise(resolve => resolve(data)); diff --git a/packages/cli/tests/subjects/progressive-hydration-preact8/preact.config.js b/packages/cli/tests/subjects/progressive-hydration-preact8/preact.config.js index ccd5b3365..b01ed8da7 100644 --- a/packages/cli/tests/subjects/progressive-hydration-preact8/preact.config.js +++ b/packages/cli/tests/subjects/progressive-hydration-preact8/preact.config.js @@ -1,6 +1,6 @@ const path = require('path'); -module.exports = function(config) { +module.exports = function (config) { const loader = path.resolve( __dirname, '../../../../async-loader/async-legacy.js' diff --git a/packages/cli/tests/subjects/progressive-hydration/preact.config.js b/packages/cli/tests/subjects/progressive-hydration/preact.config.js index bd57cef73..2c70587c4 100644 --- a/packages/cli/tests/subjects/progressive-hydration/preact.config.js +++ b/packages/cli/tests/subjects/progressive-hydration/preact.config.js @@ -1,6 +1,6 @@ const path = require('path'); -module.exports = function(config) { +module.exports = function (config) { const loader = path.resolve(__dirname, '../../../../async-loader/async.js'); const alias = config.resolve.alias; alias['preact-cli/async-component'] = alias[ diff --git a/yarn.lock b/yarn.lock index 89827549e..51287c7a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1140,10 +1140,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@eslint/eslintrc@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085" - integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA== +"@eslint/eslintrc@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" + integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -5782,10 +5782,10 @@ escodegen@^1.11.0, escodegen@^1.14.1, escodegen@^1.6.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.0.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1" - integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA== +eslint-config-prettier@^6.15.0: + version "6.15.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" + integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== dependencies: get-stdin "^6.0.0" @@ -5803,21 +5803,21 @@ eslint-plugin-prettier@^3.1.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-react@^7.14.3: - version "7.20.6" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz#4d7845311a93c463493ccfa0a19c9c5d0fd69f60" - integrity sha512-kidMTE5HAEBSLu23CUDvj8dc3LdBU0ri1scwHBZjI41oDv4tjsWZKU7MQccFzH1QYPYhsnTF2ovh7JlcIcmxgg== +eslint-plugin-react@^7.21.5: + version "7.21.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz#50b21a412b9574bfe05b21db176e8b7b3b15bff3" + integrity sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g== dependencies: array-includes "^3.1.1" array.prototype.flatmap "^1.2.3" doctrine "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.4.1" + jsx-ast-utils "^2.4.1 || ^3.0.0" object.entries "^1.1.2" object.fromentries "^2.0.2" object.values "^1.1.1" prop-types "^15.7.2" - resolve "^1.17.0" + resolve "^1.18.1" string.prototype.matchall "^4.0.2" eslint-rule-composer@^0.3.0: @@ -5833,12 +5833,12 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" eslint-utils@^2.1.0: @@ -5853,22 +5853,27 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^7.1.0: - version "7.8.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa" - integrity sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w== +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + +eslint@^7.12.1: + version "7.12.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.1.tgz#bd9a81fa67a6cfd51656cdb88812ce49ccec5801" + integrity sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg== dependencies: "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.1.3" + "@eslint/eslintrc" "^0.2.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" - eslint-scope "^5.1.0" + eslint-scope "^5.1.1" eslint-utils "^2.1.0" - eslint-visitor-keys "^1.3.0" + eslint-visitor-keys "^2.0.0" espree "^7.3.0" esquery "^1.2.0" esutils "^2.0.2" @@ -5922,7 +5927,7 @@ esquery@^1.2.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0: +esrecurse@^4.1.0, esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -7339,15 +7344,15 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@^4.2.3: - version "4.2.5" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36" - integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ== +husky@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de" + integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA== dependencies: chalk "^4.0.0" ci-info "^2.0.0" compare-versions "^3.6.0" - cosmiconfig "^6.0.0" + cosmiconfig "^7.0.0" find-versions "^3.2.0" opencollective-postinstall "^2.0.2" pkg-dir "^4.2.0" @@ -7714,6 +7719,13 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" +is-core-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d" + integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -8705,13 +8717,13 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e" - integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w== +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891" + integrity sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA== dependencies: array-includes "^3.1.1" - object.assign "^4.1.0" + object.assign "^4.1.1" keyv@^3.0.0: version "3.1.0" @@ -8989,10 +9001,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^10.0.7: - version "10.3.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.3.0.tgz#388c3d440590c45c339e7163f669ea69ae90b1e0" - integrity sha512-an3VgjHqmJk0TORB/sdQl0CTkRg4E5ybYCXTTCSJ5h9jFwZbcgKIx5oVma5e7wp/uKt17s1QYFmYqT9MGVosGw== +lint-staged@^10.5.0: + version "10.5.0" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.0.tgz#c923c2447a84c595874f3de696778736227e7a7a" + integrity sha512-gjC9+HGkBubOF+Yyoj9pd52Qfm/kYB+dRX1UOgWjHKvSDYl+VHkZXlBMlqSZa2cH3Kp5/uNL480sV6e2dTgXSg== dependencies: chalk "^4.1.0" cli-truncate "^2.1.0" @@ -10478,6 +10490,16 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" +object.assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd" + integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.0" + has-symbols "^1.0.1" + object-keys "^1.1.1" + object.entries@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add" @@ -11608,10 +11630,10 @@ prettier@^1.18.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -prettier@^2.0.2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6" - integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw== +prettier@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" + integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== pretty-bytes@^4.0.2: version "4.0.2" @@ -12423,6 +12445,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17 dependencies: path-parse "^1.0.6" +resolve@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" + integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== + dependencies: + is-core-module "^2.0.0" + path-parse "^1.0.6" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" From fce7e7a2a1b3f5cbe9856004a89723ef75b016bf Mon Sep 17 00:00:00 2001 From: Leah Date: Fri, 30 Oct 2020 20:34:17 +0100 Subject: [PATCH 4/7] chore: remove preact-compat as it's unused (#1460) --- .changeset/green-pugs-design.md | 5 ++++ packages/cli/package.json | 1 - yarn.lock | 47 +++------------------------------ 3 files changed, 8 insertions(+), 45 deletions(-) create mode 100644 .changeset/green-pugs-design.md diff --git a/.changeset/green-pugs-design.md b/.changeset/green-pugs-design.md new file mode 100644 index 000000000..742707e7e --- /dev/null +++ b/.changeset/green-pugs-design.md @@ -0,0 +1,5 @@ +--- +"preact-cli": patch +--- + +chore: remove preact-compat as it's unused diff --git a/packages/cli/package.json b/packages/cli/package.json index a3cb85e39..f7ed9deab 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -56,7 +56,6 @@ "p-retry": "^4.1.0", "polka": "^0.5.2", "preact": "^10.0.0", - "preact-compat": "^3.18.5", "preact-render-to-string": "^5.0.6", "preact-router": "^3.0.1", "puppeteer": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 51287c7a9..640bca299 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7418,13 +7418,6 @@ ignore@^5.1.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -immutability-helper@^2.7.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.9.1.tgz#71c423ba387e67b6c6ceba0650572f2a2a6727df" - integrity sha512-r/RmRG8xO06s/k+PIaif2r5rGc3j4Yhc01jSBfwPCXDLYZwp/yxralI37Df1mwmuzcCsen/E/ITKcTEvc1PQmQ== - dependencies: - invariant "^2.2.0" - import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -7596,7 +7589,7 @@ interpret@^1.0.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4: +invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -11542,30 +11535,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3 source-map "^0.6.1" supports-color "^6.1.0" -preact-compat@^3.18.5: - version "3.19.0" - resolved "https://registry.yarnpkg.com/preact-compat/-/preact-compat-3.19.0.tgz#a71457b6a3bf051690a4411603bc2085aa061c2f" - integrity sha512-f83A4hIhH8Uzhb9GbIcGk8SM19ffWlwP9mDaYwQdRnMdekZwcCA7eIAbeV4EMQaV9C0Yuy8iKgBAtyTKPZQt/Q== - dependencies: - immutability-helper "^2.7.1" - preact-context "^1.1.3" - preact-render-to-string "^3.8.2" - preact-transition-group "^1.1.1" - prop-types "^15.6.2" - standalone-react-addons-pure-render-mixin "^0.1.1" - -preact-context@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/preact-context/-/preact-context-1.1.4.tgz#866ebd35bef5788f73fc453f06f01b03ddf8f4ff" - integrity sha512-gcCjPJ65R0MiW9hDu8W/3WAmyTElIvwLyEO6oLQiM6/TbLKLxCpBCWV8GJjx52TTEyUr60HLDcmoCXZlslelzQ== - -preact-render-to-string@^3.8.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/preact-render-to-string/-/preact-render-to-string-3.8.2.tgz#bd72964d705a57da3a9e72098acaa073dd3ceff9" - integrity sha512-przuZPajiurStGgxMoJP0EJeC4xj5CgHv+M7GfF3YxAdhGgEWAkhOSE0xympAFN20uMayntBZpttIZqqLl77fw== - dependencies: - pretty-format "^3.5.1" - preact-render-to-string@^5.0.6: version "5.1.10" resolved "https://registry.yarnpkg.com/preact-render-to-string/-/preact-render-to-string-5.1.10.tgz#cce03d73b166c550148af9dedc9e06fdf6820f8a" @@ -11578,11 +11547,6 @@ preact-router@^3.0.1: resolved "https://registry.yarnpkg.com/preact-router/-/preact-router-3.2.1.tgz#c7d12d8fc7a60bfbe5cadf23a234551bec783468" integrity sha512-KEN2VN1DxUlTwzW5IFkF13YIA2OdQ2OvgJTkQREF+AA2NrHRLaGbB68EjS4IeZOa1shvQ1FvEm3bSLta4sXBhg== -preact-transition-group@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/preact-transition-group/-/preact-transition-group-1.1.1.tgz#f0a49327ea515ece34ea2be864c4a7d29e5d6e10" - integrity sha1-8KSTJ+pRXs406ivoZMSn0p5dbhA= - preact@^10.0.0: version "10.4.8" resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.8.tgz#8517b106cc5591eb675237c93da99ac052cf4756" @@ -11663,7 +11627,7 @@ pretty-format@^26.4.2: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^3.5.1, pretty-format@^3.8.0: +pretty-format@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385" integrity sha1-v77VbV6ad2ZF9LH/eqGjrE+jw4U= @@ -11724,7 +11688,7 @@ promzard@^0.3.0: dependencies: read "1" -prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -13314,11 +13278,6 @@ stack-utils@^2.0.2: dependencies: escape-string-regexp "^2.0.0" -standalone-react-addons-pure-render-mixin@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/standalone-react-addons-pure-render-mixin/-/standalone-react-addons-pure-render-mixin-0.1.1.tgz#3c7409f4c79c40de9ac72c616cf679a994f37551" - integrity sha1-PHQJ9MecQN6axyxhbPZ5qZTzdVE= - static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" From c72600a3a3971a23d95bcc3189d3b98f3598cce1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Oct 2020 20:57:16 +0100 Subject: [PATCH 5/7] Bump ejs-loader from 0.3.7 to 0.5.0 (#1403) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leah --- packages/cli/lib/lib/webpack/render-html-plugin.js | 2 +- packages/cli/lib/lib/webpack/transform-config.js | 2 +- packages/cli/package.json | 2 +- .../tests/subjects/custom-webpack/preact.config.js | 6 +----- yarn.lock | 12 ++++++------ 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/cli/lib/lib/webpack/render-html-plugin.js b/packages/cli/lib/lib/webpack/render-html-plugin.js index 9fb4444c4..1c2d8b495 100644 --- a/packages/cli/lib/lib/webpack/render-html-plugin.js +++ b/packages/cli/lib/lib/webpack/render-html-plugin.js @@ -57,7 +57,7 @@ module.exports = async function (config) { const { url, title, ...routeData } = values; return Object.assign(values, { filename: resolve(dest, url.substring(1), 'index.html'), - template: `!!ejs-loader!${template}`, + template: `!!ejs-loader?esModule=false!${template}`, minify: isProd && { collapseWhitespace: true, removeScriptTypeAttributes: true, diff --git a/packages/cli/lib/lib/webpack/transform-config.js b/packages/cli/lib/lib/webpack/transform-config.js index c7b5f6975..aca62baac 100644 --- a/packages/cli/lib/lib/webpack/transform-config.js +++ b/packages/cli/lib/lib/webpack/transform-config.js @@ -288,7 +288,7 @@ class WebpackConfigHelpers { } catch (e) {} let templatePath = isPath - ? `!!ejs-loader!${resolve(this._cwd, template)}` + ? `!!ejs-loader?esModule=false!${resolve(this._cwd, template)}` : template; let { plugin: htmlWebpackPlugin } = this.getPluginsByName( config, diff --git a/packages/cli/package.json b/packages/cli/package.json index f7ed9deab..d538b56d4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -91,7 +91,7 @@ "critters-webpack-plugin": "^2.5.0", "cross-spawn-promise": "^0.10.1", "css-loader": "^3.1.0", - "ejs-loader": "^0.3.3", + "ejs-loader": "^0.5.0", "envinfo": "^7.3.1", "esm": "^3.2.25", "fast-async": "^6.3.7", diff --git a/packages/cli/tests/subjects/custom-webpack/preact.config.js b/packages/cli/tests/subjects/custom-webpack/preact.config.js index 511c808ad..ac894d4fa 100644 --- a/packages/cli/tests/subjects/custom-webpack/preact.config.js +++ b/packages/cli/tests/subjects/custom-webpack/preact.config.js @@ -2,9 +2,5 @@ const path = require('path'); module.exports = function (config, env, helpers) { if (env.ssr) return; - let { plugin } = helpers.getPluginsByName(config, 'HtmlWebpackPlugin')[0]; - plugin.options.template = `!!ejs-loader!${path.resolve( - __dirname, - './template.html' - )}`; + helpers.setHtmlTemplate(config, path.resolve(__dirname, './template.html')); }; diff --git a/yarn.lock b/yarn.lock index 640bca299..f9dedff5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5559,12 +5559,12 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs-loader@^0.3.3: - version "0.3.7" - resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.7.tgz#82d3cd0a3d3f64d519332b95f9b8a7897c9fcaf4" - integrity sha512-K1HBDWXQZkcIAnP5h65kWsD7o7NABvHswOH49rVHX7POGaTM2kYQfkFZVn4ZQeiRnzqbtf07LxSitOVRdR98GA== +ejs-loader@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.5.0.tgz#ebed0afaedd0a58c07fcc810cf001df3c24d6399" + integrity sha512-iirFqlP3tiFoedNZ7dQcjvechunl054VbW6Ki38T/pabgXMAncduSE0ZXLeVGn1NbmcUJF9Z5TC0EvQ4RIpP9Q== dependencies: - loader-utils "^0.2.7" + loader-utils "^2.0.0" lodash "^4.17.15" ejs@^2.6.1: @@ -9086,7 +9086,7 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-utils@^0.2.16, loader-utils@^0.2.7: +loader-utils@^0.2.16: version "0.2.17" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= From 6670ba0b9ee03f03f98cfec490aee996b58a17eb Mon Sep 17 00:00:00 2001 From: Leah Date: Fri, 30 Oct 2020 21:10:32 +0100 Subject: [PATCH 6/7] fix: await copying of files in create command (#1461) --- .changeset/curvy-eggs-eat.md | 5 +++++ packages/cli/lib/commands/create.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/curvy-eggs-eat.md diff --git a/.changeset/curvy-eggs-eat.md b/.changeset/curvy-eggs-eat.md new file mode 100644 index 000000000..60ace2f12 --- /dev/null +++ b/.changeset/curvy-eggs-eat.md @@ -0,0 +1,5 @@ +--- +"preact-cli": patch +--- + +fix: await copying of files in create command diff --git a/packages/cli/lib/commands/create.js b/packages/cli/lib/commands/create.js index aeffc688e..4cfd392e1 100644 --- a/packages/cli/lib/commands/create.js +++ b/packages/cli/lib/commands/create.js @@ -345,12 +345,12 @@ module.exports = async function (repo, dest, argv) { join('..', 'resources', 'template.html') ); const templateDest = join(sourceDirectory, 'template.html'); - copyFileToDestination(templateSrc, templateDest); + await copyFileToDestination(templateSrc, templateDest); // Copy over sw.js const serviceWorkerSrc = resolve(__dirname, join('..', '..', 'sw', 'sw.js')); const serviceWorkerDest = join(sourceDirectory, 'sw.js'); - copyFileToDestination(serviceWorkerSrc, serviceWorkerDest); + await copyFileToDestination(serviceWorkerSrc, serviceWorkerDest); if (argv.install) { spinner.text = 'Installing dependencies:\n'; From 2c53b0a94952c19f8e625dfa52ecbc0ae8c0c3cb Mon Sep 17 00:00:00 2001 From: Ivan Tanev Date: Fri, 30 Oct 2020 23:45:22 +0200 Subject: [PATCH 7/7] Allow an async component to return null rendering (#1438) Co-authored-by: Jason Miller --- .changeset/famous-dolls-leave.md | 5 +++++ packages/async-loader/async.js | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .changeset/famous-dolls-leave.md diff --git a/.changeset/famous-dolls-leave.md b/.changeset/famous-dolls-leave.md new file mode 100644 index 000000000..3604b989c --- /dev/null +++ b/.changeset/famous-dolls-leave.md @@ -0,0 +1,5 @@ +--- +"preact-cli": patch +--- + +fix: allow an async component to return null rendering diff --git a/packages/async-loader/async.js b/packages/async-loader/async.js index 66b35c5f9..4319eb6e5 100644 --- a/packages/async-loader/async.js +++ b/packages/async-loader/async.js @@ -49,12 +49,11 @@ export default function async(load) { const me = (prev && prev.nextSibling) || (this.__P || this._parentDom).firstChild; - return ( - me && - h(me.localName, { - dangerouslySetInnerHTML: PENDING, - }) - ); + if (!me) return; + if (me.nodeType === 3) return me.data; + return h(me.localName, { + dangerouslySetInnerHTML: PENDING, + }); }; }