From 1248b62b9d09b10ce5ea7703d907d69d2167fdca Mon Sep 17 00:00:00 2001 From: Shinigami Date: Thu, 28 Oct 2021 21:53:49 +0200 Subject: [PATCH 001/258] chore(ci): use new node lts (#5469) --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/issue-close-require.yml | 2 +- .github/workflows/issue-labeled.yml | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef4a33afb17f05..4a73ecb9974c7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,9 +23,9 @@ jobs: node_version: [12, 14, 16] include: - os: macos-latest - node_version: 14 + node_version: 16 - os: windows-latest - node_version: 14 + node_version: 16 fail-fast: false name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}" @@ -34,9 +34,9 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2 with: - version: 6.15.1 + version: 6 - name: Set node version to ${{ matrix.node_version }} uses: actions/setup-node@v2 @@ -64,21 +64,21 @@ jobs: lint: runs-on: ubuntu-latest - name: "Lint: node-14, ubuntu-latest" + name: "Lint: node-16, ubuntu-latest" steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - name: Install pnpm - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2 with: - version: 6.15.1 + version: 6 - - name: Set node version to 14 + - name: Set node version to 16 uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 cache: "pnpm" - name: Install deps diff --git a/.github/workflows/issue-close-require.yml b/.github/workflows/issue-close-require.yml index 78822030cbf585..02ac374b06c426 100644 --- a/.github/workflows/issue-close-require.yml +++ b/.github/workflows/issue-close-require.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: need reproduction - uses: actions-cool/issues-helper@v2.4.3 + uses: actions-cool/issues-helper@v2 with: actions: "close-issues" token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml index c92baa4b7c9728..a63021952fd73d 100644 --- a/.github/workflows/issue-labeled.yml +++ b/.github/workflows/issue-labeled.yml @@ -10,7 +10,7 @@ jobs: steps: - name: contribution welcome if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted' - uses: actions-cool/issues-helper@v2.4.3 + uses: actions-cool/issues-helper@v2 with: actions: "create-comment, remove-labels" token: ${{ secrets.GITHUB_TOKEN }} @@ -21,7 +21,7 @@ jobs: - name: remove pending if: github.event.label.name == 'enhancement' || github.event.label.name == 'bug' || (contains(github.event.label.name, 'pending triage') == false && startsWith(github.event.label.name, 'bug:') == true) - uses: actions-cool/issues-helper@v2.4.3 + uses: actions-cool/issues-helper@v2 with: actions: "remove-labels" token: ${{ secrets.GITHUB_TOKEN }} @@ -30,7 +30,7 @@ jobs: - name: need reproduction if: github.event.label.name == 'need reproduction' - uses: actions-cool/issues-helper@v2.4.3 + uses: actions-cool/issues-helper@v2 with: actions: "create-comment, remove-labels" token: ${{ secrets.GITHUB_TOKEN }} From 012ab61e14e32c46b463ddb0ccfee2113bbae213 Mon Sep 17 00:00:00 2001 From: Simon Legner Date: Fri, 29 Oct 2021 08:55:19 +0200 Subject: [PATCH 002/258] docs(env): mention vite/client.d.ts (#5457) --- docs/guide/env-and-mode.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/guide/env-and-mode.md b/docs/guide/env-and-mode.md index dcf8a87483bfb3..dcd108a8c71f05 100644 --- a/docs/guide/env-and-mode.md +++ b/docs/guide/env-and-mode.md @@ -53,13 +53,15 @@ If you want to customize env variables prefix, see [envPrefix](/config/index#env - Since any variables exposed to your Vite source code will end up in your client bundle, `VITE_*` variables should _not_ contain any sensitive information. ::: -### IntelliSense +### IntelliSense for TypeScript -By default, Vite provides type definition for `import.meta.env`. While you can define more custom env variables in `.env.[mode]` files, you may want to get TypeScript IntelliSense for user-defined env variables which prefixed with `VITE_`. +By default, Vite provides type definition for `import.meta.env` in [`vite/client.d.ts`](https://github.com/vitejs/vite/blob/main/packages/vite/client.d.ts). While you can define more custom env variables in `.env.[mode]` files, you may want to get TypeScript IntelliSense for user-defined env variables which prefixed with `VITE_`. To achieve, you can create an `env.d.ts` in `src` directory, then augment `ImportMetaEnv` like this: ```typescript +/// + interface ImportMetaEnv extends Readonly> { readonly VITE_APP_TITLE: string // more env variables... From 1846df81b3f40c480a91632a2d02d9d2156d7ada Mon Sep 17 00:00:00 2001 From: Ant Date: Fri, 29 Oct 2021 21:53:56 +0800 Subject: [PATCH 003/258] docs(server): host type boolean (#5474) --- docs/config/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/config/index.md b/docs/config/index.md index 222ad9ea4fbdc3..25744ef6daa2ea 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -367,11 +367,11 @@ export default defineConfig(async ({ command, mode }) => { ### server.host -- **Type:** `string` +- **Type:** `string | boolean` - **Default:** `'127.0.0.1'` Specify which IP addresses the server should listen on. - Set this to `0.0.0.0` to listen on all addresses, including LAN and public addresses. + Set this to `0.0.0.0` or `true` to listen on all addresses, including LAN and public addresses. This can be set via the CLI using `--host 0.0.0.0` or `--host`. From 70fd32c1569c3d93a231577b573dbd2b34da4de2 Mon Sep 17 00:00:00 2001 From: Drew Powers <1369770+drwpow@users.noreply.github.com> Date: Fri, 29 Oct 2021 09:34:51 -0600 Subject: [PATCH 004/258] fix: Vite module graph race condition (#5470) Co-authored-by: Matthew Phillips --- packages/vite/src/node/ssr/ssrModuleLoader.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 16c5d0df01d992..fdfc47d2e30004 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -110,12 +110,14 @@ async function instantiateModule( if (pendingDeps.length === 1) { pendingImports.set(url, pendingDeps) } - await ssrLoadModule(dep, server, context, urlStack) + const mod = await ssrLoadModule(dep, server, context, urlStack) if (pendingDeps.length === 1) { pendingImports.delete(url) } else { pendingDeps.splice(pendingDeps.indexOf(dep), 1) } + // return local module to avoid race condition #5470 + return mod } return moduleGraph.urlToModuleMap.get(dep)?.ssrModule } From c2de09b3067bd8bdf152d4ba418941e6526dd6e4 Mon Sep 17 00:00:00 2001 From: Shinigami Date: Fri, 29 Oct 2021 22:18:25 +0200 Subject: [PATCH 005/258] chore(deps): update jest (#5480) --- package.json | 4 +- packages/vite/LICENSE.md | 2703 +++++++++++++++++++++++++++++++++++- packages/vite/package.json | 6 +- pnpm-lock.yaml | 2085 ++++++++++++--------------- 4 files changed, 3560 insertions(+), 1238 deletions(-) diff --git a/package.json b/package.json index fac0fc0688d70f..f91ff6563338ed 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "eslint-plugin-node": "^11.1.0", "execa": "^5.1.1", "fs-extra": "^10.0.0", - "jest": "^27.2.4", + "jest": "^27.3.1", "lint-staged": "^11.2.0", "minimist": "^1.2.5", "node-fetch": "^2.6.5", @@ -54,7 +54,7 @@ "rimraf": "^3.0.2", "semver": "^7.3.5", "sirv": "^1.0.17", - "ts-jest": "^27.0.5", + "ts-jest": "^27.0.7", "ts-node": "^10.1.0", "typescript": "~4.4.3", "vitepress": "^0.19.2", diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md index 73e3dcd0a162f1..52e5bbf904f1ac 100644 --- a/packages/vite/LICENSE.md +++ b/packages/vite/LICENSE.md @@ -241,18 +241,84 @@ Repository: git+https://github.com/ampproject/remapping.git License: MIT Repository: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir +> The MIT License (MIT) +> +> Copyright (c) Denis Malinochkin +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## @nodelib/fs.stat License: MIT Repository: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat +> The MIT License (MIT) +> +> Copyright (c) Denis Malinochkin +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## @nodelib/fs.walk License: MIT Repository: https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk +> The MIT License (MIT) +> +> Copyright (c) Denis Malinochkin +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## @polka/url @@ -260,6 +326,28 @@ License: MIT By: Luke Edwards Repository: lukeed/polka +> The MIT License (MIT) +> +> Copyright (c) Luke Edwards (https://lukeed.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## @rollup/plugin-alias @@ -317,6 +405,28 @@ License: MIT By: Evan You Repository: git+https://github.com/vuejs/vue-next.git +> The MIT License (MIT) +> +> Copyright (c) 2018-present, Yuxi (Evan) You +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## @vue/compiler-dom @@ -353,6 +463,28 @@ License: MIT By: Evan You Repository: git+https://github.com/vuejs/vue-next.git +> The MIT License (MIT) +> +> Copyright (c) 2018-present, Yuxi (Evan) You +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## accepts @@ -360,6 +492,30 @@ License: MIT By: Douglas Christopher Wilson, Jonathan Ong Repository: jshttp/accepts +> (The MIT License) +> +> Copyright (c) 2014 Jonathan Ong +> Copyright (c) 2015 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## acorn @@ -423,6 +579,26 @@ License: MIT By: Adrian Heine Repository: https://github.com/acornjs/acorn-private-class-elements +> Copyright (C) 2017-2018 by Adrian Heine +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## acorn-static-class-features @@ -457,6 +633,16 @@ License: MIT By: Sindre Sorhus Repository: chalk/ansi-regex +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## ansi-styles @@ -464,6 +650,16 @@ License: MIT By: Sindre Sorhus Repository: chalk/ansi-styles +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## anymatch @@ -471,6 +667,22 @@ License: ISC By: Elan Shanker Repository: https://github.com/micromatch/anymatch +> The ISC License +> +> Copyright (c) 2019 Elan Shanker, Paul Miller (https://paulmillr.com) +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## array-union @@ -478,6 +690,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/array-union +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## balanced-match @@ -485,6 +707,28 @@ License: MIT By: Julian Gruber Repository: git://github.com/juliangruber/balanced-match.git +> (MIT) +> +> Copyright (c) 2013 Julian Gruber <julian@juliangruber.com> +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## big.js @@ -492,27 +736,104 @@ License: MIT By: Michael Mclaughlin Repository: https://github.com/MikeMcl/big.js.git ---------------------------------------- - -## binary-extensions -License: MIT -By: Sindre Sorhus -Repository: sindresorhus/binary-extensions - ---------------------------------------- - -## brace-expansion -License: MIT -By: Julian Gruber -Repository: git://github.com/juliangruber/brace-expansion.git - ---------------------------------------- - -## braces -License: MIT -By: Jon Schlinkert, Brian Woodward, Elan Shanker, Eugene Sharygin, hemanth.hm +> The MIT Licence (Expat). +> +> Copyright (c) 2018 Michael Mclaughlin +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + +## binary-extensions +License: MIT +By: Sindre Sorhus +Repository: sindresorhus/binary-extensions + +> MIT License +> +> Copyright (c) 2019 Sindre Sorhus (https://sindresorhus.com), Paul Miller (https://paulmillr.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + +## brace-expansion +License: MIT +By: Julian Gruber +Repository: git://github.com/juliangruber/brace-expansion.git + +> MIT License +> +> Copyright (c) 2013 Julian Gruber +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + +## braces +License: MIT +By: Jon Schlinkert, Brian Woodward, Elan Shanker, Eugene Sharygin, hemanth.hm Repository: micromatch/braces +> The MIT License (MIT) +> +> Copyright (c) 2014-2018, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## builtin-modules @@ -537,6 +858,30 @@ License: MIT By: TJ Holowaychuk, Jed Watson, Théo FIDRY Repository: visionmedia/bytes.js +> (The MIT License) +> +> Copyright (c) 2012-2014 TJ Holowaychuk +> Copyright (c) 2015 Jed Watson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## cac @@ -618,6 +963,27 @@ License: MIT By: Heather Arthur Repository: Qix-/color-convert +> Copyright (c) 2011-2016 Heather Arthur +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## color-name @@ -625,6 +991,15 @@ License: MIT By: DY Repository: git@github.com:colorjs/color-name.git +> The MIT License (MIT) +> Copyright (c) 2015 Dmitry Ivanov +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## commondir @@ -632,6 +1007,31 @@ License: MIT By: James Halliday Repository: http://github.com/substack/node-commondir.git +> The MIT License +> +> Copyright (c) 2013 James Halliday (mail@substack.net) +> +> Permission 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: +> +> The above copyright notice and this permission notice +> shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## compressible @@ -639,6 +1039,31 @@ License: MIT By: Douglas Christopher Wilson, Jonathan Ong, Jeremiah Senkpiel Repository: jshttp/compressible +> (The MIT License) +> +> Copyright (c) 2013 Jonathan Ong +> Copyright (c) 2014 Jeremiah Senkpiel +> Copyright (c) 2015 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## compression @@ -677,6 +1102,25 @@ License: MIT By: James Halliday Repository: git://github.com/substack/node-concat-map.git +> This software is released under the MIT license: +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## connect @@ -807,6 +1251,28 @@ License: MIT By: André Cruz Repository: git@github.com:moxystudio/node-cross-spawn.git +> The MIT License (MIT) +> +> Copyright (c) 2018 Made With MOXY Lda +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## cssesc @@ -814,6 +1280,27 @@ License: MIT By: Mathias Bynens Repository: https://github.com/mathiasbynens/cssesc.git +> Copyright Mathias Bynens +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## debug @@ -847,6 +1334,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/define-lazy-prop +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## dir-glob @@ -854,6 +1351,16 @@ License: MIT By: Kevin Mårtensson Repository: kevva/dir-glob +> MIT License +> +> Copyright (c) Kevin Mårtensson (github.com/kevva) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## dotenv @@ -921,24 +1428,79 @@ License: MIT By: Jonathan Ong, Douglas Christopher Wilson Repository: jonathanong/ee-first ---------------------------------------- - -## emojis-list -License: MIT -By: Kiko Beats -Repository: git+https://github.com/kikobeats/emojis-list.git - ---------------------------------------- - -## encodeurl -License: MIT -By: Douglas Christopher Wilson -Repository: pillarjs/encodeurl - ---------------------------------------- - -## es-module-lexer -License: MIT +> The MIT License (MIT) +> +> Copyright (c) 2014 Jonathan Ong me@jongleberry.com +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + +## emojis-list +License: MIT +By: Kiko Beats +Repository: git+https://github.com/kikobeats/emojis-list.git + +> The MIT License (MIT) +> +> Copyright © 2015 Kiko Beats +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + +## encodeurl +License: MIT +By: Douglas Christopher Wilson +Repository: pillarjs/encodeurl + +> (The MIT License) +> +> Copyright (c) 2016 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + +## es-module-lexer +License: MIT By: Guy Bedford Repository: git+https://github.com/guybedford/es-module-lexer.git @@ -959,6 +1521,31 @@ Repository: git+https://github.com/guybedford/es-module-lexer.git License: MIT Repository: component/escape-html +> (The MIT License) +> +> Copyright (c) 2012-2013 TJ Holowaychuk +> Copyright (c) 2015 Andreas Lubbe +> Copyright (c) 2015 Tiancheng "Timothy" Gu +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## escape-string-regexp @@ -966,6 +1553,28 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/escape-string-regexp +> The MIT License (MIT) +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## estree-walker @@ -1018,6 +1627,28 @@ License: MIT By: Arnout Kazemier Repository: git://github.com/primus/eventemitter3.git +> The MIT License (MIT) +> +> Copyright (c) 2014 Arnout Kazemier +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## execa @@ -1071,6 +1702,20 @@ License: ISC By: Matteo Collina Repository: git+https://github.com/mcollina/fastq.git +> Copyright (c) 2015-2020, Matteo Collina +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +> OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## fill-range @@ -1078,6 +1723,28 @@ License: MIT By: Jon Schlinkert, Edo Rivai, Paul Miller, Rouven Weßling Repository: jonschlinkert/fill-range +> The MIT License (MIT) +> +> Copyright (c) 2014-present, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## finalhandler @@ -1085,6 +1752,29 @@ License: MIT By: Douglas Christopher Wilson Repository: pillarjs/finalhandler +> (The MIT License) +> +> Copyright (c) 2014-2017 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## follow-redirects @@ -1092,6 +1782,25 @@ License: MIT By: Ruben Verborgh, Olivier Lalonde, James Talmage Repository: git@github.com:follow-redirects/follow-redirects.git +> Copyright 2014–present Olivier Lalonde , James Talmage , Ruben Verborgh +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## fs.realpath @@ -1099,6 +1808,50 @@ License: ISC By: Isaac Z. Schlueter Repository: git+https://github.com/isaacs/fs.realpath.git +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter and Contributors +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +> +> ---- +> +> This library bundles a version of the `fs.realpath` and `fs.realpathSync` +> methods from Node.js v0.10 under the terms of the Node.js MIT license. +> +> Node's license follows, also included at the header of `old.js` which contains +> the licensed code: +> +> Copyright Joyent, Inc. and other Node contributors. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## generic-names @@ -1106,6 +1859,28 @@ License: MIT By: Alexey Litvinov Repository: git+https://github.com/css-modules/generic-names.git +> The MIT License (MIT) +> +> Copyright (c) 2015 Alexey Litvinov +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## get-stream @@ -1113,6 +1888,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/get-stream +> MIT License +> +> Copyright (c) Sindre Sorhus (https://sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## glob @@ -1120,13 +1905,51 @@ License: ISC By: Isaac Z. Schlueter Repository: git://github.com/isaacs/node-glob.git ---------------------------------------- - -## glob-parent +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter and Contributors +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +> +> ## Glob Logo +> +> Glob's logo created by Tanya Brassie , licensed +> under a Creative Commons Attribution-ShareAlike 4.0 International License +> https://creativecommons.org/licenses/by-sa/4.0/ + +--------------------------------------- + +## glob-parent License: ISC By: Gulp Team, Elan Shanker, Blaine Bublitz Repository: gulpjs/glob-parent +> The ISC License +> +> Copyright (c) 2015, 2019 Elan Shanker +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## globby @@ -1134,6 +1957,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/globby +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## has-flag @@ -1141,6 +1974,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/has-flag +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## http-proxy @@ -1178,6 +2021,208 @@ License: Apache-2.0 By: ehmicky Repository: ehmicky/human-signals +> Apache License +> Version 2.0, January 2004 +> http://www.apache.org/licenses/ +> +> TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +> +> 1. Definitions. +> +> "License" shall mean the terms and conditions for use, reproduction, +> and distribution as defined by Sections 1 through 9 of this document. +> +> "Licensor" shall mean the copyright owner or entity authorized by +> the copyright owner that is granting the License. +> +> "Legal Entity" shall mean the union of the acting entity and all +> other entities that control, are controlled by, or are under common +> control with that entity. For the purposes of this definition, +> "control" means (i) the power, direct or indirect, to cause the +> direction or management of such entity, whether by contract or +> otherwise, or (ii) ownership of fifty percent (50%) or more of the +> outstanding shares, or (iii) beneficial ownership of such entity. +> +> "You" (or "Your") shall mean an individual or Legal Entity +> exercising permissions granted by this License. +> +> "Source" form shall mean the preferred form for making modifications, +> including but not limited to software source code, documentation +> source, and configuration files. +> +> "Object" form shall mean any form resulting from mechanical +> transformation or translation of a Source form, including but +> not limited to compiled object code, generated documentation, +> and conversions to other media types. +> +> "Work" shall mean the work of authorship, whether in Source or +> Object form, made available under the License, as indicated by a +> copyright notice that is included in or attached to the work +> (an example is provided in the Appendix below). +> +> "Derivative Works" shall mean any work, whether in Source or Object +> form, that is based on (or derived from) the Work and for which the +> editorial revisions, annotations, elaborations, or other modifications +> represent, as a whole, an original work of authorship. For the purposes +> of this License, Derivative Works shall not include works that remain +> separable from, or merely link (or bind by name) to the interfaces of, +> the Work and Derivative Works thereof. +> +> "Contribution" shall mean any work of authorship, including +> the original version of the Work and any modifications or additions +> to that Work or Derivative Works thereof, that is intentionally +> submitted to Licensor for inclusion in the Work by the copyright owner +> or by an individual or Legal Entity authorized to submit on behalf of +> the copyright owner. For the purposes of this definition, "submitted" +> means any form of electronic, verbal, or written communication sent +> to the Licensor or its representatives, including but not limited to +> communication on electronic mailing lists, source code control systems, +> and issue tracking systems that are managed by, or on behalf of, the +> Licensor for the purpose of discussing and improving the Work, but +> excluding communication that is conspicuously marked or otherwise +> designated in writing by the copyright owner as "Not a Contribution." +> +> "Contributor" shall mean Licensor and any individual or Legal Entity +> on behalf of whom a Contribution has been received by Licensor and +> subsequently incorporated within the Work. +> +> 2. Grant of Copyright License. Subject to the terms and conditions of +> this License, each Contributor hereby grants to You a perpetual, +> worldwide, non-exclusive, no-charge, royalty-free, irrevocable +> copyright license to reproduce, prepare Derivative Works of, +> publicly display, publicly perform, sublicense, and distribute the +> Work and such Derivative Works in Source or Object form. +> +> 3. Grant of Patent License. Subject to the terms and conditions of +> this License, each Contributor hereby grants to You a perpetual, +> worldwide, non-exclusive, no-charge, royalty-free, irrevocable +> (except as stated in this section) patent license to make, have made, +> use, offer to sell, sell, import, and otherwise transfer the Work, +> where such license applies only to those patent claims licensable +> by such Contributor that are necessarily infringed by their +> Contribution(s) alone or by combination of their Contribution(s) +> with the Work to which such Contribution(s) was submitted. If You +> institute patent litigation against any entity (including a +> cross-claim or counterclaim in a lawsuit) alleging that the Work +> or a Contribution incorporated within the Work constitutes direct +> or contributory patent infringement, then any patent licenses +> granted to You under this License for that Work shall terminate +> as of the date such litigation is filed. +> +> 4. Redistribution. You may reproduce and distribute copies of the +> Work or Derivative Works thereof in any medium, with or without +> modifications, and in Source or Object form, provided that You +> meet the following conditions: +> +> (a) You must give any other recipients of the Work or +> Derivative Works a copy of this License; and +> +> (b) You must cause any modified files to carry prominent notices +> stating that You changed the files; and +> +> (c) You must retain, in the Source form of any Derivative Works +> that You distribute, all copyright, patent, trademark, and +> attribution notices from the Source form of the Work, +> excluding those notices that do not pertain to any part of +> the Derivative Works; and +> +> (d) If the Work includes a "NOTICE" text file as part of its +> distribution, then any Derivative Works that You distribute must +> include a readable copy of the attribution notices contained +> within such NOTICE file, excluding those notices that do not +> pertain to any part of the Derivative Works, in at least one +> of the following places: within a NOTICE text file distributed +> as part of the Derivative Works; within the Source form or +> documentation, if provided along with the Derivative Works; or, +> within a display generated by the Derivative Works, if and +> wherever such third-party notices normally appear. The contents +> of the NOTICE file are for informational purposes only and +> do not modify the License. You may add Your own attribution +> notices within Derivative Works that You distribute, alongside +> or as an addendum to the NOTICE text from the Work, provided +> that such additional attribution notices cannot be construed +> as modifying the License. +> +> You may add Your own copyright statement to Your modifications and +> may provide additional or different license terms and conditions +> for use, reproduction, or distribution of Your modifications, or +> for any such Derivative Works as a whole, provided Your use, +> reproduction, and distribution of the Work otherwise complies with +> the conditions stated in this License. +> +> 5. Submission of Contributions. Unless You explicitly state otherwise, +> any Contribution intentionally submitted for inclusion in the Work +> by You to the Licensor shall be under the terms and conditions of +> this License, without any additional terms or conditions. +> Notwithstanding the above, nothing herein shall supersede or modify +> the terms of any separate license agreement you may have executed +> with Licensor regarding such Contributions. +> +> 6. Trademarks. This License does not grant permission to use the trade +> names, trademarks, service marks, or product names of the Licensor, +> except as required for reasonable and customary use in describing the +> origin of the Work and reproducing the content of the NOTICE file. +> +> 7. Disclaimer of Warranty. Unless required by applicable law or +> agreed to in writing, Licensor provides the Work (and each +> Contributor provides its Contributions) on an "AS IS" BASIS, +> WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +> implied, including, without limitation, any warranties or conditions +> of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +> PARTICULAR PURPOSE. You are solely responsible for determining the +> appropriateness of using or redistributing the Work and assume any +> risks associated with Your exercise of permissions under this License. +> +> 8. Limitation of Liability. In no event and under no legal theory, +> whether in tort (including negligence), contract, or otherwise, +> unless required by applicable law (such as deliberate and grossly +> negligent acts) or agreed to in writing, shall any Contributor be +> liable to You for damages, including any direct, indirect, special, +> incidental, or consequential damages of any character arising as a +> result of this License or out of the use or inability to use the +> Work (including but not limited to damages for loss of goodwill, +> work stoppage, computer failure or malfunction, or any and all +> other commercial damages or losses), even if such Contributor +> has been advised of the possibility of such damages. +> +> 9. Accepting Warranty or Additional Liability. While redistributing +> the Work or Derivative Works thereof, You may choose to offer, +> and charge a fee for, acceptance of support, warranty, indemnity, +> or other liability obligations and/or rights consistent with this +> License. However, in accepting such obligations, You may act only +> on Your own behalf and on Your sole responsibility, not on behalf +> of any other Contributor, and only if You agree to indemnify, +> defend, and hold each Contributor harmless for any liability +> incurred by, or claims asserted against, such Contributor by reason +> of your accepting any such warranty or additional liability. +> +> END OF TERMS AND CONDITIONS +> +> APPENDIX: How to apply the Apache License to your work. +> +> To apply the Apache License to your work, attach the following +> boilerplate notice, with the fields enclosed by brackets "[]" +> replaced with your own identifying information. (Don't include +> the brackets!) The text should be enclosed in the appropriate +> comment syntax for the file format. We also recommend that a +> file or class name and description of purpose be included on the +> same "printed page" as the copyright notice for easier +> identification within third-party archives. +> +> Copyright 2019 ehmicky +> +> Licensed under the Apache License, Version 2.0 (the "License"); +> you may not use this file except in compliance with the License. +> You may obtain a copy of the License at +> +> http://www.apache.org/licenses/LICENSE-2.0 +> +> Unless required by applicable law or agreed to in writing, software +> distributed under the License is distributed on an "AS IS" BASIS, +> WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +> See the License for the specific language governing permissions and +> limitations under the License. + --------------------------------------- ## icss-replace-symbols @@ -1192,6 +2237,13 @@ License: ISC By: Glen Maddern Repository: git+https://github.com/css-modules/icss-utils.git +> ISC License (ISC) +> Copyright 2018 Glen Maddern +> +> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## ignore @@ -1199,6 +2251,28 @@ License: MIT By: kael Repository: git@github.com:kaelzhang/node-ignore.git +> Copyright (c) 2013 Kael Zhang , contributors +> http://kael.me/ +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## import-cwd @@ -1206,6 +2280,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/import-cwd +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## import-from @@ -1213,6 +2297,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/import-from +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## inflight @@ -1220,12 +2314,44 @@ License: ISC By: Isaac Z. Schlueter Repository: https://github.com/npm/inflight.git +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## inherits License: ISC Repository: git://github.com/isaacs/inherits +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +> FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +> LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +> OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +> PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## is-binary-path @@ -1233,6 +2359,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/is-binary-path +> MIT License +> +> Copyright (c) 2019 Sindre Sorhus (https://sindresorhus.com), Paul Miller (https://paulmillr.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## is-docker @@ -1240,6 +2376,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/is-docker +> MIT License +> +> Copyright (c) Sindre Sorhus (https://sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## is-extglob @@ -1247,6 +2393,28 @@ License: MIT By: Jon Schlinkert Repository: jonschlinkert/is-extglob +> The MIT License (MIT) +> +> Copyright (c) 2014-2016, Jon Schlinkert +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## is-glob @@ -1254,6 +2422,28 @@ License: MIT By: Jon Schlinkert, Brian Woodward, Daniel Perez Repository: micromatch/is-glob +> The MIT License (MIT) +> +> Copyright (c) 2014-2017, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## is-number @@ -1261,6 +2451,28 @@ License: MIT By: Jon Schlinkert, Olsten Larck, Rouven Weßling Repository: jonschlinkert/is-number +> The MIT License (MIT) +> +> Copyright (c) 2014-present, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## is-reference @@ -1275,6 +2487,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/is-stream +> MIT License +> +> Copyright (c) Sindre Sorhus (https://sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## is-wsl @@ -1282,6 +2504,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/is-wsl +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## isexe @@ -1289,6 +2521,22 @@ License: ISC By: Isaac Z. Schlueter Repository: git+https://github.com/isaacs/isexe.git +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter and Contributors +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## json5 @@ -1296,6 +2544,30 @@ License: MIT By: Aseem Kishore, Max Nanasy, Andrew Eisenberg, Jordan Tucker Repository: git+https://github.com/json5/json5.git +> MIT License +> +> Copyright (c) 2012-2018 Aseem Kishore, and [others]. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. +> +> [others]: https://github.com/json5/json5/contributors + --------------------------------------- ## launch-editor @@ -1324,6 +2596,27 @@ License: MIT By: Tobias Koppers @sokra Repository: https://github.com/webpack/loader-utils.git +> Copyright JS Foundation and other contributors +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## lodash.camelcase @@ -1331,6 +2624,54 @@ License: MIT By: John-David Dalton, Blaine Bublitz, Mathias Bynens Repository: lodash/lodash +> Copyright jQuery Foundation and other contributors +> +> Based on Underscore.js, copyright Jeremy Ashkenas, +> DocumentCloud and Investigative Reporters & Editors +> +> This software consists of voluntary contributions made by many +> individuals. For exact contribution history, see the revision history +> available at https://github.com/lodash/lodash +> +> The following license applies to all parts of this software except as +> documented below: +> +> ==== +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. +> +> ==== +> +> Copyright and related rights for sample code are waived via CC0. Sample +> code is defined as all source code displayed within the prose of the +> documentation. +> +> CC0: http://creativecommons.org/publicdomain/zero/1.0/ +> +> ==== +> +> Files located in the node_modules and vendor directories are externally +> maintained libraries used by this software which have their own +> licenses; we recommend you read them, as their terms may differ from the +> terms above. + --------------------------------------- ## magic-string @@ -1353,12 +2694,56 @@ License: MIT By: Stephen Sugden Repository: grncdr/merge-stream +> The MIT License (MIT) +> +> Copyright (c) Stephen Sugden (stephensugden.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## merge2 License: MIT Repository: git@github.com:teambition/merge2.git +> The MIT License (MIT) +> +> Copyright (c) 2014-2020 Teambition +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## micromatch @@ -1366,6 +2751,28 @@ License: MIT By: Jon Schlinkert, Amila Welihinda, Bogdan Chadkin, Brian Woodward, Devon Govett, Elan Shanker, Fabrício Matté, Martin Kolárik, Olsten Larck, Paul Miller, Tom Byrer, Tyler Akins, Peter Bright, Kuba Juszczyk Repository: micromatch/micromatch +> The MIT License (MIT) +> +> Copyright (c) 2014-present, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## mime @@ -1402,6 +2809,28 @@ License: MIT By: Douglas Christopher Wilson, Jonathan Ong, Robert Kieffer Repository: jshttp/mime-db +> The MIT License (MIT) +> +> Copyright (c) 2014 Jonathan Ong me@jongleberry.com +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## mime-types @@ -1440,6 +2869,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/mimic-fn +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## minimatch @@ -1469,6 +2908,28 @@ Repository: git://github.com/isaacs/minimatch.git License: MIT Repository: zeit/ms +> The MIT License (MIT) +> +> Copyright (c) 2016 Zeit, Inc. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## negotiator @@ -1476,6 +2937,31 @@ License: MIT By: Douglas Christopher Wilson, Federico Romero, Isaac Z. Schlueter Repository: jshttp/negotiator +> (The MIT License) +> +> Copyright (c) 2012-2014 Federico Romero +> Copyright (c) 2012-2014 Isaac Z. Schlueter +> Copyright (c) 2014-2015 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## node-forge @@ -1483,6 +2969,337 @@ License: (BSD-3-Clause OR GPL-2.0) By: Digital Bazaar, Inc., Dave Longley, David I. Lehn, Stefan Siegl, Christoph Dorn Repository: https://github.com/digitalbazaar/forge +> You may use the Forge project under the terms of either the BSD License or the +> GNU General Public License (GPL) Version 2. +> +> The BSD License is recommended for most projects. It is simple and easy to +> understand and it places almost no restrictions on what you can do with the +> Forge project. +> +> If the GPL suits your project better you are also free to use Forge under +> that license. +> +> You don't have to do anything special to choose one license or the other and +> you don't have to notify anyone which license you are using. You are free to +> use this project in commercial projects as long as the copyright header is +> left intact. +> +> If you are a commercial entity and use this set of libraries in your +> commercial software then reasonable payment to Digital Bazaar, if you can +> afford it, is not required but is expected and would be appreciated. If this +> library saves you time, then it's saving you money. The cost of developing +> the Forge software was on the order of several hundred hours and tens of +> thousands of dollars. We are attempting to strike a balance between helping +> the development community while not being taken advantage of by lucrative +> commercial entities for our efforts. +> +> ------------------------------------------------------------------------------- +> New BSD License (3-clause) +> Copyright (c) 2010, Digital Bazaar, Inc. +> All rights reserved. +> +> Redistribution and use in source and binary forms, with or without +> modification, are permitted provided that the following conditions are met: +> * Redistributions of source code must retain the above copyright +> notice, this list of conditions and the following disclaimer. +> * Redistributions in binary form must reproduce the above copyright +> notice, this list of conditions and the following disclaimer in the +> documentation and/or other materials provided with the distribution. +> * Neither the name of Digital Bazaar, Inc. nor the +> names of its contributors may be used to endorse or promote products +> derived from this software without specific prior written permission. +> +> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +> ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +> WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +> DISCLAIMED. IN NO EVENT SHALL DIGITAL BAZAAR BE LIABLE FOR ANY +> DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +> ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +> +> ------------------------------------------------------------------------------- +> GNU GENERAL PUBLIC LICENSE +> Version 2, June 1991 +> +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +> Everyone is permitted to copy and distribute verbatim copies +> of this license document, but changing it is not allowed. +> +> Preamble +> +> The licenses for most software are designed to take away your +> freedom to share and change it. By contrast, the GNU General Public +> License is intended to guarantee your freedom to share and change free +> software--to make sure the software is free for all its users. This +> General Public License applies to most of the Free Software +> Foundation's software and to any other program whose authors commit to +> using it. (Some other Free Software Foundation software is covered by +> the GNU Lesser General Public License instead.) You can apply it to +> your programs, too. +> +> When we speak of free software, we are referring to freedom, not +> price. Our General Public Licenses are designed to make sure that you +> have the freedom to distribute copies of free software (and charge for +> this service if you wish), that you receive source code or can get it +> if you want it, that you can change the software or use pieces of it +> in new free programs; and that you know you can do these things. +> +> To protect your rights, we need to make restrictions that forbid +> anyone to deny you these rights or to ask you to surrender the rights. +> These restrictions translate to certain responsibilities for you if you +> distribute copies of the software, or if you modify it. +> +> For example, if you distribute copies of such a program, whether +> gratis or for a fee, you must give the recipients all the rights that +> you have. You must make sure that they, too, receive or can get the +> source code. And you must show them these terms so they know their +> rights. +> +> We protect your rights with two steps: (1) copyright the software, and +> (2) offer you this license which gives you legal permission to copy, +> distribute and/or modify the software. +> +> Also, for each author's protection and ours, we want to make certain +> that everyone understands that there is no warranty for this free +> software. If the software is modified by someone else and passed on, we +> want its recipients to know that what they have is not the original, so +> that any problems introduced by others will not reflect on the original +> authors' reputations. +> +> Finally, any free program is threatened constantly by software +> patents. We wish to avoid the danger that redistributors of a free +> program will individually obtain patent licenses, in effect making the +> program proprietary. To prevent this, we have made it clear that any +> patent must be licensed for everyone's free use or not licensed at all. +> +> The precise terms and conditions for copying, distribution and +> modification follow. +> +> GNU GENERAL PUBLIC LICENSE +> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +> +> 0. This License applies to any program or other work which contains +> a notice placed by the copyright holder saying it may be distributed +> under the terms of this General Public License. The "Program", below, +> refers to any such program or work, and a "work based on the Program" +> means either the Program or any derivative work under copyright law: +> that is to say, a work containing the Program or a portion of it, +> either verbatim or with modifications and/or translated into another +> language. (Hereinafter, translation is included without limitation in +> the term "modification".) Each licensee is addressed as "you". +> +> Activities other than copying, distribution and modification are not +> covered by this License; they are outside its scope. The act of +> running the Program is not restricted, and the output from the Program +> is covered only if its contents constitute a work based on the +> Program (independent of having been made by running the Program). +> Whether that is true depends on what the Program does. +> +> 1. You may copy and distribute verbatim copies of the Program's +> source code as you receive it, in any medium, provided that you +> conspicuously and appropriately publish on each copy an appropriate +> copyright notice and disclaimer of warranty; keep intact all the +> notices that refer to this License and to the absence of any warranty; +> and give any other recipients of the Program a copy of this License +> along with the Program. +> +> You may charge a fee for the physical act of transferring a copy, and +> you may at your option offer warranty protection in exchange for a fee. +> +> 2. You may modify your copy or copies of the Program or any portion +> of it, thus forming a work based on the Program, and copy and +> distribute such modifications or work under the terms of Section 1 +> above, provided that you also meet all of these conditions: +> +> a) You must cause the modified files to carry prominent notices +> stating that you changed the files and the date of any change. +> +> b) You must cause any work that you distribute or publish, that in +> whole or in part contains or is derived from the Program or any +> part thereof, to be licensed as a whole at no charge to all third +> parties under the terms of this License. +> +> c) If the modified program normally reads commands interactively +> when run, you must cause it, when started running for such +> interactive use in the most ordinary way, to print or display an +> announcement including an appropriate copyright notice and a +> notice that there is no warranty (or else, saying that you provide +> a warranty) and that users may redistribute the program under +> these conditions, and telling the user how to view a copy of this +> License. (Exception: if the Program itself is interactive but +> does not normally print such an announcement, your work based on +> the Program is not required to print an announcement.) +> +> These requirements apply to the modified work as a whole. If +> identifiable sections of that work are not derived from the Program, +> and can be reasonably considered independent and separate works in +> themselves, then this License, and its terms, do not apply to those +> sections when you distribute them as separate works. But when you +> distribute the same sections as part of a whole which is a work based +> on the Program, the distribution of the whole must be on the terms of +> this License, whose permissions for other licensees extend to the +> entire whole, and thus to each and every part regardless of who wrote it. +> +> Thus, it is not the intent of this section to claim rights or contest +> your rights to work written entirely by you; rather, the intent is to +> exercise the right to control the distribution of derivative or +> collective works based on the Program. +> +> In addition, mere aggregation of another work not based on the Program +> with the Program (or with a work based on the Program) on a volume of +> a storage or distribution medium does not bring the other work under +> the scope of this License. +> +> 3. You may copy and distribute the Program (or a work based on it, +> under Section 2) in object code or executable form under the terms of +> Sections 1 and 2 above provided that you also do one of the following: +> +> a) Accompany it with the complete corresponding machine-readable +> source code, which must be distributed under the terms of Sections +> 1 and 2 above on a medium customarily used for software interchange; or, +> +> b) Accompany it with a written offer, valid for at least three +> years, to give any third party, for a charge no more than your +> cost of physically performing source distribution, a complete +> machine-readable copy of the corresponding source code, to be +> distributed under the terms of Sections 1 and 2 above on a medium +> customarily used for software interchange; or, +> +> c) Accompany it with the information you received as to the offer +> to distribute corresponding source code. (This alternative is +> allowed only for noncommercial distribution and only if you +> received the program in object code or executable form with such +> an offer, in accord with Subsection b above.) +> +> The source code for a work means the preferred form of the work for +> making modifications to it. For an executable work, complete source +> code means all the source code for all modules it contains, plus any +> associated interface definition files, plus the scripts used to +> control compilation and installation of the executable. However, as a +> special exception, the source code distributed need not include +> anything that is normally distributed (in either source or binary +> form) with the major components (compiler, kernel, and so on) of the +> operating system on which the executable runs, unless that component +> itself accompanies the executable. +> +> If distribution of executable or object code is made by offering +> access to copy from a designated place, then offering equivalent +> access to copy the source code from the same place counts as +> distribution of the source code, even though third parties are not +> compelled to copy the source along with the object code. +> +> 4. You may not copy, modify, sublicense, or distribute the Program +> except as expressly provided under this License. Any attempt +> otherwise to copy, modify, sublicense or distribute the Program is +> void, and will automatically terminate your rights under this License. +> However, parties who have received copies, or rights, from you under +> this License will not have their licenses terminated so long as such +> parties remain in full compliance. +> +> 5. You are not required to accept this License, since you have not +> signed it. However, nothing else grants you permission to modify or +> distribute the Program or its derivative works. These actions are +> prohibited by law if you do not accept this License. Therefore, by +> modifying or distributing the Program (or any work based on the +> Program), you indicate your acceptance of this License to do so, and +> all its terms and conditions for copying, distributing or modifying +> the Program or works based on it. +> +> 6. Each time you redistribute the Program (or any work based on the +> Program), the recipient automatically receives a license from the +> original licensor to copy, distribute or modify the Program subject to +> these terms and conditions. You may not impose any further +> restrictions on the recipients' exercise of the rights granted herein. +> You are not responsible for enforcing compliance by third parties to +> this License. +> +> 7. If, as a consequence of a court judgment or allegation of patent +> infringement or for any other reason (not limited to patent issues), +> conditions are imposed on you (whether by court order, agreement or +> otherwise) that contradict the conditions of this License, they do not +> excuse you from the conditions of this License. If you cannot +> distribute so as to satisfy simultaneously your obligations under this +> License and any other pertinent obligations, then as a consequence you +> may not distribute the Program at all. For example, if a patent +> license would not permit royalty-free redistribution of the Program by +> all those who receive copies directly or indirectly through you, then +> the only way you could satisfy both it and this License would be to +> refrain entirely from distribution of the Program. +> +> If any portion of this section is held invalid or unenforceable under +> any particular circumstance, the balance of the section is intended to +> apply and the section as a whole is intended to apply in other +> circumstances. +> +> It is not the purpose of this section to induce you to infringe any +> patents or other property right claims or to contest validity of any +> such claims; this section has the sole purpose of protecting the +> integrity of the free software distribution system, which is +> implemented by public license practices. Many people have made +> generous contributions to the wide range of software distributed +> through that system in reliance on consistent application of that +> system; it is up to the author/donor to decide if he or she is willing +> to distribute software through any other system and a licensee cannot +> impose that choice. +> +> This section is intended to make thoroughly clear what is believed to +> be a consequence of the rest of this License. +> +> 8. If the distribution and/or use of the Program is restricted in +> certain countries either by patents or by copyrighted interfaces, the +> original copyright holder who places the Program under this License +> may add an explicit geographical distribution limitation excluding +> those countries, so that distribution is permitted only in or among +> countries not thus excluded. In such case, this License incorporates +> the limitation as if written in the body of this License. +> +> 9. The Free Software Foundation may publish revised and/or new versions +> of the General Public License from time to time. Such new versions will +> be similar in spirit to the present version, but may differ in detail to +> address new problems or concerns. +> +> Each version is given a distinguishing version number. If the Program +> specifies a version number of this License which applies to it and "any +> later version", you have the option of following the terms and conditions +> either of that version or of any later version published by the Free +> Software Foundation. If the Program does not specify a version number of +> this License, you may choose any version ever published by the Free Software +> Foundation. +> +> 10. If you wish to incorporate parts of the Program into other free +> programs whose distribution conditions are different, write to the author +> to ask for permission. For software which is copyrighted by the Free +> Software Foundation, write to the Free Software Foundation; we sometimes +> make exceptions for this. Our decision will be guided by the two goals +> of preserving the free status of all derivatives of our free software and +> of promoting the sharing and reuse of software generally. +> +> NO WARRANTY +> +> 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +> FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +> OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +> PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +> OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +> TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +> PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +> REPAIR OR CORRECTION. +> +> 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +> WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +> REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +> INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +> OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +> TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +> YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +> PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +> POSSIBILITY OF SUCH DAMAGES. + --------------------------------------- ## normalize-path @@ -1490,6 +3307,28 @@ License: MIT By: Jon Schlinkert, Blaine Bublitz Repository: jonschlinkert/normalize-path +> The MIT License (MIT) +> +> Copyright (c) 2014-2018, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## npm-run-path @@ -1497,6 +3336,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/npm-run-path +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## object-assign @@ -1504,6 +3353,28 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/object-assign +> The MIT License (MIT) +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## okie @@ -1540,6 +3411,30 @@ License: MIT By: Douglas Christopher Wilson, Jonathan Ong Repository: jshttp/on-finished +> (The MIT License) +> +> Copyright (c) 2013 Jonathan Ong +> Copyright (c) 2014 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## on-headers @@ -1547,6 +3442,29 @@ License: MIT By: Douglas Christopher Wilson Repository: jshttp/on-headers +> (The MIT License) +> +> Copyright (c) 2014 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## once @@ -1554,6 +3472,22 @@ License: ISC By: Isaac Z. Schlueter Repository: git://github.com/isaacs/once +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter and Contributors +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## onetime @@ -1561,6 +3495,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/onetime +> MIT License +> +> Copyright (c) Sindre Sorhus (https://sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## open @@ -1585,6 +3529,30 @@ License: MIT By: Douglas Christopher Wilson, Jonathan Ong Repository: pillarjs/parseurl +> (The MIT License) +> +> Copyright (c) 2014 Jonathan Ong +> Copyright (c) 2014-2017 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## path-is-absolute @@ -1592,6 +3560,28 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/path-is-absolute +> The MIT License (MIT) +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## path-key @@ -1599,6 +3589,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/path-key +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## path-type @@ -1606,6 +3606,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/path-type +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## periscopic @@ -1627,6 +3637,28 @@ License: MIT By: Jon Schlinkert Repository: micromatch/picomatch +> The MIT License (MIT) +> +> Copyright (c) 2017-present, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## pify @@ -1634,6 +3666,28 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/pify +> The MIT License (MIT) +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## postcss-import @@ -1725,6 +3779,12 @@ License: ISC By: Glen Maddern Repository: https://github.com/css-modules/postcss-modules-extract-imports.git +> Copyright 2015 Glen Maddern +> +> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## postcss-modules-local-by-default @@ -1732,6 +3792,27 @@ License: MIT By: Mark Dalgleish Repository: https://github.com/css-modules/postcss-modules-local-by-default.git +> The MIT License (MIT) +> +> Copyright 2015 Mark Dalgleish +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## postcss-modules-scope @@ -1739,6 +3820,14 @@ License: ISC By: Glen Maddern Repository: https://github.com/css-modules/postcss-modules-scope.git +> ISC License (ISC) +> +> Copyright (c) 2015, Glen Maddern +> +> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## postcss-modules-values @@ -1746,6 +3835,14 @@ License: ISC By: Glen Maddern Repository: git+https://github.com/css-modules/postcss-modules-values.git +> ISC License (ISC) +> +> Copyright (c) 2015, Glen Maddern +> +> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## postcss-selector-parser @@ -1753,6 +3850,29 @@ License: MIT By: Ben Briggs, Chris Eppstein Repository: postcss/postcss-selector-parser +> Copyright (c) Ben Briggs (http://beneb.info) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## postcss-value-parser @@ -1760,6 +3880,29 @@ License: MIT By: Bogdan Chadkin Repository: https://github.com/TrySound/postcss-value-parser.git +> Copyright (c) Bogdan Chadkin +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## queue-microtask @@ -1767,6 +3910,27 @@ License: MIT By: Feross Aboukhadijeh Repository: git://github.com/feross/queue-microtask.git +> The MIT License (MIT) +> +> Copyright (c) Feross Aboukhadijeh +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## read-cache @@ -1774,6 +3938,27 @@ License: MIT By: Bogdan Chadkin Repository: git+https://github.com/TrySound/read-cache.git +> The MIT License (MIT) +> +> Copyright 2016 Bogdan Chadkin +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## readdirp @@ -1781,6 +3966,28 @@ License: MIT By: Thorsten Lorenz, Paul Miller Repository: git://github.com/paulmillr/readdirp.git +> MIT License +> +> Copyright (c) 2012-2019 Thorsten Lorenz, Paul Miller (https://paulmillr.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## requires-port @@ -1788,6 +3995,28 @@ License: MIT By: Arnout Kazemier Repository: https://github.com/unshiftio/requires-port +> The MIT License (MIT) +> +> Copyright (c) 2015 Unshift.io, Arnout Kazemier, the Contributors. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## resolve-from @@ -1795,6 +4024,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/resolve-from +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## resolve.exports @@ -1831,6 +4070,28 @@ License: MIT By: Matteo Collina Repository: git+https://github.com/mcollina/reusify.git +> The MIT License (MIT) +> +> Copyright (c) 2015 Matteo Collina +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## run-parallel @@ -1838,6 +4099,27 @@ License: MIT By: Feross Aboukhadijeh Repository: git://github.com/feross/run-parallel.git +> The MIT License (MIT) +> +> Copyright (c) Feross Aboukhadijeh +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## safe-buffer @@ -1845,6 +4127,28 @@ License: MIT By: Feross Aboukhadijeh Repository: git://github.com/feross/safe-buffer.git +> The MIT License (MIT) +> +> Copyright (c) Feross Aboukhadijeh +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## selfsigned @@ -1881,6 +4185,16 @@ License: MIT By: Kevin Mårtensson Repository: kevva/shebang-command +> MIT License +> +> Copyright (c) Kevin Mårtensson (github.com/kevva) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## shebang-regex @@ -1888,6 +4202,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/shebang-regex +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## shell-quote @@ -1895,6 +4219,31 @@ License: MIT By: James Halliday Repository: http://github.com/substack/node-shell-quote.git +> The MIT License +> +> Copyright (c) 2013 James Halliday (mail@substack.net) +> +> Permission 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: +> +> The above copyright notice and this permission notice +> shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## signal-exit @@ -1902,6 +4251,23 @@ License: ISC By: Ben Coe Repository: https://github.com/tapjs/signal-exit.git +> The ISC License +> +> Copyright (c) 2015, Contributors +> +> Permission to use, copy, modify, and/or distribute this software +> for any purpose with or without fee is hereby granted, provided +> that the above copyright notice and this permission notice +> appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +> OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE +> LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES +> OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +> WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +> ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## sirv @@ -1916,6 +4282,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/slash +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## source-map @@ -1958,6 +4334,28 @@ License: MIT By: Rich Harris Repository: https://github.com/Rich-Harris/sourcemap-codec +> The MIT License +> +> Copyright (c) 2015 Rich Harris +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## statuses @@ -1965,6 +4363,29 @@ License: MIT By: Douglas Christopher Wilson, Jonathan Ong Repository: jshttp/statuses +> The MIT License (MIT) +> +> Copyright (c) 2014 Jonathan Ong +> Copyright (c) 2016 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## string-hash @@ -1996,6 +4417,16 @@ License: MIT By: Sindre Sorhus Repository: sindresorhus/strip-final-newline +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## supports-color @@ -2003,6 +4434,16 @@ License: MIT By: Sindre Sorhus Repository: chalk/supports-color +> MIT License +> +> Copyright (c) Sindre Sorhus (sindresorhus.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## to-regex-range @@ -2010,6 +4451,28 @@ License: MIT By: Jon Schlinkert, Rouven Weßling Repository: micromatch/to-regex-range +> The MIT License (MIT) +> +> Copyright (c) 2015-present, Jon Schlinkert. +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## totalist @@ -2017,6 +4480,28 @@ License: MIT By: Luke Edwards Repository: lukeed/totalist +> The MIT License (MIT) +> +> Copyright (c) Luke Edwards (lukeed.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## tsconfck @@ -2078,6 +4563,29 @@ License: MIT By: Douglas Christopher Wilson Repository: stream-utils/unpipe +> (The MIT License) +> +> Copyright (c) 2015 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## util-deprecate @@ -2085,6 +4593,31 @@ License: MIT By: Nathan Rajlich Repository: git://github.com/TooTallNate/util-deprecate.git +> (The MIT License) +> +> Copyright (c) 2014 Nathan Rajlich +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## utils-merge @@ -2092,6 +4625,27 @@ License: MIT By: Jared Hanson Repository: git://github.com/jaredhanson/utils-merge.git +> The MIT License (MIT) +> +> Copyright (c) 2013-2017 Jared Hanson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## vary @@ -2099,6 +4653,29 @@ License: MIT By: Douglas Christopher Wilson Repository: jshttp/vary +> (The MIT License) +> +> Copyright (c) 2014-2017 Douglas Christopher Wilson +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be +> included in all copies or substantial portions of the Software. +> +> THE 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. + --------------------------------------- ## which @@ -2106,6 +4683,22 @@ License: ISC By: Isaac Z. Schlueter Repository: git://github.com/isaacs/node-which.git +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter and Contributors +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## wrappy @@ -2113,6 +4706,22 @@ License: ISC By: Isaac Z. Schlueter Repository: https://github.com/npm/wrappy +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter and Contributors +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +> IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + --------------------------------------- ## ws @@ -2148,3 +4757,17 @@ Repository: websockets/ws License: ISC By: Eemeli Aro Repository: github:eemeli/yaml + +> Copyright 2018 Eemeli Aro +> +> Permission to use, copy, modify, and/or distribute this software for any purpose +> with or without fee is hereby granted, provided that the above copyright notice +> and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +> FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +> OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +> TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +> THIS SOFTWARE. diff --git a/packages/vite/package.json b/packages/vite/package.json index 97813c5f0f0be7..180f6d57f29d18 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -72,7 +72,7 @@ "@types/mime": "^2.0.3", "@types/node": "^15.12.2", "@types/resolve": "^1.20.1", - "@types/sass": "^1.16.1", + "@types/sass": "~1.16.1", "@types/stylus": "^0.48.36", "@types/ws": "^7.4.7", "@vue/compiler-dom": "^3.2.19", @@ -80,7 +80,7 @@ "acorn-class-fields": "^1.0.0", "acorn-static-class-features": "^1.0.0", "builtin-modules": "^3.2.0", - "cac": "^6.7.3", + "cac": "6.7.3", "chalk": "^4.1.2", "chokidar": "^3.5.2", "compression": "^1.7.4", @@ -115,7 +115,7 @@ "source-map-support": "^0.5.20", "strip-ansi": "^6.0.0", "terser": "^5.9.0", - "tsconfck": "^1.0.0", + "tsconfck": "1.0.0", "tslib": "^2.3.1", "types": "link:./types", "ws": "^7.5.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 85a20a68fe002d..eb3c74d046d81f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,7 +24,7 @@ importers: eslint-plugin-node: ^11.1.0 execa: ^5.1.1 fs-extra: ^10.0.0 - jest: ^27.2.4 + jest: ^27.3.1 lint-staged: ^11.2.0 minimist: ^1.2.5 node-fetch: ^2.6.5 @@ -36,44 +36,44 @@ importers: rollup: ^2.57.0 semver: ^7.3.5 sirv: ^1.0.17 - ts-jest: ^27.0.5 + ts-jest: ^27.0.7 ts-node: ^10.1.0 typescript: ~4.4.3 vite: workspace:* vitepress: ^0.19.2 yorkie: ^2.0.0 devDependencies: - '@microsoft/api-extractor': 7.18.11 + '@microsoft/api-extractor': 7.18.17 '@types/fs-extra': 9.0.13 '@types/jest': 27.0.2 '@types/node': 15.14.9 - '@types/semver': 7.3.8 - '@typescript-eslint/eslint-plugin': 5.2.0_c4b1efa9b4fb23f36c6acd0134327013 - '@typescript-eslint/parser': 5.2.0_eslint@8.1.0+typescript@4.4.3 + '@types/semver': 7.3.9 + '@typescript-eslint/eslint-plugin': 5.2.0_9a56ca1c5fc1d82b3da3317a5c6f9ab1 + '@typescript-eslint/parser': 5.2.0_eslint@8.1.0+typescript@4.4.4 chalk: 4.1.2 conventional-changelog-cli: 2.1.1 cross-env: 7.0.3 - esbuild: 0.13.2 + esbuild: 0.13.10 eslint: 8.1.0 eslint-define-config: 1.1.2 eslint-plugin-node: 11.1.0_eslint@8.1.0 execa: 5.1.1 fs-extra: 10.0.0 - jest: 27.2.4_ts-node@10.2.1 - lint-staged: 11.2.0 + jest: 27.3.1_ts-node@10.4.0 + lint-staged: 11.2.6 minimist: 1.2.5 node-fetch: 2.6.5 npm-run-all: 4.1.5 - playwright-chromium: 1.15.1 + playwright-chromium: 1.16.2 prettier: 2.4.1 - prompts: 2.4.1 + prompts: 2.4.2 rimraf: 3.0.2 - rollup: 2.57.0 + rollup: 2.58.3 semver: 7.3.5 - sirv: 1.0.17 - ts-jest: 27.0.5_52a571d76319e63aeaa66dc9db9e90cc - ts-node: 10.2.1_3b624d72c50530188ff09826d1b48ebf - typescript: 4.4.3 + sirv: 1.0.18 + ts-jest: 27.0.7_2c4ca6574207836d1023f54689cc81ac + ts-node: 10.4.0_d3e11751f498564481cc5d710b5b838a + typescript: 4.4.4 vite: link:packages/vite vitepress: 0.19.2 yorkie: 2.0.0 @@ -107,7 +107,7 @@ importers: resolve-linked: workspace:* vue: ^3.2.16 dependencies: - vue: 3.2.16 + vue: 3.2.20 devDependencies: resolve-linked: link:../resolve-linked @@ -118,7 +118,7 @@ importers: specifiers: tailwindcss: ^2.2.4 dependencies: - tailwindcss: 2.2.15_ts-node@10.2.1 + tailwindcss: 2.2.19_ts-node@10.4.0 packages/playground/cli: specifiers: {} @@ -135,9 +135,9 @@ importers: stylus: ^0.54.8 devDependencies: css-dep: link:css-dep - less: 4.1.1 + less: 4.1.2 postcss-nested: 5.0.6 - sass: 1.42.1 + sass: 1.43.4 stylus: 0.54.8 packages/playground/css-codesplit: @@ -177,7 +177,7 @@ importers: specifiers: vue: ^3.2.16 dependencies: - vue: 3.2.16 + vue: 3.2.20 packages/playground/file-delete-restore: specifiers: @@ -206,7 +206,7 @@ importers: specifiers: vue: ^3.2.16 devDependencies: - vue: 3.2.16 + vue: 3.2.20 packages/playground/legacy: specifiers: @@ -297,12 +297,12 @@ importers: dep-linked-include: link:dep-linked-include lodash-es: 4.17.21 nested-exclude: link:nested-exclude - phoenix: 1.5.13 + phoenix: 1.6.2 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 resolve-linked: link:../resolve-linked - vue: 3.2.16 - vuex: 4.0.2_vue@3.2.16 + vue: 3.2.20 + vuex: 4.0.2_vue@3.2.20 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -362,8 +362,8 @@ importers: vue: ^3.2.16 vue-router: ^4.0.0 dependencies: - vue: 3.2.16 - vue-router: 4.0.11_vue@3.2.16 + vue: 3.2.20 + vue-router: 4.0.12_vue@3.2.20 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -397,7 +397,7 @@ importers: react-dom: ^17.0.1 react-switch: ^6.0.0 dependencies: - '@emotion/react': 11.4.1_react@17.0.2 + '@emotion/react': 11.5.0_react@17.0.2 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 react-switch: 6.0.0_react-dom@17.0.2+react@17.0.2 @@ -494,8 +494,8 @@ importers: vue-router: ^4.0.0 dependencies: example-external-component: link:example-external-component - vue: 3.2.16 - vue-router: 4.0.11_vue@3.2.16 + vue: 3.2.20 + vue-router: 4.0.12_vue@3.2.20 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx @@ -530,10 +530,10 @@ importers: vue: ^3.2.16 vue-router: ^4.0.0 dependencies: - autoprefixer: 10.3.5 - tailwindcss: 2.2.15_e444c4a095b9e9ba5c645754953637f2 - vue: 3.2.16 - vue-router: 4.0.11_vue@3.2.16 + autoprefixer: 10.4.0 + tailwindcss: 2.2.19_6d1fa3babc9cc84b994ff99ef39d1aff + vue: 3.2.20 + vue-router: 4.0.12_vue@3.2.20 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -555,13 +555,13 @@ importers: vue: ^3.2.16 dependencies: lodash-es: 4.17.21 - vue: 3.2.16 + vue: 3.2.20 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue js-yaml: 3.14.1 less: 3.13.1 pug: 3.0.2 - sass: 1.42.1 + sass: 1.43.4 stylus: 0.54.8 packages/playground/vue-jsx: @@ -570,7 +570,7 @@ importers: '@vitejs/plugin-vue-jsx': workspace:* vue: ^3.2.16 dependencies: - vue: 3.2.16 + vue: 3.2.20 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx @@ -674,7 +674,7 @@ importers: '@types/mime': ^2.0.3 '@types/node': ^15.12.2 '@types/resolve': ^1.20.1 - '@types/sass': ^1.16.1 + '@types/sass': ~1.16.1 '@types/stylus': ^0.48.36 '@types/ws': ^7.4.7 '@vue/compiler-dom': ^3.2.19 @@ -682,7 +682,7 @@ importers: acorn-class-fields: ^1.0.0 acorn-static-class-features: ^1.0.0 builtin-modules: ^3.2.0 - cac: ^6.7.3 + cac: 6.7.3 chalk: ^4.1.2 chokidar: ^3.5.2 compression: ^1.7.4 @@ -722,27 +722,27 @@ importers: source-map-support: ^0.5.20 strip-ansi: ^6.0.0 terser: ^5.9.0 - tsconfck: ^1.0.0 + tsconfck: 1.0.0 tslib: ^2.3.1 types: link:./types ws: ^7.5.5 dependencies: - esbuild: 0.13.2 - postcss: 8.3.8 + esbuild: 0.13.10 + postcss: 8.3.11 resolve: 1.20.0 - rollup: 2.57.0 + rollup: 2.58.3 optionalDependencies: fsevents: 2.3.2 devDependencies: '@ampproject/remapping': 1.0.1 '@babel/parser': 7.15.8 '@babel/types': 7.15.6 - '@rollup/plugin-alias': 3.1.5_rollup@2.57.0 - '@rollup/plugin-commonjs': 21.0.0_rollup@2.57.0 - '@rollup/plugin-dynamic-import-vars': 1.4.0_rollup@2.57.0 - '@rollup/plugin-json': 4.1.0_rollup@2.57.0 - '@rollup/plugin-node-resolve': 13.0.5_rollup@2.57.0 - '@rollup/plugin-typescript': 8.2.5_283b0408a190511f1240c12469d64cd5 + '@rollup/plugin-alias': 3.1.8_rollup@2.58.3 + '@rollup/plugin-commonjs': 21.0.1_rollup@2.58.3 + '@rollup/plugin-dynamic-import-vars': 1.4.1_rollup@2.58.3 + '@rollup/plugin-json': 4.1.0_rollup@2.58.3 + '@rollup/plugin-node-resolve': 13.0.5_rollup@2.58.3 + '@rollup/plugin-typescript': 8.3.0_eadbb6348e5d71a0a94215fbea4eae9e '@rollup/pluginutils': 4.1.1 '@types/convert-source-map': 1.5.2 '@types/debug': 4.1.7 @@ -756,7 +756,7 @@ importers: '@types/sass': 1.16.1 '@types/stylus': 0.48.36 '@types/ws': 7.4.7 - '@vue/compiler-dom': 3.2.19 + '@vue/compiler-dom': 3.2.20 acorn: 8.5.0 acorn-class-fields: 1.0.0_acorn@8.5.0 acorn-static-class-features: 1.0.0_acorn@8.5.0 @@ -772,7 +772,7 @@ importers: debug: 4.3.2 dotenv: 10.0.0 dotenv-expand: 5.1.0 - es-module-lexer: 0.9.2 + es-module-lexer: 0.9.3 estree-walker: 2.0.2 etag: 1.8.1 execa: 5.1.1 @@ -783,114 +783,114 @@ importers: mime: 2.5.2 minimatch: 3.0.4 okie: 1.0.1 - open: 8.2.1 + open: 8.4.0 periscopic: 2.0.3 - postcss-import: 14.0.2_postcss@8.3.8 - postcss-load-config: 3.1.0_ts-node@10.2.1 - postcss-modules: 4.2.2_postcss@8.3.8 - resolve.exports: 1.0.2 - rollup-plugin-license: 2.5.0_rollup@2.57.0 + postcss-import: 14.0.2_postcss@8.3.11 + postcss-load-config: 3.1.0_ts-node@10.4.0 + postcss-modules: 4.2.2_postcss@8.3.11 + resolve.exports: 1.1.0 + rollup-plugin-license: 2.6.0_rollup@2.58.3 selfsigned: 1.10.11 - sirv: 1.0.17 + sirv: 1.0.18 source-map: 0.6.1 source-map-support: 0.5.20 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 terser: 5.9.0 - tsconfck: 1.0.0_typescript@4.4.3 + tsconfck: 1.0.0_typescript@4.4.4 tslib: 2.3.1 types: link:types ws: 7.5.5 packages: - /@algolia/cache-browser-local-storage/4.10.5: - resolution: {integrity: sha512-cfX2rEKOtuuljcGI5DMDHClwZHdDqd2nT2Ohsc8aHtBiz6bUxKVyIqxr2gaC6tU8AgPtrTVBzcxCA+UavXpKww==} + /@algolia/cache-browser-local-storage/4.11.0: + resolution: {integrity: sha512-4sr9vHIG1fVA9dONagdzhsI/6M5mjs/qOe2xUP0yBmwsTsuwiZq3+Xu6D3dsxsuFetcJgC6ydQoCW8b7fDJHYQ==} dependencies: - '@algolia/cache-common': 4.10.5 + '@algolia/cache-common': 4.11.0 dev: true - /@algolia/cache-common/4.10.5: - resolution: {integrity: sha512-1mClwdmTHll+OnHkG+yeRoFM17kSxDs4qXkjf6rNZhoZGXDvfYLy3YcZ1FX4Kyz0DJv8aroq5RYGBDsWkHj6Tw==} + /@algolia/cache-common/4.11.0: + resolution: {integrity: sha512-lODcJRuPXqf+6mp0h6bOxPMlbNoyn3VfjBVcQh70EDP0/xExZbkpecgHyyZK4kWg+evu+mmgvTK3GVHnet/xKw==} dev: true - /@algolia/cache-in-memory/4.10.5: - resolution: {integrity: sha512-+ciQnfIGi5wjMk02XhEY8fmy2pzy+oY1nIIfu8LBOglaSipCRAtjk6WhHc7/KIbXPiYzIwuDbM2K1+YOwSGjwA==} + /@algolia/cache-in-memory/4.11.0: + resolution: {integrity: sha512-aBz+stMSTBOBaBEQ43zJXz2DnwS7fL6dR0e2myehAgtfAWlWwLDHruc/98VOy1ZAcBk1blE2LCU02bT5HekGxQ==} dependencies: - '@algolia/cache-common': 4.10.5 + '@algolia/cache-common': 4.11.0 dev: true - /@algolia/client-account/4.10.5: - resolution: {integrity: sha512-I9UkSS2glXm7RBZYZIALjBMmXSQbw/fI/djPcBHxiwXIheNIlqIFl2SNPkvihpPF979BSkzjqdJNRPhE1vku3Q==} + /@algolia/client-account/4.11.0: + resolution: {integrity: sha512-jwmFBoUSzoMwMqgD3PmzFJV/d19p1RJXB6C1ADz4ju4mU7rkaQLtqyZroQpheLoU5s5Tilmn/T8/0U2XLoJCRQ==} dependencies: - '@algolia/client-common': 4.10.5 - '@algolia/client-search': 4.10.5 - '@algolia/transporter': 4.10.5 + '@algolia/client-common': 4.11.0 + '@algolia/client-search': 4.11.0 + '@algolia/transporter': 4.11.0 dev: true - /@algolia/client-analytics/4.10.5: - resolution: {integrity: sha512-h2owwJSkovPxzc+xIsjY1pMl0gj+jdVwP9rcnGjlaTY2fqHbSLrR9yvGyyr6305LvTppxsQnfAbRdE/5Z3eFxw==} + /@algolia/client-analytics/4.11.0: + resolution: {integrity: sha512-v5U9585aeEdYml7JqggHAj3E5CQ+jPwGVztPVhakBk8H/cmLyPS2g8wvmIbaEZCHmWn4TqFj3EBHVYxAl36fSA==} dependencies: - '@algolia/client-common': 4.10.5 - '@algolia/client-search': 4.10.5 - '@algolia/requester-common': 4.10.5 - '@algolia/transporter': 4.10.5 + '@algolia/client-common': 4.11.0 + '@algolia/client-search': 4.11.0 + '@algolia/requester-common': 4.11.0 + '@algolia/transporter': 4.11.0 dev: true - /@algolia/client-common/4.10.5: - resolution: {integrity: sha512-21FAvIai5qm8DVmZHm2Gp4LssQ/a0nWwMchAx+1hIRj1TX7OcdW6oZDPyZ8asQdvTtK7rStQrRnD8a95SCUnzA==} + /@algolia/client-common/4.11.0: + resolution: {integrity: sha512-Qy+F+TZq12kc7tgfC+FM3RvYH/Ati7sUiUv/LkvlxFwNwNPwWGoZO81AzVSareXT/ksDDrabD4mHbdTbBPTRmQ==} dependencies: - '@algolia/requester-common': 4.10.5 - '@algolia/transporter': 4.10.5 + '@algolia/requester-common': 4.11.0 + '@algolia/transporter': 4.11.0 dev: true - /@algolia/client-personalization/4.10.5: - resolution: {integrity: sha512-nH+IyFKBi8tCyzGOanJTbXC5t4dspSovX3+ABfmwKWUYllYzmiQNFUadpb3qo+MLA3jFx5IwBesjneN6dD5o3w==} + /@algolia/client-personalization/4.11.0: + resolution: {integrity: sha512-mI+X5IKiijHAzf9fy8VSl/GTT67dzFDnJ0QAM8D9cMPevnfX4U72HRln3Mjd0xEaYUOGve8TK/fMg7d3Z5yG6g==} dependencies: - '@algolia/client-common': 4.10.5 - '@algolia/requester-common': 4.10.5 - '@algolia/transporter': 4.10.5 + '@algolia/client-common': 4.11.0 + '@algolia/requester-common': 4.11.0 + '@algolia/transporter': 4.11.0 dev: true - /@algolia/client-search/4.10.5: - resolution: {integrity: sha512-1eQFMz9uodrc5OM+9HeT+hHcfR1E1AsgFWXwyJ9Q3xejA2c1c4eObGgOgC9ZoshuHHdptaTN1m3rexqAxXRDBg==} + /@algolia/client-search/4.11.0: + resolution: {integrity: sha512-iovPLc5YgiXBdw2qMhU65sINgo9umWbHFzInxoNErWnYoTQWfXsW6P54/NlKx5uscoLVjSf+5RUWwFu5BX+lpw==} dependencies: - '@algolia/client-common': 4.10.5 - '@algolia/requester-common': 4.10.5 - '@algolia/transporter': 4.10.5 + '@algolia/client-common': 4.11.0 + '@algolia/requester-common': 4.11.0 + '@algolia/transporter': 4.11.0 dev: true - /@algolia/logger-common/4.10.5: - resolution: {integrity: sha512-gRJo9zt1UYP4k3woEmZm4iuEBIQd/FrArIsjzsL/b+ihNoOqIxZKTSuGFU4UUZOEhvmxDReiA4gzvQXG+TMTmA==} + /@algolia/logger-common/4.11.0: + resolution: {integrity: sha512-pRMJFeOY8hoWKIxWuGHIrqnEKN/kqKh7UilDffG/+PeEGxBuku+Wq5CfdTFG0C9ewUvn8mAJn5BhYA5k8y0Jqg==} dev: true - /@algolia/logger-console/4.10.5: - resolution: {integrity: sha512-4WfIbn4253EDU12u9UiYvz+QTvAXDv39mKNg9xSoMCjKE5szcQxfcSczw2byc6pYhahOJ9PmxPBfs1doqsdTKQ==} + /@algolia/logger-console/4.11.0: + resolution: {integrity: sha512-wXztMk0a3VbNmYP8Kpc+F7ekuvaqZmozM2eTLok0XIshpAeZ/NJDHDffXK2Pw+NF0wmHqurptLYwKoikjBYvhQ==} dependencies: - '@algolia/logger-common': 4.10.5 + '@algolia/logger-common': 4.11.0 dev: true - /@algolia/requester-browser-xhr/4.10.5: - resolution: {integrity: sha512-53/MURQEqtK+bGdfq4ITSPwTh5hnADU99qzvpAINGQveUFNSFGERipJxHjTJjIrjFz3vxj5kKwjtxDnU6ygO9g==} + /@algolia/requester-browser-xhr/4.11.0: + resolution: {integrity: sha512-Fp3SfDihAAFR8bllg8P5ouWi3+qpEVN5e7hrtVIYldKBOuI/qFv80Zv/3/AMKNJQRYglS4zWyPuqrXm58nz6KA==} dependencies: - '@algolia/requester-common': 4.10.5 + '@algolia/requester-common': 4.11.0 dev: true - /@algolia/requester-common/4.10.5: - resolution: {integrity: sha512-UkVa1Oyuj6NPiAEt5ZvrbVopEv1m/mKqjs40KLB+dvfZnNcj+9Fry4Oxnt15HMy/HLORXsx4UwcthAvBuOXE9Q==} + /@algolia/requester-common/4.11.0: + resolution: {integrity: sha512-+cZGe/9fuYgGuxjaBC+xTGBkK7OIYdfapxhfvEf03dviLMPmhmVYFJtJlzAjQ2YmGDJpHrGgAYj3i/fbs8yhiA==} dev: true - /@algolia/requester-node-http/4.10.5: - resolution: {integrity: sha512-aNEKVKXL4fiiC+bS7yJwAHdxln81ieBwY3tsMCtM4zF9f5KwCzY2OtN4WKEZa5AAADVcghSAUdyjs4AcGUlO5w==} + /@algolia/requester-node-http/4.11.0: + resolution: {integrity: sha512-qJIk9SHRFkKDi6dMT9hba8X1J1z92T5AZIgl+tsApjTGIRQXJLTIm+0q4yOefokfu4CoxYwRZ9QAq+ouGwfeOg==} dependencies: - '@algolia/requester-common': 4.10.5 + '@algolia/requester-common': 4.11.0 dev: true - /@algolia/transporter/4.10.5: - resolution: {integrity: sha512-F8DLkmIlvCoMwSCZA3FKHtmdjH3o5clbt0pi2ktFStVNpC6ZDmY307HcK619bKP5xW6h8sVJhcvrLB775D2cyA==} + /@algolia/transporter/4.11.0: + resolution: {integrity: sha512-k4dyxiaEfYpw4UqybK9q7lrFzehygo6KV3OCYJMMdX0IMWV0m4DXdU27c1zYRYtthaFYaBzGF4Kjcl8p8vxCKw==} dependencies: - '@algolia/cache-common': 4.10.5 - '@algolia/logger-common': 4.10.5 - '@algolia/requester-common': 4.10.5 + '@algolia/cache-common': 4.11.0 + '@algolia/logger-common': 4.11.0 + '@algolia/requester-common': 4.11.0 dev: true /@ampproject/remapping/1.0.1: @@ -901,12 +901,6 @@ packages: sourcemap-codec: 1.4.8 dev: true - /@babel/code-frame/7.14.5: - resolution: {integrity: sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/highlight': 7.14.5 - /@babel/code-frame/7.15.8: resolution: {integrity: sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==} engines: {node: '>=6.9.0'} @@ -917,29 +911,6 @@ packages: resolution: {integrity: sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==} engines: {node: '>=6.9.0'} - /@babel/core/7.15.5: - resolution: {integrity: sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/code-frame': 7.14.5 - '@babel/generator': 7.15.4 - '@babel/helper-compilation-targets': 7.15.4_@babel+core@7.15.5 - '@babel/helper-module-transforms': 7.15.7 - '@babel/helpers': 7.15.4 - '@babel/parser': 7.15.7 - '@babel/template': 7.15.4 - '@babel/traverse': 7.15.4 - '@babel/types': 7.15.6 - convert-source-map: 1.8.0 - debug: 4.3.2 - gensync: 1.0.0-beta.2 - json5: 2.2.0 - semver: 6.3.0 - source-map: 0.5.7 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/core/7.15.8: resolution: {integrity: sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==} engines: {node: '>=6.9.0'} @@ -961,16 +932,6 @@ packages: source-map: 0.5.7 transitivePeerDependencies: - supports-color - dev: false - - /@babel/generator/7.15.4: - resolution: {integrity: sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.15.6 - jsesc: 2.5.2 - source-map: 0.5.7 - dev: true /@babel/generator/7.15.8: resolution: {integrity: sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==} @@ -987,19 +948,6 @@ packages: '@babel/types': 7.15.6 dev: false - /@babel/helper-compilation-targets/7.15.4_@babel+core@7.15.5: - resolution: {integrity: sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/compat-data': 7.15.0 - '@babel/core': 7.15.5 - '@babel/helper-validator-option': 7.14.5 - browserslist: 4.17.1 - semver: 6.3.0 - dev: true - /@babel/helper-compilation-targets/7.15.4_@babel+core@7.15.8: resolution: {integrity: sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==} engines: {node: '>=6.9.0'} @@ -1009,9 +957,8 @@ packages: '@babel/compat-data': 7.15.0 '@babel/core': 7.15.8 '@babel/helper-validator-option': 7.14.5 - browserslist: 4.17.1 + browserslist: 4.17.5 semver: 6.3.0 - dev: false /@babel/helper-create-class-features-plugin/7.15.4_@babel+core@7.15.8: resolution: {integrity: sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==} @@ -1062,22 +1009,6 @@ packages: dependencies: '@babel/types': 7.15.6 - /@babel/helper-module-transforms/7.15.7: - resolution: {integrity: sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-module-imports': 7.15.4 - '@babel/helper-replace-supers': 7.15.4 - '@babel/helper-simple-access': 7.15.4 - '@babel/helper-split-export-declaration': 7.15.4 - '@babel/helper-validator-identifier': 7.15.7 - '@babel/template': 7.15.4 - '@babel/traverse': 7.15.4 - '@babel/types': 7.15.6 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/helper-module-transforms/7.15.8: resolution: {integrity: sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==} engines: {node: '>=6.9.0'} @@ -1092,7 +1023,6 @@ packages: '@babel/types': 7.15.6 transitivePeerDependencies: - supports-color - dev: false /@babel/helper-optimise-call-expression/7.15.4: resolution: {integrity: sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==} @@ -1153,11 +1083,6 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 - /@babel/parser/7.15.7: - resolution: {integrity: sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==} - engines: {node: '>=6.0.0'} - hasBin: true - /@babel/parser/7.15.8: resolution: {integrity: sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==} engines: {node: '>=6.0.0'} @@ -1173,39 +1098,30 @@ packages: '@babel/plugin-syntax-pipeline-operator': 7.15.0 dev: true - /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.15.5: + /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.15.8: resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.15.5: + /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.15.5: + /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.15.8: resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 - '@babel/helper-plugin-utils': 7.14.5 - dev: true - - /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.15.5: - resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true @@ -1216,14 +1132,13 @@ packages: dependencies: '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 - dev: false - /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.15.5: + /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true @@ -1246,57 +1161,57 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: false - /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.15.5: + /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.15.8: resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.15.5: + /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.15.5: + /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.15.8: resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.15.5: + /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.15.5: + /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.15.5: + /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true @@ -1309,23 +1224,13 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.15.5: + /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.15.8: resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.5 - '@babel/helper-plugin-utils': 7.14.5 - dev: true - - /@babel/plugin-syntax-typescript/7.14.5_@babel+core@7.15.5: - resolution: {integrity: sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 dev: true @@ -1337,7 +1242,6 @@ packages: dependencies: '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 - dev: false /@babel/plugin-transform-react-jsx-development/7.14.5_@babel+core@7.15.8: resolution: {integrity: sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==} @@ -1452,8 +1356,8 @@ packages: engines: {node: '>= 12'} dev: true - /@cspotcode/source-map-support/0.6.1: - resolution: {integrity: sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==} + /@cspotcode/source-map-support/0.7.0: + resolution: {integrity: sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==} engines: {node: '>=12'} dependencies: '@cspotcode/source-map-consumer': 0.8.0 @@ -1467,7 +1371,7 @@ packages: resolution: {integrity: sha512-2g7aPhBy7FoEyeZW2G3LYHWVa8CFvqyozEz8PXt3hyywdFcmEIqmoCRwn8kboVftrOKCjtPcuLCewsaBoB3uiw==} dependencies: '@docsearch/react': 1.0.0-alpha.28 - preact: 10.5.14 + preact: 10.5.15 transitivePeerDependencies: - react - react-dom @@ -1482,7 +1386,7 @@ packages: '@docsearch/css': 1.0.0-alpha.28 '@francoischalifour/autocomplete-core': 1.0.0-alpha.28 '@francoischalifour/autocomplete-preset-algolia': 1.0.0-alpha.28 - algoliasearch: 4.10.5 + algoliasearch: 4.11.0 dev: true /@emotion/babel-plugin/11.3.0: @@ -1504,11 +1408,11 @@ packages: stylis: 4.0.10 dev: true - /@emotion/cache/11.4.0: - resolution: {integrity: sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==} + /@emotion/cache/11.5.0: + resolution: {integrity: sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==} dependencies: '@emotion/memoize': 0.7.5 - '@emotion/sheet': 1.0.2 + '@emotion/sheet': 1.0.3 '@emotion/utils': 1.0.0 '@emotion/weak-memoize': 0.2.5 stylis: 4.0.10 @@ -1520,8 +1424,8 @@ packages: /@emotion/memoize/0.7.5: resolution: {integrity: sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==} - /@emotion/react/11.4.1_react@17.0.2: - resolution: {integrity: sha512-pRegcsuGYj4FCdZN6j5vqCALkNytdrKw3TZMekTzNXixRg4wkLsU5QEaBG5LC6l01Vppxlp7FE3aTHpIG5phLg==} + /@emotion/react/11.5.0_react@17.0.2: + resolution: {integrity: sha512-MYq/bzp3rYbee4EMBORCn4duPQfgpiEB5XzrZEBnUZAL80Qdfr7CEv/T80jwaTl/dnZmt9SnTa8NkTrwFNpLlw==} peerDependencies: '@babel/core': ^7.0.0 '@types/react': '*' @@ -1533,9 +1437,9 @@ packages: optional: true dependencies: '@babel/runtime': 7.15.4 - '@emotion/cache': 11.4.0 + '@emotion/cache': 11.5.0 '@emotion/serialize': 1.0.2 - '@emotion/sheet': 1.0.2 + '@emotion/sheet': 1.0.3 '@emotion/utils': 1.0.0 '@emotion/weak-memoize': 0.2.5 hoist-non-react-statics: 3.3.2 @@ -1551,8 +1455,8 @@ packages: '@emotion/utils': 1.0.0 csstype: 3.0.9 - /@emotion/sheet/1.0.2: - resolution: {integrity: sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw==} + /@emotion/sheet/1.0.3: + resolution: {integrity: sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ==} dev: false /@emotion/unitless/0.7.5: @@ -1572,7 +1476,7 @@ packages: ajv: 6.12.6 debug: 4.3.2 espree: 9.0.0 - globals: 13.11.0 + globals: 13.12.0 ignore: 4.0.6 import-fresh: 3.3.0 js-yaml: 3.14.1 @@ -1630,20 +1534,20 @@ packages: engines: {node: '>=8'} dev: true - /@jest/console/27.2.4: - resolution: {integrity: sha512-94znCKynPZpDpYHQ6esRJSc11AmONrVkBOBZiD7S+bSubHhrUfbS95EY5HIOxhm4PQO7cnvZkL3oJcY0oMA+Wg==} + /@jest/console/27.3.1: + resolution: {integrity: sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 '@types/node': 15.14.9 chalk: 4.1.2 - jest-message-util: 27.2.4 - jest-util: 27.2.4 + jest-message-util: 27.3.1 + jest-util: 27.3.1 slash: 3.0.0 dev: true - /@jest/core/27.2.4_ts-node@10.2.1: - resolution: {integrity: sha512-UNQLyy+rXoojNm2MGlapgzWhZD1CT1zcHZQYeiD0xE7MtJfC19Q6J5D/Lm2l7i4V97T30usKDoEtjI8vKwWcLg==} + /@jest/core/27.3.1_ts-node@10.4.0: + resolution: {integrity: sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1651,34 +1555,34 @@ packages: node-notifier: optional: true dependencies: - '@jest/console': 27.2.4 - '@jest/reporters': 27.2.4 - '@jest/test-result': 27.2.4 - '@jest/transform': 27.2.4 - '@jest/types': 27.2.4 + '@jest/console': 27.3.1 + '@jest/reporters': 27.3.1 + '@jest/test-result': 27.3.1 + '@jest/transform': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 exit: 0.1.2 graceful-fs: 4.2.8 - jest-changed-files: 27.2.4 - jest-config: 27.2.4_ts-node@10.2.1 - jest-haste-map: 27.2.4 - jest-message-util: 27.2.4 + jest-changed-files: 27.3.0 + jest-config: 27.3.1_ts-node@10.4.0 + jest-haste-map: 27.3.1 + jest-message-util: 27.3.1 jest-regex-util: 27.0.6 - jest-resolve: 27.2.4 - jest-resolve-dependencies: 27.2.4 - jest-runner: 27.2.4 - jest-runtime: 27.2.4 - jest-snapshot: 27.2.4 - jest-util: 27.2.4 - jest-validate: 27.2.4 - jest-watcher: 27.2.4 + jest-resolve: 27.3.1 + jest-resolve-dependencies: 27.3.1 + jest-runner: 27.3.1 + jest-runtime: 27.3.1 + jest-snapshot: 27.3.1 + jest-util: 27.3.1 + jest-validate: 27.3.1 + jest-watcher: 27.3.1 micromatch: 4.0.4 rimraf: 3.0.2 slash: 3.0.0 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 transitivePeerDependencies: - bufferutil - canvas @@ -1687,39 +1591,39 @@ packages: - utf-8-validate dev: true - /@jest/environment/27.2.4: - resolution: {integrity: sha512-wkuui5yr3SSQW0XD0Qm3TATUbL/WE3LDEM3ulC+RCQhMf2yxhci8x7svGkZ4ivJ6Pc94oOzpZ6cdHBAMSYd1ew==} + /@jest/environment/27.3.1: + resolution: {integrity: sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/fake-timers': 27.2.4 - '@jest/types': 27.2.4 + '@jest/fake-timers': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 - jest-mock: 27.2.4 + jest-mock: 27.3.0 dev: true - /@jest/fake-timers/27.2.4: - resolution: {integrity: sha512-cs/TzvwWUM7kAA6Qm/890SK6JJ2pD5RfDNM3SSEom6BmdyV6OiWP1qf/pqo6ts6xwpcM36oN0wSEzcZWc6/B6w==} + /@jest/fake-timers/27.3.1: + resolution: {integrity: sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 '@sinonjs/fake-timers': 8.0.1 '@types/node': 15.14.9 - jest-message-util: 27.2.4 - jest-mock: 27.2.4 - jest-util: 27.2.4 + jest-message-util: 27.3.1 + jest-mock: 27.3.0 + jest-util: 27.3.1 dev: true - /@jest/globals/27.2.4: - resolution: {integrity: sha512-DRsRs5dh0i+fA9mGHylTU19+8fhzNJoEzrgsu+zgJoZth3x8/0juCQ8nVVdW1er4Cqifb/ET7/hACYVPD0dBEA==} + /@jest/globals/27.3.1: + resolution: {integrity: sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.2.4 - '@jest/types': 27.2.4 - expect: 27.2.4 + '@jest/environment': 27.3.1 + '@jest/types': 27.2.5 + expect: 27.3.1 dev: true - /@jest/reporters/27.2.4: - resolution: {integrity: sha512-LHeSdDnDZkDnJ8kvnjcqV8P1Yv/32yL4d4XfR5gBiy3xGO0onwll1QEbvtW96fIwhx2nejug0GTaEdNDoyr3fQ==} + /@jest/reporters/27.3.1: + resolution: {integrity: sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1728,24 +1632,25 @@ packages: optional: true dependencies: '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 27.2.4 - '@jest/test-result': 27.2.4 - '@jest/transform': 27.2.4 - '@jest/types': 27.2.4 + '@jest/console': 27.3.1 + '@jest/test-result': 27.3.1 + '@jest/transform': 27.3.1 + '@jest/types': 27.2.5 + '@types/node': 15.14.9 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 glob: 7.2.0 graceful-fs: 4.2.8 - istanbul-lib-coverage: 3.0.1 + istanbul-lib-coverage: 3.2.0 istanbul-lib-instrument: 4.0.3 istanbul-lib-report: 3.0.0 - istanbul-lib-source-maps: 4.0.0 - istanbul-reports: 3.0.2 - jest-haste-map: 27.2.4 - jest-resolve: 27.2.4 - jest-util: 27.2.4 - jest-worker: 27.2.4 + istanbul-lib-source-maps: 4.0.1 + istanbul-reports: 3.0.5 + jest-haste-map: 27.3.1 + jest-resolve: 27.3.1 + jest-util: 27.3.1 + jest-worker: 27.3.1 slash: 3.0.0 source-map: 0.6.1 string-length: 4.0.2 @@ -1764,42 +1669,42 @@ packages: source-map: 0.6.1 dev: true - /@jest/test-result/27.2.4: - resolution: {integrity: sha512-eU+PRo0+lIS01b0dTmMdVZ0TtcRSxEaYquZTRFMQz6CvsehGhx9bRzi9Zdw6VROviJyv7rstU+qAMX5pNBmnfQ==} + /@jest/test-result/27.3.1: + resolution: {integrity: sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/console': 27.2.4 - '@jest/types': 27.2.4 + '@jest/console': 27.3.1 + '@jest/types': 27.2.5 '@types/istanbul-lib-coverage': 2.0.3 collect-v8-coverage: 1.0.1 dev: true - /@jest/test-sequencer/27.2.4: - resolution: {integrity: sha512-fpk5eknU3/DXE2QCCG1wv/a468+cfPo3Asu6d6yUtM9LOPh709ubZqrhuUOYfM8hXMrIpIdrv1CdCrWWabX0rQ==} + /@jest/test-sequencer/27.3.1: + resolution: {integrity: sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/test-result': 27.2.4 + '@jest/test-result': 27.3.1 graceful-fs: 4.2.8 - jest-haste-map: 27.2.4 - jest-runtime: 27.2.4 + jest-haste-map: 27.3.1 + jest-runtime: 27.3.1 transitivePeerDependencies: - supports-color dev: true - /@jest/transform/27.2.4: - resolution: {integrity: sha512-n5FlX2TH0oQGwyVDKPxdJ5nI2sO7TJBFe3u3KaAtt7TOiV4yL+Y+rSFDl+Ic5MpbiA/eqXmLAQxjnBmWgS2rEA==} + /@jest/transform/27.3.1: + resolution: {integrity: sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.15.5 - '@jest/types': 27.2.4 - babel-plugin-istanbul: 6.0.0 + '@babel/core': 7.15.8 + '@jest/types': 27.2.5 + babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 1.8.0 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.8 - jest-haste-map: 27.2.4 + jest-haste-map: 27.3.1 jest-regex-util: 27.0.6 - jest-util: 27.2.4 + jest-util: 27.3.1 micromatch: 4.0.4 pirates: 4.0.1 slash: 3.0.0 @@ -1809,19 +1714,8 @@ packages: - supports-color dev: true - /@jest/types/27.1.1: - resolution: {integrity: sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@types/istanbul-lib-coverage': 2.0.3 - '@types/istanbul-reports': 3.0.1 - '@types/node': 15.14.9 - '@types/yargs': 16.0.4 - chalk: 4.1.2 - dev: true - - /@jest/types/27.2.4: - resolution: {integrity: sha512-IDO2ezTxeMvQAHxzG/ZvEyA47q0aVfzT95rGFl7bZs/Go0aIucvfDbS2rmnoEdXxlLQhcolmoG/wvL/uKx4tKA==} + /@jest/types/27.2.5: + resolution: {integrity: sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@types/istanbul-lib-coverage': 2.0.3 @@ -1836,30 +1730,30 @@ packages: engines: {node: '>=6.0.0'} dev: true - /@microsoft/api-extractor-model/7.13.9: - resolution: {integrity: sha512-t/XKTr8MlHRWgDr1fkyCzTQRR5XICf/WzIFs8yw1JLU8Olw99M3by4/dtpOZNskfqoW+J8NwOxovduU2csi4Ww==} + /@microsoft/api-extractor-model/7.13.14: + resolution: {integrity: sha512-mKc917+QhOuOZebSnE77i8Tavj/G5ydIFoJqDIY9LpmAfJjsVHgL2pc7vkvW58QTxH2wadIDK1tLzcteOMEt4w==} dependencies: '@microsoft/tsdoc': 0.13.2 '@microsoft/tsdoc-config': 0.15.2 - '@rushstack/node-core-library': 3.41.0 + '@rushstack/node-core-library': 3.43.0 dev: true - /@microsoft/api-extractor/7.18.11: - resolution: {integrity: sha512-WfN5MZry4TrF60OOcGadFDsGECF9JNKNT+8P/8crYAumAYQRitI2cUiQRlCWrgmFgCWNezsNZeI/2BggdnUqcg==} + /@microsoft/api-extractor/7.18.17: + resolution: {integrity: sha512-gZuJ//FAyfrOqWssY0cyU2bEo8FOIaIYVs+pU5IDyfImkye6YkT2Qnm5PAFhyYSkfUjV5SjvyuP4+VsDfS3jww==} hasBin: true dependencies: - '@microsoft/api-extractor-model': 7.13.9 + '@microsoft/api-extractor-model': 7.13.14 '@microsoft/tsdoc': 0.13.2 '@microsoft/tsdoc-config': 0.15.2 - '@rushstack/node-core-library': 3.41.0 - '@rushstack/rig-package': 0.3.1 - '@rushstack/ts-command-line': 4.9.1 + '@rushstack/node-core-library': 3.43.0 + '@rushstack/rig-package': 0.3.4 + '@rushstack/ts-command-line': 4.10.3 colors: 1.2.5 lodash: 4.17.21 resolve: 1.17.0 semver: 7.3.5 source-map: 0.6.1 - typescript: 4.4.3 + typescript: 4.4.4 dev: true /@microsoft/tsdoc-config/0.15.2: @@ -1908,7 +1802,7 @@ packages: dependencies: '@types/asn1js': 2.0.2 asn1js: 2.1.1 - pvtsutils: 1.2.0 + pvtsutils: 1.2.1 tslib: 2.3.1 dev: true @@ -1919,100 +1813,100 @@ packages: tslib: 2.3.1 dev: true - /@peculiar/webcrypto/1.1.7: - resolution: {integrity: sha512-aCNLYdHZkvGH+T8/YBOY33jrVGVuLIa3bpizeHXqwN+P4ZtixhA+kxEEWM1amZwUY2nY/iuj+5jdZn/zB7EPPQ==} + /@peculiar/webcrypto/1.2.0: + resolution: {integrity: sha512-ln2CvfmTzXSr877zM1+3JTyvbtaDXsoDivvEyeYAzB4RQIM+Pw82gp1nQFp9xM4BylBBrip/R36Gp+WJFCoU3Q==} engines: {node: '>=10.12.0'} dependencies: '@peculiar/asn1-schema': 2.0.38 '@peculiar/json-schema': 1.1.12 - pvtsutils: 1.2.0 + pvtsutils: 1.2.1 tslib: 2.3.1 - webcrypto-core: 1.2.1 + webcrypto-core: 1.3.0 dev: true - /@polka/url/1.0.0-next.20: - resolution: {integrity: sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==} + /@polka/url/1.0.0-next.21: + resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true - /@rollup/plugin-alias/3.1.5_rollup@2.57.0: - resolution: {integrity: sha512-yzUaSvCC/LJPbl9rnzX3HN7vy0tq7EzHoEiQl1ofh4n5r2Rd5bj/+zcJgaGA76xbw95/JjWQyvHg9rOJp2y0oQ==} + /@rollup/plugin-alias/3.1.8_rollup@2.58.3: + resolution: {integrity: sha512-tf7HeSs/06wO2LPqKNY3Ckbvy0JRe7Jyn98bXnt/gfrxbe+AJucoNJlsEVi9sdgbQtXemjbakCpO/76JVgnHpA==} engines: {node: '>=8.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - rollup: 2.57.0 + rollup: 2.58.3 slash: 3.0.0 dev: true - /@rollup/plugin-commonjs/21.0.0_rollup@2.57.0: - resolution: {integrity: sha512-XDQimjHl0kNotAV5lLo34XoygaI0teqiKGJ100B3iCU8+15YscJPeqk2KqkqD3NIe1H8ZTUo5lYjUFZyEgASTw==} + /@rollup/plugin-commonjs/21.0.1_rollup@2.58.3: + resolution: {integrity: sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==} engines: {node: '>= 8.0.0'} peerDependencies: rollup: ^2.38.3 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.57.0 + '@rollup/pluginutils': 3.1.0_rollup@2.58.3 commondir: 1.0.1 estree-walker: 2.0.2 glob: 7.2.0 is-reference: 1.2.1 magic-string: 0.25.7 resolve: 1.20.0 - rollup: 2.57.0 + rollup: 2.58.3 dev: true - /@rollup/plugin-dynamic-import-vars/1.4.0_rollup@2.57.0: - resolution: {integrity: sha512-oDeBDYJkD+VleSqSmWZo4h7iMHFYgEx/XVnJJZhCGuqkrS9QwOubESyWMqujBuUMeIByv954RvBTFvkAKlLh4A==} + /@rollup/plugin-dynamic-import-vars/1.4.1_rollup@2.58.3: + resolution: {integrity: sha512-izHpMs9w8U8CLwyHTXE55H4ytGVaf2ZtlKIWxKigghw6ZC6Mx6AXCsixSY6JOchuX9BN4ZkeN8egLRTS+BxO+w==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.57.0 + '@rollup/pluginutils': 3.1.0_rollup@2.58.3 estree-walker: 2.0.2 globby: 11.0.4 magic-string: 0.25.7 - rollup: 2.57.0 + rollup: 2.58.3 dev: true - /@rollup/plugin-json/4.1.0_rollup@2.57.0: + /@rollup/plugin-json/4.1.0_rollup@2.58.3: resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} peerDependencies: rollup: ^1.20.0 || ^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.57.0 - rollup: 2.57.0 + '@rollup/pluginutils': 3.1.0_rollup@2.58.3 + rollup: 2.58.3 dev: true - /@rollup/plugin-node-resolve/13.0.5_rollup@2.57.0: + /@rollup/plugin-node-resolve/13.0.5_rollup@2.58.3: resolution: {integrity: sha512-mVaw6uxtvuGx/XCI4qBQXsDZJUfyx5vp39iE0J/7Hd6wDhEbjHr6aES7Nr9yWbuE0BY+oKp6N7Bq6jX5NCGNmQ==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^2.42.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.57.0 + '@rollup/pluginutils': 3.1.0_rollup@2.58.3 '@types/resolve': 1.17.1 builtin-modules: 3.2.0 deepmerge: 4.2.2 is-module: 1.0.0 resolve: 1.20.0 - rollup: 2.57.0 + rollup: 2.58.3 dev: true - /@rollup/plugin-typescript/8.2.5_283b0408a190511f1240c12469d64cd5: - resolution: {integrity: sha512-QL/LvDol/PAGB2O0S7/+q2HpSUNodpw7z6nGn9BfoVCPOZ0r4EALrojFU29Bkoi2Hr2jgTocTejJ5GGWZfOxbQ==} + /@rollup/plugin-typescript/8.3.0_eadbb6348e5d71a0a94215fbea4eae9e: + resolution: {integrity: sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==} engines: {node: '>=8.0.0'} peerDependencies: rollup: ^2.14.0 tslib: '*' typescript: '>=3.7.0' dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.57.0 + '@rollup/pluginutils': 3.1.0_rollup@2.58.3 resolve: 1.20.0 - rollup: 2.57.0 + rollup: 2.58.3 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.4.4 dev: true - /@rollup/pluginutils/3.1.0_rollup@2.57.0: + /@rollup/pluginutils/3.1.0_rollup@2.58.3: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} peerDependencies: @@ -2021,7 +1915,7 @@ packages: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.0 - rollup: 2.57.0 + rollup: 2.58.3 dev: true /@rollup/pluginutils/4.1.1: @@ -2031,8 +1925,8 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.0 - /@rushstack/node-core-library/3.41.0: - resolution: {integrity: sha512-JxdmqR+SHU04jTDaZhltMZL3/XTz2ZZM47DTN+FSPUGUVp6WmxLlvJnT5FoHrOZWUjL/FoIlZUdUPTSXjTjIcg==} + /@rushstack/node-core-library/3.43.0: + resolution: {integrity: sha512-MFLW+6X83k6o8m8KnWkDhL/8NCJYHbFnnDokPSX1UHC3JwiEvVhHmEnxZv2YEzwnXeFYoKViub2G2t2liHbHLA==} dependencies: '@types/node': 12.20.24 colors: 1.2.5 @@ -2045,15 +1939,15 @@ packages: z-schema: 3.18.4 dev: true - /@rushstack/rig-package/0.3.1: - resolution: {integrity: sha512-DXQmrPWOCNoE2zPzHCShE1y47FlgbAg48wpaY058Qo/yKDzL0GlEGf5Ra2NIt22pMcp0R/HHh+kZGbqTnF4CrA==} + /@rushstack/rig-package/0.3.4: + resolution: {integrity: sha512-NsCzPxPQ8cu7lnqa/4xBQXuCJwaBrb5vEbOC8Q/bMQK7GDOxeVUN3/f+NCYjgQSl39toAm8jQJ7TJe+RYYX3yQ==} dependencies: resolve: 1.17.0 strip-json-comments: 3.1.1 dev: true - /@rushstack/ts-command-line/4.9.1: - resolution: {integrity: sha512-zzoWB6OqVbMjnxlxbAUqbZqDWITUSHqwFCx7JbH5CVrjR9kcsB4NeWkN1I8GcR92beiOGvO3yPlB2NRo5Ugh+A==} + /@rushstack/ts-command-line/4.10.3: + resolution: {integrity: sha512-DdDfwr8CO6CP/kBZlQrrwKyA6UxOteujaIBrmoHa+J+dyLZC19YA/LK0fAHjr2qHLAJHHXVpZwPH8BpqN84oVg==} dependencies: '@types/argparse': 1.0.38 argparse: 1.0.10 @@ -2105,7 +1999,7 @@ packages: /@types/babel__core/7.1.16: resolution: {integrity: sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==} dependencies: - '@babel/parser': 7.15.7 + '@babel/parser': 7.15.8 '@babel/types': 7.15.6 '@types/babel__generator': 7.6.3 '@types/babel__template': 7.4.1 @@ -2121,7 +2015,7 @@ packages: /@types/babel__template/7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.15.7 + '@babel/parser': 7.15.8 '@babel/types': 7.15.6 dev: true @@ -2194,8 +2088,8 @@ packages: /@types/jest/27.0.2: resolution: {integrity: sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==} dependencies: - jest-diff: 27.2.0 - pretty-format: 27.2.0 + jest-diff: 27.3.1 + pretty-format: 27.3.1 dev: true /@types/json-schema/7.0.9: @@ -2233,8 +2127,8 @@ packages: /@types/parse-json/4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} - /@types/prettier/2.3.2: - resolution: {integrity: sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==} + /@types/prettier/2.4.1: + resolution: {integrity: sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==} dev: true /@types/resolve/1.17.1: @@ -2253,8 +2147,8 @@ packages: '@types/node': 15.14.9 dev: true - /@types/semver/7.3.8: - resolution: {integrity: sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==} + /@types/semver/7.3.9: + resolution: {integrity: sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==} dev: true /@types/stack-trace/0.0.29: @@ -2295,7 +2189,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/5.2.0_c4b1efa9b4fb23f36c6acd0134327013: + /@typescript-eslint/eslint-plugin/5.2.0_9a56ca1c5fc1d82b3da3317a5c6f9ab1: resolution: {integrity: sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2306,8 +2200,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 5.2.0_eslint@8.1.0+typescript@4.4.3 - '@typescript-eslint/parser': 5.2.0_eslint@8.1.0+typescript@4.4.3 + '@typescript-eslint/experimental-utils': 5.2.0_eslint@8.1.0+typescript@4.4.4 + '@typescript-eslint/parser': 5.2.0_eslint@8.1.0+typescript@4.4.4 '@typescript-eslint/scope-manager': 5.2.0 debug: 4.3.2 eslint: 8.1.0 @@ -2315,13 +2209,13 @@ packages: ignore: 5.1.8 regexpp: 3.2.0 semver: 7.3.5 - tsutils: 3.21.0_typescript@4.4.3 - typescript: 4.4.3 + tsutils: 3.21.0_typescript@4.4.4 + typescript: 4.4.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.2.0_eslint@8.1.0+typescript@4.4.3: + /@typescript-eslint/experimental-utils/5.2.0_eslint@8.1.0+typescript@4.4.4: resolution: {integrity: sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2330,7 +2224,7 @@ packages: '@types/json-schema': 7.0.9 '@typescript-eslint/scope-manager': 5.2.0 '@typescript-eslint/types': 5.2.0 - '@typescript-eslint/typescript-estree': 5.2.0_typescript@4.4.3 + '@typescript-eslint/typescript-estree': 5.2.0_typescript@4.4.4 eslint: 8.1.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.1.0 @@ -2339,7 +2233,7 @@ packages: - typescript dev: true - /@typescript-eslint/parser/5.2.0_eslint@8.1.0+typescript@4.4.3: + /@typescript-eslint/parser/5.2.0_eslint@8.1.0+typescript@4.4.4: resolution: {integrity: sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2351,10 +2245,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.2.0 '@typescript-eslint/types': 5.2.0 - '@typescript-eslint/typescript-estree': 5.2.0_typescript@4.4.3 + '@typescript-eslint/typescript-estree': 5.2.0_typescript@4.4.4 debug: 4.3.2 eslint: 8.1.0 - typescript: 4.4.3 + typescript: 4.4.4 transitivePeerDependencies: - supports-color dev: true @@ -2372,7 +2266,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.2.0_typescript@4.4.3: + /@typescript-eslint/typescript-estree/5.2.0_typescript@4.4.4: resolution: {integrity: sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2387,8 +2281,8 @@ packages: globby: 11.0.4 is-glob: 4.0.3 semver: 7.3.5 - tsutils: 3.21.0_typescript@4.4.3 - typescript: 4.4.3 + tsutils: 3.21.0_typescript@4.4.4 + typescript: 4.4.4 transitivePeerDependencies: - supports-color dev: true @@ -2422,23 +2316,6 @@ packages: - supports-color dev: false - /@vue/compiler-core/3.2.16: - resolution: {integrity: sha512-60LD3f1GpMtoCPWKP7HacFxv97/EUY8m4WNqfFYmfaILVGO0icojdOCYOfgGFiYC+kgk1MOVdiI4vrWci0CnhQ==} - dependencies: - '@babel/parser': 7.15.7 - '@vue/shared': 3.2.16 - estree-walker: 2.0.2 - source-map: 0.6.1 - - /@vue/compiler-core/3.2.19: - resolution: {integrity: sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==} - dependencies: - '@babel/parser': 7.15.7 - '@vue/shared': 3.2.19 - estree-walker: 2.0.2 - source-map: 0.6.1 - dev: true - /@vue/compiler-core/3.2.20: resolution: {integrity: sha512-vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA==} dependencies: @@ -2446,56 +2323,12 @@ packages: '@vue/shared': 3.2.20 estree-walker: 2.0.2 source-map: 0.6.1 - dev: true - - /@vue/compiler-dom/3.2.16: - resolution: {integrity: sha512-K7lYfwvsp5OLb0+/rKI9XT2RJy2RB7TyJBjvlfCDAF0KOJGqWAx++DLJPm+F3D29Mhxgt6ozSKP+rC3dSabvYA==} - dependencies: - '@vue/compiler-core': 3.2.16 - '@vue/shared': 3.2.16 - - /@vue/compiler-dom/3.2.19: - resolution: {integrity: sha512-WzQoE8rfkFjPtIioc7SSgTsnz9g2oG61DU8KHnzPrRS7fW/lji6H2uCYJfp4Z6kZE8GjnHc1Ljwl3/gxDes0cw==} - dependencies: - '@vue/compiler-core': 3.2.19 - '@vue/shared': 3.2.19 - dev: true /@vue/compiler-dom/3.2.20: resolution: {integrity: sha512-QnI77ec/JtV7R0YBbcVayYTDCRcI9OCbxiUQK6izVyqQO0658n0zQuoNwe+bYgtqnvGAIqTR3FShTd5y4oOjdg==} dependencies: '@vue/compiler-core': 3.2.20 '@vue/shared': 3.2.20 - dev: true - - /@vue/compiler-sfc/3.2.16: - resolution: {integrity: sha512-AxaDDg0ZjY7lCoVnCq7V+K3SIEfhyIHtten7k/LRupVC/VzSbelBmW0J8bawgsjLJAfTsdWZjeezZ5JJp2DM/A==} - dependencies: - '@babel/parser': 7.15.7 - '@vue/compiler-core': 3.2.16 - '@vue/compiler-dom': 3.2.16 - '@vue/compiler-ssr': 3.2.16 - '@vue/ref-transform': 3.2.16 - '@vue/shared': 3.2.16 - estree-walker: 2.0.2 - magic-string: 0.25.7 - postcss: 8.3.7 - source-map: 0.6.1 - - /@vue/compiler-sfc/3.2.19: - resolution: {integrity: sha512-pLlbgkO1UHTO02MSpa/sFOXUwIDxSMiKZ1ozE5n71CY4DM+YmI+G3gT/ZHZ46WBId7f3VTF/D8pGwMygcQbrQA==} - dependencies: - '@babel/parser': 7.15.7 - '@vue/compiler-core': 3.2.19 - '@vue/compiler-dom': 3.2.19 - '@vue/compiler-ssr': 3.2.19 - '@vue/ref-transform': 3.2.19 - '@vue/shared': 3.2.19 - estree-walker: 2.0.2 - magic-string: 0.25.7 - postcss: 8.3.7 - source-map: 0.6.1 - dev: true /@vue/compiler-sfc/3.2.20: resolution: {integrity: sha512-03aZo+6tQKiFLfunHKSPZvdK4Jsn/ftRCyaro8AQIWkuxJbvSosbKK6HTTn+D2c3nPScG155akJoxKENw7rftQ==} @@ -2508,69 +2341,23 @@ packages: '@vue/shared': 3.2.20 estree-walker: 2.0.2 magic-string: 0.25.7 - postcss: 8.3.8 + postcss: 8.3.11 source-map: 0.6.1 - dev: true - - /@vue/compiler-ssr/3.2.16: - resolution: {integrity: sha512-u2Inuqp3QpEV3E03ppBLdba40mU0dz/fisbfGjRPlxH5uuQ9v9i5qgrFl7xZ+N5C0ugg5+5KI7MgsbsCAPn0mQ==} - dependencies: - '@vue/compiler-dom': 3.2.16 - '@vue/shared': 3.2.16 - - /@vue/compiler-ssr/3.2.19: - resolution: {integrity: sha512-oLon0Cn3O7WEYzzmzZavGoqXH+199LT+smdjBT3Uf3UX4HwDNuBFCmvL0TsqV9SQnIgKvBRbQ7lhbpnd4lqM3w==} - dependencies: - '@vue/compiler-dom': 3.2.19 - '@vue/shared': 3.2.19 - dev: true /@vue/compiler-ssr/3.2.20: resolution: {integrity: sha512-rzzVVYivm+EjbfiGQvNeyiYZWzr6Hkej97RZLZvcumacQlnKv9176Xo9rRyeWwFbBlxmtNdrVMslRXtipMXk2w==} dependencies: '@vue/compiler-dom': 3.2.20 '@vue/shared': 3.2.20 - dev: true - /@vue/devtools-api/6.0.0-beta.18: - resolution: {integrity: sha512-56vRhO7nXWWFYTx520BQSDlQH5VYpwy62hFDEqi2yHHEBpEqseOP5WYQusq7BEW3DXSY9E9cfPVR5CFtJbKuMg==} + /@vue/devtools-api/6.0.0-beta.19: + resolution: {integrity: sha512-ObzQhgkoVeoyKv+e8+tB/jQBL2smtk/NmC9OmFK8UqdDpoOdv/Kf9pyDWL+IFyM7qLD2C75rszJujvGSPSpGlw==} dev: false - /@vue/reactivity/3.2.16: - resolution: {integrity: sha512-eOOpjakbRFg2roaGhVsGgBFnQWaXJcTw66wfc+ZMWl/cihAcgn792gFO1a6KeT68vQBp4JVpGZ5jkkdgZnwFfA==} - dependencies: - '@vue/shared': 3.2.16 - - /@vue/reactivity/3.2.19: - resolution: {integrity: sha512-FtachoYs2SnyrWup5UikP54xDX6ZJ1s5VgHcJp4rkGoutU3Ry61jhs+nCX7J64zjX992Mh9gGUC0LqTs8q9vCA==} - dependencies: - '@vue/shared': 3.2.19 - dev: true - /@vue/reactivity/3.2.20: resolution: {integrity: sha512-nSmoLojUTk+H8HNTAkrUduB4+yIUBK2HPihJo2uXVSH4Spry6oqN6lFzE5zpLK+F27Sja+UqR9R1+/kIOsHV5w==} dependencies: '@vue/shared': 3.2.20 - dev: true - - /@vue/ref-transform/3.2.16: - resolution: {integrity: sha512-IXFgxGnyd5jIXPQ/QlOoz+daeikeR1AA6DujgqalmW/ndCX9ZKW1rhFsoMGR0WAUZ4VHbT3eluUJhBF8ikNzPg==} - dependencies: - '@babel/parser': 7.15.7 - '@vue/compiler-core': 3.2.16 - '@vue/shared': 3.2.16 - estree-walker: 2.0.2 - magic-string: 0.25.7 - - /@vue/ref-transform/3.2.19: - resolution: {integrity: sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==} - dependencies: - '@babel/parser': 7.15.7 - '@vue/compiler-core': 3.2.19 - '@vue/shared': 3.2.19 - estree-walker: 2.0.2 - magic-string: 0.25.7 - dev: true /@vue/ref-transform/3.2.20: resolution: {integrity: sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q==} @@ -2580,42 +2367,12 @@ packages: '@vue/shared': 3.2.20 estree-walker: 2.0.2 magic-string: 0.25.7 - dev: true - - /@vue/runtime-core/3.2.16: - resolution: {integrity: sha512-Y7jDSKpwRmibQSXpGS2xcC2eVF9CuHQ6uPd1BSMy4aJCzB3ATI0CpRm/Ee/a5e70vjd5D9bY9IHe+9I0CIX1Bg==} - dependencies: - '@vue/reactivity': 3.2.16 - '@vue/shared': 3.2.16 - - /@vue/runtime-core/3.2.19: - resolution: {integrity: sha512-qArZSWKxWsgKfxk9BelZ32nY0MZ31CAW2kUUyVJyxh4cTfHaXGbjiQB5JgsvKc49ROMNffv9t3/qjasQqAH+RQ==} - dependencies: - '@vue/reactivity': 3.2.19 - '@vue/shared': 3.2.19 - dev: true /@vue/runtime-core/3.2.20: resolution: {integrity: sha512-d1xfUGhZPfiZzAN7SatStD4vRtT8deJSXib2+Cz3x0brjMWKxe32asQc154FF1E2fFgMCHtnfd4A90bQEzV4GQ==} dependencies: '@vue/reactivity': 3.2.20 '@vue/shared': 3.2.20 - dev: true - - /@vue/runtime-dom/3.2.16: - resolution: {integrity: sha512-PJ/aMaGfXkqFnykNqpDamcMJni4c/nqDQDz0hKncJiVqU4leiFGq7YC2IFbXECdG83GiHFhEc/77WOhecWSmCw==} - dependencies: - '@vue/runtime-core': 3.2.16 - '@vue/shared': 3.2.16 - csstype: 2.6.18 - - /@vue/runtime-dom/3.2.19: - resolution: {integrity: sha512-hIRboxXwafeHhbZEkZYNV0MiJXPNf4fP0X6hM2TJb0vssz8BKhD9cF92BkRgZztTQevecbhk0gu4uAPJ3dxL9A==} - dependencies: - '@vue/runtime-core': 3.2.19 - '@vue/shared': 3.2.19 - csstype: 2.6.18 - dev: true /@vue/runtime-dom/3.2.20: resolution: {integrity: sha512-4TCvZMLhESWCFHFYgqN4QmMA/onnINAlUovhopjlS8ST27G1A8Z0tyxPzLoXLa+b5JrOpbMPheEMPvdKExTJig==} @@ -2623,26 +2380,6 @@ packages: '@vue/runtime-core': 3.2.20 '@vue/shared': 3.2.20 csstype: 2.6.18 - dev: true - - /@vue/server-renderer/3.2.16_vue@3.2.16: - resolution: {integrity: sha512-g2aSNYHaExFElYmKw1bfmp3yQmBCPQzrX3Hd7bhDa7bbGGHGchOg0n31SwuMrGk/z/pho4Z0K+LPfChmcECynQ==} - peerDependencies: - vue: 3.2.16 - dependencies: - '@vue/compiler-ssr': 3.2.16 - '@vue/shared': 3.2.16 - vue: 3.2.16 - - /@vue/server-renderer/3.2.19_vue@3.2.19: - resolution: {integrity: sha512-A9FNT7fgQJXItwdzWREntAgWKVtKYuXHBKGev/H4+ByTu8vB7gQXGcim01QxaJshdNg4dYuH2tEBZXCNCNx+/w==} - peerDependencies: - vue: 3.2.19 - dependencies: - '@vue/compiler-ssr': 3.2.19 - '@vue/shared': 3.2.19 - vue: 3.2.19 - dev: true /@vue/server-renderer/3.2.20_vue@3.2.20: resolution: {integrity: sha512-viIbZGep9XabnrRcaxWIi00cOh1x21QYm2upIL5W0zqzTJ54VdTzpI+zi1osNp+VfRQDTHpV2U7H3Kn4ljYJvg==} @@ -2652,18 +2389,9 @@ packages: '@vue/compiler-ssr': 3.2.20 '@vue/shared': 3.2.20 vue: 3.2.20 - dev: true - - /@vue/shared/3.2.16: - resolution: {integrity: sha512-zpv8lxuatl3ruCJCsGzrO/F4+IlLug4jbu3vaIi/wJVZKQgnsW1R/xSRJMQS6K57cl4fT/2zkrYsWh1/6H7Esw==} - - /@vue/shared/3.2.19: - resolution: {integrity: sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==} - dev: true /@vue/shared/3.2.20: resolution: {integrity: sha512-FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w==} - dev: true /@wessberg/stringutil/1.0.19: resolution: {integrity: sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg==} @@ -2686,7 +2414,7 @@ packages: resolution: {integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==} engines: {node: '>= 0.6'} dependencies: - mime-types: 2.1.32 + mime-types: 2.1.33 negotiator: 0.6.2 dev: true @@ -2792,23 +2520,23 @@ packages: uri-js: 4.4.1 dev: true - /algoliasearch/4.10.5: - resolution: {integrity: sha512-KmH2XkiN+8FxhND4nWFbQDkIoU6g2OjfeU9kIv4Lb+EiOOs3Gpp7jvd+JnatsCisAZsnWQdjd7zVlW7I/85QvQ==} + /algoliasearch/4.11.0: + resolution: {integrity: sha512-IXRj8kAP2WrMmj+eoPqPc6P7Ncq1yZkFiyDrjTBObV1ADNL8Z/KdZ+dWC5MmYcBLAbcB/mMCpak5N/D1UIZvsA==} dependencies: - '@algolia/cache-browser-local-storage': 4.10.5 - '@algolia/cache-common': 4.10.5 - '@algolia/cache-in-memory': 4.10.5 - '@algolia/client-account': 4.10.5 - '@algolia/client-analytics': 4.10.5 - '@algolia/client-common': 4.10.5 - '@algolia/client-personalization': 4.10.5 - '@algolia/client-search': 4.10.5 - '@algolia/logger-common': 4.10.5 - '@algolia/logger-console': 4.10.5 - '@algolia/requester-browser-xhr': 4.10.5 - '@algolia/requester-common': 4.10.5 - '@algolia/requester-node-http': 4.10.5 - '@algolia/transporter': 4.10.5 + '@algolia/cache-browser-local-storage': 4.11.0 + '@algolia/cache-common': 4.11.0 + '@algolia/cache-in-memory': 4.11.0 + '@algolia/client-account': 4.11.0 + '@algolia/client-analytics': 4.11.0 + '@algolia/client-common': 4.11.0 + '@algolia/client-personalization': 4.11.0 + '@algolia/client-search': 4.11.0 + '@algolia/logger-common': 4.11.0 + '@algolia/logger-console': 4.11.0 + '@algolia/requester-browser-xhr': 4.11.0 + '@algolia/requester-common': 4.11.0 + '@algolia/requester-node-http': 4.11.0 + '@algolia/transporter': 4.11.0 dev: true /ansi-colors/4.1.1: @@ -2923,18 +2651,18 @@ packages: hasBin: true dev: true - /autoprefixer/10.3.5: - resolution: {integrity: sha512-2H5kQSsyoOMdIehTzIt/sC9ZDIgWqlkG/dbevm9B9xQZ1TDPBHpNUDW5ENqqQQzuaBWEo75JkV0LJe+o5Lnr5g==} + /autoprefixer/10.4.0: + resolution: {integrity: sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: - browserslist: 4.17.1 - caniuse-lite: 1.0.30001259 + browserslist: 4.17.5 + caniuse-lite: 1.0.30001272 fraction.js: 4.1.1 - nanocolors: 0.1.6 normalize-range: 0.1.2 + picocolors: 1.0.0 postcss-value-parser: 4.1.0 dev: false @@ -2946,18 +2674,18 @@ packages: - debug dev: false - /babel-jest/27.2.4_@babel+core@7.15.5: - resolution: {integrity: sha512-f24OmxyWymk5jfgLdlCMu4fTs4ldxFBIdn5sJdhvGC1m08rSkJ5hYbWkNmfBSvE/DjhCVNSHXepxsI6THGfGsg==} + /babel-jest/27.3.1_@babel+core@7.15.8: + resolution: {integrity: sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: - '@babel/core': 7.15.5 - '@jest/transform': 27.2.4 - '@jest/types': 27.2.4 + '@babel/core': 7.15.8 + '@jest/transform': 27.3.1 + '@jest/types': 27.2.5 '@types/babel__core': 7.1.16 - babel-plugin-istanbul: 6.0.0 - babel-preset-jest: 27.2.0_@babel+core@7.15.5 + babel-plugin-istanbul: 6.1.1 + babel-preset-jest: 27.2.0_@babel+core@7.15.8 chalk: 4.1.2 graceful-fs: 4.2.8 slash: 3.0.0 @@ -2965,14 +2693,14 @@ packages: - supports-color dev: true - /babel-plugin-istanbul/6.0.0: - resolution: {integrity: sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==} + /babel-plugin-istanbul/6.1.1: + resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} engines: {node: '>=8'} dependencies: '@babel/helper-plugin-utils': 7.14.5 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 - istanbul-lib-instrument: 4.0.3 + istanbul-lib-instrument: 5.1.0 test-exclude: 6.0.0 transitivePeerDependencies: - supports-color @@ -2996,35 +2724,35 @@ packages: resolve: 1.20.0 dev: true - /babel-preset-current-node-syntax/1.0.1_@babel+core@7.15.5: + /babel-preset-current-node-syntax/1.0.1_@babel+core@7.15.8: resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.15.5 - '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.15.5 - '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.15.5 - '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.15.5 - '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.15.5 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.15.5 - '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.15.5 - dev: true - - /babel-preset-jest/27.2.0_@babel+core@7.15.5: + '@babel/core': 7.15.8 + '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.15.8 + '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.15.8 + '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.15.8 + '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.15.8 + '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.15.8 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.15.8 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.15.8 + '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.15.8 + '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.15.8 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.15.8 + '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.15.8 + '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.15.8 + dev: true + + /babel-preset-jest/27.2.0_@babel+core@7.15.8: resolution: {integrity: sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 babel-plugin-jest-hoist: 27.2.0 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.15.5 + babel-preset-current-node-syntax: 1.0.1_@babel+core@7.15.8 dev: true /babel-walk/3.0.0-canary-5: @@ -3082,16 +2810,16 @@ packages: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} dev: true - /browserslist/4.17.1: - resolution: {integrity: sha512-aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ==} + /browserslist/4.17.5: + resolution: {integrity: sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001259 - electron-to-chromium: 1.3.848 + caniuse-lite: 1.0.30001272 + electron-to-chromium: 1.3.884 escalade: 3.1.1 - nanocolors: 0.1.6 - node-releases: 1.1.76 + node-releases: 2.0.1 + picocolors: 1.0.0 /bs-logger/0.2.6: resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==} @@ -3174,8 +2902,8 @@ packages: resolution: {integrity: sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==} engines: {node: '>=10'} - /caniuse-lite/1.0.30001259: - resolution: {integrity: sha512-V7mQTFhjITxuk9zBpI6nYsiTXhcPe05l+364nZjK7MFK/E7ibvYBSAXr4YcA6oPR8j3ZLM/LN+lUqUVAQEUZFg==} + /caniuse-lite/1.0.30001272: + resolution: {integrity: sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw==} /chalk/2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -3211,7 +2939,7 @@ packages: braces: 3.0.2 glob-parent: 5.1.2 is-binary-path: 2.1.0 - is-glob: 4.0.1 + is-glob: 4.0.3 normalize-path: 3.0.0 readdirp: 3.6.0 optionalDependencies: @@ -3229,7 +2957,7 @@ packages: resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==} dev: true - /cjstoesm/1.1.4_typescript@4.4.3: + /cjstoesm/1.1.4_typescript@4.4.4: resolution: {integrity: sha512-cixLJwK2HS8R8J1jJcYwlrLxWUbdNms5EmVQuvP3O0CGvHNv2WVd2gnqTP/tbTEYzbgWiSYQBZDoAakqsSl94Q==} engines: {node: '>=10.0.0'} hasBin: true @@ -3239,13 +2967,13 @@ packages: '@wessberg/stringutil': 1.0.19 chalk: 4.1.2 commander: 7.2.0 - compatfactory: 0.0.6_typescript@4.4.3 + compatfactory: 0.0.6_typescript@4.4.4 crosspath: 0.0.8 fast-glob: 3.2.7 helpertypes: 0.0.2 reserved-words: 0.1.2 resolve: 1.20.0 - typescript: 4.4.3 + typescript: 4.4.4 dev: true /clean-stack/2.2.0: @@ -3265,7 +2993,7 @@ packages: engines: {node: '>=8'} dependencies: slice-ansi: 3.0.0 - string-width: 4.2.2 + string-width: 4.2.3 dev: true /clipboard/2.0.8: @@ -3279,8 +3007,8 @@ packages: /cliui/7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} dependencies: - string-width: 4.2.2 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 wrap-ansi: 7.0.0 dev: true @@ -3333,6 +3061,10 @@ packages: resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} dev: true + /colorette/2.0.16: + resolution: {integrity: sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==} + dev: true + /colors/1.2.5: resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==} engines: {node: '>=0.1.90'} @@ -3352,14 +3084,15 @@ packages: /commander/6.2.1: resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==} engines: {node: '>= 6'} + dev: false /commander/7.2.0: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} engines: {node: '>= 10'} dev: true - /commander/8.2.0: - resolution: {integrity: sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==} + /commander/8.3.0: + resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} dev: true @@ -3378,14 +3111,14 @@ packages: dot-prop: 5.3.0 dev: true - /compatfactory/0.0.6_typescript@4.4.3: + /compatfactory/0.0.6_typescript@4.4.4: resolution: {integrity: sha512-F1LpdNxgxay4UdanmeL75+guJPDg2zu8bFZDVih/kse5hA3oa+aMgvk4tLwq7AFBpy3S0ilnPdSfYsTl/L9NXA==} engines: {node: '>=10.0.0'} peerDependencies: typescript: '>=3.x || >= 4.x' dependencies: helpertypes: 0.0.2 - typescript: 4.4.3 + typescript: 4.4.4 dev: true /compressible/2.0.18: @@ -3429,7 +3162,7 @@ packages: /constantinople/4.0.1: resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==} dependencies: - '@babel/parser': 7.15.7 + '@babel/parser': 7.15.8 '@babel/types': 7.15.6 dev: true @@ -3494,7 +3227,7 @@ packages: dependencies: add-stream: 1.0.0 conventional-changelog-writer: 5.0.0 - conventional-commits-parser: 3.2.2 + conventional-commits-parser: 3.2.3 dateformat: 3.0.3 get-pkg-repo: 4.2.1 git-raw-commits: 2.0.10 @@ -3590,8 +3323,8 @@ packages: modify-values: 1.0.1 dev: true - /conventional-commits-parser/3.2.2: - resolution: {integrity: sha512-Jr9KAKgqAkwXMRHjxDwO/zOCDKod1XdAESHAGuJX38iZ7ZzVti/tvVoysO0suMsdAObp9NQ2rHSsSbnAqZ5f5g==} + /conventional-commits-parser/3.2.3: + resolution: {integrity: sha512-YyRDR7On9H07ICFpRm/igcdjIqebXbvf4Cff+Pf0BrBys1i1EOzx9iFXNlAbdrLAR8jf7bkUYkDAr8pEy0q4Pw==} engines: {node: '>=10'} hasBin: true dependencies: @@ -3998,8 +3731,8 @@ packages: resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: true - /electron-to-chromium/1.3.848: - resolution: {integrity: sha512-wchRyBcdcmibioggdO7CbMT5QQ4lXlN/g7Mkpf1K2zINidnqij6EVu94UIZ+h5nB2S9XD4bykqFv9LonAWLFyw==} + /electron-to-chromium/1.3.884: + resolution: {integrity: sha512-kOaCAa+biA98PwH5BpCkeUeTL6mCeg8p3Q3OhqzPyqhu/5QUnWAN2wr/3IK8xMQxIV76kfoQpP+Bn/wij/jXrg==} /emittery/0.8.1: resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==} @@ -4052,8 +3785,8 @@ packages: dependencies: is-arrayish: 0.2.1 - /es-abstract/1.18.6: - resolution: {integrity: sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==} + /es-abstract/1.19.1: + resolution: {integrity: sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -4067,7 +3800,9 @@ packages: is-callable: 1.2.4 is-negative-zero: 2.0.1 is-regex: 1.1.4 + is-shared-array-buffer: 1.0.1 is-string: 1.0.7 + is-weakref: 1.0.1 object-inspect: 1.11.0 object-keys: 1.1.1 object.assign: 4.1.2 @@ -4076,8 +3811,8 @@ packages: unbox-primitive: 1.0.1 dev: true - /es-module-lexer/0.9.2: - resolution: {integrity: sha512-YkAGWqxZq2B4FxQ5y687UwywDwvLQhIMCZ+SDU7ZW729SDHOEI6wVFXwTRecz+yiwJzCsVwC6V7bxyNbZSB1rg==} + /es-module-lexer/0.9.3: + resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==} dev: true /es-to-primitive/1.2.1: @@ -4112,139 +3847,147 @@ packages: ext: 1.6.0 dev: false - /esbuild-android-arm64/0.13.2: - resolution: {integrity: sha512-Eh2paXUWYqf5JgikdkC0LnhtjSC8tGAz/L2kJRlMC0o3DzOBIxcmT2fdzBerdhW4roY0bOExfcO6deI1qsxI/A==} + /esbuild-android-arm64/0.13.10: + resolution: {integrity: sha512-1sCdVAq64yMp2Uhlu+97/enFxpmrj31QHtThz7K+/QGjbHa7JZdBdBsZCzWJuntKHZ+EU178tHYkvjaI9z5sGg==} cpu: [arm64] os: [android] requiresBuild: true optional: true - /esbuild-darwin-64/0.13.2: - resolution: {integrity: sha512-jqp6uXHIIAWZ8kxRqFjxyMmIE1cuSbINellwwigOgk44eLg74ls82oqjY72MbDAowPivQkOU/fF7tsyaGQf5Zg==} + /esbuild-darwin-64/0.13.10: + resolution: {integrity: sha512-XlL+BYZ2h9cz3opHfFgSHGA+iy/mljBFIRU9q++f9SiBXEZTb4gTW/IENAD1l9oKH0FdO9rUpyAfV+lM4uAxrg==} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /esbuild-darwin-arm64/0.13.2: - resolution: {integrity: sha512-bD4oAyPZdzOWEA/JoX0sAitOhjJRwhomhWMeyRyowtlVQhQleG2ijRUKTvkq4CAvSobrW5EnZxjvHNKJ5L7zJg==} + /esbuild-darwin-arm64/0.13.10: + resolution: {integrity: sha512-RZMMqMTyActMrXKkW71IQO8B0tyQm0Bm+ZJQWNaHJchL5LlqazJi7rriwSocP+sKLszHhsyTEBBh6qPdw5g5yQ==} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /esbuild-freebsd-64/0.13.2: - resolution: {integrity: sha512-fFJ0yc3lZyfwca+F5OPN/s+izozWryUQpN8aUMIdUkOa7UKX0h3xXrKnkDgdOo8vy3d1A6zHH0/4f2VJfEzLCg==} + /esbuild-freebsd-64/0.13.10: + resolution: {integrity: sha512-pf4BEN9reF3jvZEZdxljVgOv5JS4kuYFCI78xk+2HWustbLvTP0b9XXfWI/OD0ZLWbyLYZYIA+VbVe4tdAklig==} cpu: [x64] os: [freebsd] requiresBuild: true optional: true - /esbuild-freebsd-arm64/0.13.2: - resolution: {integrity: sha512-DWBZauEfjmqdfWxIacI+KBEim3ulOjtvK+WVm1bX67XlfyUVIkD915OIfT2EBhQUWmv+Z0tZZwskSMNj5DKojw==} + /esbuild-freebsd-arm64/0.13.10: + resolution: {integrity: sha512-j9PUcuNWmlxr4/ry4dK/s6zKh42Jhh/N5qnAAj7tx3gMbkIHW0JBoVSbbgp97p88X9xgKbXx4lG2sJDhDWmsYQ==} cpu: [arm64] os: [freebsd] requiresBuild: true optional: true - /esbuild-linux-32/0.13.2: - resolution: {integrity: sha512-Gt2rNqqRCRh1QQC2d83KP0iWIXWQYpns7l2+41a1n0PQxXkQ5AarpjjL9mUzdXtcZauNXbUvWwBKAuBTCW+XQg==} + /esbuild-linux-32/0.13.10: + resolution: {integrity: sha512-imtdHG5ru0xUUXuc2ofdtyw0fWlHYXV7JjF7oZHgmn0b+B4o4Nr6ZON3xxoo1IP8wIekW+7b9exIf/MYq0QV7w==} cpu: [ia32] os: [linux] requiresBuild: true optional: true - /esbuild-linux-64/0.13.2: - resolution: {integrity: sha512-yT0D5Xly8oGHuqq975k1XUyULHzk3fN/ZlTY+awlU+nCFsYPZ43NE5msGpxlNQu8i6KOXQEke5GXN3y5d+Zd4g==} + /esbuild-linux-64/0.13.10: + resolution: {integrity: sha512-O7fzQIH2e7GC98dvoTH0rad5BVLm9yU3cRWfEmryCEIFTwbNEWCEWOfsePuoGOHRtSwoVY1hPc21CJE4/9rWxQ==} cpu: [x64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-arm/0.13.2: - resolution: {integrity: sha512-KXeyotqj9jbvCjbSpwnxDE8E8jKoBgrgbJpOvvY5Zz7Pp2fAwu/94vWQtE/jPEJndY4C4MSs+ryJLFWzmLOa4w==} + /esbuild-linux-arm/0.13.10: + resolution: {integrity: sha512-R2Jij4A0K8BcmBehvQeUteQEcf24Y2YZ6mizlNFuJOBPxe3vZNmkZ4mCE7Pf1tbcqA65qZx8J3WSHeGJl9EsJA==} cpu: [arm] os: [linux] requiresBuild: true optional: true - /esbuild-linux-arm64/0.13.2: - resolution: {integrity: sha512-qwXL+3NDCWiC8RMKBBETpuOWdC+pUAUS+pwg9jJmapYblLdVKkyRtwF/ogj06TdYs6riSSNikW8HK/Xs0HHbbQ==} + /esbuild-linux-arm64/0.13.10: + resolution: {integrity: sha512-bkGxN67S2n0PF4zhh87/92kBTsH2xXLuH6T5omReKhpXdJZF5SVDSk5XU/nngARzE+e6QK6isK060Dr5uobzNw==} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-mips64le/0.13.2: - resolution: {integrity: sha512-sx8eheRX2XC2ppNAsbQm8/VUcU8XPYGpJK0BEyRefqHONz6u5Ib2guUdOz2Wh4YlbA7oOd482lHjprXSTwUcrQ==} + /esbuild-linux-mips64le/0.13.10: + resolution: {integrity: sha512-UDNO5snJYOLWrA2uOUxM/PVbzzh2TR7Zf2i8zCCuFlYgvAb/81XO+Tasp3YAElDpp4VGqqcpBXLtofa9nrnJGA==} cpu: [mips64el] os: [linux] requiresBuild: true optional: true - /esbuild-linux-ppc64le/0.13.2: - resolution: {integrity: sha512-y8iZ3qy2TIAKKsZ6xSopCztHOtGW9oiYDl22vQ0UIoVWjnfRKrbSzX7Y2F94y32hSvRWle6OhAIC+UpS5nQmIA==} + /esbuild-linux-ppc64le/0.13.10: + resolution: {integrity: sha512-xu6J9rMWu1TcEGuEmoc8gsTrJCEPsf+QtxK4IiUZNde9r4Q4nlRVah4JVZP3hJapZgZJcxsse0XiKXh1UFdOeA==} cpu: [ppc64] os: [linux] requiresBuild: true optional: true - /esbuild-openbsd-64/0.13.2: - resolution: {integrity: sha512-g6AYrjBeV9OK624bw0KQ1TjHJQSW+X1Yicyd1NvDWqSFpMqKAjw7EUX4tA87mOFqv8BflPGr4f43ySgNvSVzIw==} + /esbuild-netbsd-64/0.13.10: + resolution: {integrity: sha512-d+Gr0ScMC2J83Bfx/ZvJHK0UAEMncctwgjRth9d4zppYGLk/xMfFKxv5z1ib8yZpQThafq8aPm8AqmFIJrEesw==} + cpu: [x64] + os: [netbsd] + requiresBuild: true + optional: true + + /esbuild-openbsd-64/0.13.10: + resolution: {integrity: sha512-OuCYc+bNKumBvxflga+nFzZvxsgmWQW+z4rMGIjM5XIW0nNbGgRc5p/0PSDv0rTdxAmwCpV69fezal0xjrDaaA==} cpu: [x64] os: [openbsd] requiresBuild: true optional: true - /esbuild-sunos-64/0.13.2: - resolution: {integrity: sha512-hIXvFIyrqwFd6v62XSra0ctCUXDS9Tu5D6QYbvnbhEoBmvD/TmEJRYRH48/+xmRifKJLzu6aegcrjAsDmaww7g==} + /esbuild-sunos-64/0.13.10: + resolution: {integrity: sha512-gUkgivZK11bD56wDoLsnYrsOHD/zHzzLSdqKcIl3wRMulfHpRBpoX8gL0dbWr+8N9c+1HDdbNdvxSRmZ4RCVwg==} cpu: [x64] os: [sunos] requiresBuild: true optional: true - /esbuild-windows-32/0.13.2: - resolution: {integrity: sha512-Y767LG0NFkw0sPoDVOTKC5gaj4vURjjWfSCCDV5awpXXxBKOF2zsIp3aia4KvVoivoSSeRPk3emDd0OPHuPrKg==} + /esbuild-windows-32/0.13.10: + resolution: {integrity: sha512-C1xJ54E56dGWRaYcTnRy7amVZ9n1/D/D2/qVw7e5EtS7p+Fv/yZxxgqyb1hMGKXgtFYX4jMpU5eWBF/AsYrn+A==} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /esbuild-windows-64/0.13.2: - resolution: {integrity: sha512-01b59kVJUMasctn6lzswC0drchr7zO75QtF22o5w0nlOw0Zorw0loY/8i5choFuWc30gXJId9qBSc1zPvt7uEw==} + /esbuild-windows-64/0.13.10: + resolution: {integrity: sha512-6+EXEXopEs3SvPFAHcps2Krp/FvqXXsOQV33cInmyilb0ZBEQew4MIoZtMIyB3YXoV6//dl3i6YbPrFZaWEinQ==} cpu: [x64] os: [win32] requiresBuild: true optional: true - /esbuild-windows-arm64/0.13.2: - resolution: {integrity: sha512-HxyY604ytmh8NkPYyS1TdIB/bFS7DWd1hP90e8Ovo/elEdN5I13h0tyIatDYZkXKS0Ztk+9T/3h6K0fI1a/4tQ==} + /esbuild-windows-arm64/0.13.10: + resolution: {integrity: sha512-xTqM/XKhORo6u9S5I0dNJWEdWoemFjogLUTVLkQMVyUV3ZuMChahVA+bCqKHdyX55pCFxD/8v2fm3/sfFMWN+g==} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /esbuild/0.13.2: - resolution: {integrity: sha512-/tpIqo45hyRREGqh7hsIut8GwY1X2n9IhKbIwRIXUO6IohzG3/RarSGX7dT2eNvYzIbQmelpX+ZyuIphE5u+Bw==} + /esbuild/0.13.10: + resolution: {integrity: sha512-0NfCsnAh5XatHIx6Cu93wpR2v6opPoOMxONYhaAoZKzGYqAE+INcDeX2wqMdcndvPQdWCuuCmvlnsh0zmbHcSQ==} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-arm64: 0.13.2 - esbuild-darwin-64: 0.13.2 - esbuild-darwin-arm64: 0.13.2 - esbuild-freebsd-64: 0.13.2 - esbuild-freebsd-arm64: 0.13.2 - esbuild-linux-32: 0.13.2 - esbuild-linux-64: 0.13.2 - esbuild-linux-arm: 0.13.2 - esbuild-linux-arm64: 0.13.2 - esbuild-linux-mips64le: 0.13.2 - esbuild-linux-ppc64le: 0.13.2 - esbuild-openbsd-64: 0.13.2 - esbuild-sunos-64: 0.13.2 - esbuild-windows-32: 0.13.2 - esbuild-windows-64: 0.13.2 - esbuild-windows-arm64: 0.13.2 + esbuild-android-arm64: 0.13.10 + esbuild-darwin-64: 0.13.10 + esbuild-darwin-arm64: 0.13.10 + esbuild-freebsd-64: 0.13.10 + esbuild-freebsd-arm64: 0.13.10 + esbuild-linux-32: 0.13.10 + esbuild-linux-64: 0.13.10 + esbuild-linux-arm: 0.13.10 + esbuild-linux-arm64: 0.13.10 + esbuild-linux-mips64le: 0.13.10 + esbuild-linux-ppc64le: 0.13.10 + esbuild-netbsd-64: 0.13.10 + esbuild-openbsd-64: 0.13.10 + esbuild-sunos-64: 0.13.10 + esbuild-windows-32: 0.13.10 + esbuild-windows-64: 0.13.10 + esbuild-windows-arm64: 0.13.10 /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -4274,7 +4017,7 @@ packages: hasBin: true dependencies: esprima: 4.0.1 - estraverse: 5.2.0 + estraverse: 5.3.0 esutils: 2.0.3 optionator: 0.8.3 optionalDependencies: @@ -4324,7 +4067,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: esrecurse: 4.3.0 - estraverse: 5.2.0 + estraverse: 5.3.0 dev: true /eslint-utils/2.1.0: @@ -4382,12 +4125,12 @@ packages: fast-deep-equal: 3.1.3 file-entry-cache: 6.0.1 functional-red-black-tree: 1.0.1 - glob-parent: 6.0.1 - globals: 13.11.0 + glob-parent: 6.0.2 + globals: 13.12.0 ignore: 4.0.6 import-fresh: 3.3.0 imurmurhash: 0.1.4 - is-glob: 4.0.1 + is-glob: 4.0.3 js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 @@ -4398,7 +4141,7 @@ packages: progress: 2.0.3 regexpp: 3.2.0 semver: 7.3.5 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 strip-json-comments: 3.1.1 text-table: 0.2.0 v8-compile-cache: 2.3.0 @@ -4425,14 +4168,14 @@ packages: resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==} engines: {node: '>=0.10'} dependencies: - estraverse: 5.2.0 + estraverse: 5.3.0 dev: true /esrecurse/4.3.0: resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} engines: {node: '>=4.0'} dependencies: - estraverse: 5.2.0 + estraverse: 5.3.0 dev: true /estraverse/4.3.0: @@ -4440,8 +4183,8 @@ packages: engines: {node: '>=4.0'} dev: true - /estraverse/5.2.0: - resolution: {integrity: sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==} + /estraverse/5.3.0: + resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} dev: true @@ -4480,7 +4223,7 @@ packages: is-stream: 1.1.0 npm-run-path: 2.0.2 p-finally: 1.0.0 - signal-exit: 3.0.4 + signal-exit: 3.0.5 strip-eof: 1.0.0 dev: true @@ -4495,7 +4238,7 @@ packages: merge-stream: 2.0.0 npm-run-path: 4.0.1 onetime: 5.1.2 - signal-exit: 3.0.4 + signal-exit: 3.0.5 strip-final-newline: 2.0.0 dev: true @@ -4504,15 +4247,15 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /expect/27.2.4: - resolution: {integrity: sha512-gOtuonQ8TCnbNNCSw2fhVzRf8EFYDII4nB5NmG4IEV0rbUnW1I5zXvoTntU4iicB/Uh0oZr20NGlOLdJiwsOZA==} + /expect/27.3.1: + resolution: {integrity: sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 ansi-styles: 5.2.0 - jest-get-type: 27.0.6 - jest-matcher-utils: 27.2.4 - jest-message-util: 27.2.4 + jest-get-type: 27.3.1 + jest-matcher-utils: 27.3.1 + jest-message-util: 27.3.1 jest-regex-util: 27.0.6 dev: true @@ -4683,7 +4426,7 @@ packages: dependencies: asynckit: 0.4.0 combined-stream: 1.0.8 - mime-types: 2.1.32 + mime-types: 2.1.33 dev: true /formdata-node/2.5.0: @@ -4848,24 +4591,13 @@ packages: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} dependencies: - is-glob: 4.0.1 + is-glob: 4.0.3 - /glob-parent/6.0.1: - resolution: {integrity: sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==} + /glob-parent/6.0.2: + resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} dependencies: - is-glob: 4.0.1 - - /glob/7.1.7: - resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.0.4 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true + is-glob: 4.0.3 /glob/7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} @@ -4881,8 +4613,8 @@ packages: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} - /globals/13.11.0: - resolution: {integrity: sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==} + /globals/13.12.0: + resolution: {integrity: sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -5099,13 +4831,13 @@ packages: resolution: {integrity: sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=} dev: true - /icss-utils/5.1.0_postcss@8.3.8: + /icss-utils/5.1.0_postcss@8.3.11: resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.3.8 + postcss: 8.3.11 dev: true /ignore/4.0.6: @@ -5150,8 +4882,8 @@ packages: engines: {node: '>=8'} dev: true - /import-local/3.0.2: - resolution: {integrity: sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==} + /import-local/3.0.3: + resolution: {integrity: sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==} engines: {node: '>=8'} hasBin: true dependencies: @@ -5195,8 +4927,8 @@ packages: side-channel: 1.0.4 dev: true - /ioredis/4.27.9: - resolution: {integrity: sha512-hAwrx9F+OQ0uIvaJefuS3UTqW+ByOLyLIV+j0EH8ClNVxvFyH9Vmb08hCL4yje6mDYT5zMquShhypkd50RRzkg==} + /ioredis/4.28.0: + resolution: {integrity: sha512-I+zkeeWp3XFgPT2CtJKxvaF5FjGBGt4yGYljRjQecdQKteThuAsKqffeF1lgHVlYnuNeozRbPOCDNZ7tDWPeig==} engines: {node: '>=6'} dependencies: cluster-key-slot: 1.1.0 @@ -5214,6 +4946,10 @@ packages: - supports-color dev: true + /ip/1.1.5: + resolution: {integrity: sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=} + dev: true + /ipaddr.js/1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} engines: {node: '>= 0.10'} @@ -5258,13 +4994,6 @@ packages: ci-info: 1.6.0 dev: true - /is-ci/3.0.0: - resolution: {integrity: sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==} - hasBin: true - dependencies: - ci-info: 3.2.0 - dev: true - /is-color-stop/1.1.0: resolution: {integrity: sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=} dependencies: @@ -5276,8 +5005,8 @@ packages: rgba-regex: 1.0.0 dev: false - /is-core-module/2.6.0: - resolution: {integrity: sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==} + /is-core-module/2.8.0: + resolution: {integrity: sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==} dependencies: has: 1.0.3 @@ -5315,18 +5044,11 @@ packages: engines: {node: '>=6'} dev: true - /is-glob/4.0.1: - resolution: {integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==} - engines: {node: '>=0.10.0'} - dependencies: - is-extglob: 2.1.1 - /is-glob/4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} dependencies: is-extglob: 2.1.1 - dev: true /is-module/1.0.0: resolution: {integrity: sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=} @@ -5390,6 +5112,10 @@ packages: engines: {node: '>=0.10.0'} dev: true + /is-shared-array-buffer/1.0.1: + resolution: {integrity: sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==} + dev: true + /is-stream/1.1.0: resolution: {integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ=} engines: {node: '>=0.10.0'} @@ -5425,6 +5151,12 @@ packages: resolution: {integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=} dev: true + /is-weakref/1.0.1: + resolution: {integrity: sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==} + dependencies: + call-bind: 1.0.2 + dev: true + /is-what/3.14.1: resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==} dev: true @@ -5448,8 +5180,8 @@ packages: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} dev: true - /istanbul-lib-coverage/3.0.1: - resolution: {integrity: sha512-GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ==} + /istanbul-lib-coverage/3.2.0: + resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==} engines: {node: '>=8'} dev: true @@ -5457,9 +5189,22 @@ packages: resolution: {integrity: sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.15.5 + '@babel/core': 7.15.8 + '@istanbuljs/schema': 0.1.3 + istanbul-lib-coverage: 3.2.0 + semver: 6.3.0 + transitivePeerDependencies: + - supports-color + dev: true + + /istanbul-lib-instrument/5.1.0: + resolution: {integrity: sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==} + engines: {node: '>=8'} + dependencies: + '@babel/core': 7.15.8 + '@babel/parser': 7.15.8 '@istanbuljs/schema': 0.1.3 - istanbul-lib-coverage: 3.0.1 + istanbul-lib-coverage: 3.2.0 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -5469,59 +5214,59 @@ packages: resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==} engines: {node: '>=8'} dependencies: - istanbul-lib-coverage: 3.0.1 + istanbul-lib-coverage: 3.2.0 make-dir: 3.1.0 supports-color: 7.2.0 dev: true - /istanbul-lib-source-maps/4.0.0: - resolution: {integrity: sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==} - engines: {node: '>=8'} + /istanbul-lib-source-maps/4.0.1: + resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} + engines: {node: '>=10'} dependencies: debug: 4.3.2 - istanbul-lib-coverage: 3.0.1 + istanbul-lib-coverage: 3.2.0 source-map: 0.6.1 transitivePeerDependencies: - supports-color dev: true - /istanbul-reports/3.0.2: - resolution: {integrity: sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==} + /istanbul-reports/3.0.5: + resolution: {integrity: sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==} engines: {node: '>=8'} dependencies: html-escaper: 2.0.2 istanbul-lib-report: 3.0.0 dev: true - /jest-changed-files/27.2.4: - resolution: {integrity: sha512-eeO1C1u4ex7pdTroYXezr+rbr957myyVoKGjcY4R1TJi3A+9v+4fu1Iv9J4eLq1bgFyT3O3iRWU9lZsEE7J72Q==} + /jest-changed-files/27.3.0: + resolution: {integrity: sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 execa: 5.1.1 throat: 6.0.1 dev: true - /jest-circus/27.2.4: - resolution: {integrity: sha512-TtheheTElrGjlsY9VxkzUU1qwIx05ItIusMVKnvNkMt4o/PeegLRcjq3Db2Jz0GGdBalJdbzLZBgeulZAJxJWA==} + /jest-circus/27.3.1: + resolution: {integrity: sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.2.4 - '@jest/test-result': 27.2.4 - '@jest/types': 27.2.4 + '@jest/environment': 27.3.1 + '@jest/test-result': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 - expect: 27.2.4 + expect: 27.3.1 is-generator-fn: 2.1.0 - jest-each: 27.2.4 - jest-matcher-utils: 27.2.4 - jest-message-util: 27.2.4 - jest-runtime: 27.2.4 - jest-snapshot: 27.2.4 - jest-util: 27.2.4 - pretty-format: 27.2.4 + jest-each: 27.3.1 + jest-matcher-utils: 27.3.1 + jest-message-util: 27.3.1 + jest-runtime: 27.3.1 + jest-snapshot: 27.3.1 + jest-util: 27.3.1 + pretty-format: 27.3.1 slash: 3.0.0 stack-utils: 2.0.5 throat: 6.0.1 @@ -5529,8 +5274,8 @@ packages: - supports-color dev: true - /jest-cli/27.2.4_ts-node@10.2.1: - resolution: {integrity: sha512-4kpQQkg74HYLaXo3nzwtg4PYxSLgL7puz1LXHj5Tu85KmlIpxQFjRkXlx4V47CYFFIDoyl3rHA/cXOxUWyMpNg==} + /jest-cli/27.3.1_ts-node@10.4.0: + resolution: {integrity: sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: @@ -5539,17 +5284,17 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.2.4_ts-node@10.2.1 - '@jest/test-result': 27.2.4 - '@jest/types': 27.2.4 + '@jest/core': 27.3.1_ts-node@10.4.0 + '@jest/test-result': 27.3.1 + '@jest/types': 27.2.5 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.8 - import-local: 3.0.2 - jest-config: 27.2.4_ts-node@10.2.1 - jest-util: 27.2.4 - jest-validate: 27.2.4 - prompts: 2.4.1 + import-local: 3.0.3 + jest-config: 27.3.1_ts-node@10.4.0 + jest-util: 27.3.1 + jest-validate: 27.3.1 + prompts: 2.4.2 yargs: 16.2.0 transitivePeerDependencies: - bufferutil @@ -5559,8 +5304,8 @@ packages: - utf-8-validate dev: true - /jest-config/27.2.4_ts-node@10.2.1: - resolution: {integrity: sha512-tWy0UxhdzqiKyp4l5Vq4HxLyD+gH5td+GCF3c22/DJ0bYAOsMo+qi2XtbJI6oYMH5JOJQs9nLW/r34nvFCehjA==} + /jest-config/27.3.1_ts-node@10.4.0: + resolution: {integrity: sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: ts-node: '>=9.0.0' @@ -5568,28 +5313,28 @@ packages: ts-node: optional: true dependencies: - '@babel/core': 7.15.5 - '@jest/test-sequencer': 27.2.4 - '@jest/types': 27.2.4 - babel-jest: 27.2.4_@babel+core@7.15.5 + '@babel/core': 7.15.8 + '@jest/test-sequencer': 27.3.1 + '@jest/types': 27.2.5 + babel-jest: 27.3.1_@babel+core@7.15.8 chalk: 4.1.2 + ci-info: 3.2.0 deepmerge: 4.2.2 glob: 7.2.0 graceful-fs: 4.2.8 - is-ci: 3.0.0 - jest-circus: 27.2.4 - jest-environment-jsdom: 27.2.4 - jest-environment-node: 27.2.4 - jest-get-type: 27.0.6 - jest-jasmine2: 27.2.4 + jest-circus: 27.3.1 + jest-environment-jsdom: 27.3.1 + jest-environment-node: 27.3.1 + jest-get-type: 27.3.1 + jest-jasmine2: 27.3.1 jest-regex-util: 27.0.6 - jest-resolve: 27.2.4 - jest-runner: 27.2.4 - jest-util: 27.2.4 - jest-validate: 27.2.4 + jest-resolve: 27.3.1 + jest-runner: 27.3.1 + jest-util: 27.3.1 + jest-validate: 27.3.1 micromatch: 4.0.4 - pretty-format: 27.2.4 - ts-node: 10.2.1_3b624d72c50530188ff09826d1b48ebf + pretty-format: 27.3.1 + ts-node: 10.4.0_d3e11751f498564481cc5d710b5b838a transitivePeerDependencies: - bufferutil - canvas @@ -5597,24 +5342,14 @@ packages: - utf-8-validate dev: true - /jest-diff/27.2.0: - resolution: {integrity: sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==} + /jest-diff/27.3.1: + resolution: {integrity: sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: chalk: 4.1.2 diff-sequences: 27.0.6 - jest-get-type: 27.0.6 - pretty-format: 27.2.0 - dev: true - - /jest-diff/27.2.4: - resolution: {integrity: sha512-bLAVlDSCR3gqUPGv+4nzVpEXGsHh98HjUL7Vb2hVyyuBDoQmja8eJb0imUABsuxBeUVmf47taJSAd9nDrwWKEg==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - chalk: 4.1.2 - diff-sequences: 27.0.6 - jest-get-type: 27.0.6 - pretty-format: 27.2.4 + jest-get-type: 27.3.1 + pretty-format: 27.3.1 dev: true /jest-docblock/27.0.6: @@ -5624,27 +5359,27 @@ packages: detect-newline: 3.1.0 dev: true - /jest-each/27.2.4: - resolution: {integrity: sha512-w9XVc+0EDBUTJS4xBNJ7N2JCcWItFd006lFjz77OarAQcQ10eFDBMrfDv2GBJMKlXe9aq0HrIIF51AXcZrRJyg==} + /jest-each/27.3.1: + resolution: {integrity: sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 chalk: 4.1.2 - jest-get-type: 27.0.6 - jest-util: 27.2.4 - pretty-format: 27.2.4 + jest-get-type: 27.3.1 + jest-util: 27.3.1 + pretty-format: 27.3.1 dev: true - /jest-environment-jsdom/27.2.4: - resolution: {integrity: sha512-X70pTXFSypD7AIzKT1mLnDi5hP9w9mdTRcOGOmoDoBrNyNEg4rYm6d4LQWFLc9ps1VnMuDOkFSG0wjSNYGjkng==} + /jest-environment-jsdom/27.3.1: + resolution: {integrity: sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.2.4 - '@jest/fake-timers': 27.2.4 - '@jest/types': 27.2.4 + '@jest/environment': 27.3.1 + '@jest/fake-timers': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 - jest-mock: 27.2.4 - jest-util: 27.2.4 + jest-mock: 27.3.0 + jest-util: 27.3.1 jsdom: 16.7.0 transitivePeerDependencies: - bufferutil @@ -5653,28 +5388,28 @@ packages: - utf-8-validate dev: true - /jest-environment-node/27.2.4: - resolution: {integrity: sha512-ZbVbFSnbzTvhLOIkqh5lcLuGCCFvtG4xTXIRPK99rV2KzQT3kNg16KZwfTnLNlIiWCE8do960eToeDfcqmpSAw==} + /jest-environment-node/27.3.1: + resolution: {integrity: sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.2.4 - '@jest/fake-timers': 27.2.4 - '@jest/types': 27.2.4 + '@jest/environment': 27.3.1 + '@jest/fake-timers': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 - jest-mock: 27.2.4 - jest-util: 27.2.4 + jest-mock: 27.3.0 + jest-util: 27.3.1 dev: true - /jest-get-type/27.0.6: - resolution: {integrity: sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==} + /jest-get-type/27.3.1: + resolution: {integrity: sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dev: true - /jest-haste-map/27.2.4: - resolution: {integrity: sha512-bkJ4bT00T2K+1NZXbRcyKnbJ42I6QBvoDNMTAQQDBhaGNnZreiQKUNqax0e6hLTx7E75pKDeltVu3V1HAdu+YA==} + /jest-haste-map/27.3.1: + resolution: {integrity: sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 '@types/graceful-fs': 4.1.5 '@types/node': 15.14.9 anymatch: 3.1.2 @@ -5682,82 +5417,82 @@ packages: graceful-fs: 4.2.8 jest-regex-util: 27.0.6 jest-serializer: 27.0.6 - jest-util: 27.2.4 - jest-worker: 27.2.4 + jest-util: 27.3.1 + jest-worker: 27.3.1 micromatch: 4.0.4 - walker: 1.0.7 + walker: 1.0.8 optionalDependencies: fsevents: 2.3.2 dev: true - /jest-jasmine2/27.2.4: - resolution: {integrity: sha512-fcffjO/xLWLVnW2ct3No4EksxM5RyPwHDYu9QU+90cC+/eSMLkFAxS55vkqsxexOO5zSsZ3foVpMQcg/amSeIQ==} + /jest-jasmine2/27.3.1: + resolution: {integrity: sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@babel/traverse': 7.15.4 - '@jest/environment': 27.2.4 + '@jest/environment': 27.3.1 '@jest/source-map': 27.0.6 - '@jest/test-result': 27.2.4 - '@jest/types': 27.2.4 + '@jest/test-result': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 chalk: 4.1.2 co: 4.6.0 - expect: 27.2.4 + expect: 27.3.1 is-generator-fn: 2.1.0 - jest-each: 27.2.4 - jest-matcher-utils: 27.2.4 - jest-message-util: 27.2.4 - jest-runtime: 27.2.4 - jest-snapshot: 27.2.4 - jest-util: 27.2.4 - pretty-format: 27.2.4 + jest-each: 27.3.1 + jest-matcher-utils: 27.3.1 + jest-message-util: 27.3.1 + jest-runtime: 27.3.1 + jest-snapshot: 27.3.1 + jest-util: 27.3.1 + pretty-format: 27.3.1 throat: 6.0.1 transitivePeerDependencies: - supports-color dev: true - /jest-leak-detector/27.2.4: - resolution: {integrity: sha512-SrcHWbe0EHg/bw2uBjVoHacTo5xosl068x2Q0aWsjr2yYuW2XwqrSkZV4lurUop0jhv1709ymG4or+8E4sH27Q==} + /jest-leak-detector/27.3.1: + resolution: {integrity: sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - jest-get-type: 27.0.6 - pretty-format: 27.2.4 + jest-get-type: 27.3.1 + pretty-format: 27.3.1 dev: true - /jest-matcher-utils/27.2.4: - resolution: {integrity: sha512-nQeLfFAIPPkyhkDfifAPfP/U5wm1x0fLtAzqXZSSKckXDNuk2aaOfQiDYv1Mgf5GY6yOsxfUnvNm3dDjXM+BXw==} + /jest-matcher-utils/27.3.1: + resolution: {integrity: sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: chalk: 4.1.2 - jest-diff: 27.2.4 - jest-get-type: 27.0.6 - pretty-format: 27.2.4 + jest-diff: 27.3.1 + jest-get-type: 27.3.1 + pretty-format: 27.3.1 dev: true - /jest-message-util/27.2.4: - resolution: {integrity: sha512-wbKT/BNGnBVB9nzi+IoaLkXt6fbSvqUxx+IYY66YFh96J3goY33BAaNG3uPqaw/Sh/FR9YpXGVDfd5DJdbh4nA==} + /jest-message-util/27.3.1: + resolution: {integrity: sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/code-frame': 7.14.5 - '@jest/types': 27.2.4 + '@babel/code-frame': 7.15.8 + '@jest/types': 27.2.5 '@types/stack-utils': 2.0.1 chalk: 4.1.2 graceful-fs: 4.2.8 micromatch: 4.0.4 - pretty-format: 27.2.4 + pretty-format: 27.3.1 slash: 3.0.0 stack-utils: 2.0.5 dev: true - /jest-mock/27.2.4: - resolution: {integrity: sha512-iVRU905rutaAoUcrt5Tm1JoHHWi24YabqEGXjPJI4tAyA6wZ7mzDi3GrZ+M7ebgWBqUkZE93GAx1STk7yCMIQA==} + /jest-mock/27.3.0: + resolution: {integrity: sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 '@types/node': 15.14.9 dev: true - /jest-pnp-resolver/1.2.2_jest-resolve@27.2.4: + /jest-pnp-resolver/1.2.2_jest-resolve@27.3.1: resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==} engines: {node: '>=6'} peerDependencies: @@ -5766,7 +5501,7 @@ packages: jest-resolve: optional: true dependencies: - jest-resolve: 27.2.4 + jest-resolve: 27.3.1 dev: true /jest-regex-util/27.0.6: @@ -5774,57 +5509,57 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dev: true - /jest-resolve-dependencies/27.2.4: - resolution: {integrity: sha512-i5s7Uh9B3Q6uwxLpMhNKlgBf6pcemvWaORxsW1zNF/YCY3jd5EftvnGBI+fxVwJ1CBxkVfxqCvm1lpZkbaoGmg==} + /jest-resolve-dependencies/27.3.1: + resolution: {integrity: sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 jest-regex-util: 27.0.6 - jest-snapshot: 27.2.4 + jest-snapshot: 27.3.1 transitivePeerDependencies: - supports-color dev: true - /jest-resolve/27.2.4: - resolution: {integrity: sha512-IsAO/3+3BZnKjI2I4f3835TBK/90dxR7Otgufn3mnrDFTByOSXclDi3G2XJsawGV4/18IMLARJ+V7Wm7t+J89Q==} + /jest-resolve/27.3.1: + resolution: {integrity: sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 chalk: 4.1.2 - escalade: 3.1.1 graceful-fs: 4.2.8 - jest-haste-map: 27.2.4 - jest-pnp-resolver: 1.2.2_jest-resolve@27.2.4 - jest-util: 27.2.4 - jest-validate: 27.2.4 + jest-haste-map: 27.3.1 + jest-pnp-resolver: 1.2.2_jest-resolve@27.3.1 + jest-util: 27.3.1 + jest-validate: 27.3.1 resolve: 1.20.0 + resolve.exports: 1.1.0 slash: 3.0.0 dev: true - /jest-runner/27.2.4: - resolution: {integrity: sha512-hIo5PPuNUyVDidZS8EetntuuJbQ+4IHWxmHgYZz9FIDbG2wcZjrP6b52uMDjAEQiHAn8yn8ynNe+TL8UuGFYKg==} + /jest-runner/27.3.1: + resolution: {integrity: sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/console': 27.2.4 - '@jest/environment': 27.2.4 - '@jest/test-result': 27.2.4 - '@jest/transform': 27.2.4 - '@jest/types': 27.2.4 + '@jest/console': 27.3.1 + '@jest/environment': 27.3.1 + '@jest/test-result': 27.3.1 + '@jest/transform': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 chalk: 4.1.2 emittery: 0.8.1 exit: 0.1.2 graceful-fs: 4.2.8 jest-docblock: 27.0.6 - jest-environment-jsdom: 27.2.4 - jest-environment-node: 27.2.4 - jest-haste-map: 27.2.4 - jest-leak-detector: 27.2.4 - jest-message-util: 27.2.4 - jest-resolve: 27.2.4 - jest-runtime: 27.2.4 - jest-util: 27.2.4 - jest-worker: 27.2.4 + jest-environment-jsdom: 27.3.1 + jest-environment-node: 27.3.1 + jest-haste-map: 27.3.1 + jest-leak-detector: 27.3.1 + jest-message-util: 27.3.1 + jest-resolve: 27.3.1 + jest-runtime: 27.3.1 + jest-util: 27.3.1 + jest-worker: 27.3.1 source-map-support: 0.5.20 throat: 6.0.1 transitivePeerDependencies: @@ -5834,18 +5569,17 @@ packages: - utf-8-validate dev: true - /jest-runtime/27.2.4: - resolution: {integrity: sha512-ICKzzYdjIi70P17MZsLLIgIQFCQmIjMFf+xYww3aUySiUA/QBPUTdUqo5B2eg4HOn9/KkUsV0z6GVgaqAPBJvg==} + /jest-runtime/27.3.1: + resolution: {integrity: sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/console': 27.2.4 - '@jest/environment': 27.2.4 - '@jest/fake-timers': 27.2.4 - '@jest/globals': 27.2.4 + '@jest/console': 27.3.1 + '@jest/environment': 27.3.1 + '@jest/globals': 27.3.1 '@jest/source-map': 27.0.6 - '@jest/test-result': 27.2.4 - '@jest/transform': 27.2.4 - '@jest/types': 27.2.4 + '@jest/test-result': 27.3.1 + '@jest/transform': 27.3.1 + '@jest/types': 27.2.5 '@types/yargs': 16.0.4 chalk: 4.1.2 cjs-module-lexer: 1.2.2 @@ -5854,14 +5588,14 @@ packages: exit: 0.1.2 glob: 7.2.0 graceful-fs: 4.2.8 - jest-haste-map: 27.2.4 - jest-message-util: 27.2.4 - jest-mock: 27.2.4 + jest-haste-map: 27.3.1 + jest-message-util: 27.3.1 + jest-mock: 27.3.0 jest-regex-util: 27.0.6 - jest-resolve: 27.2.4 - jest-snapshot: 27.2.4 - jest-util: 27.2.4 - jest-validate: 27.2.4 + jest-resolve: 27.3.1 + jest-snapshot: 27.3.1 + jest-util: 27.3.1 + jest-validate: 27.3.1 slash: 3.0.0 strip-bom: 4.0.0 yargs: 16.2.0 @@ -5877,89 +5611,77 @@ packages: graceful-fs: 4.2.8 dev: true - /jest-snapshot/27.2.4: - resolution: {integrity: sha512-5DFxK31rYS8X8C6WXsFx8XxrxW3PGa6+9IrUcZdTLg1aEyXDGIeiBh4jbwvh655bg/9vTETbEj/njfZicHTZZw==} + /jest-snapshot/27.3.1: + resolution: {integrity: sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.15.5 - '@babel/generator': 7.15.4 - '@babel/parser': 7.15.7 - '@babel/plugin-syntax-typescript': 7.14.5_@babel+core@7.15.5 + '@babel/core': 7.15.8 + '@babel/generator': 7.15.8 + '@babel/parser': 7.15.8 + '@babel/plugin-syntax-typescript': 7.14.5_@babel+core@7.15.8 '@babel/traverse': 7.15.4 '@babel/types': 7.15.6 - '@jest/transform': 27.2.4 - '@jest/types': 27.2.4 + '@jest/transform': 27.3.1 + '@jest/types': 27.2.5 '@types/babel__traverse': 7.14.2 - '@types/prettier': 2.3.2 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.15.5 + '@types/prettier': 2.4.1 + babel-preset-current-node-syntax: 1.0.1_@babel+core@7.15.8 chalk: 4.1.2 - expect: 27.2.4 + expect: 27.3.1 graceful-fs: 4.2.8 - jest-diff: 27.2.4 - jest-get-type: 27.0.6 - jest-haste-map: 27.2.4 - jest-matcher-utils: 27.2.4 - jest-message-util: 27.2.4 - jest-resolve: 27.2.4 - jest-util: 27.2.4 + jest-diff: 27.3.1 + jest-get-type: 27.3.1 + jest-haste-map: 27.3.1 + jest-matcher-utils: 27.3.1 + jest-message-util: 27.3.1 + jest-resolve: 27.3.1 + jest-util: 27.3.1 natural-compare: 1.4.0 - pretty-format: 27.2.4 + pretty-format: 27.3.1 semver: 7.3.5 transitivePeerDependencies: - supports-color dev: true - /jest-util/27.2.0: - resolution: {integrity: sha512-T5ZJCNeFpqcLBpx+Hl9r9KoxBCUqeWlJ1Htli+vryigZVJ1vuLB9j35grEBASp4R13KFkV7jM52bBGnArpJN6A==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/types': 27.1.1 - '@types/node': 15.14.9 - chalk: 4.1.2 - graceful-fs: 4.2.8 - is-ci: 3.0.0 - picomatch: 2.3.0 - dev: true - - /jest-util/27.2.4: - resolution: {integrity: sha512-mW++4u+fSvAt3YBWm5IpbmRAceUqa2B++JlUZTiuEt2AmNYn0Yw5oay4cP17TGsMINRNPSGiJ2zNnX60g+VbFg==} + /jest-util/27.3.1: + resolution: {integrity: sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 '@types/node': 15.14.9 chalk: 4.1.2 + ci-info: 3.2.0 graceful-fs: 4.2.8 - is-ci: 3.0.0 picomatch: 2.3.0 dev: true - /jest-validate/27.2.4: - resolution: {integrity: sha512-VMtbxbkd7LHnIH7PChdDtrluCFRJ4b1YV2YJzNwwsASMWftq/HgqiqjvptBOWyWOtevgO3f14wPxkPcLlVBRog==} + /jest-validate/27.3.1: + resolution: {integrity: sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 camelcase: 6.2.0 chalk: 4.1.2 - jest-get-type: 27.0.6 + jest-get-type: 27.3.1 leven: 3.1.0 - pretty-format: 27.2.4 + pretty-format: 27.3.1 dev: true - /jest-watcher/27.2.4: - resolution: {integrity: sha512-LXC/0+dKxhK7cfF7reflRYlzDIaQE+fL4ynhKhzg8IMILNMuI4xcjXXfUJady7OR4/TZeMg7X8eHx8uan9vqaQ==} + /jest-watcher/27.3.1: + resolution: {integrity: sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/test-result': 27.2.4 - '@jest/types': 27.2.4 + '@jest/test-result': 27.3.1 + '@jest/types': 27.2.5 '@types/node': 15.14.9 ansi-escapes: 4.3.2 chalk: 4.1.2 - jest-util: 27.2.4 + jest-util: 27.3.1 string-length: 4.0.2 dev: true - /jest-worker/27.2.4: - resolution: {integrity: sha512-Zq9A2Pw59KkVjBBKD1i3iE2e22oSjXhUKKuAK1HGX8flGwkm6NMozyEYzKd41hXc64dbd/0eWFeEEuxqXyhM+g==} + /jest-worker/27.3.1: + resolution: {integrity: sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==} engines: {node: '>= 10.13.0'} dependencies: '@types/node': 15.14.9 @@ -5967,8 +5689,8 @@ packages: supports-color: 8.1.1 dev: true - /jest/27.2.4_ts-node@10.2.1: - resolution: {integrity: sha512-h4uqb1EQLfPulWyUFFWv9e9Nn8sCqsJ/j3wk/KCY0p4s4s0ICCfP3iMf6hRf5hEhsDyvyrCgKiZXma63gMz16A==} + /jest/27.3.1_ts-node@10.4.0: + resolution: {integrity: sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: @@ -5977,9 +5699,9 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.2.4_ts-node@10.2.1 - import-local: 3.0.2 - jest-cli: 27.2.4_ts-node@10.2.1 + '@jest/core': 27.3.1_ts-node@10.4.0 + import-local: 3.0.3 + jest-cli: 27.3.1_ts-node@10.4.0 transitivePeerDependencies: - bufferutil - canvas @@ -6151,7 +5873,7 @@ packages: resolution: {integrity: sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==} dependencies: chalk: 2.4.2 - shell-quote: 1.7.2 + shell-quote: 1.7.3 dev: true /less/3.13.1: @@ -6171,14 +5893,14 @@ packages: source-map: 0.6.1 dev: true - /less/4.1.1: - resolution: {integrity: sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==} + /less/4.1.2: + resolution: {integrity: sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==} engines: {node: '>=6'} hasBin: true dependencies: copy-anything: 2.0.3 parse-node-version: 1.0.1 - tslib: 1.14.1 + tslib: 2.3.1 optionalDependencies: errno: 0.1.8 graceful-fs: 4.2.8 @@ -6217,18 +5939,18 @@ packages: /lines-and-columns/1.1.6: resolution: {integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=} - /lint-staged/11.2.0: - resolution: {integrity: sha512-0KIcRuO4HQS2Su7qWtjrfTXgSklvyIb9Fk9qVWRZkGHa5S81Vj6WBbs+ogQBvHUwLJYq1eQ4R+H82GSak4OM7w==} + /lint-staged/11.2.6: + resolution: {integrity: sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg==} hasBin: true dependencies: cli-truncate: 2.1.0 colorette: 1.4.0 - commander: 8.2.0 + commander: 8.3.0 cosmiconfig: 7.0.1 debug: 4.3.2_supports-color@8.1.1 enquirer: 2.3.6 execa: 5.1.1 - listr2: 3.12.2_enquirer@2.3.6 + listr2: 3.13.1_enquirer@2.3.6 micromatch: 4.0.4 normalize-path: 3.0.0 please-upgrade-node: 3.2.0 @@ -6237,14 +5959,14 @@ packages: supports-color: 8.1.1 dev: true - /listr2/3.12.2_enquirer@2.3.6: - resolution: {integrity: sha512-64xC2CJ/As/xgVI3wbhlPWVPx0wfTqbUAkpb7bjDi0thSWMqrf07UFhrfsGoo8YSXmF049Rp9C0cjLC8rZxK9A==} + /listr2/3.13.1_enquirer@2.3.6: + resolution: {integrity: sha512-pk4YBDA2cxtpM8iLHbz6oEsfZieJKHf6Pt19NlKaHZZVpqHyVs/Wqr7RfBBCeAFCJchGO7WQHVkUPZTvJMHk8w==} engines: {node: '>=10.0.0'} peerDependencies: enquirer: '>= 2.3.0 < 3' dependencies: cli-truncate: 2.1.0 - colorette: 1.4.0 + colorette: 2.0.16 enquirer: 2.3.6 log-update: 4.0.0 p-map: 4.0.0 @@ -6319,6 +6041,10 @@ packages: resolution: {integrity: sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=} dev: true + /lodash.memoize/4.1.2: + resolution: {integrity: sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=} + dev: true + /lodash.merge/4.6.2: resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} dev: true @@ -6387,8 +6113,8 @@ packages: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} dev: true - /makeerror/1.0.11: - resolution: {integrity: sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=} + /makeerror/1.0.12: + resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} dependencies: tmpl: 1.0.5 dev: true @@ -6459,11 +6185,6 @@ packages: engines: {node: '>= 0.6'} dev: true - /mime-db/1.49.0: - resolution: {integrity: sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==} - engines: {node: '>= 0.6'} - dev: true - /mime-db/1.50.0: resolution: {integrity: sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==} engines: {node: '>= 0.6'} @@ -6476,11 +6197,11 @@ packages: mime-db: 1.46.0 dev: true - /mime-types/2.1.32: - resolution: {integrity: sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==} + /mime-types/2.1.33: + resolution: {integrity: sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==} engines: {node: '>= 0.6'} dependencies: - mime-db: 1.49.0 + mime-db: 1.50.0 dev: true /mime/1.6.0: @@ -6524,16 +6245,16 @@ packages: dependencies: '@iarna/toml': 2.2.5 '@mrbbot/node-fetch': 4.6.0 - '@peculiar/webcrypto': 1.1.7 + '@peculiar/webcrypto': 1.2.0 chokidar: 3.5.2 - cjstoesm: 1.1.4_typescript@4.4.3 + cjstoesm: 1.1.4_typescript@4.4.4 dotenv: 8.6.0 env-paths: 2.2.1 event-target-shim: 6.0.2 formdata-node: 2.5.0 html-rewriter-wasm: 0.3.2 http-cache-semantics: 4.1.0 - ioredis: 4.27.9 + ioredis: 4.28.0 kleur: 4.1.4 node-cron: 2.0.3 picomatch: 2.3.0 @@ -6542,7 +6263,7 @@ packages: semiver: 1.1.0 source-map-support: 0.5.20 tslib: 2.3.1 - typescript: 4.4.3 + typescript: 4.4.4 typeson: 6.1.0 typeson-registry: 1.0.0-alpha.39 web-streams-polyfill: 3.1.1 @@ -6613,15 +6334,8 @@ packages: hasBin: true dev: true - /nanocolors/0.1.6: - resolution: {integrity: sha512-2pvTw6vYRaBLGir2xR7MxaJtyWkrn+C53EpW8yPotG+pdAwBvt0Xwk4VJ6VHLY0aLthVZPvDfm9TdZvrvAm5UQ==} - engines: {node: '>=8.0.0'} - - /nanocolors/0.2.9: - resolution: {integrity: sha512-aymgS4Xe0LMqHOHl7jSUEkFh/6O/pcF0j61dBtreQZ1nmbyYdYjSYSJzz0iPLbKPkMtSmdRgyBGywNZGjKOEfw==} - - /nanoid/3.1.25: - resolution: {integrity: sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==} + /nanoid/3.1.30: + resolution: {integrity: sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -6700,8 +6414,8 @@ packages: engines: {node: '>=0.10.0'} dev: true - /node-releases/1.1.76: - resolution: {integrity: sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==} + /node-releases/2.0.1: + resolution: {integrity: sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==} /normalize-package-data/2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} @@ -6717,7 +6431,7 @@ packages: engines: {node: '>=10'} dependencies: hosted-git-info: 4.0.2 - is-core-module: 2.6.0 + is-core-module: 2.8.0 semver: 7.3.5 validate-npm-package-license: 3.0.4 dev: true @@ -6752,8 +6466,8 @@ packages: minimatch: 3.0.4 pidtree: 0.3.1 read-pkg: 3.0.0 - shell-quote: 1.7.2 - string.prototype.padend: 3.1.2 + shell-quote: 1.7.3 + string.prototype.padend: 3.1.3 dev: true /npm-run-path/2.0.2: @@ -6831,8 +6545,8 @@ packages: mimic-fn: 2.1.0 dev: true - /open/8.2.1: - resolution: {integrity: sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==} + /open/8.4.0: + resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==} engines: {node: '>=12'} dependencies: define-lazy-prop: 2.0.0 @@ -6924,8 +6638,8 @@ packages: engines: {node: '>=6'} dev: true - /package-name-regex/2.0.1: - resolution: {integrity: sha512-U+K6/cuwHwr/8pUQrpNpKOIFSdS/EluTRSmtn92mug1UiPcff4t9AHs36e2xXJtpEtRfbg+JOj3Y/GLX+mzT6w==} + /package-name-regex/2.0.4: + resolution: {integrity: sha512-p+ixFAmbQ9DE9TG3ptbjLc7/gwgdKEMCwdGpZwxzgD02D1q/SRRT/j32MyjGjJQ36CSTeVsvKt9Zp3PUHYWBnw==} engines: {node: '>=12'} dev: true @@ -6947,7 +6661,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.14.5 + '@babel/code-frame': 7.15.8 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.1.6 @@ -7025,10 +6739,13 @@ packages: is-reference: 1.2.1 dev: true - /phoenix/1.5.13: - resolution: {integrity: sha512-aJKbnuCTtgH8qT7AzHhPwhOP3bqhja3ogFMQmUdY7jNzl/91nsUtpnz0M3HDW7j+IvfjiM2/TIkOaGwzW9BKhg==} + /phoenix/1.6.2: + resolution: {integrity: sha512-VjR27NETvrLSj8rI6DlpVAfo7pCYth/9+1OCoTof4LKEbq0141ze/tdxFHHZzVQSok3gqJUo2h/tqbxR3r8eyw==} dev: false + /picocolors/1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + /picomatch/2.3.0: resolution: {integrity: sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==} engines: {node: '>=8.6'} @@ -7069,13 +6786,25 @@ packages: find-up: 4.1.0 dev: true - /playwright-chromium/1.15.1: - resolution: {integrity: sha512-69zZGAb6XTNyAGfbnCUiGItCMQo/5c9XW/DkdRyC89WoLGix/dH9TwrqiDEzRTwqnSYNJNT43S13w/mDE6+1Xg==} + /playwright-chromium/1.16.2: + resolution: {integrity: sha512-tqLzJCNfqIB25uJTOtBmD6WofLUMe4iO0q5SKDmUcZXkz5vKXGAvNg5PHg6piMR96qTUNXgbCCpt5i33r1u51Q==} engines: {node: '>=12'} hasBin: true requiresBuild: true dependencies: - commander: 6.2.1 + playwright-core: 1.16.2 + transitivePeerDependencies: + - bufferutil + - supports-color + - utf-8-validate + dev: true + + /playwright-core/1.16.2: + resolution: {integrity: sha512-8WkoP5OfZAYrRxtW/PCVACn9bNgqrTxVVPlc+MoxvJ48knNsZ+skrPjfno/XF3SgTUY9DyYX0g5fVOB7lkPtGg==} + engines: {node: '>=12'} + hasBin: true + dependencies: + commander: 8.3.0 debug: 4.3.2 extract-zip: 2.0.1 https-proxy-agent: 5.0.0 @@ -7086,8 +6815,10 @@ packages: proper-lockfile: 4.1.2 proxy-from-env: 1.1.0 rimraf: 3.0.2 + socks-proxy-agent: 6.1.0 stack-utils: 2.0.5 ws: 7.5.5 + yauzl: 2.10.0 yazl: 2.5.1 transitivePeerDependencies: - bufferutil @@ -7106,13 +6837,13 @@ packages: engines: {node: '>=10.13.0'} dev: true - /postcss-import/14.0.2_postcss@8.3.8: + /postcss-import/14.0.2_postcss@8.3.11: resolution: {integrity: sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==} engines: {node: '>=10.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.3.8 + postcss: 8.3.11 postcss-value-parser: 4.1.0 read-cache: 1.0.0 resolve: 1.20.0 @@ -7123,10 +6854,10 @@ packages: engines: {node: '>=10.0'} dependencies: camelcase-css: 2.0.1 - postcss: 8.3.7 + postcss: 8.3.11 dev: false - /postcss-load-config/3.1.0_ts-node@10.2.1: + /postcss-load-config/3.1.0_ts-node@10.4.0: resolution: {integrity: sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==} engines: {node: '>= 10'} peerDependencies: @@ -7137,51 +6868,51 @@ packages: dependencies: import-cwd: 3.0.0 lilconfig: 2.0.3 - ts-node: 10.2.1_3b624d72c50530188ff09826d1b48ebf + ts-node: 10.4.0_d3e11751f498564481cc5d710b5b838a yaml: 1.10.2 - /postcss-modules-extract-imports/3.0.0_postcss@8.3.8: + /postcss-modules-extract-imports/3.0.0_postcss@8.3.11: resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.3.8 + postcss: 8.3.11 dev: true - /postcss-modules-local-by-default/4.0.0_postcss@8.3.8: + /postcss-modules-local-by-default/4.0.0_postcss@8.3.11: resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0_postcss@8.3.8 - postcss: 8.3.8 + icss-utils: 5.1.0_postcss@8.3.11 + postcss: 8.3.11 postcss-selector-parser: 6.0.6 postcss-value-parser: 4.1.0 dev: true - /postcss-modules-scope/3.0.0_postcss@8.3.8: + /postcss-modules-scope/3.0.0_postcss@8.3.11: resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.3.8 + postcss: 8.3.11 postcss-selector-parser: 6.0.6 dev: true - /postcss-modules-values/4.0.0_postcss@8.3.8: + /postcss-modules-values/4.0.0_postcss@8.3.11: resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0_postcss@8.3.8 - postcss: 8.3.8 + icss-utils: 5.1.0_postcss@8.3.11 + postcss: 8.3.11 dev: true - /postcss-modules/4.2.2_postcss@8.3.8: + /postcss-modules/4.2.2_postcss@8.3.11: resolution: {integrity: sha512-/H08MGEmaalv/OU8j6bUKi/kZr2kqGF6huAW8m9UAgOLWtpFdhA14+gPBoymtqyv+D4MLsmqaF2zvIegdCxJXg==} peerDependencies: postcss: ^8.0.0 @@ -7189,11 +6920,11 @@ packages: generic-names: 2.0.1 icss-replace-symbols: 1.1.0 lodash.camelcase: 4.3.0 - postcss: 8.3.8 - postcss-modules-extract-imports: 3.0.0_postcss@8.3.8 - postcss-modules-local-by-default: 4.0.0_postcss@8.3.8 - postcss-modules-scope: 3.0.0_postcss@8.3.8 - postcss-modules-values: 4.0.0_postcss@8.3.8 + postcss: 8.3.11 + postcss-modules-extract-imports: 3.0.0_postcss@8.3.11 + postcss-modules-local-by-default: 4.0.0_postcss@8.3.11 + postcss-modules-scope: 3.0.0_postcss@8.3.11 + postcss-modules-values: 4.0.0_postcss@8.3.11 string-hash: 1.1.3 dev: true @@ -7219,24 +6950,16 @@ packages: /postcss-value-parser/4.1.0: resolution: {integrity: sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==} - /postcss/8.3.7: - resolution: {integrity: sha512-9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanocolors: 0.1.6 - nanoid: 3.1.25 - source-map-js: 0.6.2 - - /postcss/8.3.8: - resolution: {integrity: sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==} + /postcss/8.3.11: + resolution: {integrity: sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanocolors: 0.2.9 - nanoid: 3.1.25 + nanoid: 3.1.30 + picocolors: 1.0.0 source-map-js: 0.6.2 - /preact/10.5.14: - resolution: {integrity: sha512-KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ==} + /preact/10.5.15: + resolution: {integrity: sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==} dev: true /prelude-ls/1.1.2: @@ -7255,21 +6978,11 @@ packages: hasBin: true dev: true - /pretty-format/27.2.0: - resolution: {integrity: sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==} + /pretty-format/27.3.1: + resolution: {integrity: sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.1.1 - ansi-regex: 5.0.1 - ansi-styles: 5.2.0 - react-is: 17.0.2 - dev: true - - /pretty-format/27.2.4: - resolution: {integrity: sha512-NUjw22WJHldzxyps2YjLZkUj6q1HvjqFezkB9Y2cklN8NtVZN/kZEXGZdFw4uny3oENzV5EEMESrkI0YDUH8vg==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/types': 27.2.4 + '@jest/types': 27.2.5 ansi-regex: 5.0.1 ansi-styles: 5.2.0 react-is: 17.0.2 @@ -7299,21 +7012,12 @@ packages: asap: 2.0.6 dev: true - /prompts/2.4.1: - resolution: {integrity: sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==} - engines: {node: '>= 6'} - dependencies: - kleur: 3.0.3 - sisteransi: 1.0.5 - dev: true - /prompts/2.4.2: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} dependencies: kleur: 3.0.3 sisteransi: 1.0.5 - dev: false /prop-types/15.7.2: resolution: {integrity: sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==} @@ -7328,7 +7032,7 @@ packages: dependencies: graceful-fs: 4.2.8 retry: 0.12.0 - signal-exit: 3.0.4 + signal-exit: 3.0.5 dev: true /proxy-addr/2.0.7: @@ -7465,12 +7169,12 @@ packages: dependencies: commander: 6.2.1 glob: 7.2.0 - postcss: 8.3.7 + postcss: 8.3.11 postcss-selector-parser: 6.0.6 dev: false - /pvtsutils/1.2.0: - resolution: {integrity: sha512-IDefMJEQl7HX0FP2hIKJFnAR11klP1js2ixCrOaMhe3kXFK6RQ2ABUCuwWaaD4ib0hSbh2fGTICvWJJhDfNecA==} + /pvtsutils/1.2.1: + resolution: {integrity: sha512-Q867jEr30lBR2YSFFLZ0/XsEvpweqH6Kj096wmlRAFXrdRGPCNq2iz9B5Tk085EZ+OBZyYAVA5UhPkjSHGrUzQ==} dependencies: tslib: 2.3.1 dev: true @@ -7747,8 +7451,8 @@ packages: deprecated: https://github.com/lydell/resolve-url#deprecated dev: true - /resolve.exports/1.0.2: - resolution: {integrity: sha512-1+PDdTR3xrGWB/NzXLkzS1+PQlJ+BOR2baBGJSVat4HasiY1mnkyAQws3FUTmBDB79oK54QFaDM8Ig9nUtJwvQ==} + /resolve.exports/1.1.0: + resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==} engines: {node: '>=10'} dev: true @@ -7761,14 +7465,14 @@ packages: /resolve/1.19.0: resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==} dependencies: - is-core-module: 2.6.0 + is-core-module: 2.8.0 path-parse: 1.0.7 dev: true /resolve/1.20.0: resolution: {integrity: sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==} dependencies: - is-core-module: 2.6.0 + is-core-module: 2.8.0 path-parse: 1.0.7 /restore-cursor/3.1.0: @@ -7776,7 +7480,7 @@ packages: engines: {node: '>=8'} dependencies: onetime: 5.1.2 - signal-exit: 3.0.4 + signal-exit: 3.0.5 dev: true /retry/0.12.0: @@ -7802,38 +7506,30 @@ packages: dependencies: glob: 7.2.0 - /rollup-plugin-license/2.5.0_rollup@2.57.0: - resolution: {integrity: sha512-HUjGV+i1tRxi/zL4WpeNCLJZfEJBbCcDmwGJCjKBvcLDIK6VNW1JmYKjSJJOqJjNqRIvKt6/BLSQB9RwNDLtQw==} + /rollup-plugin-license/2.6.0_rollup@2.58.3: + resolution: {integrity: sha512-ilM+sb9xCvP+23tmzsCqJSm33877nIFeO6lMDGbckxc1jq2nW6WtU1nFD4cfOrKYl0cw1dkz4rC3VMAe8dA8cQ==} engines: {node: '>=10.0.0'} peerDependencies: rollup: ^1.0.0 || ^2.0.0 dependencies: commenting: 1.1.0 - glob: 7.1.7 + glob: 7.2.0 lodash: 4.17.21 magic-string: 0.25.7 mkdirp: 1.0.4 moment: 2.29.1 - package-name-regex: 2.0.1 - rollup: 2.57.0 + package-name-regex: 2.0.4 + rollup: 2.58.3 spdx-expression-validate: 2.0.0 spdx-satisfies: 5.0.1 dev: true - /rollup/2.57.0: - resolution: {integrity: sha512-bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg==} - engines: {node: '>=10.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - /rollup/2.58.3: resolution: {integrity: sha512-ei27MSw1KhRur4p87Q0/Va2NAYqMXOX++FNEumMBcdreIRLURKy+cE2wcDJKBn0nfmhP2ZGrJkP1XPO+G8FJQw==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: fsevents: 2.3.2 - dev: true /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -7864,8 +7560,8 @@ packages: truncate-utf8-bytes: 1.0.2 dev: true - /sass/1.42.1: - resolution: {integrity: sha512-/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg==} + /sass/1.43.4: + resolution: {integrity: sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==} engines: {node: '>=8.9.0'} hasBin: true dependencies: @@ -7983,8 +7679,8 @@ packages: engines: {node: '>=8'} dev: true - /shell-quote/1.7.2: - resolution: {integrity: sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==} + /shell-quote/1.7.3: + resolution: {integrity: sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==} dev: true /side-channel/1.0.4: @@ -7995,8 +7691,8 @@ packages: object-inspect: 1.11.0 dev: true - /signal-exit/3.0.4: - resolution: {integrity: sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==} + /signal-exit/3.0.5: + resolution: {integrity: sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==} dev: true /simple-swizzle/0.2.2: @@ -8005,11 +7701,11 @@ packages: is-arrayish: 0.3.2 dev: false - /sirv/1.0.17: - resolution: {integrity: sha512-qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw==} + /sirv/1.0.18: + resolution: {integrity: sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA==} engines: {node: '>= 10'} dependencies: - '@polka/url': 1.0.0-next.20 + '@polka/url': 1.0.0-next.21 mime: 2.5.2 totalist: 1.1.0 dev: true @@ -8040,6 +7736,30 @@ packages: is-fullwidth-code-point: 3.0.0 dev: true + /smart-buffer/4.2.0: + resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} + engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} + dev: true + + /socks-proxy-agent/6.1.0: + resolution: {integrity: sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg==} + engines: {node: '>= 10'} + dependencies: + agent-base: 6.0.2 + debug: 4.3.2 + socks: 2.6.1 + transitivePeerDependencies: + - supports-color + dev: true + + /socks/2.6.1: + resolution: {integrity: sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==} + engines: {node: '>= 10.13.0', npm: '>= 3.0.0'} + dependencies: + ip: 1.1.5 + smart-buffer: 4.2.0 + dev: true + /source-map-js/0.6.2: resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==} engines: {node: '>=0.10.0'} @@ -8184,25 +7904,25 @@ packages: engines: {node: '>=10'} dependencies: char-regex: 1.0.2 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 dev: true - /string-width/4.2.2: - resolution: {integrity: sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==} + /string-width/4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} dependencies: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 dev: true - /string.prototype.padend/3.1.2: - resolution: {integrity: sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==} + /string.prototype.padend/3.1.3: + resolution: {integrity: sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 define-properties: 1.1.3 - es-abstract: 1.18.6 + es-abstract: 1.19.1 dev: true /string.prototype.trimend/1.0.4: @@ -8240,8 +7960,8 @@ packages: is-regexp: 1.0.0 dev: true - /strip-ansi/6.0.0: - resolution: {integrity: sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==} + /strip-ansi/6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} dependencies: ansi-regex: 5.0.1 @@ -8340,8 +8060,8 @@ packages: resolution: {integrity: sha512-7YPIY44j+BoY+E6cGBSw0oCU8SNTTIHKZgftcBdwWkDzs/M86Fdlr21FrzAyph7Zo8r3CFGscyFe4rrBtixrBg==} dev: false - /tailwindcss/2.2.15_e444c4a095b9e9ba5c645754953637f2: - resolution: {integrity: sha512-WgV41xTMbnSoTNMNnJvShQZ+8GmY86DmXTrCgnsveNZJdlybfwCItV8kAqjYmU49YiFr+ofzmT1JlAKajBZboQ==} + /tailwindcss/2.2.19_6d1fa3babc9cc84b994ff99ef39d1aff: + resolution: {integrity: sha512-6Ui7JSVtXadtTUo2NtkBBacobzWiQYVjYW0ZnKaP9S1ZCKQ0w7KVNz+YSDI/j7O7KCMHbOkz94ZMQhbT9pOqjw==} engines: {node: '>=12.13.0'} hasBin: true peerDependencies: @@ -8349,7 +8069,7 @@ packages: postcss: ^8.0.9 dependencies: arg: 5.0.1 - autoprefixer: 10.3.5 + autoprefixer: 10.4.0 bytes: 3.1.0 chalk: 4.1.2 chokidar: 3.5.2 @@ -8360,10 +8080,10 @@ packages: dlv: 1.1.3 fast-glob: 3.2.7 fs-extra: 10.0.0 - glob-parent: 6.0.1 + glob-parent: 6.0.2 html-tags: 3.1.0 is-color-stop: 1.1.0 - is-glob: 4.0.1 + is-glob: 4.0.3 lodash: 4.17.21 lodash.topath: 4.5.2 modern-normalize: 1.1.0 @@ -8371,7 +8091,7 @@ packages: normalize-path: 3.0.0 object-hash: 2.2.0 postcss-js: 3.0.3 - postcss-load-config: 3.1.0_ts-node@10.2.1 + postcss-load-config: 3.1.0_ts-node@10.4.0 postcss-nested: 5.0.6 postcss-selector-parser: 6.0.6 postcss-value-parser: 4.1.0 @@ -8385,8 +8105,8 @@ packages: - ts-node dev: false - /tailwindcss/2.2.15_ts-node@10.2.1: - resolution: {integrity: sha512-WgV41xTMbnSoTNMNnJvShQZ+8GmY86DmXTrCgnsveNZJdlybfwCItV8kAqjYmU49YiFr+ofzmT1JlAKajBZboQ==} + /tailwindcss/2.2.19_ts-node@10.4.0: + resolution: {integrity: sha512-6Ui7JSVtXadtTUo2NtkBBacobzWiQYVjYW0ZnKaP9S1ZCKQ0w7KVNz+YSDI/j7O7KCMHbOkz94ZMQhbT9pOqjw==} engines: {node: '>=12.13.0'} hasBin: true peerDependencies: @@ -8404,10 +8124,10 @@ packages: dlv: 1.1.3 fast-glob: 3.2.7 fs-extra: 10.0.0 - glob-parent: 6.0.1 + glob-parent: 6.0.2 html-tags: 3.1.0 is-color-stop: 1.1.0 - is-glob: 4.0.1 + is-glob: 4.0.3 lodash: 4.17.21 lodash.topath: 4.5.2 modern-normalize: 1.1.0 @@ -8415,7 +8135,7 @@ packages: normalize-path: 3.0.0 object-hash: 2.2.0 postcss-js: 3.0.3 - postcss-load-config: 3.1.0_ts-node@10.2.1 + postcss-load-config: 3.1.0_ts-node@10.4.0 postcss-nested: 5.0.6 postcss-selector-parser: 6.0.6 postcss-value-parser: 4.1.0 @@ -8581,8 +8301,8 @@ packages: utf8-byte-length: 1.0.4 dev: true - /ts-jest/27.0.5_52a571d76319e63aeaa66dc9db9e90cc: - resolution: {integrity: sha512-lIJApzfTaSSbtlksfFNHkWOzLJuuSm4faFAfo5kvzOiRAuoN4/eKxVJ2zEAho8aecE04qX6K1pAzfH5QHL1/8w==} + /ts-jest/27.0.7_2c4ca6574207836d1023f54689cc81ac: + resolution: {integrity: sha512-O41shibMqzdafpuP+CkrOL7ykbmLh+FqQrXEmV9CydQ5JBk0Sj0uAEF5TNNe94fZWKm3yYvWa/IbyV4Yg1zK2Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: @@ -8602,19 +8322,18 @@ packages: '@types/jest': 27.0.2 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 27.2.4_ts-node@10.2.1 - jest-util: 27.2.0 + jest: 27.3.1_ts-node@10.4.0 + jest-util: 27.3.1 json5: 2.2.0 - lodash: 4.17.21 + lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.3.5 - typescript: 4.4.3 + typescript: 4.4.4 yargs-parser: 20.2.9 dev: true - /ts-node/10.2.1_3b624d72c50530188ff09826d1b48ebf: - resolution: {integrity: sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==} - engines: {node: '>=12.0.0'} + /ts-node/10.4.0_d3e11751f498564481cc5d710b5b838a: + resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==} hasBin: true peerDependencies: '@swc/core': '>=1.2.50' @@ -8627,7 +8346,7 @@ packages: '@swc/wasm': optional: true dependencies: - '@cspotcode/source-map-support': 0.6.1 + '@cspotcode/source-map-support': 0.7.0 '@tsconfig/node10': 1.0.8 '@tsconfig/node12': 1.0.9 '@tsconfig/node14': 1.0.1 @@ -8639,11 +8358,11 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.4.3 + typescript: 4.4.4 yn: 3.1.1 dev: true - /tsconfck/1.0.0_typescript@4.4.3: + /tsconfck/1.0.0_typescript@4.4.4: resolution: {integrity: sha512-9+flUmolxrnyKAYbNzXZX1UPHUuZsVqM42ioZ1H55r0I+UfJgYui4b7zUxhdJ4o5emEuZo89Cx4TiWG/Dd0c/A==} engines: {node: ^12.20 || ^14.13.1 || >= 16, pnpm: '>=6.7.0'} hasBin: true @@ -8653,7 +8372,7 @@ packages: typescript: optional: true dependencies: - typescript: 4.4.3 + typescript: 4.4.4 dev: true /tslib/1.14.1: @@ -8664,14 +8383,14 @@ packages: resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} dev: true - /tsutils/3.21.0_typescript@4.4.3: + /tsutils/3.21.0_typescript@4.4.4: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.4.3 + typescript: 4.4.4 dev: true /type-check/0.3.2: @@ -8723,7 +8442,7 @@ packages: engines: {node: '>= 0.6'} dependencies: media-typer: 0.3.0 - mime-types: 2.1.32 + mime-types: 2.1.33 dev: true /type/1.2.0: @@ -8740,8 +8459,8 @@ packages: is-typedarray: 1.0.0 dev: true - /typescript/4.4.3: - resolution: {integrity: sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==} + /typescript/4.4.4: + resolution: {integrity: sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==} engines: {node: '>=4.2.0'} hasBin: true dev: true @@ -8868,7 +8587,7 @@ packages: '@vitejs/plugin-vue': link:packages/plugin-vue prismjs: 1.25.0 vite: link:packages/vite - vue: 3.2.19 + vue: 3.2.20 transitivePeerDependencies: - react - react-dom @@ -8879,34 +8598,15 @@ packages: engines: {node: '>=0.10.0'} dev: true - /vue-router/4.0.11_vue@3.2.16: - resolution: {integrity: sha512-sha6I8fx9HWtvTrFZfxZkiQQBpqSeT+UCwauYjkdOQYRvwsGwimlQQE2ayqUwuuXGzquFpCPoXzYKWlzL4OuXg==} + /vue-router/4.0.12_vue@3.2.20: + resolution: {integrity: sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==} peerDependencies: vue: ^3.0.0 dependencies: - '@vue/devtools-api': 6.0.0-beta.18 - vue: 3.2.16 + '@vue/devtools-api': 6.0.0-beta.19 + vue: 3.2.20 dev: false - /vue/3.2.16: - resolution: {integrity: sha512-aGm8HbZe6IIj2b/LX6QXpAwwDFrpo8E1jdTkuBX2fS42c1+mQ1n0Wl+Dxnj9cgRM7bp1MIoXbPbDyDsOrXTO0w==} - dependencies: - '@vue/compiler-dom': 3.2.16 - '@vue/compiler-sfc': 3.2.16 - '@vue/runtime-dom': 3.2.16 - '@vue/server-renderer': 3.2.16_vue@3.2.16 - '@vue/shared': 3.2.16 - - /vue/3.2.19: - resolution: {integrity: sha512-6KAMdIfAtlK+qohTIUE4urwAv4A3YRuo8uAbByApUmiB0CziGAAPs6qVugN6oHPia8YIafHB/37K0O6KZ7sGmA==} - dependencies: - '@vue/compiler-dom': 3.2.19 - '@vue/compiler-sfc': 3.2.19 - '@vue/runtime-dom': 3.2.19 - '@vue/server-renderer': 3.2.19_vue@3.2.19 - '@vue/shared': 3.2.19 - dev: true - /vue/3.2.20: resolution: {integrity: sha512-81JjEP4OGk9oO8+CU0h2nFPGgJBm9mNa3kdCX2k6FuRdrWrC+CNe+tOnuIeTg8EWwQuI+wwdra5Q7vSzp7p4Iw==} dependencies: @@ -8915,15 +8615,14 @@ packages: '@vue/runtime-dom': 3.2.20 '@vue/server-renderer': 3.2.20_vue@3.2.20 '@vue/shared': 3.2.20 - dev: true - /vuex/4.0.2_vue@3.2.16: + /vuex/4.0.2_vue@3.2.20: resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==} peerDependencies: vue: ^3.0.2 dependencies: - '@vue/devtools-api': 6.0.0-beta.18 - vue: 3.2.16 + '@vue/devtools-api': 6.0.0-beta.19 + vue: 3.2.20 dev: false /w3c-hr-time/1.0.2: @@ -8939,10 +8638,10 @@ packages: xml-name-validator: 3.0.0 dev: true - /walker/1.0.7: - resolution: {integrity: sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=} + /walker/1.0.8: + resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} dependencies: - makeerror: 1.0.11 + makeerror: 1.0.12 dev: true /web-streams-polyfill/3.1.1: @@ -8950,13 +8649,13 @@ packages: engines: {node: '>= 8'} dev: true - /webcrypto-core/1.2.1: - resolution: {integrity: sha512-5+h1/e/A4eegCRTg+oQ9ehTJRTMwFhZazJ2RH1FP0VC3q1/0xl7x6SzzTwPxd/VTGc7kjuSEJGnfNgoLe5jNRQ==} + /webcrypto-core/1.3.0: + resolution: {integrity: sha512-/+Hz+uNM6T8FtizWRYMNdGTXxWaljLFzQ5GKU4WqCTZKpaki94YqDA39h/SpWxEZfgkVMZzrqqtPlfy2+BloQw==} dependencies: '@peculiar/asn1-schema': 2.0.38 '@peculiar/json-schema': 1.1.12 asn1js: 2.1.1 - pvtsutils: 1.2.0 + pvtsutils: 1.2.1 tslib: 2.3.1 dev: true @@ -9029,7 +8728,7 @@ packages: resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==} engines: {node: '>= 10.0.0'} dependencies: - '@babel/parser': 7.15.7 + '@babel/parser': 7.15.8 '@babel/types': 7.15.6 assert-never: 1.2.1 babel-walk: 3.0.0-canary-5 @@ -9049,8 +8748,8 @@ packages: engines: {node: '>=8'} dependencies: ansi-styles: 4.3.0 - string-width: 4.2.2 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 dev: true /wrap-ansi/7.0.0: @@ -9058,8 +8757,8 @@ packages: engines: {node: '>=10'} dependencies: ansi-styles: 4.3.0 - string-width: 4.2.2 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 dev: true /wrappy/1.0.2: @@ -9070,7 +8769,7 @@ packages: dependencies: imurmurhash: 0.1.4 is-typedarray: 1.0.0 - signal-exit: 3.0.4 + signal-exit: 3.0.5 typedarray-to-buffer: 3.1.5 dev: true @@ -9129,7 +8828,7 @@ packages: escalade: 3.1.1 get-caller-file: 2.0.5 require-directory: 2.1.1 - string-width: 4.2.2 + string-width: 4.2.3 y18n: 5.0.8 yargs-parser: 20.2.9 dev: true From 6bef5956a12642b256b71ceca293aeab06b61485 Mon Sep 17 00:00:00 2001 From: Shinigami Date: Fri, 29 Oct 2021 22:37:47 +0200 Subject: [PATCH 006/258] chore(deps): update vite dependencies (#5468) --- packages/vite/package.json | 34 +++++++++++++------------- pnpm-lock.yaml | 49 ++++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/packages/vite/package.json b/packages/vite/package.json index 180f6d57f29d18..38a6a25c698096 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -44,10 +44,10 @@ }, "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!", "dependencies": { - "esbuild": "^0.13.2", - "postcss": "^8.3.8", + "esbuild": "^0.13.10", + "postcss": "^8.3.11", "resolve": "^1.20.0", - "rollup": "^2.57.0" + "rollup": "^2.58.3" }, "optionalDependencies": { "fsevents": "~2.3.2" @@ -56,26 +56,26 @@ "@ampproject/remapping": "^1.0.1", "@babel/parser": "^7.15.8", "@babel/types": "^7.15.6", - "@rollup/plugin-alias": "^3.1.5", - "@rollup/plugin-commonjs": "^21.0.0", - "@rollup/plugin-dynamic-import-vars": "^1.4.0", + "@rollup/plugin-alias": "^3.1.8", + "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "13.0.5", - "@rollup/plugin-typescript": "^8.2.5", + "@rollup/plugin-node-resolve": "13.0.6", + "@rollup/plugin-typescript": "^8.3.0", "@rollup/pluginutils": "^4.1.1", "@types/convert-source-map": "^1.5.2", "@types/debug": "^4.1.7", - "@types/es-module-lexer": "^0.3.0", + "@types/es-module-lexer": "^0.4.1", "@types/estree": "^0.0.50", "@types/etag": "^1.8.1", "@types/less": "^3.0.3", "@types/mime": "^2.0.3", - "@types/node": "^15.12.2", + "@types/node": "^15.14.9", "@types/resolve": "^1.20.1", "@types/sass": "~1.16.1", "@types/stylus": "^0.48.36", "@types/ws": "^7.4.7", - "@vue/compiler-dom": "^3.2.19", + "@vue/compiler-dom": "^3.2.20", "acorn": "^8.5.0", "acorn-class-fields": "^1.0.0", "acorn-static-class-features": "^1.0.0", @@ -91,7 +91,7 @@ "debug": "^4.3.2", "dotenv": "^10.0.0", "dotenv-expand": "^5.1.0", - "es-module-lexer": "^0.9.2", + "es-module-lexer": "^0.9.3", "estree-walker": "^2.0.2", "etag": "^1.8.1", "execa": "^5.1.1", @@ -102,18 +102,18 @@ "mime": "^2.5.2", "minimatch": "^3.0.4", "okie": "^1.0.1", - "open": "^8.2.1", + "open": "^8.4.0", "periscopic": "^2.0.3", "postcss-import": "^14.0.2", "postcss-load-config": "^3.1.0", "postcss-modules": "^4.2.2", - "resolve.exports": "^1.0.2", - "rollup-plugin-license": "^2.5.0", + "resolve.exports": "^1.1.0", + "rollup-plugin-license": "^2.6.0", "selfsigned": "^1.10.11", - "sirv": "^1.0.17", + "sirv": "^1.0.18", "source-map": "^0.6.1", "source-map-support": "^0.5.20", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "terser": "^5.9.0", "tsconfck": "1.0.0", "tslib": "^2.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb3c74d046d81f..e86f24fd601903 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -658,26 +658,26 @@ importers: '@ampproject/remapping': ^1.0.1 '@babel/parser': ^7.15.8 '@babel/types': ^7.15.6 - '@rollup/plugin-alias': ^3.1.5 - '@rollup/plugin-commonjs': ^21.0.0 - '@rollup/plugin-dynamic-import-vars': ^1.4.0 + '@rollup/plugin-alias': ^3.1.8 + '@rollup/plugin-commonjs': ^21.0.1 + '@rollup/plugin-dynamic-import-vars': ^1.4.1 '@rollup/plugin-json': ^4.1.0 - '@rollup/plugin-node-resolve': 13.0.5 - '@rollup/plugin-typescript': ^8.2.5 + '@rollup/plugin-node-resolve': 13.0.6 + '@rollup/plugin-typescript': ^8.3.0 '@rollup/pluginutils': ^4.1.1 '@types/convert-source-map': ^1.5.2 '@types/debug': ^4.1.7 - '@types/es-module-lexer': ^0.3.0 + '@types/es-module-lexer': ^0.4.1 '@types/estree': ^0.0.50 '@types/etag': ^1.8.1 '@types/less': ^3.0.3 '@types/mime': ^2.0.3 - '@types/node': ^15.12.2 + '@types/node': ^15.14.9 '@types/resolve': ^1.20.1 '@types/sass': ~1.16.1 '@types/stylus': ^0.48.36 '@types/ws': ^7.4.7 - '@vue/compiler-dom': ^3.2.19 + '@vue/compiler-dom': ^3.2.20 acorn: ^8.5.0 acorn-class-fields: ^1.0.0 acorn-static-class-features: ^1.0.0 @@ -693,8 +693,8 @@ importers: debug: ^4.3.2 dotenv: ^10.0.0 dotenv-expand: ^5.1.0 - es-module-lexer: ^0.9.2 - esbuild: ^0.13.2 + es-module-lexer: ^0.9.3 + esbuild: ^0.13.10 estree-walker: ^2.0.2 etag: ^1.8.1 execa: ^5.1.1 @@ -706,21 +706,21 @@ importers: mime: ^2.5.2 minimatch: ^3.0.4 okie: ^1.0.1 - open: ^8.2.1 + open: ^8.4.0 periscopic: ^2.0.3 - postcss: ^8.3.8 + postcss: ^8.3.11 postcss-import: ^14.0.2 postcss-load-config: ^3.1.0 postcss-modules: ^4.2.2 resolve: ^1.20.0 - resolve.exports: ^1.0.2 - rollup: ^2.57.0 - rollup-plugin-license: ^2.5.0 + resolve.exports: ^1.1.0 + rollup: ^2.58.3 + rollup-plugin-license: ^2.6.0 selfsigned: ^1.10.11 - sirv: ^1.0.17 + sirv: ^1.0.18 source-map: ^0.6.1 source-map-support: ^0.5.20 - strip-ansi: ^6.0.0 + strip-ansi: ^6.0.1 terser: ^5.9.0 tsconfck: 1.0.0 tslib: ^2.3.1 @@ -741,12 +741,12 @@ importers: '@rollup/plugin-commonjs': 21.0.1_rollup@2.58.3 '@rollup/plugin-dynamic-import-vars': 1.4.1_rollup@2.58.3 '@rollup/plugin-json': 4.1.0_rollup@2.58.3 - '@rollup/plugin-node-resolve': 13.0.5_rollup@2.58.3 + '@rollup/plugin-node-resolve': 13.0.6_rollup@2.58.3 '@rollup/plugin-typescript': 8.3.0_eadbb6348e5d71a0a94215fbea4eae9e '@rollup/pluginutils': 4.1.1 '@types/convert-source-map': 1.5.2 '@types/debug': 4.1.7 - '@types/es-module-lexer': 0.3.0 + '@types/es-module-lexer': 0.4.1 '@types/estree': 0.0.50 '@types/etag': 1.8.1 '@types/less': 3.0.3 @@ -1876,8 +1876,8 @@ packages: rollup: 2.58.3 dev: true - /@rollup/plugin-node-resolve/13.0.5_rollup@2.58.3: - resolution: {integrity: sha512-mVaw6uxtvuGx/XCI4qBQXsDZJUfyx5vp39iE0J/7Hd6wDhEbjHr6aES7Nr9yWbuE0BY+oKp6N7Bq6jX5NCGNmQ==} + /@rollup/plugin-node-resolve/13.0.6_rollup@2.58.3: + resolution: {integrity: sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^2.42.0 @@ -2035,8 +2035,11 @@ packages: '@types/ms': 0.7.31 dev: true - /@types/es-module-lexer/0.3.0: - resolution: {integrity: sha512-XI3MGSejUQIJ3wzY0i5IHy5J3eb36M/ytgG8jIOssP08ovtRPcjpjXQqrx51AHBNBOisTS/NQNWJitI17+EwzQ==} + /@types/es-module-lexer/0.4.1: + resolution: {integrity: sha512-PDKZezERXh0axp2G+rGqqwaz6eU9U9OnasbO6BjINSC4BjbeTnrBxrLS2KGqOHMVTB5z73BUuvMjY6FNyF8zDw==} + deprecated: This is a stub types definition. es-module-lexer provides its own type definitions, so you do not need this installed. + dependencies: + es-module-lexer: 0.9.3 dev: true /@types/estree/0.0.39: From 852c9844b7366d055612380dcc226fd6abf2c882 Mon Sep 17 00:00:00 2001 From: Evan Boehs <51836263+boehs@users.noreply.github.com> Date: Sun, 31 Oct 2021 15:07:24 -0400 Subject: [PATCH 007/258] docs: add note about glob imports (#5491) --- docs/guide/features.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/guide/features.md b/docs/guide/features.md index 56ffeab20ad694..7f383d59371358 100644 --- a/docs/guide/features.md +++ b/docs/guide/features.md @@ -295,6 +295,7 @@ Note that: - This is a Vite-only feature and is not a web or ES standard. - The glob patterns are treated like import specifiers: they must be either relative (start with `./`) or absolute (start with `/`, resolved relative to project root). - The glob matching is done via `fast-glob` - check out its documentation for [supported glob patterns](https://github.com/mrmlnc/fast-glob#pattern-syntax). +- You should also be aware that glob imports do not accept variables, you need to directly pass the string pattern. ## WebAssembly From 532f6839541d3cbe500c6ffd9c8f0eb2ebe45cd9 Mon Sep 17 00:00:00 2001 From: patak-js Date: Mon, 1 Nov 2021 13:46:24 +0100 Subject: [PATCH 008/258] release: v2.7.0-beta.1 --- packages/vite/CHANGELOG.md | 10 ++++++++++ packages/vite/package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 48597d99a25bd3..778079e5a0409b 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,13 @@ +# [2.7.0-beta.1](https://github.com/vitejs/vite/compare/v2.7.0-beta.0...v2.7.0-beta.1) (2021-11-01) + + +### Bug Fixes + +* **ssr:** dont transform process.env. in ssr ([#5404](https://github.com/vitejs/vite/issues/5404)) ([1140981](https://github.com/vitejs/vite/commit/11409818d934f2b13ba7d5972647d31273fd3293)) +* Vite module graph race condition ([#5470](https://github.com/vitejs/vite/issues/5470)) ([70fd32c](https://github.com/vitejs/vite/commit/70fd32c1569c3d93a231577b573dbd2b34da4de2)) + + + # [2.7.0-beta.0](https://github.com/vitejs/vite/compare/v2.6.13...v2.7.0-beta.0) (2021-10-28) diff --git a/packages/vite/package.json b/packages/vite/package.json index 38a6a25c698096..4ce0efb956dd9a 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.0", + "version": "2.7.0-beta.1", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From 9f1f221051be2e5c923b78f01db2ecccb3dea9a0 Mon Sep 17 00:00:00 2001 From: patak Date: Mon, 1 Nov 2021 14:55:52 +0100 Subject: [PATCH 009/258] chore: changelog for 2.7-beta-0 (#5500) --- packages/vite/CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 778079e5a0409b..10a7bb5e8bb45a 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -11,6 +11,34 @@ # [2.7.0-beta.0](https://github.com/vitejs/vite/compare/v2.6.13...v2.7.0-beta.0) (2021-10-28) +### BREAKING CHANGES + +- `server.fs.strict` is `true` by default ([#5341](https://github.com/vitejs/vite/pull/5341)) + See [server filesystem restriction docs](https://vitejs.dev/config/#server-fs-strict) for more details. +- Plugin hooks `ssr` param to object in `resolveId`, `load`, and `transform` ([#5253](https://github.com/vitejs/vite/pull/5253)) + Previous to this release, the `ssr` param was passed as a `boolean` in the last parameter of each hook. The new interface for these hooks is now: + ```ts + export interface Plugin extends RollupPlugin { + // ... other hooks + resolveId?(this: PluginContext, source: string, importer: string | undefined, options: { + custom?: CustomPluginOptions; + ssr?: boolean; + }): Promise | ResolveIdResult; + load?(this: PluginContext, id: string, options?: { + ssr?: boolean; + }): Promise | LoadResult; + transform?(this: TransformPluginContext, code: string, id: string, options?: { + ssr?: boolean; + }): Promise | TransformResult; + } + ``` + In your plugins, you can check if the last param is a boolean or an object to be backward compatible with 2.6 and give some time to users to migrate to Vite 2.7. +- `server.pluginContainer` options object for `resolveId`, `load`, and `transform` ([#5294](https://github.com/vitejs/vite/pull/5294)) +- Normalize scripts and commands naming ([#5207](https://github.com/vitejs/vite/pull/5207)) + Adds a new `vite dev` command alias for `vite serve`, preparing for the new release of create-vite where package scripts are renamed to `dev`, `build`, and `preview`. +- Align experimental `preview` api ([#5407](https://github.com/vitejs/vite/pull/5407)) + This API was first introduced in 2.6 and it is still in flux. + ### Bug Fixes * add `import` support to `ssrModuleLoader` ([#5197](https://github.com/vitejs/vite/issues/5197)) ([baba1f9](https://github.com/vitejs/vite/commit/baba1f9e8fb22254b3858bcc1ffe89b334736068)) From 8f075a8068f2f1aff4b296c7860f5a0630e18925 Mon Sep 17 00:00:00 2001 From: stygian-desolator <73412177+stygian-desolator@users.noreply.github.com> Date: Tue, 2 Nov 2021 08:48:37 +0800 Subject: [PATCH 010/258] docs: update pnpm link command (#5506) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2bba1b6f533a56..0c4c916a6bf215 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ To development and test the core `vite` package: 1. Go to `packages/vite` and run `pnpm run dev`. This starts `rollup` in watch mode. -2. Run `pnpm link` in `packages/vite`. This links `vite` globally so that you can: +2. Run `pnpm link --global` in `packages/vite`. This links `vite` globally so that you can: - Run `pnpm link vite` in another Vite project to use the locally built Vite; - Use the `vite` binary anywhere. From 981e1f5ca214ace0044350d566ecd267269a4e9b Mon Sep 17 00:00:00 2001 From: patak Date: Tue, 2 Nov 2021 01:48:49 +0100 Subject: [PATCH 011/258] docs: virtual modules ID naming convention (#5505) --- docs/guide/api-plugin.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/guide/api-plugin.md b/docs/guide/api-plugin.md index 5a76575d8fe914..58afcfea832dfe 100644 --- a/docs/guide/api-plugin.md +++ b/docs/guide/api-plugin.md @@ -17,7 +17,7 @@ When learning, debugging, or authoring plugins we suggest including [vite-plugin ## Conventions -If the plugin doesn't use Vite specific hooks and can be implemented as a [Compatible Rollup Plugin](#rollup-plugin-compatibility), then it is recommended to use the [Rollup Plugin naming conventions](https://rollupjs.org/guide/en/#conventions) +If the plugin doesn't use Vite specific hooks and can be implemented as a [Compatible Rollup Plugin](#rollup-plugin-compatibility), then it is recommended to use the [Rollup Plugin naming conventions](https://rollupjs.org/guide/en/#conventions) (except for virtual modules naming, see note below). - Rollup Plugins should have a clear name with `rollup-plugin-` prefix. - Include `rollup-plugin` and `vite-plugin` keywords in package.json. @@ -36,6 +36,10 @@ If your plugin is only going to work for a particular framework, its name should - `vite-plugin-react-` prefix for React Plugins - `vite-plugin-svelte-` prefix for Svelte Plugins +Rollup recommends prefixing the module ID for 'virtual modules' (e.g. for helper functions) with `\0`. This prevents other plugins from trying to process it. But this convention for paths isn't browser-friendly. + +Vite convention for virtual modules is to prefix the path with `virtual:`. If possible the plugin name should be used as a namespace to avoid collisions with other plugins in the ecosystem. For example, a `vite-plugin-posts` could ask users to import a `virtual:posts` or `virtual:posts/helpers` virtual modules to get build time information. + ## Plugins config Users will add plugins to the project `devDependencies` and configure them using the `plugins` array option. From 27b7f90ce2aa9de4290a8422b899d2d718a8c7d7 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:50:33 -0400 Subject: [PATCH 012/258] fix(server): use `options` argument in caching of `transformRequest` calls (#5391) --- packages/vite/src/node/server/index.ts | 4 ++-- .../vite/src/node/server/transformRequest.ts | 21 +++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 90f6af4ad00939..3e06ec732e8157 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -324,7 +324,7 @@ export interface ViteDevServer { /** * @internal */ - _pendingRequests: Record | null> + _pendingRequests: Map> } export async function createServer( @@ -432,7 +432,7 @@ export async function createServer( _isRunningOptimizer: false, _registerMissingImport: null, _pendingReload: null, - _pendingRequests: Object.create(null) + _pendingRequests: new Map() } server.transformIndexHtml = createDevHtmlTransformFn(server) diff --git a/packages/vite/src/node/server/transformRequest.ts b/packages/vite/src/node/server/transformRequest.ts index cf4762cc4b0ff3..4381529dba1c8e 100644 --- a/packages/vite/src/node/server/transformRequest.ts +++ b/packages/vite/src/node/server/transformRequest.ts @@ -43,20 +43,15 @@ export function transformRequest( server: ViteDevServer, options: TransformOptions = {} ): Promise { - const pending = server._pendingRequests[url] - if (pending) { - debugTransform( - `[reuse pending] for ${prettifyUrl(url, server.config.root)}` - ) - return pending + const cacheKey = (options.ssr ? 'ssr:' : options.html ? 'html:' : '') + url + let request = server._pendingRequests.get(cacheKey) + if (!request) { + request = doTransform(url, server, options) + server._pendingRequests.set(cacheKey, request) + const done = () => server._pendingRequests.delete(cacheKey) + request.then(done, done) } - const result = doTransform(url, server, options) - server._pendingRequests[url] = result - const onDone = () => { - server._pendingRequests[url] = null - } - result.then(onDone, onDone) - return result + return request } async function doTransform( From 518da447e573b6f6ec5e2b1ca837332e0e230c14 Mon Sep 17 00:00:00 2001 From: OneNail <31649110+OneNail@users.noreply.github.com> Date: Tue, 2 Nov 2021 09:06:54 +0800 Subject: [PATCH 013/258] fix(plugin-vue): template src isn't working when script setup (#5418) --- packages/playground/vue/Main.vue | 2 ++ packages/playground/vue/__tests__/vue.spec.ts | 8 ++++++++ .../setup-import-template/SetupImportTemplate.vue | 5 +++++ .../vue/setup-import-template/template.html | 2 ++ packages/plugin-vue/src/main.ts | 11 ++--------- packages/plugin-vue/src/script.ts | 13 ++++++++++++- 6 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 packages/playground/vue/setup-import-template/SetupImportTemplate.vue create mode 100644 packages/playground/vue/setup-import-template/template.html diff --git a/packages/playground/vue/Main.vue b/packages/playground/vue/Main.vue index bf491f9a71e9af..a65c9d7480920e 100644 --- a/packages/playground/vue/Main.vue +++ b/packages/playground/vue/Main.vue @@ -19,6 +19,7 @@ + diff --git a/packages/playground/vue/setup-import-template/template.html b/packages/playground/vue/setup-import-template/template.html new file mode 100644 index 00000000000000..414069f2e9e929 --- /dev/null +++ b/packages/playground/vue/setup-import-template/template.html @@ -0,0 +1,2 @@ +

Setup Import Template

+ diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index 9ddb73ea61c078..ef82b3a05551d2 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -10,7 +10,7 @@ import { } from './utils/descriptorCache' import { PluginContext, SourceMap, TransformPluginContext } from 'rollup' import { normalizePath } from '@rollup/pluginutils' -import { resolveScript } from './script' +import { resolveScript, isUseInlineTemplate } from './script' import { transformTemplateInMain } from './template' import { isOnlyTemplateChanged, isEqualBlock } from './handleHotUpdate' import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map' @@ -53,14 +53,7 @@ export async function transformMain( ) // template - // Check if we can use compile template as inlined render function - // inside + +` + +async function createServer( + root = process.cwd(), + isProd = process.env.NODE_ENV === 'production' +) { + const resolve = (p) => path.resolve(__dirname, p) + + const app = express() + + /** + * @type {import('vite').ViteDevServer} + */ + let vite + vite = await require('vite').createServer({ + root, + logLevel: isTest ? 'error' : 'info', + server: { + middlewareMode: 'ssr', + watch: { + // During tests we edit the files too fast and sometimes chokidar + // misses change events, so enforce polling for consistency + usePolling: true, + interval: 100 + } + } + }) + // use vite's connect instance as middleware + app.use(vite.middlewares) + + app.use('*', async (req, res) => { + try { + let [url] = req.originalUrl.split('?') + url = url.replace(/\.html$/, '.pug') + if (url.endsWith('/')) url += 'index.pug' + + const htmlLoc = resolve(`.${url}`) + let html = pug.renderFile(htmlLoc) + html = html.replace('', `${DYNAMIC_SCRIPTS}`) + html = await vite.transformIndexHtml(url, html) + + res.status(200).set({ 'Content-Type': 'text/html' }).end(html) + } catch (e) { + vite && vite.ssrFixStacktrace(e) + console.log(e.stack) + res.status(500).end(e.stack) + } + }) + + return { app, vite } +} + +if (!isTest) { + createServer().then(({ app }) => + app.listen(3000, () => { + console.log('http://localhost:3000') + }) + ) +} + +// for test use +exports.createServer = createServer diff --git a/packages/playground/ssr-pug/src/app.js b/packages/playground/ssr-pug/src/app.js new file mode 100644 index 00000000000000..5b0175bb863d70 --- /dev/null +++ b/packages/playground/ssr-pug/src/app.js @@ -0,0 +1,3 @@ +const p = document.createElement('p') +p.innerHTML = '✅ Dynamically injected script from file' +document.body.appendChild(p) diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts index 42ed41453f2ab5..1731a8aad57e5e 100644 --- a/packages/vite/src/node/plugins/html.ts +++ b/packages/vite/src/node/plugins/html.ts @@ -7,6 +7,7 @@ import { generateCodeFrame, isDataUrl, isExternalUrl, + normalizePath, processSrcSet, slash } from '../utils' @@ -55,7 +56,7 @@ export function htmlInlineScriptProxyPlugin(config: ResolvedConfig): Plugin { if (proxyMatch) { const index = Number(proxyMatch[1]) const file = cleanUrl(id) - const url = file.replace(config.root, '') + const url = file.replace(normalizePath(config.root), '') const result = htmlProxyMap.get(config)!.get(url)![index] if (result) { return result @@ -230,7 +231,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin { .map((child: any) => child.content || '') .join('') // - const filePath = id.replace(config.root, '') + const filePath = id.replace(normalizePath(config.root), '') addToHTMLProxyCache( config, filePath, diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts index 43d0075c7afd66..c6702e3966779e 100644 --- a/packages/vite/src/node/server/middlewares/indexHtml.ts +++ b/packages/vite/src/node/server/middlewares/indexHtml.ts @@ -15,7 +15,7 @@ import { import { ResolvedConfig, ViteDevServer } from '../..' import { send } from '../send' import { CLIENT_PUBLIC_PATH, FS_PREFIX } from '../../constants' -import { cleanUrl, fsPathFromId } from '../../utils' +import { cleanUrl, fsPathFromId, normalizePath } from '../../utils' export function createDevHtmlTransformFn( server: ViteDevServer @@ -105,7 +105,7 @@ const devHtmlHook: IndexHtmlTransformHook = async ( if (src) { processNodeUrl(src, s, config, htmlPath, originalUrl) } else if (isModule) { - const url = filePath.replace(config.root, '') + const url = filePath.replace(normalizePath(config.root), '') const contents = node.children .map((child: any) => child.content || '') diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 238fe7680b6810..09bc8bdf7e4696 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -462,6 +462,16 @@ importers: cross-env: 7.0.3 express: 4.17.1 + packages/playground/ssr-pug: + specifiers: + cross-env: ^7.0.3 + express: ^4.17.1 + pug: ^3.0.0 + devDependencies: + cross-env: 7.0.3 + express: 4.17.1 + pug: 3.0.2 + packages/playground/ssr-react: specifiers: '@vitejs/plugin-react': workspace:* From 09e2a5f16f36d84e95448a9ae819cec5faeb41f3 Mon Sep 17 00:00:00 2001 From: Shinigami Date: Sat, 6 Nov 2021 11:28:17 +0100 Subject: [PATCH 024/258] chore(deps): update non critical deps (#5569) --- package.json | 24 +- packages/playground/alias/package.json | 4 +- packages/playground/css/package.json | 2 +- packages/playground/extensions/package.json | 2 +- .../file-delete-restore/package.json | 2 +- packages/playground/json/package.json | 2 +- .../dep-linked-include/package.json | 2 +- .../playground/optimize-deps/package.json | 6 +- packages/playground/preload/package.json | 2 +- .../playground/react-emotion/package.json | 4 +- packages/playground/react/package.json | 2 +- packages/playground/resolve/package.json | 12 +- packages/playground/ssr-react/package.json | 2 +- packages/playground/ssr-vue/package.json | 4 +- packages/playground/tailwind/package.json | 2 +- packages/playground/vue-jsx/package.json | 6 +- packages/playground/vue/package.json | 4 +- packages/plugin-legacy/package.json | 4 +- packages/plugin-react/package.json | 10 +- packages/plugin-vue-jsx/package.json | 4 +- packages/plugin-vue/package.json | 6 +- packages/vite/package.json | 12 +- pnpm-lock.yaml | 1083 ++++++++++------- 23 files changed, 731 insertions(+), 470 deletions(-) diff --git a/package.json b/package.json index d180f1c2ef0427..b4c4218104e196 100644 --- a/package.json +++ b/package.json @@ -28,40 +28,40 @@ "ci-docs": "run-s build-vite build-plugin-vue build-docs" }, "devDependencies": { - "@microsoft/api-extractor": "^7.18.11", + "@microsoft/api-extractor": "^7.18.19", "@types/fs-extra": "^9.0.13", "@types/jest": "^27.0.2", "@types/node": "^15.12.2", "@types/semver": "^7.3.8", - "@typescript-eslint/eslint-plugin": "^5.2.0", - "@typescript-eslint/parser": "^5.2.0", + "@typescript-eslint/eslint-plugin": "^5.3.0", + "@typescript-eslint/parser": "^5.3.0", "chalk": "^4.1.2", "conventional-changelog-cli": "^2.1.1", "cross-env": "^7.0.3", - "eslint": "^8.1.0", - "eslint-define-config": "^1.1.2", + "esbuild": "^0.13.12", + "eslint": "^8.2.0", + "eslint-define-config": "^1.1.3", "eslint-plugin-node": "^11.1.0", "execa": "^5.1.1", "fs-extra": "^10.0.0", "jest": "^27.3.1", "lint-staged": "^11.2.0", "minimist": "^1.2.5", - "node-fetch": "^2.6.5", + "node-fetch": "^2.6.6", "npm-run-all": "^4.1.5", - "playwright-chromium": "^1.15.1", + "playwright-chromium": "^1.16.3", "prettier": "2.4.1", "prompts": "^2.4.1", "rimraf": "^3.0.2", + "rollup": "^2.59.0", "semver": "^7.3.5", "sirv": "^1.0.17", "ts-jest": "^27.0.7", "ts-node": "^10.1.0", "typescript": "~4.4.3", - "vitepress": "^0.20.0", - "yorkie": "^2.0.0", - "rollup": "^2.57.0", - "esbuild": "^0.13.2", - "vite": "workspace:*" + "vite": "workspace:*", + "vitepress": "^0.20.1", + "yorkie": "^2.0.0" }, "gitHooks": { "pre-commit": "lint-staged --concurrent false", diff --git a/packages/playground/alias/package.json b/packages/playground/alias/package.json index 11e45824945548..21392c87a5cb96 100644 --- a/packages/playground/alias/package.json +++ b/packages/playground/alias/package.json @@ -10,8 +10,8 @@ "postinstall": "node ../../../scripts/patchFileDeps" }, "dependencies": { - "vue": "^3.2.16", - "aliased-module": "file:./dir/module" + "aliased-module": "file:./dir/module", + "vue": "^3.2.21" }, "devDependencies": { "resolve-linked": "workspace:*" diff --git a/packages/playground/css/package.json b/packages/playground/css/package.json index b8b7c77c4016f0..7dc980f4199500 100644 --- a/packages/playground/css/package.json +++ b/packages/playground/css/package.json @@ -13,6 +13,6 @@ "less": "^4.1.0", "postcss-nested": "^5.0.3", "sass": "^1.32.5", - "stylus": "^0.54.8" + "stylus": "^0.55.0" } } diff --git a/packages/playground/extensions/package.json b/packages/playground/extensions/package.json index 1bdef7c845635a..b3645637097ca8 100644 --- a/packages/playground/extensions/package.json +++ b/packages/playground/extensions/package.json @@ -9,6 +9,6 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.16" + "vue": "^3.2.21" } } diff --git a/packages/playground/file-delete-restore/package.json b/packages/playground/file-delete-restore/package.json index f24429efe64e84..d37004efadc425 100644 --- a/packages/playground/file-delete-restore/package.json +++ b/packages/playground/file-delete-restore/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "react": "^17.0.1", + "react": "^17.0.2", "react-dom": "^17.0.1" }, "devDependencies": { diff --git a/packages/playground/json/package.json b/packages/playground/json/package.json index 5dc22762f6b1a0..ab5e7f6cd85a9c 100644 --- a/packages/playground/json/package.json +++ b/packages/playground/json/package.json @@ -9,6 +9,6 @@ "preview": "vite preview" }, "devDependencies": { - "vue": "^3.2.16" + "vue": "^3.2.21" } } diff --git a/packages/playground/optimize-deps/dep-linked-include/package.json b/packages/playground/optimize-deps/dep-linked-include/package.json index 43533d4f02a6b6..d1a21edfd44d55 100644 --- a/packages/playground/optimize-deps/dep-linked-include/package.json +++ b/packages/playground/optimize-deps/dep-linked-include/package.json @@ -3,6 +3,6 @@ "version": "0.0.0", "main": "index.mjs", "dependencies": { - "react": "17.0.0" + "react": "17.0.2" } } diff --git a/packages/playground/optimize-deps/package.json b/packages/playground/optimize-deps/package.json index 45e73b29a37fb8..7891d1677154ec 100644 --- a/packages/playground/optimize-deps/package.json +++ b/packages/playground/optimize-deps/package.json @@ -10,7 +10,7 @@ "postinstall": "node ../../../scripts/patchFileDeps" }, "dependencies": { - "axios": "^0.21.1", + "axios": "^0.24.0", "clipboard": "^2.0.6", "dep-cjs-compiled-from-cjs": "file:./dep-cjs-compiled-from-cjs", "dep-cjs-compiled-from-esm": "file:./dep-cjs-compiled-from-esm", @@ -20,10 +20,10 @@ "lodash-es": "^4.17.20", "nested-exclude": "file:./nested-exclude", "phoenix": "^1.5.7", - "react": "^17.0.1", + "react": "^17.0.2", "react-dom": "^17.0.1", "resolve-linked": "0.0.0", - "vue": "^3.2.16", + "vue": "^3.2.21", "vuex": "^4.0.0" }, "devDependencies": { diff --git a/packages/playground/preload/package.json b/packages/playground/preload/package.json index 746bdfa2a14fc5..01f7df4a6fb6a2 100644 --- a/packages/playground/preload/package.json +++ b/packages/playground/preload/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.16", + "vue": "^3.2.21", "vue-router": "^4.0.0" }, "devDependencies": { diff --git a/packages/playground/react-emotion/package.json b/packages/playground/react-emotion/package.json index 606c16fed9a2f3..b21512dc1ade7b 100644 --- a/packages/playground/react-emotion/package.json +++ b/packages/playground/react-emotion/package.json @@ -10,12 +10,12 @@ }, "dependencies": { "@emotion/react": "^11.4.0", - "react": "^17.0.1", + "react": "^17.0.2", "react-dom": "^17.0.1", "react-switch": "^6.0.0" }, "devDependencies": { - "@babel/plugin-proposal-pipeline-operator": "^7.14.5", + "@babel/plugin-proposal-pipeline-operator": "^7.16.0", "@emotion/babel-plugin": "^11.3.0", "@vitejs/plugin-react": "workspace:*" }, diff --git a/packages/playground/react/package.json b/packages/playground/react/package.json index 60de1cebffea53..f8c6c265a1204c 100644 --- a/packages/playground/react/package.json +++ b/packages/playground/react/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "react": "^17.0.1", + "react": "^17.0.2", "react-dom": "^17.0.1" }, "devDependencies": { diff --git a/packages/playground/resolve/package.json b/packages/playground/resolve/package.json index 084a55de945714..5e0f53b4c8468a 100644 --- a/packages/playground/resolve/package.json +++ b/packages/playground/resolve/package.json @@ -9,14 +9,14 @@ "preview": "vite preview" }, "dependencies": { - "resolve-exports-path": "link:./exports-path", - "resolve-exports-env": "link:./exports-env", + "@babel/runtime": "^7.16.0", + "es5-ext": "0.10.53", + "normalize.css": "^8.0.1", "resolve-browser-field": "link:./browser-field", - "resolve-custom-main-field": "link:./custom-main-field", "resolve-custom-condition": "link:./custom-condition", - "@babel/runtime": "^7.12.5", - "normalize.css": "^8.0.1", - "es5-ext": "0.10.53", + "resolve-custom-main-field": "link:./custom-main-field", + "resolve-exports-env": "link:./exports-env", + "resolve-exports-path": "link:./exports-path", "resolve-linked": "workspace:*" } } diff --git a/packages/playground/ssr-react/package.json b/packages/playground/ssr-react/package.json index 00db0400061ed9..1f66f85f6879cf 100644 --- a/packages/playground/ssr-react/package.json +++ b/packages/playground/ssr-react/package.json @@ -12,7 +12,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "react": "^17.0.1", + "react": "^17.0.2", "react-dom": "^17.0.1", "react-router": "^5.2.0", "react-router-dom": "^5.2.0" diff --git a/packages/playground/ssr-vue/package.json b/packages/playground/ssr-vue/package.json index c23e86fa5085a9..09fd811ce24973 100644 --- a/packages/playground/ssr-vue/package.json +++ b/packages/playground/ssr-vue/package.json @@ -15,15 +15,15 @@ }, "dependencies": { "example-external-component": "file:example-external-component", - "vue": "^3.2.16", + "vue": "^3.2.21", "vue-router": "^4.0.0" }, "devDependencies": { "@vitejs/plugin-vue": "workspace:*", "@vitejs/plugin-vue-jsx": "workspace:*", - "dep-import-type": "link:./dep-import-type", "compression": "^1.7.4", "cross-env": "^7.0.3", + "dep-import-type": "link:./dep-import-type", "express": "^4.17.1", "serve-static": "^1.14.1" } diff --git a/packages/playground/tailwind/package.json b/packages/playground/tailwind/package.json index 2d8e808757dae6..70d87abda6b356 100644 --- a/packages/playground/tailwind/package.json +++ b/packages/playground/tailwind/package.json @@ -11,7 +11,7 @@ "dependencies": { "autoprefixer": "^10.3.0", "tailwindcss": "^2.2.4", - "vue": "^3.2.16", + "vue": "^3.2.21", "vue-router": "^4.0.0" }, "devDependencies": { diff --git a/packages/playground/vue-jsx/package.json b/packages/playground/vue-jsx/package.json index f0807abdee0f32..d3a80ca3c8e7cf 100644 --- a/packages/playground/vue-jsx/package.json +++ b/packages/playground/vue-jsx/package.json @@ -9,10 +9,10 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.16" + "vue": "^3.2.21" }, "devDependencies": { - "@vitejs/plugin-vue-jsx": "workspace:*", - "@vitejs/plugin-vue": "workspace:*" + "@vitejs/plugin-vue": "workspace:*", + "@vitejs/plugin-vue-jsx": "workspace:*" } } diff --git a/packages/playground/vue/package.json b/packages/playground/vue/package.json index df0ad540aabfbd..78e3c90a16c063 100644 --- a/packages/playground/vue/package.json +++ b/packages/playground/vue/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "lodash-es": "^4.17.20", - "vue": "^3.2.16" + "vue": "^3.2.21" }, "devDependencies": { "@vitejs/plugin-vue": "workspace:*", @@ -18,6 +18,6 @@ "less": "^3.13.0", "pug": "^3.0.0", "sass": "^1.30.0", - "stylus": "^0.54.8" + "stylus": "^0.55.0" } } diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json index b3992e77282a74..411d5b6ae73007 100644 --- a/packages/plugin-legacy/package.json +++ b/packages/plugin-legacy/package.json @@ -26,8 +26,8 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme", "dependencies": { - "@babel/standalone": "^7.15.8", - "core-js": "^3.19.0", + "@babel/standalone": "^7.16.2", + "core-js": "^3.19.1", "magic-string": "^0.25.7", "regenerator-runtime": "^0.13.9", "systemjs": "^6.11.0" diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index 3180c3c6853328..67396fd66a5152 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -33,11 +33,11 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme", "dependencies": { - "@babel/core": "^7.15.8", - "@babel/plugin-transform-react-jsx": "^7.14.9", - "@babel/plugin-transform-react-jsx-development": "^7.14.5", - "@babel/plugin-transform-react-jsx-self": "^7.14.9", - "@babel/plugin-transform-react-jsx-source": "^7.14.5", + "@babel/core": "^7.16.0", + "@babel/plugin-transform-react-jsx": "^7.16.0", + "@babel/plugin-transform-react-jsx-development": "^7.16.0", + "@babel/plugin-transform-react-jsx-self": "^7.16.0", + "@babel/plugin-transform-react-jsx-source": "^7.16.0", "@rollup/pluginutils": "^4.1.1", "react-refresh": "^0.10.0", "resolve": "^1.20.0" diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 672669aa273fd3..827f0f56661bb1 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -26,9 +26,9 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue-jsx#readme", "dependencies": { - "@babel/core": "^7.15.8", + "@babel/core": "^7.16.0", "@babel/plugin-syntax-import-meta": "^7.10.4", - "@babel/plugin-transform-typescript": "^7.15.8", + "@babel/plugin-transform-typescript": "^7.16.1", "@rollup/pluginutils": "^4.1.1", "@vue/babel-plugin-jsx": "^1.1.1", "hash-sum": "^2.0.0" diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index a853dd8370d479..726b01a1f6f29e 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -34,12 +34,12 @@ "devDependencies": { "@rollup/pluginutils": "^4.1.1", "@types/hash-sum": "^1.0.0", + "@vue/compiler-sfc": "^3.2.21", "debug": "^4.3.2", "hash-sum": "^2.0.0", - "rollup": "^2.58.3", + "rollup": "^2.59.0", "slash": "^3.0.0", "source-map": "^0.6.1", - "vue": "^3.2.20", - "@vue/compiler-sfc": "^3.2.20" + "vue": "^3.2.21" } } diff --git a/packages/vite/package.json b/packages/vite/package.json index 9faadf86dda207..d6225e5725c622 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -44,18 +44,18 @@ }, "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!", "dependencies": { - "esbuild": "^0.13.10", + "esbuild": "^0.13.12", "postcss": "^8.3.11", "resolve": "^1.20.0", - "rollup": "^2.58.3" + "rollup": "^2.59.0" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "devDependencies": { "@ampproject/remapping": "^1.0.1", - "@babel/parser": "^7.15.8", - "@babel/types": "^7.15.6", + "@babel/parser": "^7.16.2", + "@babel/types": "^7.16.0", "@rollup/plugin-alias": "^3.1.8", "@rollup/plugin-commonjs": "^21.0.1", "@rollup/plugin-dynamic-import-vars": "^1.4.1", @@ -74,7 +74,7 @@ "@types/sass": "~1.16.1", "@types/stylus": "^0.48.36", "@types/ws": "^7.4.7", - "@vue/compiler-dom": "^3.2.20", + "@vue/compiler-dom": "^3.2.21", "acorn": "^8.5.0", "acorn-class-fields": "^1.0.0", "acorn-static-class-features": "^1.0.0", @@ -114,7 +114,7 @@ "source-map-support": "^0.5.20", "strip-ansi": "^6.0.1", "terser": "^5.9.0", - "tsconfck": "1.0.0", + "tsconfck": "1.1.1", "tslib": "^2.3.1", "types": "link:./types", "ws": "^7.5.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09bc8bdf7e4696..46671f12a2edec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,74 +8,74 @@ importers: .: specifiers: - '@microsoft/api-extractor': ^7.18.11 + '@microsoft/api-extractor': ^7.18.19 '@types/fs-extra': ^9.0.13 '@types/jest': ^27.0.2 '@types/node': ^15.12.2 '@types/semver': ^7.3.8 - '@typescript-eslint/eslint-plugin': ^5.2.0 - '@typescript-eslint/parser': ^5.2.0 + '@typescript-eslint/eslint-plugin': ^5.3.0 + '@typescript-eslint/parser': ^5.3.0 chalk: ^4.1.2 conventional-changelog-cli: ^2.1.1 cross-env: ^7.0.3 - esbuild: ^0.13.2 - eslint: ^8.1.0 - eslint-define-config: ^1.1.2 + esbuild: ^0.13.12 + eslint: ^8.2.0 + eslint-define-config: ^1.1.3 eslint-plugin-node: ^11.1.0 execa: ^5.1.1 fs-extra: ^10.0.0 jest: ^27.3.1 lint-staged: ^11.2.0 minimist: ^1.2.5 - node-fetch: ^2.6.5 + node-fetch: ^2.6.6 npm-run-all: ^4.1.5 - playwright-chromium: ^1.15.1 + playwright-chromium: ^1.16.3 prettier: 2.4.1 prompts: ^2.4.1 rimraf: ^3.0.2 - rollup: ^2.57.0 + rollup: ^2.59.0 semver: ^7.3.5 sirv: ^1.0.17 ts-jest: ^27.0.7 ts-node: ^10.1.0 typescript: ~4.4.3 vite: workspace:* - vitepress: ^0.20.0 + vitepress: ^0.20.1 yorkie: ^2.0.0 devDependencies: - '@microsoft/api-extractor': 7.18.17 + '@microsoft/api-extractor': 7.18.19 '@types/fs-extra': 9.0.13 '@types/jest': 27.0.2 '@types/node': 15.14.9 '@types/semver': 7.3.9 - '@typescript-eslint/eslint-plugin': 5.2.0_9a56ca1c5fc1d82b3da3317a5c6f9ab1 - '@typescript-eslint/parser': 5.2.0_eslint@8.1.0+typescript@4.4.4 + '@typescript-eslint/eslint-plugin': 5.3.0_c2f57e23dad63fa3be14ade7e20e2af7 + '@typescript-eslint/parser': 5.3.0_eslint@8.2.0+typescript@4.4.4 chalk: 4.1.2 conventional-changelog-cli: 2.1.1 cross-env: 7.0.3 - esbuild: 0.13.10 - eslint: 8.1.0 - eslint-define-config: 1.1.2 - eslint-plugin-node: 11.1.0_eslint@8.1.0 + esbuild: 0.13.12 + eslint: 8.2.0 + eslint-define-config: 1.1.3 + eslint-plugin-node: 11.1.0_eslint@8.2.0 execa: 5.1.1 fs-extra: 10.0.0 jest: 27.3.1_ts-node@10.4.0 lint-staged: 11.2.6 minimist: 1.2.5 - node-fetch: 2.6.5 + node-fetch: 2.6.6 npm-run-all: 4.1.5 - playwright-chromium: 1.16.2 + playwright-chromium: 1.16.3 prettier: 2.4.1 prompts: 2.4.2 rimraf: 3.0.2 - rollup: 2.58.3 + rollup: 2.59.0 semver: 7.3.5 sirv: 1.0.18 ts-jest: 27.0.7_2c4ca6574207836d1023f54689cc81ac ts-node: 10.4.0_d3e11751f498564481cc5d710b5b838a typescript: 4.4.4 vite: link:packages/vite - vitepress: 0.20.0 + vitepress: 0.20.1 yorkie: 2.0.0 packages/create-app: @@ -106,10 +106,10 @@ importers: specifiers: aliased-module: file:./dir/module resolve-linked: workspace:* - vue: ^3.2.16 + vue: ^3.2.21 dependencies: aliased-module: link:dir/module - vue: 3.2.20 + vue: 3.2.21 devDependencies: resolve-linked: link:../resolve-linked @@ -137,13 +137,13 @@ importers: less: ^4.1.0 postcss-nested: ^5.0.3 sass: ^1.32.5 - stylus: ^0.54.8 + stylus: ^0.55.0 devDependencies: css-dep: link:css-dep less: 4.1.2 postcss-nested: 5.0.6 sass: 1.43.4 - stylus: 0.54.8 + stylus: 0.55.0 packages/playground/css-codesplit: specifiers: {} @@ -180,14 +180,14 @@ importers: packages/playground/extensions: specifiers: - vue: ^3.2.16 + vue: ^3.2.21 dependencies: - vue: 3.2.20 + vue: 3.2.21 packages/playground/file-delete-restore: specifiers: '@vitejs/plugin-react': workspace:* - react: ^17.0.1 + react: ^17.0.2 react-dom: ^17.0.1 dependencies: react: 17.0.2 @@ -209,9 +209,9 @@ importers: packages/playground/json: specifiers: - vue: ^3.2.16 + vue: ^3.2.21 devDependencies: - vue: 3.2.20 + vue: 3.2.21 packages/playground/legacy: specifiers: @@ -277,7 +277,7 @@ importers: packages/playground/optimize-deps: specifiers: '@vitejs/plugin-vue': workspace:* - axios: ^0.21.1 + axios: ^0.24.0 clipboard: ^2.0.6 dep-cjs-compiled-from-cjs: file:./dep-cjs-compiled-from-cjs dep-cjs-compiled-from-esm: file:./dep-cjs-compiled-from-esm @@ -287,13 +287,13 @@ importers: lodash-es: ^4.17.20 nested-exclude: file:./nested-exclude phoenix: ^1.5.7 - react: ^17.0.1 + react: ^17.0.2 react-dom: ^17.0.1 resolve-linked: 0.0.0 - vue: ^3.2.16 + vue: ^3.2.21 vuex: ^4.0.0 dependencies: - axios: 0.21.4 + axios: 0.24.0 clipboard: 2.0.8 dep-cjs-compiled-from-cjs: link:dep-cjs-compiled-from-cjs dep-cjs-compiled-from-esm: link:dep-cjs-compiled-from-esm @@ -306,8 +306,8 @@ importers: react: 17.0.2 react-dom: 17.0.2_react@17.0.2 resolve-linked: link:../resolve-linked - vue: 3.2.20 - vuex: 4.0.2_vue@3.2.20 + vue: 3.2.21 + vuex: 4.0.2_vue@3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -328,9 +328,9 @@ importers: packages/playground/optimize-deps/dep-linked-include: specifiers: - react: 17.0.0 + react: 17.0.2 dependencies: - react: 17.0.0 + react: 17.0.2 packages/playground/optimize-deps/nested-exclude: specifiers: @@ -364,11 +364,11 @@ importers: packages/playground/preload: specifiers: '@vitejs/plugin-vue': workspace:* - vue: ^3.2.16 + vue: ^3.2.21 vue-router: ^4.0.0 dependencies: - vue: 3.2.20 - vue-router: 4.0.12_vue@3.2.20 + vue: 3.2.21 + vue-router: 4.0.12_vue@3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -384,7 +384,7 @@ importers: packages/playground/react: specifiers: '@vitejs/plugin-react': workspace:* - react: ^17.0.1 + react: ^17.0.2 react-dom: ^17.0.1 dependencies: react: 17.0.2 @@ -394,11 +394,11 @@ importers: packages/playground/react-emotion: specifiers: - '@babel/plugin-proposal-pipeline-operator': ^7.14.5 + '@babel/plugin-proposal-pipeline-operator': ^7.16.0 '@emotion/babel-plugin': ^11.3.0 '@emotion/react': ^11.4.0 '@vitejs/plugin-react': workspace:* - react: ^17.0.1 + react: ^17.0.2 react-dom: ^17.0.1 react-switch: ^6.0.0 dependencies: @@ -407,13 +407,13 @@ importers: react-dom: 17.0.2_react@17.0.2 react-switch: 6.0.0_react-dom@17.0.2+react@17.0.2 devDependencies: - '@babel/plugin-proposal-pipeline-operator': 7.15.0 + '@babel/plugin-proposal-pipeline-operator': 7.16.0 '@emotion/babel-plugin': 11.3.0 '@vitejs/plugin-react': link:../../plugin-react packages/playground/resolve: specifiers: - '@babel/runtime': ^7.12.5 + '@babel/runtime': ^7.16.0 es5-ext: 0.10.53 normalize.css: ^8.0.1 resolve-browser-field: link:./browser-field @@ -423,7 +423,7 @@ importers: resolve-exports-path: link:./exports-path resolve-linked: workspace:* dependencies: - '@babel/runtime': 7.15.4 + '@babel/runtime': 7.16.0 es5-ext: 0.10.53 normalize.css: 8.0.1 resolve-browser-field: link:browser-field @@ -478,7 +478,7 @@ importers: compression: ^1.7.4 cross-env: ^7.0.3 express: ^4.17.1 - react: ^17.0.1 + react: ^17.0.2 react-dom: ^17.0.1 react-router: ^5.2.0 react-router-dom: ^5.2.0 @@ -505,12 +505,12 @@ importers: example-external-component: file:example-external-component express: ^4.17.1 serve-static: ^1.14.1 - vue: ^3.2.16 + vue: ^3.2.21 vue-router: ^4.0.0 dependencies: example-external-component: link:example-external-component - vue: 3.2.20 - vue-router: 4.0.12_vue@3.2.20 + vue: 3.2.21 + vue-router: 4.0.12_vue@3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx @@ -542,13 +542,13 @@ importers: '@vitejs/plugin-vue': workspace:* autoprefixer: ^10.3.0 tailwindcss: ^2.2.4 - vue: ^3.2.16 + vue: ^3.2.21 vue-router: ^4.0.0 dependencies: autoprefixer: 10.4.0 tailwindcss: 2.2.19_6d1fa3babc9cc84b994ff99ef39d1aff - vue: 3.2.20 - vue-router: 4.0.12_vue@3.2.20 + vue: 3.2.21 + vue-router: 4.0.12_vue@3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -566,26 +566,26 @@ importers: lodash-es: ^4.17.20 pug: ^3.0.0 sass: ^1.30.0 - stylus: ^0.54.8 - vue: ^3.2.16 + stylus: ^0.55.0 + vue: ^3.2.21 dependencies: lodash-es: 4.17.21 - vue: 3.2.20 + vue: 3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue js-yaml: 3.14.1 less: 3.13.1 pug: 3.0.2 sass: 1.43.4 - stylus: 0.54.8 + stylus: 0.55.0 packages/playground/vue-jsx: specifiers: '@vitejs/plugin-vue': workspace:* '@vitejs/plugin-vue-jsx': workspace:* - vue: ^3.2.16 + vue: ^3.2.21 dependencies: - vue: 3.2.20 + vue: 3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx @@ -598,34 +598,34 @@ importers: packages/plugin-legacy: specifiers: - '@babel/standalone': ^7.15.8 - core-js: ^3.19.0 + '@babel/standalone': ^7.16.2 + core-js: ^3.19.1 magic-string: ^0.25.7 regenerator-runtime: ^0.13.9 systemjs: ^6.11.0 dependencies: - '@babel/standalone': 7.15.8 - core-js: 3.19.0 + '@babel/standalone': 7.16.2 + core-js: 3.19.1 magic-string: 0.25.7 regenerator-runtime: 0.13.9 systemjs: 6.11.0 packages/plugin-react: specifiers: - '@babel/core': ^7.15.8 - '@babel/plugin-transform-react-jsx': ^7.14.9 - '@babel/plugin-transform-react-jsx-development': ^7.14.5 - '@babel/plugin-transform-react-jsx-self': ^7.14.9 - '@babel/plugin-transform-react-jsx-source': ^7.14.5 + '@babel/core': ^7.16.0 + '@babel/plugin-transform-react-jsx': ^7.16.0 + '@babel/plugin-transform-react-jsx-development': ^7.16.0 + '@babel/plugin-transform-react-jsx-self': ^7.16.0 + '@babel/plugin-transform-react-jsx-source': ^7.16.0 '@rollup/pluginutils': ^4.1.1 react-refresh: ^0.10.0 resolve: ^1.20.0 dependencies: - '@babel/core': 7.15.8 - '@babel/plugin-transform-react-jsx': 7.14.9_@babel+core@7.15.8 - '@babel/plugin-transform-react-jsx-development': 7.14.5_@babel+core@7.15.8 - '@babel/plugin-transform-react-jsx-self': 7.14.9_@babel+core@7.15.8 - '@babel/plugin-transform-react-jsx-source': 7.14.5_@babel+core@7.15.8 + '@babel/core': 7.16.0 + '@babel/plugin-transform-react-jsx': 7.16.0_@babel+core@7.16.0 + '@babel/plugin-transform-react-jsx-development': 7.16.0_@babel+core@7.16.0 + '@babel/plugin-transform-react-jsx-self': 7.16.0_@babel+core@7.16.0 + '@babel/plugin-transform-react-jsx-source': 7.16.0_@babel+core@7.16.0 '@rollup/pluginutils': 4.1.1 react-refresh: 0.10.0 resolve: 1.20.0 @@ -634,45 +634,45 @@ importers: specifiers: '@rollup/pluginutils': ^4.1.1 '@types/hash-sum': ^1.0.0 - '@vue/compiler-sfc': ^3.2.20 + '@vue/compiler-sfc': ^3.2.21 debug: ^4.3.2 hash-sum: ^2.0.0 - rollup: ^2.58.3 + rollup: ^2.59.0 slash: ^3.0.0 source-map: ^0.6.1 - vue: ^3.2.20 + vue: ^3.2.21 devDependencies: '@rollup/pluginutils': 4.1.1 '@types/hash-sum': 1.0.0 - '@vue/compiler-sfc': 3.2.20 + '@vue/compiler-sfc': 3.2.21 debug: 4.3.2 hash-sum: 2.0.0 - rollup: 2.58.3 + rollup: 2.59.0 slash: 3.0.0 source-map: 0.6.1 - vue: 3.2.20 + vue: 3.2.21 packages/plugin-vue-jsx: specifiers: - '@babel/core': ^7.15.8 + '@babel/core': ^7.16.0 '@babel/plugin-syntax-import-meta': ^7.10.4 - '@babel/plugin-transform-typescript': ^7.15.8 + '@babel/plugin-transform-typescript': ^7.16.1 '@rollup/pluginutils': ^4.1.1 '@vue/babel-plugin-jsx': ^1.1.1 hash-sum: ^2.0.0 dependencies: - '@babel/core': 7.15.8 - '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.15.8 - '@babel/plugin-transform-typescript': 7.15.8_@babel+core@7.15.8 + '@babel/core': 7.16.0 + '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.16.0 + '@babel/plugin-transform-typescript': 7.16.1_@babel+core@7.16.0 '@rollup/pluginutils': 4.1.1 - '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.15.8 + '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.16.0 hash-sum: 2.0.0 packages/vite: specifiers: '@ampproject/remapping': ^1.0.1 - '@babel/parser': ^7.15.8 - '@babel/types': ^7.15.6 + '@babel/parser': ^7.16.2 + '@babel/types': ^7.16.0 '@rollup/plugin-alias': ^3.1.8 '@rollup/plugin-commonjs': ^21.0.1 '@rollup/plugin-dynamic-import-vars': ^1.4.1 @@ -691,7 +691,7 @@ importers: '@types/sass': ~1.16.1 '@types/stylus': ^0.48.36 '@types/ws': ^7.4.7 - '@vue/compiler-dom': ^3.2.20 + '@vue/compiler-dom': ^3.2.21 acorn: ^8.5.0 acorn-class-fields: ^1.0.0 acorn-static-class-features: ^1.0.0 @@ -708,7 +708,7 @@ importers: dotenv: ^10.0.0 dotenv-expand: ^5.1.0 es-module-lexer: ^0.9.3 - esbuild: ^0.13.10 + esbuild: ^0.13.12 estree-walker: ^2.0.2 etag: ^1.8.1 execa: ^5.1.1 @@ -728,7 +728,7 @@ importers: postcss-modules: ^4.2.2 resolve: ^1.20.0 resolve.exports: ^1.1.0 - rollup: ^2.58.3 + rollup: ^2.59.0 rollup-plugin-license: ^2.6.0 selfsigned: ^1.10.11 sirv: ^1.0.18 @@ -736,27 +736,27 @@ importers: source-map-support: ^0.5.20 strip-ansi: ^6.0.1 terser: ^5.9.0 - tsconfck: 1.0.0 + tsconfck: 1.1.1 tslib: ^2.3.1 types: link:./types ws: ^7.5.5 dependencies: - esbuild: 0.13.10 + esbuild: 0.13.12 postcss: 8.3.11 resolve: 1.20.0 - rollup: 2.58.3 + rollup: 2.59.0 optionalDependencies: fsevents: 2.3.2 devDependencies: '@ampproject/remapping': 1.0.1 - '@babel/parser': 7.15.8 - '@babel/types': 7.15.6 - '@rollup/plugin-alias': 3.1.8_rollup@2.58.3 - '@rollup/plugin-commonjs': 21.0.1_rollup@2.58.3 - '@rollup/plugin-dynamic-import-vars': 1.4.1_rollup@2.58.3 - '@rollup/plugin-json': 4.1.0_rollup@2.58.3 - '@rollup/plugin-node-resolve': 13.0.6_rollup@2.58.3 - '@rollup/plugin-typescript': 8.3.0_eadbb6348e5d71a0a94215fbea4eae9e + '@babel/parser': 7.16.2 + '@babel/types': 7.16.0 + '@rollup/plugin-alias': 3.1.8_rollup@2.59.0 + '@rollup/plugin-commonjs': 21.0.1_rollup@2.59.0 + '@rollup/plugin-dynamic-import-vars': 1.4.1_rollup@2.59.0 + '@rollup/plugin-json': 4.1.0_rollup@2.59.0 + '@rollup/plugin-node-resolve': 13.0.6_rollup@2.59.0 + '@rollup/plugin-typescript': 8.3.0_80f1acc233e4df93aa4e78959e046afc '@rollup/pluginutils': 4.1.1 '@types/convert-source-map': 1.5.2 '@types/debug': 4.1.7 @@ -769,7 +769,7 @@ importers: '@types/sass': 1.16.1 '@types/stylus': 0.48.36 '@types/ws': 7.4.7 - '@vue/compiler-dom': 3.2.20 + '@vue/compiler-dom': 3.2.21 acorn: 8.5.0 acorn-class-fields: 1.0.0_acorn@8.5.0 acorn-static-class-features: 1.0.0_acorn@8.5.0 @@ -802,14 +802,14 @@ importers: postcss-load-config: 3.1.0_ts-node@10.4.0 postcss-modules: 4.2.2_postcss@8.3.11 resolve.exports: 1.1.0 - rollup-plugin-license: 2.6.0_rollup@2.58.3 + rollup-plugin-license: 2.6.0_rollup@2.59.0 selfsigned: 1.10.11 sirv: 1.0.18 source-map: 0.6.1 source-map-support: 0.5.20 strip-ansi: 6.0.1 terser: 5.9.0 - tsconfck: 1.0.0_typescript@4.4.4 + tsconfck: 1.1.1_typescript@4.4.4 tslib: 2.3.1 types: link:types ws: 7.5.5 @@ -920,9 +920,22 @@ packages: dependencies: '@babel/highlight': 7.14.5 + /@babel/code-frame/7.16.0: + resolution: {integrity: sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.16.0 + dev: false + /@babel/compat-data/7.15.0: resolution: {integrity: sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==} engines: {node: '>=6.9.0'} + dev: true + + /@babel/compat-data/7.16.0: + resolution: {integrity: sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==} + engines: {node: '>=6.9.0'} + dev: false /@babel/core/7.15.8: resolution: {integrity: sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==} @@ -945,6 +958,30 @@ packages: source-map: 0.5.7 transitivePeerDependencies: - supports-color + dev: true + + /@babel/core/7.16.0: + resolution: {integrity: sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.16.0 + '@babel/generator': 7.16.0 + '@babel/helper-compilation-targets': 7.16.0_@babel+core@7.16.0 + '@babel/helper-module-transforms': 7.16.0 + '@babel/helpers': 7.16.0 + '@babel/parser': 7.16.2 + '@babel/template': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 + convert-source-map: 1.8.0 + debug: 4.3.2 + gensync: 1.0.0-beta.2 + json5: 2.2.0 + semver: 6.3.0 + source-map: 0.5.7 + transitivePeerDependencies: + - supports-color + dev: false /@babel/generator/7.15.8: resolution: {integrity: sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==} @@ -954,11 +991,20 @@ packages: jsesc: 2.5.2 source-map: 0.5.7 - /@babel/helper-annotate-as-pure/7.15.4: - resolution: {integrity: sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==} + /@babel/generator/7.16.0: + resolution: {integrity: sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.15.6 + '@babel/types': 7.16.0 + jsesc: 2.5.2 + source-map: 0.5.7 + dev: false + + /@babel/helper-annotate-as-pure/7.16.0: + resolution: {integrity: sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 dev: false /@babel/helper-compilation-targets/7.15.4_@babel+core@7.15.8: @@ -972,20 +1018,34 @@ packages: '@babel/helper-validator-option': 7.14.5 browserslist: 4.17.5 semver: 6.3.0 + dev: true - /@babel/helper-create-class-features-plugin/7.15.4_@babel+core@7.15.8: - resolution: {integrity: sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==} + /@babel/helper-compilation-targets/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.15.8 - '@babel/helper-annotate-as-pure': 7.15.4 - '@babel/helper-function-name': 7.15.4 - '@babel/helper-member-expression-to-functions': 7.15.4 - '@babel/helper-optimise-call-expression': 7.15.4 - '@babel/helper-replace-supers': 7.15.4 - '@babel/helper-split-export-declaration': 7.15.4 + '@babel/compat-data': 7.16.0 + '@babel/core': 7.16.0 + '@babel/helper-validator-option': 7.14.5 + browserslist: 4.17.6 + semver: 6.3.0 + dev: false + + /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.16.0 + '@babel/helper-annotate-as-pure': 7.16.0 + '@babel/helper-function-name': 7.16.0 + '@babel/helper-member-expression-to-functions': 7.16.0 + '@babel/helper-optimise-call-expression': 7.16.0 + '@babel/helper-replace-supers': 7.16.0 + '@babel/helper-split-export-declaration': 7.16.0 transitivePeerDependencies: - supports-color dev: false @@ -998,23 +1058,54 @@ packages: '@babel/template': 7.15.4 '@babel/types': 7.15.6 + /@babel/helper-function-name/7.16.0: + resolution: {integrity: sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-get-function-arity': 7.16.0 + '@babel/template': 7.16.0 + '@babel/types': 7.16.0 + dev: false + /@babel/helper-get-function-arity/7.15.4: resolution: {integrity: sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 + /@babel/helper-get-function-arity/7.16.0: + resolution: {integrity: sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false + /@babel/helper-hoist-variables/7.15.4: resolution: {integrity: sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 + /@babel/helper-hoist-variables/7.16.0: + resolution: {integrity: sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false + /@babel/helper-member-expression-to-functions/7.15.4: resolution: {integrity: sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 + dev: true + + /@babel/helper-member-expression-to-functions/7.16.0: + resolution: {integrity: sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false /@babel/helper-module-imports/7.15.4: resolution: {integrity: sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==} @@ -1022,6 +1113,13 @@ packages: dependencies: '@babel/types': 7.15.6 + /@babel/helper-module-imports/7.16.0: + resolution: {integrity: sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false + /@babel/helper-module-transforms/7.15.8: resolution: {integrity: sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==} engines: {node: '>=6.9.0'} @@ -1036,12 +1134,37 @@ packages: '@babel/types': 7.15.6 transitivePeerDependencies: - supports-color + dev: true + + /@babel/helper-module-transforms/7.16.0: + resolution: {integrity: sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-module-imports': 7.16.0 + '@babel/helper-replace-supers': 7.16.0 + '@babel/helper-simple-access': 7.16.0 + '@babel/helper-split-export-declaration': 7.16.0 + '@babel/helper-validator-identifier': 7.15.7 + '@babel/template': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 + transitivePeerDependencies: + - supports-color + dev: false /@babel/helper-optimise-call-expression/7.15.4: resolution: {integrity: sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 + dev: true + + /@babel/helper-optimise-call-expression/7.16.0: + resolution: {integrity: sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false /@babel/helper-plugin-utils/7.14.5: resolution: {integrity: sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==} @@ -1057,12 +1180,33 @@ packages: '@babel/types': 7.15.6 transitivePeerDependencies: - supports-color + dev: true + + /@babel/helper-replace-supers/7.16.0: + resolution: {integrity: sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-member-expression-to-functions': 7.16.0 + '@babel/helper-optimise-call-expression': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 + transitivePeerDependencies: + - supports-color + dev: false /@babel/helper-simple-access/7.15.4: resolution: {integrity: sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.15.6 + dev: true + + /@babel/helper-simple-access/7.16.0: + resolution: {integrity: sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false /@babel/helper-split-export-declaration/7.15.4: resolution: {integrity: sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==} @@ -1070,6 +1214,13 @@ packages: dependencies: '@babel/types': 7.15.6 + /@babel/helper-split-export-declaration/7.16.0: + resolution: {integrity: sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + dev: false + /@babel/helper-validator-identifier/7.15.7: resolution: {integrity: sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==} engines: {node: '>=6.9.0'} @@ -1087,6 +1238,18 @@ packages: '@babel/types': 7.15.6 transitivePeerDependencies: - supports-color + dev: true + + /@babel/helpers/7.16.0: + resolution: {integrity: sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.16.0 + '@babel/traverse': 7.16.0 + '@babel/types': 7.16.0 + transitivePeerDependencies: + - supports-color + dev: false /@babel/highlight/7.14.5: resolution: {integrity: sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==} @@ -1096,19 +1259,33 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 + /@babel/highlight/7.16.0: + resolution: {integrity: sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.15.7 + chalk: 2.4.2 + js-tokens: 4.0.0 + dev: false + /@babel/parser/7.15.8: resolution: {integrity: sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==} engines: {node: '>=6.0.0'} hasBin: true - /@babel/plugin-proposal-pipeline-operator/7.15.0: - resolution: {integrity: sha512-/XNBV8GmMxl7icZ0G5o4f3aGXHDKuhS8xHhbdusjE/ZDrsqtLq5kUiw/i7J6ZnlS/ngM0IQTN2CPlrPTb6GKVw==} + /@babel/parser/7.16.2: + resolution: {integrity: sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==} + engines: {node: '>=6.0.0'} + hasBin: true + + /@babel/plugin-proposal-pipeline-operator/7.16.0: + resolution: {integrity: sha512-y9WbLfaPDDkShmU89N1spx54ELht7rXE2jWDzCgc23OmTwliEK9NSoR8KZdtjr1mR3QfG7D6mcDHmI4M0bhMQA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/helper-plugin-utils': 7.14.5 - '@babel/plugin-syntax-pipeline-operator': 7.15.0 + '@babel/plugin-syntax-pipeline-operator': 7.16.0 dev: true /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.15.8: @@ -1145,6 +1322,16 @@ packages: dependencies: '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.16.0: + resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.16.0 + '@babel/helper-plugin-utils': 7.14.5 + dev: false /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.15.8: resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} @@ -1164,13 +1351,23 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-jsx/7.14.5_@babel+core@7.15.8: + /@babel/plugin-syntax-jsx/7.14.5_@babel+core@7.16.0: resolution: {integrity: sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.8 + '@babel/core': 7.16.0 + '@babel/helper-plugin-utils': 7.14.5 + dev: false + + /@babel/plugin-syntax-jsx/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.16.0 '@babel/helper-plugin-utils': 7.14.5 dev: false @@ -1228,8 +1425,8 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-pipeline-operator/7.15.0: - resolution: {integrity: sha512-APuEsBJFWgLasnPi3XS4o7AW24Z8hsX1odmCl9it1fpIA38E2+rSWk6zy1MpFQYKGyphlh84dJB4MtDwI0XN5w==} + /@babel/plugin-syntax-pipeline-operator/7.16.0: + resolution: {integrity: sha512-wUWeLyChgsQ2cVp3vDtDqnwmDHdTiRyxuEeGRGwmPxp7YcNyQw+axni5R+WO/TF565j36Pp8zRU1qnY5etf4BQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -1255,61 +1452,72 @@ packages: dependencies: '@babel/core': 7.15.8 '@babel/helper-plugin-utils': 7.14.5 + dev: true - /@babel/plugin-transform-react-jsx-development/7.14.5_@babel+core@7.15.8: - resolution: {integrity: sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==} + /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.8 - '@babel/plugin-transform-react-jsx': 7.14.9_@babel+core@7.15.8 + '@babel/core': 7.16.0 + '@babel/helper-plugin-utils': 7.14.5 dev: false - /@babel/plugin-transform-react-jsx-self/7.14.9_@babel+core@7.15.8: - resolution: {integrity: sha512-Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw==} + /@babel/plugin-transform-react-jsx-development/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.8 + '@babel/core': 7.16.0 + '@babel/plugin-transform-react-jsx': 7.16.0_@babel+core@7.16.0 + dev: false + + /@babel/plugin-transform-react-jsx-self/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-97yCFY+2GvniqOThOSjPor8xUoDiQ0STVWAQMl3pjhJoFVe5DuXDLZCRSZxu9clx+oRCbTiXGgKEG/Yoyo6Y+w==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.16.0 '@babel/helper-plugin-utils': 7.14.5 dev: false - /@babel/plugin-transform-react-jsx-source/7.14.5_@babel+core@7.15.8: - resolution: {integrity: sha512-1TpSDnD9XR/rQ2tzunBVPThF5poaYT9GqP+of8fAtguYuI/dm2RkrMBDemsxtY0XBzvW7nXjYM0hRyKX9QYj7Q==} + /@babel/plugin-transform-react-jsx-source/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-8yvbGGrHOeb/oyPc9tzNoe9/lmIjz3HLa9Nc5dMGDyNpGjfFrk8D2KdEq9NRkftZzeoQEW6yPQ29TMZtrLiUUA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.8 + '@babel/core': 7.16.0 '@babel/helper-plugin-utils': 7.14.5 dev: false - /@babel/plugin-transform-react-jsx/7.14.9_@babel+core@7.15.8: - resolution: {integrity: sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==} + /@babel/plugin-transform-react-jsx/7.16.0_@babel+core@7.16.0: + resolution: {integrity: sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.8 - '@babel/helper-annotate-as-pure': 7.15.4 - '@babel/helper-module-imports': 7.15.4 + '@babel/core': 7.16.0 + '@babel/helper-annotate-as-pure': 7.16.0 + '@babel/helper-module-imports': 7.16.0 '@babel/helper-plugin-utils': 7.14.5 - '@babel/plugin-syntax-jsx': 7.14.5_@babel+core@7.15.8 - '@babel/types': 7.15.6 + '@babel/plugin-syntax-jsx': 7.16.0_@babel+core@7.16.0 + '@babel/types': 7.16.0 dev: false - /@babel/plugin-transform-typescript/7.15.8_@babel+core@7.15.8: - resolution: {integrity: sha512-ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ==} + /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.0: + resolution: {integrity: sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.15.8 - '@babel/helper-create-class-features-plugin': 7.15.4_@babel+core@7.15.8 + '@babel/core': 7.16.0 + '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0 '@babel/helper-plugin-utils': 7.14.5 - '@babel/plugin-syntax-typescript': 7.14.5_@babel+core@7.15.8 + '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0 transitivePeerDependencies: - supports-color dev: false @@ -1320,8 +1528,15 @@ packages: dependencies: regenerator-runtime: 0.13.9 - /@babel/standalone/7.15.8: - resolution: {integrity: sha512-EF2uQLeuwflnPRGetWH2Z400ITOSK7YbkXIKxY91EWSiOJ8xsbupT3sx3sFRwVyQgjsHSILFDzLcSo/rGspLhQ==} + /@babel/runtime/7.16.0: + resolution: {integrity: sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.13.9 + dev: false + + /@babel/standalone/7.16.2: + resolution: {integrity: sha512-Cc0b/YJapYV1o+lhevV2FCr0lkbGbejA/iRWH5S5aZCF/AeAVVRcIS491omYMNbf+Z9SCDgczUu8Kx8WGCnr2g==} engines: {node: '>=6.9.0'} dev: false @@ -1333,6 +1548,15 @@ packages: '@babel/parser': 7.15.8 '@babel/types': 7.15.6 + /@babel/template/7.16.0: + resolution: {integrity: sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.16.0 + '@babel/parser': 7.16.2 + '@babel/types': 7.16.0 + dev: false + /@babel/traverse/7.15.4: resolution: {integrity: sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==} engines: {node: '>=6.9.0'} @@ -1349,6 +1573,23 @@ packages: transitivePeerDependencies: - supports-color + /@babel/traverse/7.16.0: + resolution: {integrity: sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.16.0 + '@babel/generator': 7.16.0 + '@babel/helper-function-name': 7.16.0 + '@babel/helper-hoist-variables': 7.16.0 + '@babel/helper-split-export-declaration': 7.16.0 + '@babel/parser': 7.16.2 + '@babel/types': 7.16.0 + debug: 4.3.2 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: false + /@babel/types/7.15.6: resolution: {integrity: sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==} engines: {node: '>=6.9.0'} @@ -1356,6 +1597,13 @@ packages: '@babel/helper-validator-identifier': 7.15.7 to-fast-properties: 2.0.0 + /@babel/types/7.16.0: + resolution: {integrity: sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.15.7 + to-fast-properties: 2.0.0 + /@bcoe/v8-coverage/0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true @@ -1482,8 +1730,8 @@ packages: resolution: {integrity: sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==} dev: false - /@eslint/eslintrc/1.0.3: - resolution: {integrity: sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg==} + /@eslint/eslintrc/1.0.4: + resolution: {integrity: sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -1492,7 +1740,7 @@ packages: globals: 13.12.0 ignore: 4.0.6 import-fresh: 3.3.0 - js-yaml: 3.14.1 + js-yaml: 4.1.0 minimatch: 3.0.4 strip-json-comments: 3.1.1 transitivePeerDependencies: @@ -1511,15 +1759,15 @@ packages: resolution: {integrity: sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==} engines: {node: '>=10.10.0'} dependencies: - '@humanwhocodes/object-schema': 1.2.0 + '@humanwhocodes/object-schema': 1.2.1 debug: 4.3.2 minimatch: 3.0.4 transitivePeerDependencies: - supports-color dev: true - /@humanwhocodes/object-schema/1.2.0: - resolution: {integrity: sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==} + /@humanwhocodes/object-schema/1.2.1: + resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true /@hutson/parse-repository-url/3.0.2: @@ -1743,24 +1991,24 @@ packages: engines: {node: '>=6.0.0'} dev: true - /@microsoft/api-extractor-model/7.13.14: - resolution: {integrity: sha512-mKc917+QhOuOZebSnE77i8Tavj/G5ydIFoJqDIY9LpmAfJjsVHgL2pc7vkvW58QTxH2wadIDK1tLzcteOMEt4w==} + /@microsoft/api-extractor-model/7.13.16: + resolution: {integrity: sha512-ttdxVXsTWL5dd26W1YNLe3LgDsE0EE273aZlcLe58W0opymBybCYU1Mn+OHQM8BuErrdvdN8LdpWAAbkiOEN/Q==} dependencies: '@microsoft/tsdoc': 0.13.2 '@microsoft/tsdoc-config': 0.15.2 - '@rushstack/node-core-library': 3.43.0 + '@rushstack/node-core-library': 3.43.2 dev: true - /@microsoft/api-extractor/7.18.17: - resolution: {integrity: sha512-gZuJ//FAyfrOqWssY0cyU2bEo8FOIaIYVs+pU5IDyfImkye6YkT2Qnm5PAFhyYSkfUjV5SjvyuP4+VsDfS3jww==} + /@microsoft/api-extractor/7.18.19: + resolution: {integrity: sha512-aY+/XR7PtQXtnqNPFRs3/+iVRlQJpo6uLTjO2g7PqmnMywl3GBU3bCgAlV/khZtAQbIs6Le57XxmSE6rOqbcfg==} hasBin: true dependencies: - '@microsoft/api-extractor-model': 7.13.14 + '@microsoft/api-extractor-model': 7.13.16 '@microsoft/tsdoc': 0.13.2 '@microsoft/tsdoc-config': 0.15.2 - '@rushstack/node-core-library': 3.43.0 - '@rushstack/rig-package': 0.3.4 - '@rushstack/ts-command-line': 4.10.3 + '@rushstack/node-core-library': 3.43.2 + '@rushstack/rig-package': 0.3.5 + '@rushstack/ts-command-line': 4.10.4 colors: 1.2.5 lodash: 4.17.21 resolve: 1.17.0 @@ -1841,70 +2089,70 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true - /@rollup/plugin-alias/3.1.8_rollup@2.58.3: + /@rollup/plugin-alias/3.1.8_rollup@2.59.0: resolution: {integrity: sha512-tf7HeSs/06wO2LPqKNY3Ckbvy0JRe7Jyn98bXnt/gfrxbe+AJucoNJlsEVi9sdgbQtXemjbakCpO/76JVgnHpA==} engines: {node: '>=8.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - rollup: 2.58.3 + rollup: 2.59.0 slash: 3.0.0 dev: true - /@rollup/plugin-commonjs/21.0.1_rollup@2.58.3: + /@rollup/plugin-commonjs/21.0.1_rollup@2.59.0: resolution: {integrity: sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==} engines: {node: '>= 8.0.0'} peerDependencies: rollup: ^2.38.3 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.58.3 + '@rollup/pluginutils': 3.1.0_rollup@2.59.0 commondir: 1.0.1 estree-walker: 2.0.2 glob: 7.2.0 is-reference: 1.2.1 magic-string: 0.25.7 resolve: 1.20.0 - rollup: 2.58.3 + rollup: 2.59.0 dev: true - /@rollup/plugin-dynamic-import-vars/1.4.1_rollup@2.58.3: + /@rollup/plugin-dynamic-import-vars/1.4.1_rollup@2.59.0: resolution: {integrity: sha512-izHpMs9w8U8CLwyHTXE55H4ytGVaf2ZtlKIWxKigghw6ZC6Mx6AXCsixSY6JOchuX9BN4ZkeN8egLRTS+BxO+w==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.58.3 + '@rollup/pluginutils': 3.1.0_rollup@2.59.0 estree-walker: 2.0.2 globby: 11.0.4 magic-string: 0.25.7 - rollup: 2.58.3 + rollup: 2.59.0 dev: true - /@rollup/plugin-json/4.1.0_rollup@2.58.3: + /@rollup/plugin-json/4.1.0_rollup@2.59.0: resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} peerDependencies: rollup: ^1.20.0 || ^2.0.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.58.3 - rollup: 2.58.3 + '@rollup/pluginutils': 3.1.0_rollup@2.59.0 + rollup: 2.59.0 dev: true - /@rollup/plugin-node-resolve/13.0.6_rollup@2.58.3: + /@rollup/plugin-node-resolve/13.0.6_rollup@2.59.0: resolution: {integrity: sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^2.42.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.58.3 + '@rollup/pluginutils': 3.1.0_rollup@2.59.0 '@types/resolve': 1.17.1 builtin-modules: 3.2.0 deepmerge: 4.2.2 is-module: 1.0.0 resolve: 1.20.0 - rollup: 2.58.3 + rollup: 2.59.0 dev: true - /@rollup/plugin-typescript/8.3.0_eadbb6348e5d71a0a94215fbea4eae9e: + /@rollup/plugin-typescript/8.3.0_80f1acc233e4df93aa4e78959e046afc: resolution: {integrity: sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==} engines: {node: '>=8.0.0'} peerDependencies: @@ -1912,14 +2160,14 @@ packages: tslib: '*' typescript: '>=3.7.0' dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.58.3 + '@rollup/pluginutils': 3.1.0_rollup@2.59.0 resolve: 1.20.0 - rollup: 2.58.3 + rollup: 2.59.0 tslib: 2.3.1 typescript: 4.4.4 dev: true - /@rollup/pluginutils/3.1.0_rollup@2.58.3: + /@rollup/pluginutils/3.1.0_rollup@2.59.0: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} peerDependencies: @@ -1928,7 +2176,7 @@ packages: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.0 - rollup: 2.58.3 + rollup: 2.59.0 dev: true /@rollup/pluginutils/4.1.1: @@ -1938,8 +2186,8 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.0 - /@rushstack/node-core-library/3.43.0: - resolution: {integrity: sha512-MFLW+6X83k6o8m8KnWkDhL/8NCJYHbFnnDokPSX1UHC3JwiEvVhHmEnxZv2YEzwnXeFYoKViub2G2t2liHbHLA==} + /@rushstack/node-core-library/3.43.2: + resolution: {integrity: sha512-b7AEhSf6CvZgvuDcWMFDeKx2mQSn9AVnMQVyxNxFeHCtLz3gJicqCOlw2GOXM8HKh6PInLdil/NVCDcstwSrIw==} dependencies: '@types/node': 12.20.24 colors: 1.2.5 @@ -1952,15 +2200,15 @@ packages: z-schema: 3.18.4 dev: true - /@rushstack/rig-package/0.3.4: - resolution: {integrity: sha512-NsCzPxPQ8cu7lnqa/4xBQXuCJwaBrb5vEbOC8Q/bMQK7GDOxeVUN3/f+NCYjgQSl39toAm8jQJ7TJe+RYYX3yQ==} + /@rushstack/rig-package/0.3.5: + resolution: {integrity: sha512-CvqWw+E81U5lRBN/lUj7Ngr/XQa/PPb2jAS5QcLP7WL+IMUl+3+Cc2qYrsDoB4zke81kz+usWGmBQpBzGMLmAA==} dependencies: resolve: 1.17.0 strip-json-comments: 3.1.1 dev: true - /@rushstack/ts-command-line/4.10.3: - resolution: {integrity: sha512-DdDfwr8CO6CP/kBZlQrrwKyA6UxOteujaIBrmoHa+J+dyLZC19YA/LK0fAHjr2qHLAJHHXVpZwPH8BpqN84oVg==} + /@rushstack/ts-command-line/4.10.4: + resolution: {integrity: sha512-4T5ao4UgDb6LmiRj4GumvG3VT/p6RSMgl7TN7S58ifaAGN2GeTNBajFCDdJs9QQP0d/4tA5p0SFzT7Ps5Byirg==} dependencies: '@types/argparse': 1.0.38 argparse: 1.0.10 @@ -2198,8 +2446,8 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/5.2.0_9a56ca1c5fc1d82b3da3317a5c6f9ab1: - resolution: {integrity: sha512-qQwg7sqYkBF4CIQSyRQyqsYvP+g/J0To9ZPVNJpfxfekl5RmdvQnFFTVVwpRtaUDFNvjfe/34TgY/dpc3MgNTw==} + /@typescript-eslint/eslint-plugin/5.3.0_c2f57e23dad63fa3be14ade7e20e2af7: + resolution: {integrity: sha512-ARUEJHJrq85aaiCqez7SANeahDsJTD3AEua34EoQN9pHS6S5Bq9emcIaGGySt/4X2zSi+vF5hAH52sEen7IO7g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -2209,13 +2457,13 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 5.2.0_eslint@8.1.0+typescript@4.4.4 - '@typescript-eslint/parser': 5.2.0_eslint@8.1.0+typescript@4.4.4 - '@typescript-eslint/scope-manager': 5.2.0 + '@typescript-eslint/experimental-utils': 5.3.0_eslint@8.2.0+typescript@4.4.4 + '@typescript-eslint/parser': 5.3.0_eslint@8.2.0+typescript@4.4.4 + '@typescript-eslint/scope-manager': 5.3.0 debug: 4.3.2 - eslint: 8.1.0 + eslint: 8.2.0 functional-red-black-tree: 1.0.1 - ignore: 5.1.8 + ignore: 5.1.9 regexpp: 3.2.0 semver: 7.3.5 tsutils: 3.21.0_typescript@4.4.4 @@ -2224,26 +2472,26 @@ packages: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.2.0_eslint@8.1.0+typescript@4.4.4: - resolution: {integrity: sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw==} + /@typescript-eslint/experimental-utils/5.3.0_eslint@8.2.0+typescript@4.4.4: + resolution: {integrity: sha512-NFVxYTjKj69qB0FM+piah1x3G/63WB8vCBMnlnEHUsiLzXSTWb9FmFn36FD9Zb4APKBLY3xRArOGSMQkuzTF1w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' dependencies: '@types/json-schema': 7.0.9 - '@typescript-eslint/scope-manager': 5.2.0 - '@typescript-eslint/types': 5.2.0 - '@typescript-eslint/typescript-estree': 5.2.0_typescript@4.4.4 - eslint: 8.1.0 + '@typescript-eslint/scope-manager': 5.3.0 + '@typescript-eslint/types': 5.3.0 + '@typescript-eslint/typescript-estree': 5.3.0_typescript@4.4.4 + eslint: 8.2.0 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.1.0 + eslint-utils: 3.0.0_eslint@8.2.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/parser/5.2.0_eslint@8.1.0+typescript@4.4.4: - resolution: {integrity: sha512-Uyy4TjJBlh3NuA8/4yIQptyJb95Qz5PX//6p8n7zG0QnN4o3NF9Je3JHbVU7fxf5ncSXTmnvMtd/LDQWDk0YqA==} + /@typescript-eslint/parser/5.3.0_eslint@8.2.0+typescript@4.4.4: + resolution: {integrity: sha512-rKu/yAReip7ovx8UwOAszJVO5MgBquo8WjIQcp1gx4pYQCwYzag+I5nVNHO4MqyMkAo0gWt2gWUi+36gWAVKcw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -2252,31 +2500,31 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.2.0 - '@typescript-eslint/types': 5.2.0 - '@typescript-eslint/typescript-estree': 5.2.0_typescript@4.4.4 + '@typescript-eslint/scope-manager': 5.3.0 + '@typescript-eslint/types': 5.3.0 + '@typescript-eslint/typescript-estree': 5.3.0_typescript@4.4.4 debug: 4.3.2 - eslint: 8.1.0 + eslint: 8.2.0 typescript: 4.4.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager/5.2.0: - resolution: {integrity: sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ==} + /@typescript-eslint/scope-manager/5.3.0: + resolution: {integrity: sha512-22Uic9oRlTsPppy5Tcwfj+QET5RWEnZ5414Prby465XxQrQFZ6nnm5KnXgnsAJefG4hEgMnaxTB3kNEyjdjj6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.2.0 - '@typescript-eslint/visitor-keys': 5.2.0 + '@typescript-eslint/types': 5.3.0 + '@typescript-eslint/visitor-keys': 5.3.0 dev: true - /@typescript-eslint/types/5.2.0: - resolution: {integrity: sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ==} + /@typescript-eslint/types/5.3.0: + resolution: {integrity: sha512-fce5pG41/w8O6ahQEhXmMV+xuh4+GayzqEogN24EK+vECA3I6pUwKuLi5QbXO721EMitpQne5VKXofPonYlAQg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.2.0_typescript@4.4.4: - resolution: {integrity: sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g==} + /@typescript-eslint/typescript-estree/5.3.0_typescript@4.4.4: + resolution: {integrity: sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -2284,8 +2532,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.2.0 - '@typescript-eslint/visitor-keys': 5.2.0 + '@typescript-eslint/types': 5.3.0 + '@typescript-eslint/visitor-keys': 5.3.0 debug: 4.3.2 globby: 11.0.4 is-glob: 4.0.3 @@ -2296,11 +2544,11 @@ packages: - supports-color dev: true - /@typescript-eslint/visitor-keys/5.2.0: - resolution: {integrity: sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg==} + /@typescript-eslint/visitor-keys/5.3.0: + resolution: {integrity: sha512-oVIAfIQuq0x2TFDNLVavUn548WL+7hdhxYn+9j3YdJJXB7mH9dAmZNJsPDa7Jc+B9WGqoiex7GUDbyMxV0a/aw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.2.0 + '@typescript-eslint/types': 5.3.0 eslint-visitor-keys: 3.0.0 dev: true @@ -2308,11 +2556,11 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false - /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.15.8: + /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.16.0: resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: '@babel/helper-module-imports': 7.15.4 - '@babel/plugin-syntax-jsx': 7.14.5_@babel+core@7.15.8 + '@babel/plugin-syntax-jsx': 7.14.5_@babel+core@7.16.0 '@babel/template': 7.15.4 '@babel/traverse': 7.15.4 '@babel/types': 7.15.6 @@ -2325,82 +2573,82 @@ packages: - supports-color dev: false - /@vue/compiler-core/3.2.20: - resolution: {integrity: sha512-vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA==} + /@vue/compiler-core/3.2.21: + resolution: {integrity: sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==} dependencies: - '@babel/parser': 7.15.8 - '@vue/shared': 3.2.20 + '@babel/parser': 7.16.2 + '@vue/shared': 3.2.21 estree-walker: 2.0.2 source-map: 0.6.1 - /@vue/compiler-dom/3.2.20: - resolution: {integrity: sha512-QnI77ec/JtV7R0YBbcVayYTDCRcI9OCbxiUQK6izVyqQO0658n0zQuoNwe+bYgtqnvGAIqTR3FShTd5y4oOjdg==} + /@vue/compiler-dom/3.2.21: + resolution: {integrity: sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA==} dependencies: - '@vue/compiler-core': 3.2.20 - '@vue/shared': 3.2.20 + '@vue/compiler-core': 3.2.21 + '@vue/shared': 3.2.21 - /@vue/compiler-sfc/3.2.20: - resolution: {integrity: sha512-03aZo+6tQKiFLfunHKSPZvdK4Jsn/ftRCyaro8AQIWkuxJbvSosbKK6HTTn+D2c3nPScG155akJoxKENw7rftQ==} + /@vue/compiler-sfc/3.2.21: + resolution: {integrity: sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ==} dependencies: - '@babel/parser': 7.15.8 - '@vue/compiler-core': 3.2.20 - '@vue/compiler-dom': 3.2.20 - '@vue/compiler-ssr': 3.2.20 - '@vue/ref-transform': 3.2.20 - '@vue/shared': 3.2.20 + '@babel/parser': 7.16.2 + '@vue/compiler-core': 3.2.21 + '@vue/compiler-dom': 3.2.21 + '@vue/compiler-ssr': 3.2.21 + '@vue/ref-transform': 3.2.21 + '@vue/shared': 3.2.21 estree-walker: 2.0.2 magic-string: 0.25.7 postcss: 8.3.11 source-map: 0.6.1 - /@vue/compiler-ssr/3.2.20: - resolution: {integrity: sha512-rzzVVYivm+EjbfiGQvNeyiYZWzr6Hkej97RZLZvcumacQlnKv9176Xo9rRyeWwFbBlxmtNdrVMslRXtipMXk2w==} + /@vue/compiler-ssr/3.2.21: + resolution: {integrity: sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g==} dependencies: - '@vue/compiler-dom': 3.2.20 - '@vue/shared': 3.2.20 + '@vue/compiler-dom': 3.2.21 + '@vue/shared': 3.2.21 /@vue/devtools-api/6.0.0-beta.19: resolution: {integrity: sha512-ObzQhgkoVeoyKv+e8+tB/jQBL2smtk/NmC9OmFK8UqdDpoOdv/Kf9pyDWL+IFyM7qLD2C75rszJujvGSPSpGlw==} dev: false - /@vue/reactivity/3.2.20: - resolution: {integrity: sha512-nSmoLojUTk+H8HNTAkrUduB4+yIUBK2HPihJo2uXVSH4Spry6oqN6lFzE5zpLK+F27Sja+UqR9R1+/kIOsHV5w==} + /@vue/reactivity/3.2.21: + resolution: {integrity: sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==} dependencies: - '@vue/shared': 3.2.20 + '@vue/shared': 3.2.21 - /@vue/ref-transform/3.2.20: - resolution: {integrity: sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q==} + /@vue/ref-transform/3.2.21: + resolution: {integrity: sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ==} dependencies: - '@babel/parser': 7.15.8 - '@vue/compiler-core': 3.2.20 - '@vue/shared': 3.2.20 + '@babel/parser': 7.16.2 + '@vue/compiler-core': 3.2.21 + '@vue/shared': 3.2.21 estree-walker: 2.0.2 magic-string: 0.25.7 - /@vue/runtime-core/3.2.20: - resolution: {integrity: sha512-d1xfUGhZPfiZzAN7SatStD4vRtT8deJSXib2+Cz3x0brjMWKxe32asQc154FF1E2fFgMCHtnfd4A90bQEzV4GQ==} + /@vue/runtime-core/3.2.21: + resolution: {integrity: sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==} dependencies: - '@vue/reactivity': 3.2.20 - '@vue/shared': 3.2.20 + '@vue/reactivity': 3.2.21 + '@vue/shared': 3.2.21 - /@vue/runtime-dom/3.2.20: - resolution: {integrity: sha512-4TCvZMLhESWCFHFYgqN4QmMA/onnINAlUovhopjlS8ST27G1A8Z0tyxPzLoXLa+b5JrOpbMPheEMPvdKExTJig==} + /@vue/runtime-dom/3.2.21: + resolution: {integrity: sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==} dependencies: - '@vue/runtime-core': 3.2.20 - '@vue/shared': 3.2.20 + '@vue/runtime-core': 3.2.21 + '@vue/shared': 3.2.21 csstype: 2.6.18 - /@vue/server-renderer/3.2.20_vue@3.2.20: - resolution: {integrity: sha512-viIbZGep9XabnrRcaxWIi00cOh1x21QYm2upIL5W0zqzTJ54VdTzpI+zi1osNp+VfRQDTHpV2U7H3Kn4ljYJvg==} + /@vue/server-renderer/3.2.21_vue@3.2.21: + resolution: {integrity: sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg==} peerDependencies: - vue: 3.2.20 + vue: 3.2.21 dependencies: - '@vue/compiler-ssr': 3.2.20 - '@vue/shared': 3.2.20 - vue: 3.2.20 + '@vue/compiler-ssr': 3.2.21 + '@vue/shared': 3.2.21 + vue: 3.2.21 - /@vue/shared/3.2.20: - resolution: {integrity: sha512-FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w==} + /@vue/shared/3.2.21: + resolution: {integrity: sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA==} /@wessberg/stringutil/1.0.19: resolution: {integrity: sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg==} @@ -2675,10 +2923,10 @@ packages: postcss-value-parser: 4.1.0 dev: false - /axios/0.21.4: - resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} + /axios/0.24.0: + resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==} dependencies: - follow-redirects: 1.14.4 + follow-redirects: 1.14.5 transitivePeerDependencies: - debug dev: false @@ -2830,6 +3078,18 @@ packages: node-releases: 2.0.1 picocolors: 1.0.0 + /browserslist/4.17.6: + resolution: {integrity: sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001278 + electron-to-chromium: 1.3.890 + escalade: 3.1.1 + node-releases: 2.0.1 + picocolors: 1.0.0 + dev: false + /bs-logger/0.2.6: resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==} engines: {node: '>= 6'} @@ -2914,6 +3174,10 @@ packages: /caniuse-lite/1.0.30001272: resolution: {integrity: sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw==} + /caniuse-lite/1.0.30001278: + resolution: {integrity: sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==} + dev: false + /chalk/2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} @@ -3370,8 +3634,8 @@ packages: is-what: 3.14.1 dev: true - /core-js/3.19.0: - resolution: {integrity: sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==} + /core-js/3.19.1: + resolution: {integrity: sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==} requiresBuild: true dev: false @@ -3463,23 +3727,16 @@ packages: resolution: {integrity: sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==} dev: true - /css-parse/2.0.0: - resolution: {integrity: sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=} - dependencies: - css: 2.2.4 - dev: true - /css-unit-converter/1.1.2: resolution: {integrity: sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==} dev: false - /css/2.2.4: - resolution: {integrity: sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==} + /css/3.0.0: + resolution: {integrity: sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==} dependencies: inherits: 2.0.4 source-map: 0.6.1 - source-map-resolve: 0.5.3 - urix: 0.1.0 + source-map-resolve: 0.6.0 dev: true /cssesc/3.0.0: @@ -3743,6 +4000,10 @@ packages: /electron-to-chromium/1.3.884: resolution: {integrity: sha512-kOaCAa+biA98PwH5BpCkeUeTL6mCeg8p3Q3OhqzPyqhu/5QUnWAN2wr/3IK8xMQxIV76kfoQpP+Bn/wij/jXrg==} + /electron-to-chromium/1.3.890: + resolution: {integrity: sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==} + dev: false + /emittery/0.8.1: resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==} engines: {node: '>=10'} @@ -3856,147 +4117,147 @@ packages: ext: 1.6.0 dev: false - /esbuild-android-arm64/0.13.10: - resolution: {integrity: sha512-1sCdVAq64yMp2Uhlu+97/enFxpmrj31QHtThz7K+/QGjbHa7JZdBdBsZCzWJuntKHZ+EU178tHYkvjaI9z5sGg==} + /esbuild-android-arm64/0.13.12: + resolution: {integrity: sha512-TSVZVrb4EIXz6KaYjXfTzPyyRpXV5zgYIADXtQsIenjZ78myvDGaPi11o4ZSaHIwFHsuwkB6ne5SZRBwAQ7maw==} cpu: [arm64] os: [android] requiresBuild: true optional: true - /esbuild-darwin-64/0.13.10: - resolution: {integrity: sha512-XlL+BYZ2h9cz3opHfFgSHGA+iy/mljBFIRU9q++f9SiBXEZTb4gTW/IENAD1l9oKH0FdO9rUpyAfV+lM4uAxrg==} + /esbuild-darwin-64/0.13.12: + resolution: {integrity: sha512-c51C+N+UHySoV2lgfWSwwmlnLnL0JWj/LzuZt9Ltk9ub1s2Y8cr6SQV5W3mqVH1egUceew6KZ8GyI4nwu+fhsw==} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /esbuild-darwin-arm64/0.13.10: - resolution: {integrity: sha512-RZMMqMTyActMrXKkW71IQO8B0tyQm0Bm+ZJQWNaHJchL5LlqazJi7rriwSocP+sKLszHhsyTEBBh6qPdw5g5yQ==} + /esbuild-darwin-arm64/0.13.12: + resolution: {integrity: sha512-JvAMtshP45Hd8A8wOzjkY1xAnTKTYuP/QUaKp5eUQGX+76GIie3fCdUUr2ZEKdvpSImNqxiZSIMziEiGB5oUmQ==} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /esbuild-freebsd-64/0.13.10: - resolution: {integrity: sha512-pf4BEN9reF3jvZEZdxljVgOv5JS4kuYFCI78xk+2HWustbLvTP0b9XXfWI/OD0ZLWbyLYZYIA+VbVe4tdAklig==} + /esbuild-freebsd-64/0.13.12: + resolution: {integrity: sha512-r6On/Skv9f0ZjTu6PW5o7pdXr8aOgtFOEURJZYf1XAJs0IQ+gW+o1DzXjVkIoT+n1cm3N/t1KRJfX71MPg/ZUA==} cpu: [x64] os: [freebsd] requiresBuild: true optional: true - /esbuild-freebsd-arm64/0.13.10: - resolution: {integrity: sha512-j9PUcuNWmlxr4/ry4dK/s6zKh42Jhh/N5qnAAj7tx3gMbkIHW0JBoVSbbgp97p88X9xgKbXx4lG2sJDhDWmsYQ==} + /esbuild-freebsd-arm64/0.13.12: + resolution: {integrity: sha512-F6LmI2Q1gii073kmBE3NOTt/6zLL5zvZsxNLF8PMAwdHc+iBhD1vzfI8uQZMJA1IgXa3ocr3L3DJH9fLGXy6Yw==} cpu: [arm64] os: [freebsd] requiresBuild: true optional: true - /esbuild-linux-32/0.13.10: - resolution: {integrity: sha512-imtdHG5ru0xUUXuc2ofdtyw0fWlHYXV7JjF7oZHgmn0b+B4o4Nr6ZON3xxoo1IP8wIekW+7b9exIf/MYq0QV7w==} + /esbuild-linux-32/0.13.12: + resolution: {integrity: sha512-U1UZwG3UIwF7/V4tCVAo/nkBV9ag5KJiJTt+gaCmLVWH3bPLX7y+fNlhIWZy8raTMnXhMKfaTvWZ9TtmXzvkuQ==} cpu: [ia32] os: [linux] requiresBuild: true optional: true - /esbuild-linux-64/0.13.10: - resolution: {integrity: sha512-O7fzQIH2e7GC98dvoTH0rad5BVLm9yU3cRWfEmryCEIFTwbNEWCEWOfsePuoGOHRtSwoVY1hPc21CJE4/9rWxQ==} + /esbuild-linux-64/0.13.12: + resolution: {integrity: sha512-YpXSwtu2NxN3N4ifJxEdsgd6Q5d8LYqskrAwjmoCT6yQnEHJSF5uWcxv783HWN7lnGpJi9KUtDvYsnMdyGw71Q==} cpu: [x64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-arm/0.13.10: - resolution: {integrity: sha512-R2Jij4A0K8BcmBehvQeUteQEcf24Y2YZ6mizlNFuJOBPxe3vZNmkZ4mCE7Pf1tbcqA65qZx8J3WSHeGJl9EsJA==} + /esbuild-linux-arm/0.13.12: + resolution: {integrity: sha512-SyiT/JKxU6J+DY2qUiSLZJqCAftIt3uoGejZ0HDnUM2MGJqEGSGh7p1ecVL2gna3PxS4P+j6WAehCwgkBPXNIw==} cpu: [arm] os: [linux] requiresBuild: true optional: true - /esbuild-linux-arm64/0.13.10: - resolution: {integrity: sha512-bkGxN67S2n0PF4zhh87/92kBTsH2xXLuH6T5omReKhpXdJZF5SVDSk5XU/nngARzE+e6QK6isK060Dr5uobzNw==} + /esbuild-linux-arm64/0.13.12: + resolution: {integrity: sha512-sgDNb8kb3BVodtAlcFGgwk+43KFCYjnFOaOfJibXnnIojNWuJHpL6aQJ4mumzNWw8Rt1xEtDQyuGK9f+Y24jGA==} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /esbuild-linux-mips64le/0.13.10: - resolution: {integrity: sha512-UDNO5snJYOLWrA2uOUxM/PVbzzh2TR7Zf2i8zCCuFlYgvAb/81XO+Tasp3YAElDpp4VGqqcpBXLtofa9nrnJGA==} + /esbuild-linux-mips64le/0.13.12: + resolution: {integrity: sha512-qQJHlZBG+QwVIA8AbTEtbvF084QgDi4DaUsUnA+EolY1bxrG+UyOuGflM2ZritGhfS/k7THFjJbjH2wIeoKA2g==} cpu: [mips64el] os: [linux] requiresBuild: true optional: true - /esbuild-linux-ppc64le/0.13.10: - resolution: {integrity: sha512-xu6J9rMWu1TcEGuEmoc8gsTrJCEPsf+QtxK4IiUZNde9r4Q4nlRVah4JVZP3hJapZgZJcxsse0XiKXh1UFdOeA==} + /esbuild-linux-ppc64le/0.13.12: + resolution: {integrity: sha512-2dSnm1ldL7Lppwlo04CGQUpwNn5hGqXI38OzaoPOkRsBRWFBozyGxTFSee/zHFS+Pdh3b28JJbRK3owrrRgWNw==} cpu: [ppc64] os: [linux] requiresBuild: true optional: true - /esbuild-netbsd-64/0.13.10: - resolution: {integrity: sha512-d+Gr0ScMC2J83Bfx/ZvJHK0UAEMncctwgjRth9d4zppYGLk/xMfFKxv5z1ib8yZpQThafq8aPm8AqmFIJrEesw==} + /esbuild-netbsd-64/0.13.12: + resolution: {integrity: sha512-D4raxr02dcRiQNbxOLzpqBzcJNFAdsDNxjUbKkDMZBkL54Z0vZh4LRndycdZAMcIdizC/l/Yp/ZsBdAFxc5nbA==} cpu: [x64] os: [netbsd] requiresBuild: true optional: true - /esbuild-openbsd-64/0.13.10: - resolution: {integrity: sha512-OuCYc+bNKumBvxflga+nFzZvxsgmWQW+z4rMGIjM5XIW0nNbGgRc5p/0PSDv0rTdxAmwCpV69fezal0xjrDaaA==} + /esbuild-openbsd-64/0.13.12: + resolution: {integrity: sha512-KuLCmYMb2kh05QuPJ+va60bKIH5wHL8ypDkmpy47lzwmdxNsuySeCMHuTv5o2Af1RUn5KLO5ZxaZeq4GEY7DaQ==} cpu: [x64] os: [openbsd] requiresBuild: true optional: true - /esbuild-sunos-64/0.13.10: - resolution: {integrity: sha512-gUkgivZK11bD56wDoLsnYrsOHD/zHzzLSdqKcIl3wRMulfHpRBpoX8gL0dbWr+8N9c+1HDdbNdvxSRmZ4RCVwg==} + /esbuild-sunos-64/0.13.12: + resolution: {integrity: sha512-jBsF+e0woK3miKI8ufGWKG3o3rY9DpHvCVRn5eburMIIE+2c+y3IZ1srsthKyKI6kkXLvV4Cf/E7w56kLipMXw==} cpu: [x64] os: [sunos] requiresBuild: true optional: true - /esbuild-windows-32/0.13.10: - resolution: {integrity: sha512-C1xJ54E56dGWRaYcTnRy7amVZ9n1/D/D2/qVw7e5EtS7p+Fv/yZxxgqyb1hMGKXgtFYX4jMpU5eWBF/AsYrn+A==} + /esbuild-windows-32/0.13.12: + resolution: {integrity: sha512-L9m4lLFQrFeR7F+eLZXG82SbXZfUhyfu6CexZEil6vm+lc7GDCE0Q8DiNutkpzjv1+RAbIGVva9muItQ7HVTkQ==} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /esbuild-windows-64/0.13.10: - resolution: {integrity: sha512-6+EXEXopEs3SvPFAHcps2Krp/FvqXXsOQV33cInmyilb0ZBEQew4MIoZtMIyB3YXoV6//dl3i6YbPrFZaWEinQ==} + /esbuild-windows-64/0.13.12: + resolution: {integrity: sha512-k4tX4uJlSbSkfs78W5d9+I9gpd+7N95W7H2bgOMFPsYREVJs31+Q2gLLHlsnlY95zBoPQMIzHooUIsixQIBjaQ==} cpu: [x64] os: [win32] requiresBuild: true optional: true - /esbuild-windows-arm64/0.13.10: - resolution: {integrity: sha512-xTqM/XKhORo6u9S5I0dNJWEdWoemFjogLUTVLkQMVyUV3ZuMChahVA+bCqKHdyX55pCFxD/8v2fm3/sfFMWN+g==} + /esbuild-windows-arm64/0.13.12: + resolution: {integrity: sha512-2tTv/BpYRIvuwHpp2M960nG7uvL+d78LFW/ikPItO+2GfK51CswIKSetSpDii+cjz8e9iSPgs+BU4o8nWICBwQ==} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /esbuild/0.13.10: - resolution: {integrity: sha512-0NfCsnAh5XatHIx6Cu93wpR2v6opPoOMxONYhaAoZKzGYqAE+INcDeX2wqMdcndvPQdWCuuCmvlnsh0zmbHcSQ==} + /esbuild/0.13.12: + resolution: {integrity: sha512-vTKKUt+yoz61U/BbrnmlG9XIjwpdIxmHB8DlPR0AAW6OdS+nBQBci6LUHU2q9WbBobMEIQxxDpKbkmOGYvxsow==} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-arm64: 0.13.10 - esbuild-darwin-64: 0.13.10 - esbuild-darwin-arm64: 0.13.10 - esbuild-freebsd-64: 0.13.10 - esbuild-freebsd-arm64: 0.13.10 - esbuild-linux-32: 0.13.10 - esbuild-linux-64: 0.13.10 - esbuild-linux-arm: 0.13.10 - esbuild-linux-arm64: 0.13.10 - esbuild-linux-mips64le: 0.13.10 - esbuild-linux-ppc64le: 0.13.10 - esbuild-netbsd-64: 0.13.10 - esbuild-openbsd-64: 0.13.10 - esbuild-sunos-64: 0.13.10 - esbuild-windows-32: 0.13.10 - esbuild-windows-64: 0.13.10 - esbuild-windows-arm64: 0.13.10 + esbuild-android-arm64: 0.13.12 + esbuild-darwin-64: 0.13.12 + esbuild-darwin-arm64: 0.13.12 + esbuild-freebsd-64: 0.13.12 + esbuild-freebsd-arm64: 0.13.12 + esbuild-linux-32: 0.13.12 + esbuild-linux-64: 0.13.12 + esbuild-linux-arm: 0.13.12 + esbuild-linux-arm64: 0.13.12 + esbuild-linux-mips64le: 0.13.12 + esbuild-linux-ppc64le: 0.13.12 + esbuild-netbsd-64: 0.13.12 + esbuild-openbsd-64: 0.13.12 + esbuild-sunos-64: 0.13.12 + esbuild-windows-32: 0.13.12 + esbuild-windows-64: 0.13.12 + esbuild-windows-arm64: 0.13.12 /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -4033,29 +4294,30 @@ packages: source-map: 0.6.1 dev: true - /eslint-define-config/1.1.2: - resolution: {integrity: sha512-wf+ATzYNAG3xU1eT4QosuF20E60nGbaAvTwjDARabsTuelRxhmyzJEvk8prO/xJScU427X/gCmUNpzpy6Mc1uQ==} + /eslint-define-config/1.1.3: + resolution: {integrity: sha512-QKVZKhZMw+wwjddgHlKM8HZd33RWFDacMfW863a7tNWNHirbKL0vGj5VwF2L4OiiEsK8QqvyAY5DQywyA5IzLw==} + engines: {node: '>= 16.9.0', npm: '>= 7.0.0', pnpm: '>= 6.17.0'} dev: true - /eslint-plugin-es/3.0.1_eslint@8.1.0: + /eslint-plugin-es/3.0.1_eslint@8.2.0: resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=4.19.1' dependencies: - eslint: 8.1.0 + eslint: 8.2.0 eslint-utils: 2.1.0 regexpp: 3.2.0 dev: true - /eslint-plugin-node/11.1.0_eslint@8.1.0: + /eslint-plugin-node/11.1.0_eslint@8.2.0: resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=5.16.0' dependencies: - eslint: 8.1.0 - eslint-plugin-es: 3.0.1_eslint@8.1.0 + eslint: 8.2.0 + eslint-plugin-es: 3.0.1_eslint@8.2.0 eslint-utils: 2.1.0 ignore: 5.1.8 minimatch: 3.0.4 @@ -4086,13 +4348,13 @@ packages: eslint-visitor-keys: 1.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.1.0: + /eslint-utils/3.0.0_eslint@8.2.0: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.1.0 + eslint: 8.2.0 eslint-visitor-keys: 2.1.0 dev: true @@ -4111,12 +4373,12 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.1.0: - resolution: {integrity: sha512-JZvNneArGSUsluHWJ8g8MMs3CfIEzwaLx9KyH4tZ2i+R2/rPWzL8c0zg3rHdwYVpN/1sB9gqnjHwz9HoeJpGHw==} + /eslint/8.2.0: + resolution: {integrity: sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint/eslintrc': 1.0.3 + '@eslint/eslintrc': 1.0.4 '@humanwhocodes/config-array': 0.6.0 ajv: 6.12.6 chalk: 4.1.2 @@ -4126,7 +4388,7 @@ packages: enquirer: 2.3.6 escape-string-regexp: 4.0.0 eslint-scope: 6.0.0 - eslint-utils: 3.0.0_eslint@8.1.0 + eslint-utils: 3.0.0_eslint@8.2.0 eslint-visitor-keys: 3.0.0 espree: 9.0.0 esquery: 1.4.0 @@ -4420,7 +4682,7 @@ packages: resolution: {integrity: sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==} dev: true - /follow-redirects/1.14.4: + /follow-redirects/1.14.4_debug@4.3.2: resolution: {integrity: sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==} engines: {node: '>=4.0'} peerDependencies: @@ -4428,6 +4690,19 @@ packages: peerDependenciesMeta: debug: optional: true + dependencies: + debug: 4.3.2 + dev: true + + /follow-redirects/1.14.5: + resolution: {integrity: sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + dev: false /form-data/3.0.1: resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==} @@ -4660,7 +4935,7 @@ packages: source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: 3.14.2 + uglify-js: 3.14.3 dev: true /hard-rejection/2.1.0: @@ -4808,7 +5083,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.14.4 + follow-redirects: 1.14.4_debug@4.3.2 requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -4859,6 +5134,11 @@ packages: engines: {node: '>= 4'} dev: true + /ignore/5.1.9: + resolution: {integrity: sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==} + engines: {node: '>= 4'} + dev: true + /image-size/0.5.5: resolution: {integrity: sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=} engines: {node: '>=0.10.0'} @@ -6225,6 +6505,12 @@ packages: hasBin: true dev: true + /mime/2.6.0: + resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} + engines: {node: '>=4.0.0'} + hasBin: true + dev: true + /mimic-fn/2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} @@ -6402,8 +6688,8 @@ packages: lodash: 4.17.21 dev: false - /node-fetch/2.6.5: - resolution: {integrity: sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==} + /node-fetch/2.6.6: + resolution: {integrity: sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==} engines: {node: 4.x || >=6.0.0} dependencies: whatwg-url: 5.0.0 @@ -6795,21 +7081,21 @@ packages: find-up: 4.1.0 dev: true - /playwright-chromium/1.16.2: - resolution: {integrity: sha512-tqLzJCNfqIB25uJTOtBmD6WofLUMe4iO0q5SKDmUcZXkz5vKXGAvNg5PHg6piMR96qTUNXgbCCpt5i33r1u51Q==} + /playwright-chromium/1.16.3: + resolution: {integrity: sha512-wXKjf9UYB2WtzC3C+3CCn9bNO6svRGY+F1vjm2UMxW/9wjyclLFkbcV3P6EztGQ0Ngrov9BQwvtmpjIZuKk8dQ==} engines: {node: '>=12'} hasBin: true requiresBuild: true dependencies: - playwright-core: 1.16.2 + playwright-core: 1.16.3 transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate dev: true - /playwright-core/1.16.2: - resolution: {integrity: sha512-8WkoP5OfZAYrRxtW/PCVACn9bNgqrTxVVPlc+MoxvJ48knNsZ+skrPjfno/XF3SgTUY9DyYX0g5fVOB7lkPtGg==} + /playwright-core/1.16.3: + resolution: {integrity: sha512-16hF27IvQheJee+DbhC941AUZLjbJgfZFWi9YPS4LKEk/lKFhZI+9TiFD0sboYqb9eaEWvul47uR5xxTVbE4iw==} engines: {node: '>=12'} hasBin: true dependencies: @@ -6818,7 +7104,7 @@ packages: extract-zip: 2.0.1 https-proxy-agent: 5.0.0 jpeg-js: 0.4.3 - mime: 2.5.2 + mime: 2.6.0 pngjs: 5.0.0 progress: 2.0.3 proper-lockfile: 4.1.2 @@ -7299,14 +7585,6 @@ packages: react-dom: 17.0.2_react@17.0.2 dev: false - /react/17.0.0: - resolution: {integrity: sha512-rG9bqS3LMuetoSUKHN8G3fMNuQOePKDThK6+2yXFWtoeTDLVNh/QCaxT+Jr+rNf4lwNXpx+atdn3Aa0oi8/6eQ==} - engines: {node: '>=0.10.0'} - dependencies: - loose-envify: 1.4.0 - object-assign: 4.1.1 - dev: false - /react/17.0.2: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} engines: {node: '>=0.10.0'} @@ -7455,11 +7733,6 @@ packages: resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==} dev: false - /resolve-url/0.2.1: - resolution: {integrity: sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=} - deprecated: https://github.com/lydell/resolve-url#deprecated - dev: true - /resolve.exports/1.1.0: resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==} engines: {node: '>=10'} @@ -7515,7 +7788,7 @@ packages: dependencies: glob: 7.2.0 - /rollup-plugin-license/2.6.0_rollup@2.58.3: + /rollup-plugin-license/2.6.0_rollup@2.59.0: resolution: {integrity: sha512-ilM+sb9xCvP+23tmzsCqJSm33877nIFeO6lMDGbckxc1jq2nW6WtU1nFD4cfOrKYl0cw1dkz4rC3VMAe8dA8cQ==} engines: {node: '>=10.0.0'} peerDependencies: @@ -7528,13 +7801,13 @@ packages: mkdirp: 1.0.4 moment: 2.29.1 package-name-regex: 2.0.4 - rollup: 2.58.3 + rollup: 2.59.0 spdx-expression-validate: 2.0.0 spdx-satisfies: 5.0.1 dev: true - /rollup/2.58.3: - resolution: {integrity: sha512-ei27MSw1KhRur4p87Q0/Va2NAYqMXOX++FNEumMBcdreIRLURKy+cE2wcDJKBn0nfmhP2ZGrJkP1XPO+G8FJQw==} + /rollup/2.59.0: + resolution: {integrity: sha512-l7s90JQhCQ6JyZjKgo7Lq1dKh2RxatOM+Jr6a9F7WbS9WgKbocyUSeLmZl8evAse7y96Ae98L2k1cBOwWD8nHw==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: @@ -7773,14 +8046,11 @@ packages: resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==} engines: {node: '>=0.10.0'} - /source-map-resolve/0.5.3: - resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==} + /source-map-resolve/0.6.0: + resolution: {integrity: sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==} dependencies: atob: 2.1.2 decode-uri-component: 0.2.0 - resolve-url: 0.2.1 - source-map-url: 0.4.1 - urix: 0.1.0 dev: true /source-map-support/0.5.20: @@ -7790,10 +8060,6 @@ packages: source-map: 0.6.1 dev: true - /source-map-url/0.4.1: - resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==} - dev: true - /source-map/0.5.7: resolution: {integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=} engines: {node: '>=0.10.0'} @@ -8016,11 +8282,11 @@ packages: /stylis/4.0.10: resolution: {integrity: sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==} - /stylus/0.54.8: - resolution: {integrity: sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==} + /stylus/0.55.0: + resolution: {integrity: sha512-MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw==} hasBin: true dependencies: - css-parse: 2.0.0 + css: 3.0.0 debug: 3.1.0 glob: 7.2.0 mkdirp: 1.0.4 @@ -8371,8 +8637,8 @@ packages: yn: 3.1.1 dev: true - /tsconfck/1.0.0_typescript@4.4.4: - resolution: {integrity: sha512-9+flUmolxrnyKAYbNzXZX1UPHUuZsVqM42ioZ1H55r0I+UfJgYui4b7zUxhdJ4o5emEuZo89Cx4TiWG/Dd0c/A==} + /tsconfck/1.1.1_typescript@4.4.4: + resolution: {integrity: sha512-uEsCWef+3lA9/YqpGt/mdr+nDovhlr+f0zoycYiOyVDDOUb3BjYFA71+Ee3LB/GiZBRDyTfKBK1kGN2iuPPuEA==} engines: {node: ^12.20 || ^14.13.1 || >= 16, pnpm: '>=6.7.0'} hasBin: true peerDependencies: @@ -8492,8 +8758,8 @@ packages: resolution: {integrity: sha512-kMBmblijHJXyOpKzgDhKx9INYU4u4E1RPMB0HqmKSgWG8vEcf3exEfLh4FFfzd3xdQOw9EuIy/cP0akY6rHopQ==} dev: true - /uglify-js/3.14.2: - resolution: {integrity: sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A==} + /uglify-js/3.14.3: + resolution: {integrity: sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g==} engines: {node: '>=0.8.0'} hasBin: true requiresBuild: true @@ -8529,11 +8795,6 @@ packages: punycode: 2.1.1 dev: true - /urix/0.1.0: - resolution: {integrity: sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=} - deprecated: Please see https://github.com/lydell/urix#deprecated - dev: true - /utf8-byte-length/1.0.4: resolution: {integrity: sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=} dev: true @@ -8586,8 +8847,8 @@ packages: engines: {node: '>= 0.8'} dev: true - /vitepress/0.20.0: - resolution: {integrity: sha512-+PZy1BAWha46hcaWqhB1Vet+2dwhebTnk900ZzrAgLiw4Dx0dQpnMRnDlrp5HR8fgmLNB1Ij9PJO4gh4tvb6gQ==} + /vitepress/0.20.1: + resolution: {integrity: sha512-2SOlvRv0bvPrQ3RPtp7Fh/G1MKidrsgAgYz18OvV+nIJb9iiYo0GUVHKN3OYswMh+vH78NyTeA1Q5v4YJ/H9LQ==} engines: {node: '>=12.0.0'} hasBin: true dependencies: @@ -8596,7 +8857,7 @@ packages: '@vitejs/plugin-vue': link:packages/plugin-vue prismjs: 1.25.0 vite: link:packages/vite - vue: 3.2.20 + vue: 3.2.21 transitivePeerDependencies: - react - react-dom @@ -8607,31 +8868,31 @@ packages: engines: {node: '>=0.10.0'} dev: true - /vue-router/4.0.12_vue@3.2.20: + /vue-router/4.0.12_vue@3.2.21: resolution: {integrity: sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==} peerDependencies: vue: ^3.0.0 dependencies: '@vue/devtools-api': 6.0.0-beta.19 - vue: 3.2.20 + vue: 3.2.21 dev: false - /vue/3.2.20: - resolution: {integrity: sha512-81JjEP4OGk9oO8+CU0h2nFPGgJBm9mNa3kdCX2k6FuRdrWrC+CNe+tOnuIeTg8EWwQuI+wwdra5Q7vSzp7p4Iw==} + /vue/3.2.21: + resolution: {integrity: sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg==} dependencies: - '@vue/compiler-dom': 3.2.20 - '@vue/compiler-sfc': 3.2.20 - '@vue/runtime-dom': 3.2.20 - '@vue/server-renderer': 3.2.20_vue@3.2.20 - '@vue/shared': 3.2.20 + '@vue/compiler-dom': 3.2.21 + '@vue/compiler-sfc': 3.2.21 + '@vue/runtime-dom': 3.2.21 + '@vue/server-renderer': 3.2.21_vue@3.2.21 + '@vue/shared': 3.2.21 - /vuex/4.0.2_vue@3.2.20: + /vuex/4.0.2_vue@3.2.21: resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==} peerDependencies: vue: ^3.0.2 dependencies: '@vue/devtools-api': 6.0.0-beta.19 - vue: 3.2.20 + vue: 3.2.21 dev: false /w3c-hr-time/1.0.2: From ff755eb7ec2346d2d6c2b74850f0c95063d51a6a Mon Sep 17 00:00:00 2001 From: patak Date: Sat, 6 Nov 2021 21:14:39 +0100 Subject: [PATCH 025/258] feat: preview config (#5514) --- docs/config/index.md | 71 +++++++++++++ docs/guide/api-javascript.md | 30 ++++++ .../vite/src/node/__tests__/config.spec.ts | 60 +++++++++++ packages/vite/src/node/cli.ts | 6 +- packages/vite/src/node/config.ts | 15 ++- packages/vite/src/node/{server => }/http.ts | 100 +++++++++++++++--- packages/vite/src/node/index.ts | 13 ++- packages/vite/src/node/logger.ts | 16 ++- packages/vite/src/node/preview.ts | 44 ++++++-- packages/vite/src/node/server/index.ts | 82 ++------------ 10 files changed, 336 insertions(+), 101 deletions(-) rename packages/vite/src/node/{server => }/http.ts (60%) diff --git a/docs/config/index.md b/docs/config/index.md index 25744ef6daa2ea..5a760794440d9f 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -789,6 +789,77 @@ export default defineConfig({ Set to `{}` to enable rollup watcher. This is mostly used in cases that involve build-only plugins or integrations processes. +## Preview Options + +### preview.host + +- **Type:** `string | boolean` +- **Default:** [`server.host`](#server_host) + + Specify which IP addresses the server should listen on. + Set this to `0.0.0.0` or `true` to listen on all addresses, including LAN and public addresses. + + This can be set via the CLI using `--host 0.0.0.0` or `--host`. + +### preview.port + +- **Type:** `number` +- **Default:** `5000` + + Specify server port. Note if the port is already being used, Vite will automatically try the next available port so this may not be the actual port the server ends up listening on. + +**Example:** + + ```js + export default defineConfig({ + server: { + port: 3030 + }, + preview: { + port: 8080 + } + }) + ``` + +### preview.strictPort + +- **Type:** `boolean` +- **Default:** [`server.strictPort`](#server_strictport) + + Set to `true` to exit if port is already in use, instead of automatically try the next available port. + +### preview.https + +- **Type:** `boolean | https.ServerOptions` +- **Default:** [`server.https`](#server_https) + + Enable TLS + HTTP/2. Note this downgrades to TLS only when the [`server.proxy` option](#server-proxy) is also used. + + The value can also be an [options object](https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener) passed to `https.createServer()`. + +### preview.open + +- **Type:** `boolean | string` +- **Default:** [`server.open`](#server_open) + + Automatically open the app in the browser on server start. When the value is a string, it will be used as the URL's pathname. If you want to open the server in a specific browser you like, you can set the env `process.env.BROWSER` (e.g. `firefox`). See [the `open` package](https://github.com/sindresorhus/open#app) for more details. + +### preview.proxy + +- **Type:** `Record` +- **Default:** [`server.proxy`](#server_proxy) + + Configure custom proxy rules for the dev server. Expects an object of `{ key: options }` pairs. If the key starts with `^`, it will be interpreted as a `RegExp`. The `configure` option can be used to access the proxy instance. + + Uses [`http-proxy`](https://github.com/http-party/node-http-proxy). Full options [here](https://github.com/http-party/node-http-proxy#options). + +### preview.cors + +- **Type:** `boolean | CorsOptions` +- **Default:** [`server.cors`](#server_proxy) + + Configure CORS for the dev server. This is enabled by default and allows any origin. Pass an [options object](https://github.com/expressjs/cors) to fine tune the behavior or `false` to disable. + ## Dep Optimization Options - **Related:** [Dependency Pre-Bundling](/guide/dep-pre-bundling) diff --git a/docs/guide/api-javascript.md b/docs/guide/api-javascript.md index 24ea8da2d9a220..ce5f6ba0257fac 100644 --- a/docs/guide/api-javascript.md +++ b/docs/guide/api-javascript.md @@ -25,6 +25,8 @@ const { createServer } = require('vite') } }) await server.listen() + + server.printUrls() })() ``` @@ -138,6 +140,34 @@ const { build } = require('vite') })() ``` +## `preview` + +**Experimental** + +**Type Signature:** + +```ts +async function preview(inlineConfig?: InlineConfig): Promise +``` + +**Example Usage:** + +```js +const { preview } = require('vite') + +;(async () => { + const previewServer = await preview({ + // any valid user config options, plus `mode` and `configFile` + preview: { + port: 8080, + open: true + } + }) + + previewServer.printUrls() +})() +``` + ## `resolveConfig` **Type Signature:** diff --git a/packages/vite/src/node/__tests__/config.spec.ts b/packages/vite/src/node/__tests__/config.spec.ts index 9fa1a61b0b4710..5a21b5ba7267a0 100644 --- a/packages/vite/src/node/__tests__/config.spec.ts +++ b/packages/vite/src/node/__tests__/config.spec.ts @@ -164,3 +164,63 @@ describe('resolveEnvPrefix', () => { expect(resolveEnvPrefix(config)).toMatchObject([' ', 'CUSTOM_']) }) }) + +describe('preview config', () => { + + const serverConfig = () => ({ + port: 3003, + strictPort: true, + host: true, + open: true, + https: true, + proxy: { '/foo': 'http://localhost:4567' }, + cors: false + }) + + test('preview inherits server config with default port', async () => { + const config: InlineConfig = { + server: serverConfig(), + } + expect(await resolveConfig(config, 'serve')).toMatchObject({ + preview: { + ...serverConfig(), + port: undefined + } + }) + }) + + test('preview inherits server config with port override', async () => { + const config: InlineConfig = { + server: serverConfig(), + preview: { + port: 3006 + } + } + expect(await resolveConfig(config, 'serve')).toMatchObject({ + preview: { + ...serverConfig(), + port: 3006 + } + }) + }) + + const previewConfig = () => ({ + port: 3006, + strictPort: false, + open: false, + host: false, + https: false, + proxy: { '/bar': 'http://localhost:3010' }, + cors: true + }) + + test('preview overrides server config', async () => { + const config: InlineConfig = { + server: serverConfig(), + preview: previewConfig() + } + expect(await resolveConfig(config, 'serve')).toMatchObject({ + preview: previewConfig() + }) + }) +}) diff --git a/packages/vite/src/node/cli.ts b/packages/vite/src/node/cli.ts index 15c581d719b0f7..e62af36cc8f558 100644 --- a/packages/vite/src/node/cli.ts +++ b/packages/vite/src/node/cli.ts @@ -238,10 +238,10 @@ cli base: options.base, configFile: options.config, logLevel: options.logLevel, - server: { - host: options.host, - port: options.port ?? 5000, + preview: { + port: options.port, strictPort: options.strictPort, + host: options.host, https: options.https, open: options.open } diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index c3cd81b9cb6e24..fcb5fba205bc93 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -7,6 +7,11 @@ import { resolveServerOptions, ServerOptions } from './server' +import { + ResolvedPreviewOptions, + resolvePreviewOptions, + PreviewOptions +} from './preview' import { CSSOptions } from './plugins/css' import { arraify, @@ -141,6 +146,10 @@ export interface UserConfig { */ build?: BuildOptions /** + * Preview specific options, e.g. host, port, https... + */ + preview?: PreviewOptions + /** * Dep optimization options */ optimizeDeps?: DepOptimizationOptions @@ -225,6 +234,7 @@ export type ResolvedConfig = Readonly< plugins: readonly Plugin[] server: ResolvedServerOptions build: ResolvedBuildOptions + preview: ResolvedPreviewOptions assetsInclude: (file: string) => boolean logger: Logger createResolver: (options?: Partial) => ResolveFn @@ -418,6 +428,8 @@ export async function resolveConfig( ) : '' + const server = resolveServerOptions(resolvedRoot, config.server) + const resolved: ResolvedConfig = { ...config, configFile: configFile ? normalizePath(configFile) : undefined, @@ -432,8 +444,9 @@ export async function resolveConfig( mode, isProduction, plugins: userPlugins, - server: resolveServerOptions(resolvedRoot, config.server), + server, build: resolvedBuildOptions, + preview: resolvePreviewOptions(config.preview, server), env: { ...userEnv, BASE_URL, diff --git a/packages/vite/src/node/server/http.ts b/packages/vite/src/node/http.ts similarity index 60% rename from packages/vite/src/node/server/http.ts rename to packages/vite/src/node/http.ts index 25e2bb4211a82d..a05b596af660d0 100644 --- a/packages/vite/src/node/server/http.ts +++ b/packages/vite/src/node/http.ts @@ -2,13 +2,88 @@ import fs, { promises as fsp } from 'fs' import path from 'path' import { Server as HttpServer } from 'http' import { ServerOptions as HttpsServerOptions } from 'https' -import { ResolvedConfig, ServerOptions } from '..' -import { isObject } from '../utils' +import { isObject } from './utils' +import { ProxyOptions } from './server/middlewares/proxy' import { Connect } from 'types/connect' -import { Logger } from '../logger' +import { Logger } from './logger' + +export interface CommonServerOptions { + /** + * Specify server port. Note if the port is already being used, Vite will + * automatically try the next available port so this may not be the actual + * port the server ends up listening on. + */ + port?: number + /** + * If enabled, vite will exit if specified port is already in use + */ + strictPort?: boolean + /** + * Specify which IP addresses the server should listen on. + * Set to 0.0.0.0 to listen on all addresses, including LAN and public addresses. + */ + host?: string | boolean + /** + * Enable TLS + HTTP/2. + * Note: this downgrades to TLS only when the proxy option is also used. + */ + https?: boolean | HttpsServerOptions + /** + * Open browser window on startup + */ + open?: boolean | string + /** + * Configure custom proxy rules for the dev server. Expects an object + * of `{ key: options }` pairs. + * Uses [`http-proxy`](https://github.com/http-party/node-http-proxy). + * Full options [here](https://github.com/http-party/node-http-proxy#options). + * + * Example `vite.config.js`: + * ``` js + * module.exports = { + * proxy: { + * // string shorthand + * '/foo': 'http://localhost:4567/foo', + * // with options + * '/api': { + * target: 'http://jsonplaceholder.typicode.com', + * changeOrigin: true, + * rewrite: path => path.replace(/^\/api/, '') + * } + * } + * } + * ``` + */ + proxy?: Record + /** + * Configure CORS for the dev server. + * Uses https://github.com/expressjs/cors. + * Set to `true` to allow all methods from any origin, or configure separately + * using an object. + */ + cors?: CorsOptions | boolean +} + +/** + * https://github.com/expressjs/cors#configuration-options + */ + export interface CorsOptions { + origin?: + | CorsOrigin + | ((origin: string, cb: (err: Error, origins: CorsOrigin) => void) => void) + methods?: string | string[] + allowedHeaders?: string | string[] + exposedHeaders?: string | string[] + credentials?: boolean + maxAge?: number + preflightContinue?: boolean + optionsSuccessStatus?: number +} + +export type CorsOrigin = boolean | string | RegExp | (string | RegExp)[] export async function resolveHttpServer( - { proxy }: ServerOptions, + { proxy }: CommonServerOptions, app: Connect.Server, httpsOptions?: HttpsServerOptions ): Promise { @@ -31,11 +106,12 @@ export async function resolveHttpServer( } export async function resolveHttpsConfig( - config: ResolvedConfig + https?: boolean | HttpsServerOptions, + cacheDir?: string ): Promise { - if (!config.server.https) return undefined + if (!https) return undefined - const httpsOption = isObject(config.server.https) ? config.server.https : {} + const httpsOption = isObject(https) ? https : {} const { ca, cert, key, pfx } = httpsOption Object.assign(httpsOption, { @@ -45,7 +121,7 @@ export async function resolveHttpsConfig( pfx: readFileIfExists(pfx) }) if (!httpsOption.key || !httpsOption.cert) { - httpsOption.cert = httpsOption.key = await getCertificate(config) + httpsOption.cert = httpsOption.key = await getCertificate(cacheDir) } return httpsOption } @@ -135,10 +211,10 @@ async function createCertificate() { return pems.private + pems.cert } -async function getCertificate(config: ResolvedConfig) { - if (!config.cacheDir) return await createCertificate() +async function getCertificate(cacheDir?: string) { + if (!cacheDir) return await createCertificate() - const cachePath = path.join(config.cacheDir, '_cert.pem') + const cachePath = path.join(cacheDir, '_cert.pem') try { const [stat, content] = await Promise.all([ @@ -154,7 +230,7 @@ async function getCertificate(config: ResolvedConfig) { } catch { const content = await createCertificate() fsp - .mkdir(config.cacheDir, { recursive: true }) + .mkdir(cacheDir, { recursive: true }) .then(() => fsp.writeFile(cachePath, content)) .catch(() => {}) return content diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts index f4456eac290bcd..49e738769f8449 100644 --- a/packages/vite/src/node/index.ts +++ b/packages/vite/src/node/index.ts @@ -10,12 +10,15 @@ export { resolvePackageData, resolvePackageEntry } from './plugins/resolve' export { normalizePath } from './utils' // additional types +export type { + CorsOptions, + CorsOrigin, + CommonServerOptions +} from './http' export type { ViteDevServer, ServerOptions, - CorsOptions, FileSystemServeOptions, - CorsOrigin, ServerHook, ResolvedServerOptions } from './server' @@ -25,7 +28,11 @@ export type { LibraryFormats, ResolvedBuildOptions } from './build' -export type { PreviewServer } from './preview' +export type { + PreviewOptions, + PreviewServer, + ResolvedPreviewOptions +} from './preview' export type { DepOptimizationMetadata, DepOptimizationOptions diff --git a/packages/vite/src/node/logger.ts b/packages/vite/src/node/logger.ts index 0ebee8e950fc12..8a9b6accca2567 100644 --- a/packages/vite/src/node/logger.ts +++ b/packages/vite/src/node/logger.ts @@ -6,6 +6,7 @@ import os from 'os' import readline from 'readline' import { RollupError } from 'rollup' import { ResolvedConfig } from '.' +import { CommonServerOptions } from './http' import { Hostname, resolveHostname } from './utils' export type LogType = 'error' | 'warn' | 'info' @@ -139,15 +140,26 @@ export function createLogger( return logger } +/** + * @deprecated Use `server.printUrls()` instead + */ export function printHttpServerUrls( server: Server, config: ResolvedConfig +): void { + printCommonServerUrls(server, config.server, config) +} + +export function printCommonServerUrls( + server: Server, + options: CommonServerOptions, + config: ResolvedConfig, ): void { const address = server.address() const isAddressInfo = (x: any): x is AddressInfo => x?.address if (isAddressInfo(address)) { - const hostname = resolveHostname(config.server.host) - const protocol = config.server.https ? 'https' : 'http' + const hostname = resolveHostname(options.host) + const protocol = options.https ? 'https' : 'http' printServerUrls( hostname, protocol, diff --git a/packages/vite/src/node/preview.ts b/packages/vite/src/node/preview.ts index 0f48f1b2541477..a12db3881c3ad6 100644 --- a/packages/vite/src/node/preview.ts +++ b/packages/vite/src/node/preview.ts @@ -5,16 +5,42 @@ import compression from 'compression' import { Server } from 'http' import { resolveConfig, InlineConfig, ResolvedConfig } from '.' import { Connect } from 'types/connect' +import { ResolvedServerOptions } from './server' import { resolveHttpsConfig, resolveHttpServer, - httpServerStart -} from './server/http' + httpServerStart, + CommonServerOptions +} from './http' import { openBrowser } from './server/openBrowser' import corsMiddleware from 'cors' import { proxyMiddleware } from './server/middlewares/proxy' import { resolveHostname } from './utils' -import { printHttpServerUrls } from './logger' +import { printCommonServerUrls } from './logger' + +export interface PreviewOptions extends CommonServerOptions { +} + +export interface ResolvedPreviewOptions extends PreviewOptions { +} + +export function resolvePreviewOptions( + preview: PreviewOptions | undefined, + server: ResolvedServerOptions +): ResolvedPreviewOptions { + // The preview server inherits every CommonServerOption from the `server` config + // except for the port to enable having both the dev and preview servers running + // at the same time without extra configuration + return { + port: preview?.port, + strictPort: preview?.strictPort ?? server.strictPort, + host: preview?.host ?? server.host, + https: preview?.https ?? server.https, + open: preview?.open ?? server.open, + proxy: preview?.proxy ?? server.proxy, + cors: preview?.cors ?? server.cors + } +} export interface PreviewServer { /** @@ -44,19 +70,19 @@ export async function preview( const app = connect() as Connect.Server const httpServer = await resolveHttpServer( - config.server, + config.preview, app, - await resolveHttpsConfig(config) + await resolveHttpsConfig(config.preview?.https, config.cacheDir) ) // cors - const { cors } = config.server + const { cors } = config.preview if (cors !== false) { app.use(corsMiddleware(typeof cors === 'boolean' ? {} : cors)) } // proxy - if (config.server.proxy) { + if (config.preview.proxy) { app.use(proxyMiddleware(httpServer, config)) } @@ -72,7 +98,7 @@ export async function preview( }) ) - const options = config.server + const options = config.preview const hostname = resolveHostname(options.host) const port = options.port ?? 5000 const protocol = options.https ? 'https' : 'http' @@ -101,7 +127,7 @@ export async function preview( config, httpServer, printUrls() { - printHttpServerUrls(httpServer, config) + printCommonServerUrls(httpServer, config.preview, config) } } } diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 3e06ec732e8157..5ecc6578867764 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -2,19 +2,23 @@ import fs from 'fs' import path from 'path' import * as net from 'net' import * as http from 'http' -import * as https from 'https' import connect from 'connect' import corsMiddleware from 'cors' import chalk from 'chalk' import { AddressInfo } from 'net' import chokidar from 'chokidar' -import { resolveHttpsConfig, resolveHttpServer, httpServerStart } from './http' +import { + resolveHttpsConfig, + resolveHttpServer, + httpServerStart, + CommonServerOptions +} from '../http' import { resolveConfig, InlineConfig, ResolvedConfig } from '../config' import { createPluginContainer, PluginContainer } from './pluginContainer' import { FSWatcher, WatchOptions } from 'types/chokidar' import { createWebSocketServer, WebSocketServer } from './ws' import { baseMiddleware } from './middlewares/base' -import { proxyMiddleware, ProxyOptions } from './middlewares/proxy' +import { proxyMiddleware } from './middlewares/proxy' import { spaFallbackMiddleware } from './middlewares/spaFallback' import { transformMiddleware } from './middlewares/transform' import { @@ -55,57 +59,11 @@ import { createMissingImporterRegisterFn } from '../optimizer/registerMissing' import { resolveHostname } from '../utils' import { searchForWorkspaceRoot } from './searchRoot' import { CLIENT_DIR } from '../constants' -import { printHttpServerUrls } from '../logger' +import { printCommonServerUrls } from '../logger' export { searchForWorkspaceRoot } from './searchRoot' -export interface ServerOptions { - host?: string | boolean - port?: number - /** - * If enabled, vite will exit if specified port is already in use - */ - strictPort?: boolean - /** - * Enable TLS + HTTP/2. - * Note: this downgrades to TLS only when the proxy option is also used. - */ - https?: boolean | https.ServerOptions - /** - * Open browser window on startup - */ - open?: boolean | string - /** - * Configure custom proxy rules for the dev server. Expects an object - * of `{ key: options }` pairs. - * Uses [`http-proxy`](https://github.com/http-party/node-http-proxy). - * Full options [here](https://github.com/http-party/node-http-proxy#options). - * - * Example `vite.config.js`: - * ``` js - * module.exports = { - * proxy: { - * // string shorthand - * '/foo': 'http://localhost:4567/foo', - * // with options - * '/api': { - * target: 'http://jsonplaceholder.typicode.com', - * changeOrigin: true, - * rewrite: path => path.replace(/^\/api/, '') - * } - * } - * } - * ``` - */ - proxy?: Record - /** - * Configure CORS for the dev server. - * Uses https://github.com/expressjs/cors. - * Set to `true` to allow all methods from any origin, or configure separately - * using an object. - */ - cors?: CorsOptions | boolean - +export interface ServerOptions extends CommonServerOptions { /** * Force dep pre-optimization regardless of whether deps have changed. */ @@ -174,24 +132,6 @@ export interface FileSystemServeOptions { deny?: string[] } -/** - * https://github.com/expressjs/cors#configuration-options - */ -export interface CorsOptions { - origin?: - | CorsOrigin - | ((origin: string, cb: (err: Error, origins: CorsOrigin) => void) => void) - methods?: string | string[] - allowedHeaders?: string | string[] - exposedHeaders?: string | string[] - credentials?: boolean - maxAge?: number - preflightContinue?: boolean - optionsSuccessStatus?: number -} - -export type CorsOrigin = boolean | string | RegExp | (string | RegExp)[] - export type ServerHook = ( server: ViteDevServer ) => (() => void) | void | Promise<(() => void) | void> @@ -333,7 +273,7 @@ export async function createServer( const config = await resolveConfig(inlineConfig, 'serve', 'development') const root = config.root const serverConfig = config.server - const httpsOptions = await resolveHttpsConfig(config) + const httpsOptions = await resolveHttpsConfig(config.server.https) let { middlewareMode } = serverConfig if (middlewareMode === true) { middlewareMode = 'ssr' @@ -421,7 +361,7 @@ export async function createServer( }, printUrls() { if (httpServer) { - printHttpServerUrls(httpServer, config) + printCommonServerUrls(httpServer, config.server, config) } else { throw new Error('cannot print server URLs in middleware mode.') } From 211f183ffd747e870f769cd1e3f24baab9c1b555 Mon Sep 17 00:00:00 2001 From: Shinigami Date: Sun, 7 Nov 2021 11:37:05 +0100 Subject: [PATCH 026/258] chore(deps): massive major deps update (#5574) --- .github/renovate.json5 | 16 +- docs/config/index.md | 20 +- docs/guide/migration.md | 2 +- package.json | 14 +- .../backend-integration/package.json | 2 +- packages/playground/css/package.json | 6 +- .../file-delete-restore/package.json | 2 +- .../optimize-deps/dep-linked/package.json | 2 +- .../playground/optimize-deps/package.json | 10 +- .../playground/react-emotion/package.json | 4 +- packages/playground/react/package.json | 2 +- packages/playground/ssr-pug/package.json | 2 +- packages/playground/ssr-react/package.json | 6 +- .../playground/ssr-webworker/package.json | 2 +- packages/playground/tailwind/package.json | 4 +- packages/playground/testEnv.d.ts | 13 - packages/playground/vue/CustomBlockPlugin.ts | 2 +- packages/playground/vue/package.json | 10 +- packages/plugin-vue/README.md | 2 +- packages/plugin-vue/package.json | 2 +- packages/plugin-vue/src/main.ts | 3 +- packages/plugin-vue/src/script.ts | 11 +- packages/vite/package.json | 8 +- .../vite/src/node/__tests__/config.spec.ts | 3 +- packages/vite/src/node/config.ts | 4 +- packages/vite/src/node/http.ts | 8 +- packages/vite/src/node/index.ts | 6 +- packages/vite/src/node/logger.ts | 2 +- packages/vite/src/node/plugins/css.ts | 6 +- packages/vite/src/node/preview.ts | 6 +- packages/vite/src/node/server/index.ts | 10 +- packages/vite/src/node/server/ws.ts | 5 +- packages/vite/src/node/ssr/ssrModuleLoader.ts | 2 +- packages/vite/src/node/ssr/ssrStacktrace.ts | 2 + packages/vite/types/commonjs.d.ts | 2 +- pnpm-lock.yaml | 741 ++++++------------ scripts/jestPerTestSetup.ts | 24 +- 37 files changed, 331 insertions(+), 635 deletions(-) delete mode 100644 packages/playground/testEnv.d.ts diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 85b1b7078c7d0a..763dfcfc467d9d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -24,14 +24,14 @@ "typescript", // breaking changes - "source-map", - "react-refresh", + "cac", // `cac:v6.7.10+` has breaking changes + "react-router", // `react-router:v6.0.0+` has breaking changes + "react-router-dom", // `react-router-dom:v6.0.0+` has breaking changes + "source-map", // `source-map:v0.7.0+` needs more investigation - // breaks since "3.0.1", needs futher investigate - "postcss-load-config", - - // ESM Only - "strip-ansi", - "periscopic" + // ESM Only => https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c#how-can-i-move-my-commonjs-project-to-esm + "node-fetch", + "periscopic", + "strip-ansi" ] } diff --git a/docs/config/index.md b/docs/config/index.md index 5a760794440d9f..16cfa47c5d21d1 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -810,16 +810,16 @@ export default defineConfig({ **Example:** - ```js - export default defineConfig({ - server: { - port: 3030 - }, - preview: { - port: 8080 - } - }) - ``` +```js +export default defineConfig({ + server: { + port: 3030 + }, + preview: { + port: 8080 + } +}) +``` ### preview.strictPort diff --git a/docs/guide/migration.md b/docs/guide/migration.md index e3707f3581dcf7..12cab91d9f48e3 100644 --- a/docs/guide/migration.md +++ b/docs/guide/migration.md @@ -76,7 +76,7 @@ const vueI18nPlugin = { return } if (/\.ya?ml$/.test(id)) { - code = JSON.stringify(require('js-yaml').safeLoad(code.trim())) + code = JSON.stringify(require('js-yaml').load(code.trim())) } return `export default Comp => { Comp.i18n = ${code} diff --git a/package.json b/package.json index b4c4218104e196..435cedfe8e2d70 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ "@microsoft/api-extractor": "^7.18.19", "@types/fs-extra": "^9.0.13", "@types/jest": "^27.0.2", - "@types/node": "^15.12.2", - "@types/semver": "^7.3.8", + "@types/node": "^16.11.6", + "@types/semver": "^7.3.9", "@typescript-eslint/eslint-plugin": "^5.3.0", "@typescript-eslint/parser": "^5.3.0", "chalk": "^4.1.2", @@ -45,20 +45,20 @@ "execa": "^5.1.1", "fs-extra": "^10.0.0", "jest": "^27.3.1", - "lint-staged": "^11.2.0", + "lint-staged": "^11.2.6", "minimist": "^1.2.5", "node-fetch": "^2.6.6", "npm-run-all": "^4.1.5", "playwright-chromium": "^1.16.3", "prettier": "2.4.1", - "prompts": "^2.4.1", + "prompts": "^2.4.2", "rimraf": "^3.0.2", "rollup": "^2.59.0", "semver": "^7.3.5", - "sirv": "^1.0.17", + "sirv": "^1.0.18", "ts-jest": "^27.0.7", - "ts-node": "^10.1.0", - "typescript": "~4.4.3", + "ts-node": "^10.4.0", + "typescript": "~4.4.4", "vite": "workspace:*", "vitepress": "^0.20.1", "yorkie": "^2.0.0" diff --git a/packages/playground/backend-integration/package.json b/packages/playground/backend-integration/package.json index cc70456e556ba2..afbdb63d356a8b 100644 --- a/packages/playground/backend-integration/package.json +++ b/packages/playground/backend-integration/package.json @@ -9,6 +9,6 @@ "preview": "vite preview" }, "dependencies": { - "tailwindcss": "^2.2.4" + "tailwindcss": "^2.2.19" } } diff --git a/packages/playground/css/package.json b/packages/playground/css/package.json index 7dc980f4199500..13a58874578c09 100644 --- a/packages/playground/css/package.json +++ b/packages/playground/css/package.json @@ -10,9 +10,9 @@ }, "devDependencies": { "css-dep": "link:./css-dep", - "less": "^4.1.0", - "postcss-nested": "^5.0.3", - "sass": "^1.32.5", + "less": "^4.1.2", + "postcss-nested": "^5.0.6", + "sass": "^1.43.4", "stylus": "^0.55.0" } } diff --git a/packages/playground/file-delete-restore/package.json b/packages/playground/file-delete-restore/package.json index d37004efadc425..8f9caa3578f8bd 100644 --- a/packages/playground/file-delete-restore/package.json +++ b/packages/playground/file-delete-restore/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "react": "^17.0.2", - "react-dom": "^17.0.1" + "react-dom": "^17.0.2" }, "devDependencies": { "@vitejs/plugin-react": "workspace:*" diff --git a/packages/playground/optimize-deps/dep-linked/package.json b/packages/playground/optimize-deps/dep-linked/package.json index b8ab3d859fe055..d1d90cd7ff688b 100644 --- a/packages/playground/optimize-deps/dep-linked/package.json +++ b/packages/playground/optimize-deps/dep-linked/package.json @@ -3,6 +3,6 @@ "version": "0.0.0", "main": "index.js", "dependencies": { - "lodash-es": "^4.17.20" + "lodash-es": "^4.17.21" } } diff --git a/packages/playground/optimize-deps/package.json b/packages/playground/optimize-deps/package.json index 7891d1677154ec..cfd3123a96534e 100644 --- a/packages/playground/optimize-deps/package.json +++ b/packages/playground/optimize-deps/package.json @@ -11,18 +11,18 @@ }, "dependencies": { "axios": "^0.24.0", - "clipboard": "^2.0.6", + "clipboard": "^2.0.8", "dep-cjs-compiled-from-cjs": "file:./dep-cjs-compiled-from-cjs", "dep-cjs-compiled-from-esm": "file:./dep-cjs-compiled-from-esm", "dep-esbuild-plugin-transform": "file:./dep-esbuild-plugin-transform", "dep-linked": "link:./dep-linked", "dep-linked-include": "link:./dep-linked-include", - "lodash-es": "^4.17.20", + "lodash-es": "^4.17.21", "nested-exclude": "file:./nested-exclude", - "phoenix": "^1.5.7", + "phoenix": "^1.6.2", "react": "^17.0.2", - "react-dom": "^17.0.1", - "resolve-linked": "0.0.0", + "react-dom": "^17.0.2", + "resolve-linked": "workspace:0.0.0", "vue": "^3.2.21", "vuex": "^4.0.0" }, diff --git a/packages/playground/react-emotion/package.json b/packages/playground/react-emotion/package.json index b21512dc1ade7b..fc78ac30b34a8d 100644 --- a/packages/playground/react-emotion/package.json +++ b/packages/playground/react-emotion/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@emotion/react": "^11.4.0", + "@emotion/react": "^11.5.0", "react": "^17.0.2", - "react-dom": "^17.0.1", + "react-dom": "^17.0.2", "react-switch": "^6.0.0" }, "devDependencies": { diff --git a/packages/playground/react/package.json b/packages/playground/react/package.json index f8c6c265a1204c..fc9b8e69d3999e 100644 --- a/packages/playground/react/package.json +++ b/packages/playground/react/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "react": "^17.0.2", - "react-dom": "^17.0.1" + "react-dom": "^17.0.2" }, "devDependencies": { "@vitejs/plugin-react": "workspace:*" diff --git a/packages/playground/ssr-pug/package.json b/packages/playground/ssr-pug/package.json index 8eeb8d55ffaf90..e2282b20565c1b 100644 --- a/packages/playground/ssr-pug/package.json +++ b/packages/playground/ssr-pug/package.json @@ -10,6 +10,6 @@ "devDependencies": { "cross-env": "^7.0.3", "express": "^4.17.1", - "pug": "^3.0.0" + "pug": "^3.0.2" } } diff --git a/packages/playground/ssr-react/package.json b/packages/playground/ssr-react/package.json index 1f66f85f6879cf..a05bcc08806f3b 100644 --- a/packages/playground/ssr-react/package.json +++ b/packages/playground/ssr-react/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "react": "^17.0.2", - "react-dom": "^17.0.1", - "react-router": "^5.2.0", - "react-router-dom": "^5.2.0" + "react-dom": "^17.0.2", + "react-router": "^5.2.1", + "react-router-dom": "^5.3.0" }, "devDependencies": { "@vitejs/plugin-react": "workspace:*", diff --git a/packages/playground/ssr-webworker/package.json b/packages/playground/ssr-webworker/package.json index ca06be0aa38fd8..a7ebdf27ea22aa 100644 --- a/packages/playground/ssr-webworker/package.json +++ b/packages/playground/ssr-webworker/package.json @@ -10,7 +10,7 @@ "react": "^17.0.2" }, "devDependencies": { - "miniflare": "^1.3.3", + "miniflare": "^1.4.1", "resolve-linked": "workspace:*" } } diff --git a/packages/playground/tailwind/package.json b/packages/playground/tailwind/package.json index 70d87abda6b356..93b4dd7479d04f 100644 --- a/packages/playground/tailwind/package.json +++ b/packages/playground/tailwind/package.json @@ -9,8 +9,8 @@ "preview": "vite preview" }, "dependencies": { - "autoprefixer": "^10.3.0", - "tailwindcss": "^2.2.4", + "autoprefixer": "^10.4.0", + "tailwindcss": "^2.2.19", "vue": "^3.2.21", "vue-router": "^4.0.0" }, diff --git a/packages/playground/testEnv.d.ts b/packages/playground/testEnv.d.ts deleted file mode 100644 index ae08a54dd1498c..00000000000000 --- a/packages/playground/testEnv.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Page } from 'playwright-chromium' -import { RollupWatcher } from 'rollup' - -declare global { - // injected by the custom jest env in scripts/jestEnv.js - const page: Page - - // injected in scripts/jestPerTestSetup.ts - const browserLogs: string[] - const viteTestUrl: string - const watcher: RollupWatcher - let beforeAllError: any | null // error caught in beforeAll, useful if you want to test error scenarios on build -} diff --git a/packages/playground/vue/CustomBlockPlugin.ts b/packages/playground/vue/CustomBlockPlugin.ts index 12834d4c383fe4..b434bbc24cf324 100644 --- a/packages/playground/vue/CustomBlockPlugin.ts +++ b/packages/playground/vue/CustomBlockPlugin.ts @@ -7,7 +7,7 @@ export const vueI18nPlugin: Plugin = { return } if (/\.ya?ml$/.test(id)) { - code = JSON.stringify(require('js-yaml').safeLoad(code.trim())) + code = JSON.stringify(require('js-yaml').load(code.trim())) } return { code: `export default Comp => { diff --git a/packages/playground/vue/package.json b/packages/playground/vue/package.json index 78e3c90a16c063..672ecc36a17e1a 100644 --- a/packages/playground/vue/package.json +++ b/packages/playground/vue/package.json @@ -9,15 +9,15 @@ "preview": "vite preview" }, "dependencies": { - "lodash-es": "^4.17.20", + "lodash-es": "^4.17.21", "vue": "^3.2.21" }, "devDependencies": { "@vitejs/plugin-vue": "workspace:*", - "js-yaml": "^3.14.1", - "less": "^3.13.0", - "pug": "^3.0.0", - "sass": "^1.30.0", + "js-yaml": "^4.1.0", + "less": "^4.1.2", + "pug": "^3.0.2", + "sass": "^1.43.4", "stylus": "^0.55.0" } } diff --git a/packages/plugin-vue/README.md b/packages/plugin-vue/README.md index b29039da2cbef0..96f9cbb1414a84 100644 --- a/packages/plugin-vue/README.md +++ b/packages/plugin-vue/README.md @@ -83,7 +83,7 @@ const vueI18nPlugin = { return } if (/\.ya?ml$/.test(id)) { - code = JSON.stringify(require('js-yaml').safeLoad(code.trim())) + code = JSON.stringify(require('js-yaml').load(code.trim())) } return `export default Comp => { Comp.i18n = ${code} diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 726b01a1f6f29e..1be309a306de16 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -38,7 +38,7 @@ "debug": "^4.3.2", "hash-sum": "^2.0.0", "rollup": "^2.59.0", - "slash": "^3.0.0", + "slash": "^4.0.0", "source-map": "^0.6.1", "vue": "^3.2.21" } diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index ef82b3a05551d2..82ccb9ed5a2c9f 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -53,7 +53,8 @@ export async function transformMain( ) // template - const hasTemplateImport = descriptor.template && !isUseInlineTemplate(descriptor, !devServer) + const hasTemplateImport = + descriptor.template && !isUseInlineTemplate(descriptor, !devServer) let templateCode = '' let templateMap: RawSourceMap | undefined diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts index f1f1b18fa82d8a..1302282c84676a 100644 --- a/packages/plugin-vue/src/script.ts +++ b/packages/plugin-vue/src/script.ts @@ -25,12 +25,11 @@ export function setResolvedScript( // Check if we can use compile template as inlined render function // inside + + diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 14c5f41c25656e..8e2faba046c178 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -257,7 +257,7 @@ function proxyESM(id: string, mod: any) { return new Proxy(mod, { get(mod, prop) { if (prop === 'default') return defaultExport - return mod[prop] + return mod[prop] ?? defaultExport?.[prop] } }) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95eaf0635eb3c5..b10e883df866c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -507,10 +507,12 @@ importers: serve-static: ^1.14.1 vue: ^3.2.21 vue-router: ^4.0.0 + vuex: ^4.0.2 dependencies: example-external-component: link:example-external-component vue: 3.2.21 vue-router: 4.0.12_vue@3.2.21 + vuex: 4.0.2_vue@3.2.21 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx From 5b6b01693720290e8998b2613f0dcb2d699ee84f Mon Sep 17 00:00:00 2001 From: Nurettin Kaya Date: Thu, 11 Nov 2021 05:39:59 -0800 Subject: [PATCH 049/258] fix(build): resolve `rollupOptions.input` paths (#5601) --- packages/plugin-legacy/index.js | 2 +- .../vite/src/node/__tests__/build.spec.ts | 70 +++++++++++++++++++ packages/vite/src/node/build.ts | 55 ++++++++++----- packages/vite/src/node/config.ts | 2 +- 4 files changed, 109 insertions(+), 20 deletions(-) diff --git a/packages/plugin-legacy/index.js b/packages/plugin-legacy/index.js index bfa6ee491bcbf6..2267cd9cf82b42 100644 --- a/packages/plugin-legacy/index.js +++ b/packages/plugin-legacy/index.js @@ -596,7 +596,7 @@ async function buildPolyfillChunk( bundle[polyfillChunk.name] = polyfillChunk } -const polyfillId = 'vite/legacy-polyfills' +const polyfillId = '\0vite/legacy-polyfills' /** * @param {Set} imports diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index b3ef37e64fd28e..b745c38aa44790 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -1,5 +1,6 @@ import { resolveLibFilename } from '../build' import { resolve } from 'path' +import { resolveConfig } from '..' describe('resolveLibFilename', () => { test('custom filename function', () => { @@ -65,3 +66,72 @@ describe('resolveLibFilename', () => { }).toThrow() }) }) + +describe('resolvePaths', () => { + test('resolve build.rollupOptions.input', async () => { + const config = await resolveConfig({ + build: { + rollupOptions: { + input: 'index.html' + } + } + }, 'build', 'production') + + expect(config.build.rollupOptions.input).toBe(resolve('index.html')) + }) + test('resolve build.rollupOptions.input{}', async () => { + const config = await resolveConfig({ + build: { + rollupOptions: { + input: { + index: 'index.html' + } + } + } + }, 'build', 'production') + + expect(config.build.rollupOptions.input['index']).toBe(resolve('index.html')) + }) + + test('resolve build.rollupOptions.input[]', async () => { + const config = await resolveConfig({ + build: { + rollupOptions: { + input: ['index.html'] + } + } + }, 'build', 'production') + + expect(config.build.rollupOptions.input).toStrictEqual([resolve('index.html')]) + }) + + test('resolve index.html', async () => { + const config = await resolveConfig({}, 'build', 'production') + + expect(config.build.rollupOptions.input).toBe(resolve('index.html')) + }) + + test('resolve build.outdir', async () => { + const config = await resolveConfig({ build: { outDir: 'outDir' } }, 'build', 'production') + + expect(config.build.outDir).toBe(resolve('outDir')) + }) + + test('resolve default build.outdir', async () => { + const config = await resolveConfig({}, 'build', 'production') + + expect(config.build.outDir).toBe(resolve('dist')) + }) + + test('resolve build.lib.entry', async () => { + const config = await resolveConfig({ build: { lib: { entry: 'index.html' } } }, 'build', 'production') + + expect(config.build.rollupOptions.input).toBe(resolve('index.html')) + }) + + test('resolve build.ssr', async () => { + const config = await resolveConfig({ build: { ssr: 'ssr.ts' } }, 'build', 'production') + + expect(config.build.rollupOptions.input).toBe(resolve('ssr.ts')) + }) +}) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index b9ccf666b53550..a374bc9908f353 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -233,7 +233,7 @@ export type ResolvedBuildOptions = Required< > > -export function resolveBuildOptions(raw?: BuildOptions): ResolvedBuildOptions { +export function resolveBuildOptions(root: string, raw?: BuildOptions): ResolvedBuildOptions { const resolved: ResolvedBuildOptions = { target: 'modules', polyfillModulePreload: true, @@ -269,6 +269,40 @@ export function resolveBuildOptions(raw?: BuildOptions): ResolvedBuildOptions { } } + const resolve = (p: string) => p.startsWith('\0') ? p : path.resolve(root, p) + + resolved.outDir = resolve(resolved.outDir) + + let input + + if (raw?.rollupOptions?.input) { + input = Array.isArray(raw.rollupOptions.input) + ? raw.rollupOptions.input.map(input => resolve(input)) + : typeof raw.rollupOptions.input === 'object' + ? Object.assign( + // @ts-ignore + ...Object.keys(raw.rollupOptions.input).map(key => ({ [key]: resolve(raw.rollupOptions.input[key]) })) + ) + : resolve(raw.rollupOptions.input) + } else { + input = resolve( + raw?.lib + ? raw.lib.entry + : typeof raw?.ssr === 'string' + ? raw.ssr + : 'index.html' + ) + } + + if (!!raw?.ssr && typeof input === 'string' && input.endsWith('.html')) { + throw new Error( + `rollupOptions.input should not be an html file when building for SSR. ` + + `Please specify a dedicated SSR entry.` + ) + } + + resolved.rollupOptions.input = input + // handle special build targets if (resolved.target === 'modules') { // Support browserslist @@ -362,6 +396,8 @@ async function doBuild( ): Promise { const config = await resolveConfig(inlineConfig, 'build', 'production') const options = config.build + const input = options.rollupOptions.input + const outDir = options.outDir const ssr = !!options.ssr const libOptions = options.lib @@ -373,22 +409,6 @@ async function doBuild( ) ) - const resolve = (p: string) => path.resolve(config.root, p) - const input = libOptions - ? resolve(libOptions.entry) - : typeof options.ssr === 'string' - ? resolve(options.ssr) - : options.rollupOptions?.input || resolve('index.html') - - if (ssr && typeof input === 'string' && input.endsWith('.html')) { - throw new Error( - `rollupOptions.input should not be an html file when building for SSR. ` + - `Please specify a dedicated SSR entry.` - ) - } - - const outDir = resolve(options.outDir) - // inject ssr arg to plugin load/transform hooks const plugins = ( ssr ? config.plugins.map((p) => injectSsrFlagToHooks(p)) : config.plugins @@ -421,7 +441,6 @@ async function doBuild( const rollup = require('rollup') as typeof Rollup const rollupOptions: RollupOptions = { - input, context: 'globalThis', preserveEntrySignatures: ssr ? 'allow-extension' diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 51a9ffac7f3bb6..c627fc5c502886 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -364,7 +364,7 @@ export async function resolveConfig( // resolve public base url const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger) - const resolvedBuildOptions = resolveBuildOptions(config.build) + const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build) // resolve cache directory const pkgPath = lookupFile( From 7b70bff7ca330040884d05c1b867761029a9c26e Mon Sep 17 00:00:00 2001 From: Jasper Van Gestel Date: Thu, 11 Nov 2021 22:20:06 +0100 Subject: [PATCH 050/258] docs(contributing): fix pnpm link example (#5649) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 610cc04d033f96..88028ffad9b8de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ To develop and test the core `vite` package: 3. Run `pnpm link --global` in `packages/vite`. This links `vite` globally so that you can: - - Run `pnpm link vite` in another Vite project to use the locally built Vite; + - Run `pnpm link --global vite` in another Vite project to use the locally built Vite; - Use the `vite` binary anywhere. If your project has `vite` as a nested dependency, you can customize the dependency resolution instead depending on the package manager used. For pnpm, add this in your project's root `package.json`: From 1f91cdb6c5c573fd9efd147e38cabc0e5f22028f Mon Sep 17 00:00:00 2001 From: patak Date: Thu, 11 Nov 2021 23:57:33 +0100 Subject: [PATCH 051/258] fix: vitepress/theme in ssrExternals (#5651) --- packages/vite/src/node/ssr/ssrExternal.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts index 9b68b83d6dce5e..f846c64edd1aaa 100644 --- a/packages/vite/src/node/ssr/ssrExternal.ts +++ b/packages/vite/src/node/ssr/ssrExternal.ts @@ -3,6 +3,7 @@ import path from 'path' import { tryNodeResolve, InternalResolveOptions } from '../plugins/resolve' import { createDebugger, + isDefined, lookupFile, normalizePath, resolveFrom @@ -39,7 +40,8 @@ export function resolveSSRExternal( seen ) - for (const dep of knownImports) { + const importedDeps = knownImports.map(getNpmPackageName).filter(isDefined) + for (const dep of importedDeps) { // Assume external if not yet seen // At this point, the project root and any linked packages have had their dependencies checked, // so we can safely mark any knownImports not yet seen as external. They are guaranteed to be @@ -172,3 +174,13 @@ export function shouldExternalizeForSSR( }) return should } + +function getNpmPackageName(importPath: string): string | null { + const parts = importPath.split('/') + if (parts[0].startsWith('@')) { + if (!parts[1]) return null + return `${parts[0]}/${parts[1]}` + } else { + return parts[0] + } +} From afd6b6d5408745b6f376318a15762ca6f34e8c68 Mon Sep 17 00:00:00 2001 From: Jasper Van Gestel Date: Fri, 12 Nov 2021 13:36:36 +0100 Subject: [PATCH 052/258] fix(logger): no sameCount if clearScreen is false (#5648) --- packages/vite/src/node/logger.ts | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/vite/src/node/logger.ts b/packages/vite/src/node/logger.ts index 2fc04b8a11a915..12e41f3ff089c8 100644 --- a/packages/vite/src/node/logger.ts +++ b/packages/vite/src/node/logger.ts @@ -66,10 +66,9 @@ export function createLogger( const loggedErrors = new WeakSet() const { prefix = '[vite]', allowClearScreen = true } = options const thresh = LogLevels[level] - const clear = + const canClearScreen = allowClearScreen && process.stdout.isTTY && !process.env.CI - ? clearScreen - : () => {} + const clear = canClearScreen ? clearScreen : () => {} function output(type: LogType, msg: string, options: LogErrorOptions = {}) { if (thresh >= LogLevels[type]) { @@ -90,17 +89,21 @@ export function createLogger( if (options.error) { loggedErrors.add(options.error) } - if (type === lastType && msg === lastMsg) { - sameCount++ - clear() - console[method](format(), chalk.yellow(`(x${sameCount + 1})`)) - } else { - sameCount = 0 - lastMsg = msg - lastType = type - if (options.clear) { + if (canClearScreen) { + if (type === lastType && msg === lastMsg) { + sameCount++ clear() + console[method](format(), chalk.yellow(`(x${sameCount + 1})`)) + } else { + sameCount = 0 + lastMsg = msg + lastType = type + if (options.clear) { + clear() + } + console[method](format()) } + } else { console[method](format()) } } From 6c0701dceb67010430e6b3b315d0c8915165aef3 Mon Sep 17 00:00:00 2001 From: patak-js Date: Fri, 12 Nov 2021 13:55:04 +0100 Subject: [PATCH 053/258] release: v2.7.0-beta.4 --- packages/vite/CHANGELOG.md | 22 ++++++++++++++++++++++ packages/vite/package.json | 2 +- pnpm-lock.yaml | 6 ------ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index c6286999e492bf..4788487b17bfec 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,25 @@ +# [2.7.0-beta.4](https://github.com/vitejs/vite/compare/v2.7.0-beta.3...v2.7.0-beta.4) (2021-11-12) + + +### Bug Fixes + +* **build:** resolve `rollupOptions.input` paths ([#5601](https://github.com/vitejs/vite/issues/5601)) ([5b6b016](https://github.com/vitejs/vite/commit/5b6b01693720290e8998b2613f0dcb2d699ee84f)) +* check exactly in proxyESM ([#5512](https://github.com/vitejs/vite/issues/5512)) ([a17da55](https://github.com/vitejs/vite/commit/a17da55c5dd7ec6206fea8a255f9383b75384351)) +* handle local and module scripts separately ([#5464](https://github.com/vitejs/vite/issues/5464)) ([0713446](https://github.com/vitejs/vite/commit/0713446fa4df678422c84bd141b189a930c100e7)) +* **logger:** no sameCount if clearScreen is false ([#5648](https://github.com/vitejs/vite/issues/5648)) ([afd6b6d](https://github.com/vitejs/vite/commit/afd6b6d5408745b6f376318a15762ca6f34e8c68)) +* **server:** watch correct env files ([#5520](https://github.com/vitejs/vite/issues/5520)) ([03b77bd](https://github.com/vitejs/vite/commit/03b77bd01677cfa2ac76d1a8438af0ce1c7c5678)) +* **sourcemap:** tolerate virtual modules in `sources` array ([#5587](https://github.com/vitejs/vite/issues/5587)) ([cfd2c5e](https://github.com/vitejs/vite/commit/cfd2c5e8deb9fe1e80ec611deff7834a89dcdecc)) +* **ssr:** use `tryNodeResolve` instead of `resolveFrom` ([#3951](https://github.com/vitejs/vite/issues/3951)) ([87c0050](https://github.com/vitejs/vite/commit/87c0050dea008120aad79cf23acca7dfd41cd72e)) +* use micromatch for consistent glob matching ([#5610](https://github.com/vitejs/vite/issues/5610)) ([9d50df8](https://github.com/vitejs/vite/commit/9d50df8198d7cf339e95095580775a5bf8e93948)) +* vitepress/theme in ssrExternals ([#5651](https://github.com/vitejs/vite/issues/5651)) ([1f91cdb](https://github.com/vitejs/vite/commit/1f91cdb6c5c573fd9efd147e38cabc0e5f22028f)) + + +### Features + +* support `moduleInfo.meta` in dev server ([#5465](https://github.com/vitejs/vite/issues/5465)) ([f6d08c7](https://github.com/vitejs/vite/commit/f6d08c7430906d6262ee1df729d2ea193a80fa6c)) + + + # [2.7.0-beta.3](https://github.com/vitejs/vite/compare/v2.7.0-beta.2...v2.7.0-beta.3) (2021-11-08) diff --git a/packages/vite/package.json b/packages/vite/package.json index f2c85ebc03f9a9..f438bd55e75bdb 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.3", + "version": "2.7.0-beta.4", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b10e883df866c3..63675a1a47e49f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -670,12 +670,6 @@ importers: '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.16.0 hash-sum: 2.0.0 - packages/temp: - specifiers: - css-color-names: ^1.0.1 - devDependencies: - css-color-names: 1.0.1 - packages/vite: specifiers: '@ampproject/remapping': ^1.0.1 From 40d503cce08324b6bd6341b45ad8a73876f6f4a0 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 12 Nov 2021 10:48:46 -0800 Subject: [PATCH 054/258] fix: correctly resolve virtual modules during import scan (#5659) --- packages/vite/src/node/optimizer/scan.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts index 657b5d6d0fdbcb..f4ae31b060f649 100644 --- a/packages/vite/src/node/optimizer/scan.ts +++ b/packages/vite/src/node/optimizer/scan.ts @@ -207,7 +207,10 @@ function esbuildScanPlugin( { filter: virtualModuleRE }, async ({ path, importer }) => { return { - path, + path: await resolve( + path.substring('virtual-module:'.length), + importer + ), namespace: 'html' } } From 68e8e35aab58b3d8c99805a9575dc595d1b44a07 Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Sat, 13 Nov 2021 05:31:19 +0800 Subject: [PATCH 055/258] chore: remove useless cli option (#5653) --- packages/vite/src/node/cli.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/vite/src/node/cli.ts b/packages/vite/src/node/cli.ts index e62af36cc8f558..275283407ae66c 100644 --- a/packages/vite/src/node/cli.ts +++ b/packages/vite/src/node/cli.ts @@ -14,8 +14,6 @@ interface GlobalCLIOptions { '--'?: string[] c?: boolean | string config?: string - r?: string - root?: string base?: string l?: LogLevel logLevel?: LogLevel @@ -38,8 +36,6 @@ function cleanOptions( delete ret['--'] delete ret.c delete ret.config - delete ret.r - delete ret.root delete ret.base delete ret.l delete ret.logLevel @@ -55,7 +51,6 @@ function cleanOptions( cli .option('-c, --config ', `[string] use specified config file`) - .option('-r, --root ', `[string] use specified root directory`) .option('--base ', `[string] public base path (default: /)`) .option('-l, --logLevel ', `[string] info | warn | error | silent`) .option('--clearScreen', `[boolean] allow/disable clear screen when logging`) From d788682492465a9365b262dcd93a618e4415637c Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Fri, 12 Nov 2021 17:02:29 -0500 Subject: [PATCH 056/258] fix: tolerate undefined parent in `hookNodeResolve` callback (#5664) --- packages/vite/src/node/ssr/ssrModuleLoader.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 8e2faba046c178..283834fd845e9f 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -222,10 +222,15 @@ async function nodeImport( // When an ESM module imports an ESM dependency, this hook is *not* used. const unhookNodeResolve = hookNodeResolve( - (nodeResolve) => (id, parent, isMain, options) => - id[0] === '.' || isBuiltin(id) - ? nodeResolve(id, parent, isMain, options) - : viteResolve(id, parent.id) + (nodeResolve) => (id, parent, isMain, options) => { + if (id[0] === '.' || isBuiltin(id)) { + return nodeResolve(id, parent, isMain, options) + } + if (!parent) { + return id + } + return viteResolve(id, parent.id) + } ) let url: string From 5b79bc0251df438588ccc707c9acfa2556b4f038 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sat, 13 Nov 2021 10:18:43 +0800 Subject: [PATCH 057/258] docs: tweak sponsors --- docs/.vitepress/theme/index.js | 2 +- docs/.vitepress/theme/sponsors.css | 35 ++++++++++++++++++++-------- docs/.vitepress/theme/sponsors.json | 6 +++++ docs/index.md | 18 +++++++------- docs/public/divriots.png | Bin 0 -> 5159 bytes 5 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 docs/public/divriots.png diff --git a/docs/.vitepress/theme/index.js b/docs/.vitepress/theme/index.js index 3cedb624abdbfd..5d0a1b7a652039 100644 --- a/docs/.vitepress/theme/index.js +++ b/docs/.vitepress/theme/index.js @@ -9,7 +9,7 @@ export default { Layout() { return h(Theme.Layout, null, { 'sidebar-bottom': () => - h('div', { class: 'sponsors' }, [ + h('div', { class: 'sponsors sidebar' }, [ h( 'a', { diff --git a/docs/.vitepress/theme/sponsors.css b/docs/.vitepress/theme/sponsors.css index 00b1e8e5f6a5e3..a512ed577f583a 100644 --- a/docs/.vitepress/theme/sponsors.css +++ b/docs/.vitepress/theme/sponsors.css @@ -5,18 +5,13 @@ .sponsors a { color: #999; -} - -.sponsors img { - max-width: 180px; - height: 40px; + margin: 1em; display: block; - margin-top: 1em; } -.sponsors a.platinum img { - max-width: 240px; - height: 60px; +.sponsors img { + max-width: 160px; + max-height: 40px; } .sponsors.frontpage { @@ -26,7 +21,6 @@ .sponsors.frontpage img { display: inline-block; vertical-align: middle; - margin: 0 1rem 1.25rem 1rem; } .sponsors.frontpage h2 { @@ -35,7 +29,28 @@ border: none; } +.sponsors.sidebar a img { + max-height: 36px; +} + +.platinum-sponsors { + margin-bottom: 1.5em; +} + +.platinum-sponsors a img { + max-width: 240px; + max-height: 60px; +} + +.gold-sponsors { + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; + align-items: center; +} + /* special cases */ #sponsor-mux { padding: 5px 0; + min-height: 36px; } diff --git a/docs/.vitepress/theme/sponsors.json b/docs/.vitepress/theme/sponsors.json index 93e1ee38528b52..33e19a2cde3634 100644 --- a/docs/.vitepress/theme/sponsors.json +++ b/docs/.vitepress/theme/sponsors.json @@ -29,5 +29,11 @@ "name": "Plaid Inc.", "href": "https://plaid.co.jp/", "src": "/plaid.svg" + }, + { + "id": "divriots", + "name": "divriots", + "href": "https://divriots.com/", + "src": "/divriots.png" } ] diff --git a/docs/index.md b/docs/index.md index bed942c95a8f5b..81b0eb027e8f05 100644 --- a/docs/index.md +++ b/docs/index.md @@ -25,14 +25,16 @@ footer: MIT Licensed | Copyright © 2019-present Evan You & Vite Contributors

Sponsors

- - - -
- - - -
+
+ + + +
+
+ + + +
Become a sponsor on GitHub
diff --git a/docs/public/divriots.png b/docs/public/divriots.png new file mode 100644 index 0000000000000000000000000000000000000000..b021d0aa965f49a2137193e8c973efe5162af69c GIT binary patch literal 5159 zcmV+?6xi#DP)77Zw&47Z(>77Z(>77Zw&478Vv378Vy57Z(>77Z(@&prAMa z000nlQchCLC$%prG4gjmQLTjy~h)c&Hm`&aQ_wk$l3c;t&TwnY^ z5>~7AN=kR4RJZ}xK+z-js1UoKD1bB|Sgn30b0k@ifE)w7c007|2g}B{+#$}}pMDFJ9 zQvjC7ak-M_yU6EN`RqB@Z+@*PaCrLS8LG>FFo{{ z)mpnk?RlJ_So9m<_aNBP+%Tv4jP`PYi)ACXX6>*ubh9hC1-9@2E3id^4ItzRU(zM@ z4e&b<9LUCOYec4o@@vL;oklOthFGSdrjrgKro<)m<4aj#{A_?PCD`c>02;c23|9YY zT8(T>Moi-MC|boaf|H8QTI<-(zOQ7f?rwlzPB1rJ;*Mgz7T}KKx&Fu25DX}Cw-xrb2EG^U_?7$$mmPdtPDmQBF(C}^^+6)t0AE9J)ADGZ zQ(@)50ne|LEm~{6Vpds~V%(`+=@~gL`Y;NgZ!dj$Y+AS|6qJ^Vm`pG|PHw=y?(*ho=e&A#;c+==hh zh4oPv6UgQ7I=?ZL7f!+;zxopaelEej-CMDl7?#42fKQD=-k3_0jJ7=QCKS$@Ky~S4 z*R#IQfL8dG9|`ak1V^%s&=oK&?jnT0|qi<3T?*iur%|S9mtT1tBzGynm=$%L2fGR;VecTRZ}0(V-kYo$4&l058wuH%FyS7NL7`3!(hrpF+O(!{R0 zh+vJ(;iRuV?}oSvbd(lEQs>I{aONMP1R6R&n8+`oMnlZlk)iskm6pCG_UQy;%Uwm? z7HNd3(jB#3D=9~Yb~qm~tJt~TF^Ex`!7pjgiI@N|@2mC@q>;Id;02k(tqo`D+WC2 zP!ya%qLGcf3Mrz=*|RO>yF;`7VGj9{n0zfsGDl@Eg)A06tr> zjXcvL={+YBj9G`vmVU2wFQifOE6@S<6cJ)+|D>6G$gkn`je(uPuQRU!80hPbiawH; z5DbV~%Dh{1b%8-(u7Z)wDW_%w;c}jD*Y>*DhAFvhuUM((BtQZT__tB*osbpd=<(&{0B z>(epXC?Yvva0$uw5U(mS$WA zG_=VCH#(rWa~E2nG$Mk~eNSldB7|+_`oz#}y^`PTI!~0;^^QJ(9c|6r3}|Rm30|tg zmMpretu=u?B7)$v0hZWk<2U4s>-g6TC)KZOnoM4*nCJue9822EG_;unhgw`(KDY67 z7tyk=8H3?Fr&dgIIM`6W;B0>PaC17&yyHMAyAbH2Q&c^)I(qD+&@ z*b7r^YXH3B6}Qt*RkXpqkl&oxW2tj{0N`_s7p~LLss!6Hw*~DqA@gcY-`A<39j8$X zU`y!OY;@!W`J?pH_HP<`ju=}o8 z4Sz*ChrAHqE8N#)r6!dX_XKkYX-ZE7_&kH$g&JCoU_toj0#=Jo6n--av}^iDq<}>c z-#n=&iV?mKtP7o?{qv%ygWODj(MsAjLqn?&OqdXm&*7>ieH@XMp1M)@MiA#!`Xte? zTdMQ=8DB@AS7ZF1>#2Po_Wb}mqzjO9G_=Y<;J-(`<|1fNRDRo~Jlzq*ezyBYoe2;T-9&)Tvw>f#p_K>14)`sQTO#v&UPEeCJE0$PZ36<5met?lmnxCbi6$!>qiL(i+pQcf=F|Fm^wRf}+7Df<7h&BVRR{kZa z0FMk|*QN+e@J2~*6~+Qg)X+)evkA!A(wmNPHH`_sb=;$Jeu#2U1X%Yi zQ)bfe0f0Fsjf)dCw1O{015Es0ijZhU9a=dY(!lscaIIZm^Q#eXoa5goM09 z){?Mp2aMHo0ETYwF&AKHO{Do6+A?rJv6*3hkBLO~6m#BL%kD`L#Jt1y9siAr#YX{r z&Iy-l*5ohX7yltt)>YS*B}I)7rYx=up$Ubqo1>qYvrRD|5t!dUil!CP1n#eYoUZWv0=>bLhD15vy-+< zgaG0eg}#FMYWJ3Jn$^h%CQJ9egxLVwnynF&yLgOW#HUsjDn<`2Ths@zJ{#cLjPEyM z%{c)$fJX@KRw35O0J}=QJzGN?;n%HxM)dH=XWr4ro?1#E62f~X2`)Cu93GJ-6P$Xp zBRd)3vyv8ylO?{6Urh9Xem?QI4yT)PU7rL|<$g%HKj~AKD23=OhR{K9Z!im3@(%Ot9|kdzNMcTrSI)tD%j>zql$0y9x{VYo}RYiNSIOU#r90xHvS7`YW%m_h30^s}? z)$F_wZ4SQ~Dbsjj;JKsCq?FRvFxa+v0kQ<#3JLV1mN(Y`*DK5?5X^fj_H4QYV8}VY zc^cXzep!aq+!4zg-cl(@De279XcCRtgPvQiVD~?2N}ZIZgze)5%Z>zON!I{;j^N~J zg87&8oBc{T?@)vFkA$WdpVE?9ovbDZEve`kLc!2CRyrfF!i z_$_>yM$y&apMNomrIa8cWM@Uu^f3_^OfKbdh6eCB!GW|VuQ<`C0DOx1{4z^Jo5t_H z!?a4tC|z>j3LA=SOeX^dlVeMQvWdwh*U2iHB1_`K1bZ66rE`U*0DL~Me3E^b$M5bL z6%vn~j$=ARkoawzQ%y#m$P#Cl6Pyicx4iEO#dWAD0Jrx0#@F+^ zf2Sp-6u*Z&n;L|6^l4IJHYLv;CPgt6x2QS>e=@(Q>aanA^Bp_vD3-a$pjM?s{4zNU>{#M7K>jyo){b zzN~-ga1OxrdPV;R{IYbEZ@I4yU^$EWwZMV#=w$&nL>HFaB5_yKsEW1@RF;krT>ezD zk2U}Rz`C_6VJ891Yxm%9!0*n^E|5~Pu^s@adMs^H(2UunSwyAFR5bja)r^U#nL{cwkB6W5k$p|Jb2k(= z3g_%O1dI0pxN`2;_6Gd!9HnM9C9OmKZpHh3+bE?Oi`KFQ8&v_u{2~E}lSGI@6ypa* zibk+{8-U$Z4Q)EVI~C2bxDz2NabP_=^MbKp7yLWy!s>EyvgjQ5E}hcF88P1w!BV{o zz-4a`-+|xVE3M3@6jH;am86L8SXy|;n2?kRPkd+9 zK{yRyn5Us#!0*mx0n;gk2QQgbgLB`p{eI1$7bdM`D+H0;c^G}zdbikMkfu>N|tyWd<(WhjgRkTo0v}Fa~ zj)ZWGU_s%RT?a6qq@i8H?|1p3G8<#-x-g5%Lbp;Z?IAEG!S?k@KGedCH5QvE+iV~d zs>t+6%7bc}!Sj0|z8EjX-sF_dbY4Qn*l zb13gNGrFk?H)`MPAgP_l(EZsKRjZ7jsOVE>Y)Vii~81*07h5L7`R{r(~M&?Z+=<$B9qI7F}4H<)wI2mng25kUo^vO zdMXmDcabL>E)&M^lL6)z^2-==JOFtb`G=$a!;`x; z!Te=UaSSp2K2HMJYw9m*u4k>QMzC;~&8-guc-PIZ-o)U(%!^>@o}{FtpGNJ_u|%CYc0SaJRqN)V-W^x4+z^8vYXT-R}0v1|J_j{09!Q V5H0%77H Date: Sat, 13 Nov 2021 01:11:31 -0500 Subject: [PATCH 058/258] fix(resolve): check nested directories for package.json (#5665) --- packages/vite/src/node/plugins/resolve.ts | 65 +++++++++++++++++------ 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts index bfdea8ba9416bf..1ce74cfa6ee80d 100644 --- a/packages/vite/src/node/plugins/resolve.ts +++ b/packages/vite/src/node/plugins/resolve.ts @@ -13,7 +13,6 @@ import { isBuiltin, bareImportRE, createDebugger, - deepImportRE, injectQuery, isExternalUrl, isObject, @@ -505,13 +504,35 @@ export function tryNodeResolve( const nestedRoot = id.substring(0, lastArrowIndex).trim() const nestedPath = id.substring(lastArrowIndex + 1).trim() - // check for deep import, e.g. "my-lib/foo" - const deepMatch = nestedPath.match(deepImportRE) + const possiblePkgIds: string[] = [] + for (let prevSlashIndex = -1; ; ) { + let slashIndex = nestedPath.indexOf('/', prevSlashIndex + 1) + if (slashIndex < 0) { + slashIndex = nestedPath.length + } + + const part = nestedPath.slice( + prevSlashIndex + 1, + (prevSlashIndex = slashIndex) + ) + if (!part) { + break + } - const pkgId = deepMatch ? deepMatch[1] || deepMatch[2] : nestedPath + // Assume path parts with an extension are not package roots, except for the + // first path part (since periods are sadly allowed in package names). + // At the same time, skip the first path part if it begins with "@" + // (since "@foo/bar" should be treated as the top-level path). + if (possiblePkgIds.length ? path.extname(part) : part[0] === '@') { + continue + } + + const possiblePkgId = nestedPath.slice(0, slashIndex) + possiblePkgIds.push(possiblePkgId) + } let basedir: string - if (dedupe && dedupe.includes(pkgId)) { + if (dedupe?.some((id) => possiblePkgIds.includes(id))) { basedir = root } else if ( importer && @@ -528,21 +549,33 @@ export function tryNodeResolve( basedir = nestedResolveFrom(nestedRoot, basedir, options.preserveSymlinks) } - const pkg = resolvePackageData(pkgId, basedir, options.preserveSymlinks) + let pkg: PackageData | undefined + const pkgId = possiblePkgIds.reverse().find((pkgId) => { + pkg = resolvePackageData(pkgId, basedir, options.preserveSymlinks) + return pkg + })! if (!pkg) { return } - let resolved = deepMatch - ? resolveDeepImport( - '.' + id.slice(pkgId.length), - pkg, - options, - targetWeb, - options.preserveSymlinks - ) - : resolvePackageEntry(id, pkg, options, targetWeb, options.preserveSymlinks) + let resolved = + nestedPath !== pkgId + ? resolveDeepImport( + '.' + nestedPath.slice(pkgId.length), + pkg, + options, + targetWeb, + options.preserveSymlinks + ) + : resolvePackageEntry( + nestedPath, + pkg, + options, + targetWeb, + options.preserveSymlinks + ) + if (!resolved) { return } @@ -572,7 +605,7 @@ export function tryNodeResolve( !isJsType || importer?.includes('node_modules') || exclude?.includes(pkgId) || - exclude?.includes(id) || + exclude?.includes(nestedPath) || SPECIAL_QUERY_RE.test(resolved) || ssr ) { From 502b8f2b31f06d4e524d36b5566197db76f6ccda Mon Sep 17 00:00:00 2001 From: yuuang <569105585@qq.com> Date: Sat, 13 Nov 2021 14:36:28 +0800 Subject: [PATCH 059/258] fix: plugin-vue dev scripts error in ssr-vue (#5607) --- packages/plugin-vue/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 1be309a306de16..e082669d824633 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -9,7 +9,9 @@ "main": "dist/index.js", "types": "dist/index.d.ts", "scripts": { - "dev": "tsc -p . -w --incremental", + "dev": "rimraf dist && run-p dev-types dev-watch", + "dev-types": "tsc -p . -w --incremental --emitDeclarationOnly", + "dev-watch": "esbuild src/index.ts --watch --bundle --platform=node --target=node12 --external:@vue/compiler-sfc --external:vue/compiler-sfc --external:vite --outfile=dist/index.js", "build": "rimraf dist && run-s build-bundle build-types", "build-bundle": "esbuild src/index.ts --bundle --platform=node --target=node12 --external:@vue/compiler-sfc --external:vue/compiler-sfc --external:vite --outfile=dist/index.js", "build-types": "tsc -p . --emitDeclarationOnly --outDir temp && api-extractor run && rimraf temp", From 41a7c9ccfbc1a7bc60aec672056eac3966ddd036 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Sat, 13 Nov 2021 14:26:42 -0500 Subject: [PATCH 060/258] fix(plugin-react): uncompiled JSX in linked pkgs (#5669) --- packages/plugin-react/src/index.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts index 316149c8452287..134df5fcb1db57 100644 --- a/packages/plugin-react/src/index.ts +++ b/packages/plugin-react/src/index.ts @@ -134,11 +134,12 @@ export default function viteReact(opts: Options = {}): PluginOption[] { // By reverse-compiling "React.createElement" calls into JSX, // React elements provided by dependencies will also use the // automatic runtime! - const [restoredAst, isCommonJS] = !isProjectFile - ? await restoreJSX(babel, code, id) - : [null, false] + const [restoredAst, isCommonJS] = + !isProjectFile && !isJSX + ? await restoreJSX(babel, code, id) + : [null, false] - if (isProjectFile || (ast = restoredAst)) { + if (isJSX || (ast = restoredAst)) { plugins.push([ await loadPlugin( '@babel/plugin-transform-react-jsx' + From 72d8925f79a8983ae131df06a627ee020aab71f8 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Sat, 13 Nov 2021 15:09:00 -0500 Subject: [PATCH 061/258] fix(ssr): prefer CJS but still allow ESM entries (#5662) --- packages/vite/src/node/ssr/ssrModuleLoader.ts | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 283834fd845e9f..b4d58f60aab362 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -18,6 +18,7 @@ import { import { transformRequest } from '../server/transformRequest' import { InternalResolveOptions, tryNodeResolve } from '../plugins/resolve' import { hookNodeResolve } from '../plugins/ssrRequireHook' +import { DEFAULT_MAIN_FIELDS } from '../constants' interface SSRContext { global: typeof globalThis @@ -101,19 +102,29 @@ async function instantiateModule( root } = server.config + // The `extensions` and `mainFields` options are used to ensure that + // CommonJS modules are preferred. We want to avoid ESM->ESM imports + // whenever possible, because `hookNodeResolve` can't intercept them. const resolveOptions: InternalResolveOptions = { - conditions: ['node'], + // By adding "require" to the `conditions` array, resolution of the + // pkg.exports field will use "require" condition whenever it comes + // before "import" condition. + conditions: ['node', 'require'], dedupe, - // Prefer CommonJS modules. - extensions: ['.js', '.mjs', '.ts', '.jsx', '.tsx', '.json'], + extensions: ['.js', '.cjs', '.mjs', '.jsx', '.json'], isBuild: true, isProduction, - // Disable "module" condition. - isRequire: true, - mainFields: ['main'], + mainFields: ['main', ...DEFAULT_MAIN_FIELDS], root } + // Prevent ESM modules from being resolved during test runs, since Jest + // cannot `require` them. Note: This prevents testing of ESM-only packages. + if (typeof jest !== 'undefined') { + resolveOptions.isRequire = true + resolveOptions.mainFields = ['main'] + } + // Since dynamic imports can happen in parallel, we need to // account for multiple pending deps and duplicate imports. const pendingDeps: string[] = [] From 96b9fbbd01d431aded2ebfd12cb30ce34b6cafc1 Mon Sep 17 00:00:00 2001 From: patak-js Date: Sat, 13 Nov 2021 21:20:20 +0100 Subject: [PATCH 062/258] release: v2.7.0-beta.5 --- packages/vite/CHANGELOG.md | 12 ++++++++++++ packages/vite/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 4788487b17bfec..43f436d0c3d6bf 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,15 @@ +# [2.7.0-beta.5](https://github.com/vitejs/vite/compare/v2.7.0-beta.4...v2.7.0-beta.5) (2021-11-13) + + +### Bug Fixes + +* correctly resolve virtual modules during import scan ([#5659](https://github.com/vitejs/vite/issues/5659)) ([40d503c](https://github.com/vitejs/vite/commit/40d503cce08324b6bd6341b45ad8a73876f6f4a0)) +* **resolve:** check nested directories for package.json ([#5665](https://github.com/vitejs/vite/issues/5665)) ([022db52](https://github.com/vitejs/vite/commit/022db52f6de19e98e6412e7c11bf719b1fd8960c)) +* **ssr:** prefer CJS but still allow ESM entries ([#5662](https://github.com/vitejs/vite/issues/5662)) ([72d8925](https://github.com/vitejs/vite/commit/72d8925f79a8983ae131df06a627ee020aab71f8)) +* tolerate undefined parent in `hookNodeResolve` callback ([#5664](https://github.com/vitejs/vite/issues/5664)) ([d788682](https://github.com/vitejs/vite/commit/d788682492465a9365b262dcd93a618e4415637c)) + + + # [2.7.0-beta.4](https://github.com/vitejs/vite/compare/v2.7.0-beta.3...v2.7.0-beta.4) (2021-11-12) diff --git a/packages/vite/package.json b/packages/vite/package.json index f438bd55e75bdb..79276336e2dd25 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.4", + "version": "2.7.0-beta.5", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From 3ba3e2c9c8ee8f282d8292ded0efe05a0481e17d Mon Sep 17 00:00:00 2001 From: Nurettin Kaya Date: Sat, 13 Nov 2021 22:41:54 -0800 Subject: [PATCH 063/258] chore: cleanup #5601 (#5672) --- packages/vite/src/node/__tests__/build.spec.ts | 2 +- packages/vite/src/node/build.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index b745c38aa44790..34d80736a5b430 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -67,7 +67,7 @@ describe('resolveLibFilename', () => { }) }) -describe('resolvePaths', () => { +describe('resolveBuildOptions', () => { test('resolve build.rollupOptions.input', async () => { const config = await resolveConfig({ build: { diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index a374bc9908f353..76809b0af7a0ff 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -279,9 +279,8 @@ export function resolveBuildOptions(root: string, raw?: BuildOptions): ResolvedB input = Array.isArray(raw.rollupOptions.input) ? raw.rollupOptions.input.map(input => resolve(input)) : typeof raw.rollupOptions.input === 'object' - ? Object.assign( - // @ts-ignore - ...Object.keys(raw.rollupOptions.input).map(key => ({ [key]: resolve(raw.rollupOptions.input[key]) })) + ? Object.fromEntries( + Object.entries(raw.rollupOptions.input).map(([key, value]) => [key, resolve(value)]) ) : resolve(raw.rollupOptions.input) } else { From 36cc896b6bcdb722408947ec54a9160e39edfd20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 10:43:53 +0100 Subject: [PATCH 064/258] chore(deps): update dependency lint-staged to v12 (#5680) --- package.json | 2 +- pnpm-lock.yaml | 132 +++++++++++++++++++++++++++++-------------------- 2 files changed, 80 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 11b87ef87dbba5..1d87771fdc3bf3 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "execa": "^5.1.1", "fs-extra": "^10.0.0", "jest": "^27.3.1", - "lint-staged": "^11.2.6", + "lint-staged": "^12.0.2", "minimist": "^1.2.5", "node-fetch": "^2.6.6", "npm-run-all": "^4.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 63675a1a47e49f..3fff6748cf94c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,7 +25,7 @@ importers: execa: ^5.1.1 fs-extra: ^10.0.0 jest: ^27.3.1 - lint-staged: ^11.2.6 + lint-staged: ^12.0.2 minimist: ^1.2.5 node-fetch: ^2.6.6 npm-run-all: ^4.1.5 @@ -60,7 +60,7 @@ importers: execa: 5.1.1 fs-extra: 10.0.0 jest: 27.3.1_ts-node@10.4.0 - lint-staged: 11.2.6 + lint-staged: 12.0.2 minimist: 1.2.5 node-fetch: 2.6.6 npm-run-all: 4.1.5 @@ -2583,6 +2583,11 @@ packages: engines: {node: '>=8'} dev: true + /ansi-regex/6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + dev: true + /ansi-styles/3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -2600,6 +2605,11 @@ packages: engines: {node: '>=10'} dev: true + /ansi-styles/6.1.0: + resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==} + engines: {node: '>=12'} + dev: true + /anymatch/3.1.2: resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==} engines: {node: '>= 8'} @@ -3023,6 +3033,14 @@ packages: string-width: 4.2.3 dev: true + /cli-truncate/3.1.0: + resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + slice-ansi: 5.0.0 + string-width: 5.0.1 + dev: true + /clipboard/2.0.8: resolution: {integrity: sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==} dependencies: @@ -3089,10 +3107,6 @@ packages: color-string: 1.6.0 dev: false - /colorette/1.4.0: - resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} - dev: true - /colorette/2.0.16: resolution: {integrity: sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==} dev: true @@ -3579,7 +3593,7 @@ packages: dependencies: ms: 2.1.2 - /debug/4.3.2_supports-color@8.1.1: + /debug/4.3.2_supports-color@9.0.2: resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==} engines: {node: '>=6.0'} peerDependencies: @@ -3589,7 +3603,7 @@ packages: optional: true dependencies: ms: 2.1.2 - supports-color: 8.1.1 + supports-color: 9.0.2 dev: true /decamelize-keys/1.1.0: @@ -3768,6 +3782,10 @@ packages: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} dev: true + /emoji-regex/9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + dev: true + /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} @@ -4533,10 +4551,6 @@ packages: has-symbols: 1.0.2 dev: true - /get-own-enumerable-property-symbols/3.0.2: - resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==} - dev: true - /get-package-type/0.1.0: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} engines: {node: '>=8.0.0'} @@ -4697,6 +4711,11 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} + /has-flag/5.0.1: + resolution: {integrity: sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA==} + engines: {node: '>=12'} + dev: true + /has-symbols/1.0.2: resolution: {integrity: sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==} engines: {node: '>= 0.4'} @@ -5065,6 +5084,11 @@ packages: engines: {node: '>=8'} dev: true + /is-fullwidth-code-point/4.0.0: + resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} + engines: {node: '>=12'} + dev: true + /is-generator-fn/2.1.0: resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==} engines: {node: '>=6'} @@ -5096,11 +5120,6 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - /is-obj/1.0.1: - resolution: {integrity: sha1-PkcprB9f3gJc19g6iW2rn09n2w8=} - engines: {node: '>=0.10.0'} - dev: true - /is-obj/2.0.0: resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} engines: {node: '>=8'} @@ -5133,11 +5152,6 @@ packages: has-tostringtag: 1.0.0 dev: true - /is-regexp/1.0.0: - resolution: {integrity: sha1-/S2INUXEa6xaYz57mgnof6LLUGk=} - engines: {node: '>=0.10.0'} - dev: true - /is-shared-array-buffer/1.0.1: resolution: {integrity: sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==} dev: true @@ -5948,27 +5962,28 @@ packages: /lines-and-columns/1.1.6: resolution: {integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=} - /lint-staged/11.2.6: - resolution: {integrity: sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg==} + /lint-staged/12.0.2: + resolution: {integrity: sha512-tpCvACqc7bykziGJmXG0G8YG2RaCrWiDBwmrP9wU7i/3za9JMOvCECQmXjw/sO4ICC70ApVwyqixS1htQX9Haw==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true dependencies: - cli-truncate: 2.1.0 - colorette: 1.4.0 + cli-truncate: 3.1.0 + colorette: 2.0.16 commander: 8.3.0 cosmiconfig: 7.0.1 - debug: 4.3.2_supports-color@8.1.1 - enquirer: 2.3.6 + debug: 4.3.2_supports-color@9.0.2 execa: 5.1.1 - listr2: 3.13.3_enquirer@2.3.6 + listr2: 3.13.3 micromatch: 4.0.4 normalize-path: 3.0.0 - please-upgrade-node: 3.2.0 + object-inspect: 1.11.0 string-argv: 0.3.1 - stringify-object: 3.3.0 - supports-color: 8.1.1 + supports-color: 9.0.2 + transitivePeerDependencies: + - enquirer dev: true - /listr2/3.13.3_enquirer@2.3.6: + /listr2/3.13.3: resolution: {integrity: sha512-VqAgN+XVfyaEjSaFewGPcDs5/3hBbWVaX1VgWv2f52MF7US45JuARlArULctiB44IIcEk3JF7GtoFCLqEdeuPA==} engines: {node: '>=10.0.0'} peerDependencies: @@ -5977,7 +5992,6 @@ packages: cli-truncate: 2.1.0 clone: 2.1.2 colorette: 2.0.16 - enquirer: 2.3.6 log-update: 4.0.0 p-map: 4.0.0 rxjs: 7.4.0 @@ -6836,12 +6850,6 @@ packages: - utf-8-validate dev: true - /please-upgrade-node/3.2.0: - resolution: {integrity: sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==} - dependencies: - semver-compare: 1.0.0 - dev: true - /pngjs/5.0.0: resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==} engines: {node: '>=10.13.0'} @@ -7597,10 +7605,6 @@ packages: engines: {node: '>=6'} dev: true - /semver-compare/1.0.0: - resolution: {integrity: sha1-De4hahyUGrN+nvsXiPavxf9VN/w=} - dev: true - /semver/5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true @@ -7737,6 +7741,14 @@ packages: is-fullwidth-code-point: 3.0.0 dev: true + /slice-ansi/5.0.0: + resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.1.0 + is-fullwidth-code-point: 4.0.0 + dev: true + /smart-buffer/4.2.0: resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} @@ -7910,6 +7922,15 @@ packages: strip-ansi: 6.0.1 dev: true + /string-width/5.0.1: + resolution: {integrity: sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==} + engines: {node: '>=12'} + dependencies: + emoji-regex: 9.2.2 + is-fullwidth-code-point: 4.0.0 + strip-ansi: 7.0.1 + dev: true + /string.prototype.padend/3.1.3: resolution: {integrity: sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==} engines: {node: '>= 0.4'} @@ -7945,15 +7966,6 @@ packages: safe-buffer: 5.2.1 dev: true - /stringify-object/3.3.0: - resolution: {integrity: sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==} - engines: {node: '>=4'} - dependencies: - get-own-enumerable-property-symbols: 3.0.2 - is-obj: 1.0.1 - is-regexp: 1.0.0 - dev: true - /strip-ansi/6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} @@ -7961,6 +7973,13 @@ packages: ansi-regex: 5.0.1 dev: true + /strip-ansi/7.0.1: + resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + dev: true + /strip-bom/3.0.0: resolution: {integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=} engines: {node: '>=4'} @@ -8034,6 +8053,13 @@ packages: has-flag: 4.0.0 dev: true + /supports-color/9.0.2: + resolution: {integrity: sha512-ii6tc8ImGFrgMPYq7RVAMKkhPo9vk8uA+D3oKbJq/3Pk2YSMv1+9dUAesa9UxMbxBTvxwKTQffBahNVNxEvM8Q==} + engines: {node: '>=12'} + dependencies: + has-flag: 5.0.1 + dev: true + /supports-hyperlinks/2.2.0: resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==} engines: {node: '>=8'} From bce4e56cb12b3c76f48bf2ddc37423025e79a0d2 Mon Sep 17 00:00:00 2001 From: David Jackson <1735971+davidwallacejackson@users.noreply.github.com> Date: Mon, 15 Nov 2021 01:44:27 -0800 Subject: [PATCH 065/258] fix(dev): Fix infinite recursion on query imports (#5671) (#5674) --- .../playground/worker/__tests__/worker.spec.ts | 9 +++++++-- packages/playground/worker/index.html | 16 ++++++++++++++++ .../worker/possible-ts-output-worker.mjs | 7 +++++++ packages/vite/src/node/utils.ts | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 packages/playground/worker/possible-ts-output-worker.mjs diff --git a/packages/playground/worker/__tests__/worker.spec.ts b/packages/playground/worker/__tests__/worker.spec.ts index 93bc590cb90b4e..46b136edd66d2a 100644 --- a/packages/playground/worker/__tests__/worker.spec.ts +++ b/packages/playground/worker/__tests__/worker.spec.ts @@ -12,6 +12,11 @@ test('normal', async () => { ) }) +test('TS output', async () => { + await page.click('.ping-ts-output') + await untilUpdated(() => page.textContent('.pong-ts-output'), 'pong') +}) + test('inlined', async () => { await page.click('.ping-inline') await untilUpdated(() => page.textContent('.pong-inline'), 'pong') @@ -47,8 +52,8 @@ if (isBuild) { test('inlined code generation', async () => { const assetsDir = path.resolve(testDir, 'dist/assets') const files = fs.readdirSync(assetsDir) - // should have 2 worker chunk - expect(files.length).toBe(3) + // should have 3 worker chunk + expect(files.length).toBe(4) const index = files.find((f) => f.includes('index')) const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8') const worker = files.find((f) => f.includes('my-worker')) diff --git a/packages/playground/worker/index.html b/packages/playground/worker/index.html index d388b9e3350a8f..1ce429eece42cc 100644 --- a/packages/playground/worker/index.html +++ b/packages/playground/worker/index.html @@ -7,6 +7,12 @@
Response from inline worker:
+ +
+ Response from worker imported from code that might be compiled TS: + +
+
Tick from shared worker, it syncs between pages: @@ -17,6 +23,7 @@ import Worker from './my-worker?worker' import InlineWorker from './my-worker?worker&inline' import SharedWorker from './my-shared-worker?sharedworker&name=shared' + import TSOutputWorker from './possible-ts-output-worker?worker' import { mode } from './workerImport' document.querySelector('.mode-true').textContent = mode @@ -51,6 +58,15 @@ sharedWorker.port.start() + const tsOutputWorker = new TSOutputWorker() + worker.addEventListener('message', (e) => { + text('.pong-ts-output', e.data.msg) + }) + + document.querySelector('.ping-ts-output').addEventListener('click', () => { + inlineWorker.postMessage('ping') + }) + function text(el, text) { document.querySelector(el).textContent = text } diff --git a/packages/playground/worker/possible-ts-output-worker.mjs b/packages/playground/worker/possible-ts-output-worker.mjs new file mode 100644 index 00000000000000..2bcce3faa8a50e --- /dev/null +++ b/packages/playground/worker/possible-ts-output-worker.mjs @@ -0,0 +1,7 @@ +import { msg, mode } from './workerImport' + +self.onmessage = (e) => { + if (e.data === 'ping') { + self.postMessage({ msg, mode }) + } +} diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts index 5c4b76646c8570..6c09b069450bd0 100644 --- a/packages/vite/src/node/utils.ts +++ b/packages/vite/src/node/utils.ts @@ -172,7 +172,7 @@ export const isTsRequest = (url: string) => knownTsRE.test(cleanUrl(url)) export const isPossibleTsOutput = (url: string) => knownTsOutputRE.test(cleanUrl(url)) export const getTsSrcPath = (filename: string) => - filename.replace(/\.([cm])?(js)(x?)$/, '.$1ts$3') + filename.replace(/\.([cm])?(js)(x?)(\?|$)/, '.$1ts$3') const importQueryRE = /(\?|&)import=?(?:&|$)/ const internalPrefixes = [ From 2dcb04287ce4b9909904558a0907579e5335fa08 Mon Sep 17 00:00:00 2001 From: yuuang <569105585@qq.com> Date: Mon, 15 Nov 2021 17:45:15 +0800 Subject: [PATCH 066/258] test: ssr-vue example error when routerChanged (#5677) --- packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts | 2 ++ packages/playground/ssr-vue/src/pages/About.vue | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts b/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts index 63558880862739..6ed0f14567add5 100644 --- a/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts +++ b/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts @@ -151,6 +151,8 @@ test('client navigation', async () => { await untilUpdated(() => page.textContent('h1'), 'About') editFile('src/pages/About.vue', (code) => code.replace('About', 'changed')) await untilUpdated(() => page.textContent('h1'), 'changed') + await page.click('a[href="/"]') + await untilUpdated(() => page.textContent('a[href="/"]'), 'Home') }) test('import.meta.url', async () => { diff --git a/packages/playground/ssr-vue/src/pages/About.vue b/packages/playground/ssr-vue/src/pages/About.vue index 5fe0930c7abc4f..a5c29a24e8dbaf 100644 --- a/packages/playground/ssr-vue/src/pages/About.vue +++ b/packages/playground/ssr-vue/src/pages/About.vue @@ -1,12 +1,17 @@ + + + diff --git a/packages/playground/lib/vite.config.js b/packages/playground/lib/vite.config.js index 2545d488e165ad..50cd188b1a40cc 100644 --- a/packages/playground/lib/vite.config.js +++ b/packages/playground/lib/vite.config.js @@ -9,6 +9,7 @@ module.exports = { lib: { entry: path.resolve(__dirname, 'src/main.js'), name: 'MyLib', + formats: ['es', 'umd', 'iife'], fileName: (format) => `my-lib-custom-filename.${format}.js` } }, diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts index 1f0e29bcda3359..4fd8db24c37959 100644 --- a/packages/vite/src/node/plugins/esbuild.ts +++ b/packages/vite/src/node/plugins/esbuild.ts @@ -202,7 +202,16 @@ const rollupToEsbuildFormatMap: Record< > = { es: 'esm', cjs: 'cjs', - iife: 'iife' + + // passing `var Lib = (() => {})()` to esbuild with format = "iife" + // will turn it to `(() => { var Lib = (() => {})() })()`, + // so we remove the format config to tell esbuild not doing this + // + // although esbuild doesn't change format, there is still possibility + // that `{ treeShaking: true }` removes a top-level no-side-effect variable + // like: `var Lib = 1`, which becomes `` after esbuild transforming, + // but thankfully rollup does not do this optimization now + iife: undefined } export const buildEsbuildPlugin = (config: ResolvedConfig): Plugin => { From 0ed7bc3cd36faa37d7c60e372242dfe3b80a19ce Mon Sep 17 00:00:00 2001 From: patak-js Date: Wed, 17 Nov 2021 14:34:47 +0100 Subject: [PATCH 075/258] release: v2.7.0-beta.7 --- packages/vite/CHANGELOG.md | 11 +++++++++++ packages/vite/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index a73784a84d4a5a..0f98bbb669bac8 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,14 @@ +# [2.7.0-beta.7](https://github.com/vitejs/vite/compare/v2.7.0-beta.6...v2.7.0-beta.7) (2021-11-17) + + +### Bug Fixes + +* **build:** keep IIFE name after minifying (fix [#5490](https://github.com/vitejs/vite/issues/5490)) ([#5715](https://github.com/vitejs/vite/issues/5715)) ([1544211](https://github.com/vitejs/vite/commit/1544211767695982597c18d028a2edf15372931f)) +* **scan:** correctly resolve virtual modules ([#5711](https://github.com/vitejs/vite/issues/5711)) ([01f9b16](https://github.com/vitejs/vite/commit/01f9b16a8bdfa182890924ac00207fe54496b99f)) +* **ssr:** skip dedupe require in esm ([#5714](https://github.com/vitejs/vite/issues/5714)) ([9666446](https://github.com/vitejs/vite/commit/96664469e49d44f8c628bf0310bdd03d1c4556de)) + + + # [2.7.0-beta.6](https://github.com/vitejs/vite/compare/v2.7.0-beta.5...v2.7.0-beta.6) (2021-11-16) diff --git a/packages/vite/package.json b/packages/vite/package.json index 2d2f36b9c627c8..a58ce10da58b6f 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.6", + "version": "2.7.0-beta.7", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From 04016df8beb7110ad2087ada8e1abbefdbd70254 Mon Sep 17 00:00:00 2001 From: patak Date: Wed, 17 Nov 2021 20:32:39 +0100 Subject: [PATCH 076/258] docs: virtual modules internal convention (#5553) --- docs/guide/api-plugin.md | 22 ++++++++++--------- .../resolve/__tests__/resolve.spec.ts | 4 ++++ packages/playground/resolve/index.html | 6 +++++ packages/playground/resolve/vite.config.js | 22 ++++++++++++++++--- packages/vite/src/node/constants.ts | 12 +++++++--- 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/docs/guide/api-plugin.md b/docs/guide/api-plugin.md index c95f7fd0a3a3ea..ddccdd36c6296b 100644 --- a/docs/guide/api-plugin.md +++ b/docs/guide/api-plugin.md @@ -17,7 +17,7 @@ When learning, debugging, or authoring plugins we suggest including [vite-plugin ## Conventions -If the plugin doesn't use Vite specific hooks and can be implemented as a [Compatible Rollup Plugin](#rollup-plugin-compatibility), then it is recommended to use the [Rollup Plugin naming conventions](https://rollupjs.org/guide/en/#conventions) (except for virtual modules naming, see note below). +If the plugin doesn't use Vite specific hooks and can be implemented as a [Compatible Rollup Plugin](#rollup-plugin-compatibility), then it is recommended to use the [Rollup Plugin naming conventions](https://rollupjs.org/guide/en/#conventions). - Rollup Plugins should have a clear name with `rollup-plugin-` prefix. - Include `rollup-plugin` and `vite-plugin` keywords in package.json. @@ -36,9 +36,10 @@ If your plugin is only going to work for a particular framework, its name should - `vite-plugin-react-` prefix for React Plugins - `vite-plugin-svelte-` prefix for Svelte Plugins -Rollup recommends prefixing the module ID for 'virtual modules' (e.g. for helper functions) with `\0`. This prevents other plugins from trying to process it. But this convention for paths isn't browser-friendly. +Vite convention for virtual modules is to prefix the user-facing path with `virtual:`. If possible the plugin name should be used as a namespace to avoid collisions with other plugins in the ecosystem. For example, a `vite-plugin-posts` could ask users to import a `virtual:posts` or `virtual:posts/helpers` virtual modules to get build time information. Internally, plugins that use virtual modules should prefix the module ID with `\0` while resolving the id, a convention from the rollup ecosystem. This prevents other plugins from trying to process the id (like node resolution), and core features like sourcemaps can use this info to differentiate between virtual modules and regular files. `\0` is not a permitted char in import URLs so we have to replace them during import analysis. A `\0{id}` virtual id ends up encoded as `/@id/__x00__{id}` during dev in the browser. The id will be decoded back before entering the plugins pipeline, so this is not seen by plugins hooks code. + +Note that modules directly derived from a real file, as in the case of a script module in a Single File Component (like a .vue or .svelte SFC) don't need to follow this convention. SFCs generally generate a set of submodules when processed but the code in these can be mapped back to the filesystem. Using `\0` for these submodules would prevent sourcemaps from working correctly. -Vite convention for virtual modules is to prefix the path with `virtual:`. If possible the plugin name should be used as a namespace to avoid collisions with other plugins in the ecosystem. For example, a `vite-plugin-posts` could ask users to import a `virtual:posts` or `virtual:posts/helpers` virtual modules to get build time information. ## Plugins config @@ -88,28 +89,29 @@ It is common convention to author a Vite/Rollup plugin as a factory function tha ```js export default function myPlugin() { - const virtualFileId = '@my-virtual-file' + const virtualModuleId = '@my-virtual-module' + const resolvedVirtualModuleId = '\0' + virtualModuleId return { name: 'my-plugin', // required, will show up in warnings and errors resolveId(id) { - if (id === virtualFileId) { - return virtualFileId + if (id === virtualModuleId) { + return resolvedVirtualModuleId } }, load(id) { - if (id === virtualFileId) { - return `export const msg = "from virtual file"` + if (id === resolvedVirtualModuleId) { + return `export const msg = "from virtual module"` } } } } ``` -Which allows importing the file in JavaScript: +Which allows importing the module in JavaScript: ```js -import { msg } from '@my-virtual-file' +import { msg } from '@my-virtual-module' console.log(msg) ``` diff --git a/packages/playground/resolve/__tests__/resolve.spec.ts b/packages/playground/resolve/__tests__/resolve.spec.ts index b1524e1e42aa08..97e4a5dd0add7b 100644 --- a/packages/playground/resolve/__tests__/resolve.spec.ts +++ b/packages/playground/resolve/__tests__/resolve.spec.ts @@ -78,6 +78,10 @@ test('plugin resolved virtual file', async () => { expect(await page.textContent('.virtual')).toMatch('[success]') }) +test('plugin resolved custom virtual file', async () => { + expect(await page.textContent('.custom-virtual')).toMatch('[success]') +}) + test('resolve inline package', async () => { expect(await page.textContent('.inline-pkg')).toMatch('[success]') }) diff --git a/packages/playground/resolve/index.html b/packages/playground/resolve/index.html index 9dc6525fcd7a43..db0a4bc54f1ad7 100644 --- a/packages/playground/resolve/index.html +++ b/packages/playground/resolve/index.html @@ -53,6 +53,9 @@

Monorepo linked dep

Plugin resolved virtual file

+

Plugin resolved custom virtual file

+

+

Inline package

@@ -180,6 +183,9 @@

resolve package that contains # in path

import { msg as virtualMsg } from '@virtual-file' text('.virtual', virtualMsg) + import { msg as customVirtualMsg } from '@custom-virtual-file' + text('.custom-virtual', customVirtualMsg) + import { msg as inlineMsg } from './inline-package' text('.inline-pkg', inlineMsg) diff --git a/packages/playground/resolve/vite.config.js b/packages/playground/resolve/vite.config.js index e7d531097add7c..036033e6a5f220 100644 --- a/packages/playground/resolve/vite.config.js +++ b/packages/playground/resolve/vite.config.js @@ -1,4 +1,7 @@ const virtualFile = '@virtual-file' +const virtualId = '\0' + virtualFile + +const customVirtualFile = '@custom-virtual-file' module.exports = { resolve: { @@ -8,15 +11,28 @@ module.exports = { }, plugins: [ { - name: 'custom-resolve', + name: 'virtual-module', resolveId(id) { if (id === virtualFile) { + return virtualId + } + }, + load(id) { + if (id === virtualId) { + return `export const msg = "[success] from conventional virtual file"` + } + } + }, + { + name: 'custom-resolve', + resolveId(id) { + if (id === customVirtualFile) { return id } }, load(id) { - if (id === virtualFile) { - return `export const msg = "[success] from virtual file"` + if (id === customVirtualFile) { + return `export const msg = "[success] from custom virtual file"` } } } diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts index ffbf177bc7e935..e19ab1eea5fa51 100644 --- a/packages/vite/src/node/constants.ts +++ b/packages/vite/src/node/constants.ts @@ -32,9 +32,15 @@ export const FS_PREFIX = `/@fs/` export const VALID_ID_PREFIX = `/@id/` /** - * Some Rollup plugins use ids that starts with the null byte \0 to avoid - * collisions, but it is not permitted in import URLs so we have to replace - * them. + * Plugins that use 'virtual modules' (e.g. for helper functions), prefix the + * module ID with `\0`, a convention from the rollup ecosystem. + * This prevents other plugins from trying to process the id (like node resolution), + * and core features like sourcemaps can use this info to differentiate between + * virtual modules and regular files. + * `\0` is not a permitted char in import URLs so we have to replace them during + * import analysis. The id will be decoded back before entering the plugins pipeline. + * These encoded virtual ids are also prefixed by the VALID_ID_PREFIX, so virtual + * modules in the browser end up encoded as `/@id/__x00__{id}` */ export const NULL_BYTE_PLACEHOLDER = `__x00__` From 8dbc17a20f22be35c25eae7c0b868784260a38f5 Mon Sep 17 00:00:00 2001 From: "hongmin.qiao" Date: Fri, 19 Nov 2021 00:00:00 +0800 Subject: [PATCH 077/258] fix: ssr-vue prerender need input rootDir parameter (#5740) --- packages/playground/ssr-vue/prerender.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/playground/ssr-vue/prerender.js b/packages/playground/ssr-vue/prerender.js index c4158dbe3357a9..678fc59897a4d4 100644 --- a/packages/playground/ssr-vue/prerender.js +++ b/packages/playground/ssr-vue/prerender.js @@ -21,7 +21,7 @@ const routesToPrerender = fs ;(async () => { // pre-render each route... for (const url of routesToPrerender) { - const [appHtml, preloadLinks] = await render(url, manifest) + const [appHtml, preloadLinks] = await render(url, manifest, __dirname) const html = template .replace(``, preloadLinks) From dcaaa0fcfe84f7ccbd908af94db58df294fe5b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B0=B8=E5=AE=89?= Date: Fri, 19 Nov 2021 00:05:13 +0800 Subject: [PATCH 078/258] docs: add tip Note for build.cssCodeSplit (#5739) Co-authored-by: Shinigami --- docs/config/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/config/index.md b/docs/config/index.md index f89581fc922932..79d282fb51a0a3 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -688,6 +688,10 @@ export default defineConfig({ If disabled, all CSS in the entire project will be extracted into a single CSS file. + ::: tip Note + If you specify `build.lib`, `build.cssCodeSplit` will be `false` as default. + ::: + ### build.cssTarget - **Type:** `string | string[]` From 2cacc6b231662d0f23745edeb37f3d944cce6cf6 Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Thu, 18 Nov 2021 10:56:28 -0600 Subject: [PATCH 079/258] refactor: simplify array handling (#5734) --- packages/plugin-vue/src/template.ts | 6 +----- packages/vite/src/client/client.ts | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/plugin-vue/src/template.ts b/packages/plugin-vue/src/template.ts index a29874d0ed2cff..25da54203e6214 100644 --- a/packages/plugin-vue/src/template.ts +++ b/packages/plugin-vue/src/template.ts @@ -134,11 +134,7 @@ export function resolveTemplateCompilerOptions( if (transformAssetUrls && typeof transformAssetUrls === 'object') { // presence of array fields means this is raw tags config - if ( - Object.keys(transformAssetUrls).some((key) => - Array.isArray((transformAssetUrls as any)[key]) - ) - ) { + if (Object.values(transformAssetUrls).some((val) => Array.isArray(val))) { transformAssetUrls = { ...assetUrlOptions, tags: transformAssetUrls as any diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts index 5c04bc23af0cc1..15c86910aa3848 100644 --- a/packages/vite/src/client/client.ts +++ b/packages/vite/src/client/client.ts @@ -78,10 +78,8 @@ async function handleMessage(payload: HMRPayload) { // can't use querySelector with `[href*=]` here since the link may be // using relative paths so we need to use link.href to grab the full // URL for the include check. - const el = ( - [].slice.call( - document.querySelectorAll(`link`) - ) as HTMLLinkElement[] + const el = Array.from( + document.querySelectorAll('link') ).find((e) => e.href.includes(path)) if (el) { const newPath = `${base}${path.slice(1)}${ From 4ffc9a554293ab3675cfd6b8f29b72ed62ae1946 Mon Sep 17 00:00:00 2001 From: sanyuan <39261479+sanyuan0704@users.noreply.github.com> Date: Fri, 19 Nov 2021 06:04:40 +0800 Subject: [PATCH 080/258] chore: correct config transpile comment (#5735) --- packages/vite/src/node/config.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index c627fc5c502886..94e81d1f4213b7 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -873,8 +873,7 @@ export async function loadConfigFromFile( if (!userConfig) { // 2. if we reach here, the file is ts or using es import syntax, or // the user has type: "module" in their package.json (#917) - // transpile es import syntax to require syntax using rollup. - // lazy require rollup (it's actually in dependencies) + // transpile es import syntax to require syntax using esbuild. const bundled = await bundleConfigFile(resolvedPath) dependencies = bundled.dependencies userConfig = await loadConfigFromBundledFile(resolvedPath, bundled.code) From 650b56e0414d772294817bc2dc399e70563ed699 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:52:27 -0500 Subject: [PATCH 081/258] fix: move package.json cache into ResolvedConfig (#5388) --- packages/vite/src/node/build.ts | 2 + packages/vite/src/node/config.ts | 4 + packages/vite/src/node/index.ts | 10 +- packages/vite/src/node/packages.ts | 164 ++++++++++++++++++++++ packages/vite/src/node/plugins/index.ts | 1 + packages/vite/src/node/plugins/resolve.ts | 97 +++---------- packages/vite/src/node/server/index.ts | 13 ++ 7 files changed, 204 insertions(+), 87 deletions(-) create mode 100644 packages/vite/src/node/packages.ts diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 3a72a666ff4752..a8eeda6ec97a93 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -40,6 +40,7 @@ import { DepOptimizationMetadata } from './optimizer' import { scanImports } from './optimizer/scan' import { assetImportMetaUrlPlugin } from './plugins/assetImportMetaUrl' import { loadFallbackPlugin } from './plugins/loadFallback' +import { watchPackageDataPlugin } from './packages' export interface BuildOptions { /** @@ -348,6 +349,7 @@ export function resolveBuildPlugins(config: ResolvedConfig): { const options = config.build return { pre: [ + watchPackageDataPlugin(config), buildHtmlPlugin(config), commonjsPlugin(options.commonjsOptions), dataURIPlugin(), diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 94e81d1f4213b7..fac0890b8f6926 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -47,6 +47,7 @@ import { import aliasPlugin from '@rollup/plugin-alias' import { build } from 'esbuild' import { performance } from 'perf_hooks' +import { PackageCache } from './packages' const debug = createDebugger('vite:config') @@ -239,6 +240,8 @@ export type ResolvedConfig = Readonly< logger: Logger createResolver: (options?: Partial) => ResolveFn optimizeDeps: Omit + /** @internal */ + packageCache: PackageCache } > @@ -458,6 +461,7 @@ export async function resolveConfig( return DEFAULT_ASSETS_RE.test(file) || assetsFilter(file) }, logger, + packageCache: new Map(), createResolver, optimizeDeps: { ...config.optimizeDeps, diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts index 084aa66b03f141..5b92990f83a221 100644 --- a/packages/vite/src/node/index.ts +++ b/packages/vite/src/node/index.ts @@ -6,7 +6,8 @@ export { optimizeDeps } from './optimizer' export { send } from './server/send' export { createLogger, printHttpServerUrls } from './logger' export { transformWithEsbuild } from './plugins/esbuild' -export { resolvePackageData, resolvePackageEntry } from './plugins/resolve' +export { resolvePackageEntry } from './plugins/resolve' +export { resolvePackageData } from './packages' export { normalizePath } from './utils' // additional types @@ -34,6 +35,7 @@ export type { DepOptimizationOptions } from './optimizer' export type { Plugin } from './plugin' +export type { PackageCache, PackageData } from './packages' export type { Logger, LogOptions, @@ -60,11 +62,7 @@ export type { JsonOptions } from './plugins/json' export type { TransformOptions as EsbuildTransformOptions } from 'esbuild' export type { ESBuildOptions, ESBuildTransformResult } from './plugins/esbuild' export type { Manifest, ManifestChunk } from './plugins/manifest' -export type { - PackageData, - ResolveOptions, - InternalResolveOptions -} from './plugins/resolve' +export type { ResolveOptions, InternalResolveOptions } from './plugins/resolve' export type { WebSocketServer } from './server/ws' export type { PluginContainer } from './server/pluginContainer' export type { ModuleGraph, ModuleNode, ResolvedUrl } from './server/moduleGraph' diff --git a/packages/vite/src/node/packages.ts b/packages/vite/src/node/packages.ts new file mode 100644 index 00000000000000..8b769020a05853 --- /dev/null +++ b/packages/vite/src/node/packages.ts @@ -0,0 +1,164 @@ +import fs from 'fs' +import path from 'path' +import { createFilter } from '@rollup/pluginutils' +import { createDebugger, resolveFrom } from './utils' +import { ResolvedConfig } from './config' +import { Plugin } from './plugin' + +const isDebug = process.env.DEBUG +const debug = createDebugger('vite:resolve-details', { + onlyWhenFocused: true +}) + +/** Cache for package.json resolution and package.json contents */ +export type PackageCache = Map + +export interface PackageData { + dir: string + hasSideEffects: (id: string) => boolean | 'no-treeshake' + webResolvedImports: Record + nodeResolvedImports: Record + setResolvedCache: (key: string, entry: string, targetWeb: boolean) => void + getResolvedCache: (key: string, targetWeb: boolean) => string | undefined + data: { + [field: string]: any + version: string + main: string + module: string + browser: string | Record + exports: string | Record | string[] + dependencies: Record + } +} + +export function invalidatePackageData( + packageCache: PackageCache, + pkgPath: string +): void { + packageCache.delete(pkgPath) + const pkgDir = path.dirname(pkgPath) + packageCache.forEach((pkg, cacheKey) => { + if (pkg.dir === pkgDir) { + packageCache.delete(cacheKey) + } + }) +} + +export function resolvePackageData( + id: string, + basedir: string, + preserveSymlinks = false, + packageCache?: PackageCache +): PackageData | null { + let pkg: PackageData | undefined + let cacheKey: string | undefined + if (packageCache) { + cacheKey = `${id}&${basedir}&${preserveSymlinks}` + if ((pkg = packageCache.get(cacheKey))) { + return pkg + } + } + let pkgPath: string | undefined + try { + pkgPath = resolveFrom(`${id}/package.json`, basedir, preserveSymlinks) + pkg = loadPackageData(pkgPath, true, packageCache) + if (packageCache) { + packageCache.set(cacheKey!, pkg) + } + return pkg + } catch (e) { + if (e instanceof SyntaxError) { + isDebug && debug(`Parsing failed: ${pkgPath}`) + } + // Ignore error for missing package.json + else if (e.code !== 'MODULE_NOT_FOUND') { + throw e + } + } + return null +} + +export function loadPackageData( + pkgPath: string, + preserveSymlinks?: boolean, + packageCache?: PackageCache +): PackageData { + if (!preserveSymlinks) { + pkgPath = fs.realpathSync.native(pkgPath) + } + + let cached: PackageData | undefined + if ((cached = packageCache?.get(pkgPath))) { + return cached + } + + const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')) + const pkgDir = path.dirname(pkgPath) + const { sideEffects } = data + let hasSideEffects: (id: string) => boolean + if (typeof sideEffects === 'boolean') { + hasSideEffects = () => sideEffects + } else if (Array.isArray(sideEffects)) { + hasSideEffects = createFilter(sideEffects, null, { resolve: pkgDir }) + } else { + hasSideEffects = () => true + } + + const pkg: PackageData = { + dir: pkgDir, + data, + hasSideEffects, + webResolvedImports: {}, + nodeResolvedImports: {}, + setResolvedCache(key: string, entry: string, targetWeb: boolean) { + if (targetWeb) { + pkg.webResolvedImports[key] = entry + } else { + pkg.nodeResolvedImports[key] = entry + } + }, + getResolvedCache(key: string, targetWeb: boolean) { + if (targetWeb) { + return pkg.webResolvedImports[key] + } else { + return pkg.nodeResolvedImports[key] + } + } + } + + packageCache?.set(pkgPath, pkg) + return pkg +} + +export function watchPackageDataPlugin(config: ResolvedConfig): Plugin { + const watchQueue = new Set() + let watchFile = (id: string) => { + watchQueue.add(id) + } + + const { packageCache } = config + const setPackageData = packageCache.set.bind(packageCache) + packageCache.set = (id, pkg) => { + if (id.endsWith('.json')) { + watchFile(id) + } + return setPackageData(id, pkg) + } + + return { + name: 'vite:watch-package-data', + buildStart() { + watchFile = this.addWatchFile + watchQueue.forEach(watchFile) + watchQueue.clear() + }, + buildEnd() { + watchFile = (id) => watchQueue.add(id) + }, + watchChange(id) { + if (id.endsWith('/package.json')) { + invalidatePackageData(packageCache, id) + } + } + } +} diff --git a/packages/vite/src/node/plugins/index.ts b/packages/vite/src/node/plugins/index.ts index 0452e4f19a73fb..54a7ae8589b2a6 100644 --- a/packages/vite/src/node/plugins/index.ts +++ b/packages/vite/src/node/plugins/index.ts @@ -40,6 +40,7 @@ export async function resolvePlugins( root: config.root, isProduction: config.isProduction, isBuild, + packageCache: config.packageCache, ssrConfig: config.ssr, asSrc: true }), diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts index f80cfdeb18608b..e68c62b8c0aea0 100644 --- a/packages/vite/src/node/plugins/resolve.ts +++ b/packages/vite/src/node/plugins/resolve.ts @@ -30,9 +30,14 @@ import { getTsSrcPath } from '../utils' import { ViteDevServer, SSROptions } from '..' -import { createFilter } from '@rollup/pluginutils' import { PartialResolvedId } from 'rollup' import { resolve as _resolveExports } from 'resolve.exports' +import { + loadPackageData, + PackageCache, + PackageData, + resolvePackageData +} from '../packages' // special id for paths marked with browser: false // https://github.com/defunctzombie/package-browser-field-spec#ignore-a-module @@ -56,6 +61,7 @@ export interface InternalResolveOptions extends ResolveOptions { isBuild: boolean isProduction: boolean ssrConfig?: SSROptions + packageCache?: PackageCache /** * src code mode also attempts the following: * - resolving /xxx as URLs @@ -415,11 +421,15 @@ function tryResolveFile( } else if (tryIndex) { if (!skipPackageJson) { const pkgPath = file + '/package.json' - if (fs.existsSync(pkgPath)) { + try { // path points to a node package - const pkg = loadPackageData(pkgPath) + const pkg = loadPackageData(pkgPath, options.preserveSymlinks) const resolved = resolvePackageEntry(file, pkg, targetWeb, options) return resolved + } catch (e) { + if (e.code !== 'ENOENT') { + throw e + } } } const index = tryFsResolve(file + '/index', options) @@ -457,7 +467,7 @@ export function tryNodeResolve( server?: ViteDevServer, ssr?: boolean ): PartialResolvedId | undefined { - const { root, dedupe, isBuild } = options + const { root, dedupe, isBuild, preserveSymlinks, packageCache } = options // split id by last '>' for nested selected packages, for example: // 'foo > bar > baz' => 'foo > bar' & 'baz' @@ -508,12 +518,12 @@ export function tryNodeResolve( // nested node module, step-by-step resolve to the basedir of the nestedPath if (nestedRoot) { - basedir = nestedResolveFrom(nestedRoot, basedir, options.preserveSymlinks) + basedir = nestedResolveFrom(nestedRoot, basedir, preserveSymlinks) } let pkg: PackageData | undefined const pkgId = possiblePkgIds.reverse().find((pkgId) => { - pkg = resolvePackageData(pkgId, basedir, options.preserveSymlinks) + pkg = resolvePackageData(pkgId, basedir, preserveSymlinks, packageCache)! return pkg })! @@ -650,81 +660,6 @@ export function tryOptimizedResolve( } } -export interface PackageData { - dir: string - hasSideEffects: (id: string) => boolean - webResolvedImports: Record - nodeResolvedImports: Record - setResolvedCache: (key: string, entry: string, targetWeb: boolean) => void - getResolvedCache: (key: string, targetWeb: boolean) => string | undefined - data: { - [field: string]: any - version: string - main: string - module: string - browser: string | Record - exports: string | Record | string[] - dependencies: Record - } -} - -const packageCache = new Map() - -export function resolvePackageData( - id: string, - basedir: string, - preserveSymlinks = false -): PackageData | undefined { - const cacheKey = id + basedir - if (packageCache.has(cacheKey)) { - return packageCache.get(cacheKey) - } - try { - const pkgPath = resolveFrom(`${id}/package.json`, basedir, preserveSymlinks) - return loadPackageData(pkgPath, cacheKey) - } catch (e) { - isDebug && debug(`${chalk.red(`[failed loading package.json]`)} ${id}`) - } -} - -function loadPackageData(pkgPath: string, cacheKey = pkgPath) { - const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')) - const pkgDir = path.dirname(pkgPath) - const { sideEffects } = data - let hasSideEffects: (id: string) => boolean - if (typeof sideEffects === 'boolean') { - hasSideEffects = () => sideEffects - } else if (Array.isArray(sideEffects)) { - hasSideEffects = createFilter(sideEffects, null, { resolve: pkgDir }) - } else { - hasSideEffects = () => true - } - - const pkg: PackageData = { - dir: pkgDir, - data, - hasSideEffects, - webResolvedImports: {}, - nodeResolvedImports: {}, - setResolvedCache(key: string, entry: string, targetWeb: boolean) { - if (targetWeb) { - pkg.webResolvedImports[key] = entry - } else { - pkg.nodeResolvedImports[key] = entry - } - }, - getResolvedCache(key: string, targetWeb: boolean) { - if (targetWeb) { - return pkg.webResolvedImports[key] - } else { - return pkg.nodeResolvedImports[key] - } - } - } - packageCache.set(cacheKey, pkg) - return pkg -} - export function resolvePackageEntry( id: string, { dir, data, setResolvedCache, getResolvedCache }: PackageData, diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index a9fe5431ee59ae..65db5964b43384 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -60,6 +60,7 @@ import { resolveHostname } from '../utils' import { searchForWorkspaceRoot } from './searchRoot' import { CLIENT_DIR } from '../constants' import { printCommonServerUrls } from '../logger' +import { invalidatePackageData } from '../packages' export { searchForWorkspaceRoot } from './searchRoot' @@ -390,8 +391,20 @@ export async function createServer( process.stdin.on('end', exitProcess) } + const { packageCache } = config + const setPackageData = packageCache.set.bind(packageCache) + packageCache.set = (id, pkg) => { + if (id.endsWith('.json')) { + watcher.add(id) + } + return setPackageData(id, pkg) + } + watcher.on('change', async (file) => { file = normalizePath(file) + if (file.endsWith('/package.json')) { + return invalidatePackageData(packageCache, file) + } // invalidate module graph cache on file change moduleGraph.onFileChange(file) if (serverConfig.hmr !== false) { From 37e561755030e87383897af3ea28b9a08e8c2773 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:55:56 -0500 Subject: [PATCH 082/258] fix(hmr): prevent SSR from setting `isSelfAccepting` to false (#5377) --- packages/vite/src/node/plugins/importAnalysis.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts index 31a4a7d001e155..341d3cf37d9474 100644 --- a/packages/vite/src/node/plugins/importAnalysis.ts +++ b/packages/vite/src/node/plugins/importAnalysis.ts @@ -538,6 +538,12 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin { ) ).forEach(([url]) => importedUrls.add(url)) } + // HMR transforms are no-ops in SSR, so an `accept` call will + // never be injected. Avoid updating the `isSelfAccepting` + // property for our module node in that case. + if (ssr && importerModule.isSelfAccepting) { + isSelfAccepting = true + } const prunedImports = await moduleGraph.updateModuleInfo( importerModule, importedUrls, From 1425a162e768f569e5d9a3929e31ed5f421a5ca2 Mon Sep 17 00:00:00 2001 From: Dominik G Date: Fri, 19 Nov 2021 16:29:45 +0100 Subject: [PATCH 083/258] feat(dev): expose restart function on ViteDevServer (#5723) --- docs/guide/api-javascript.md | 6 +++ packages/vite/src/node/server/hmr.ts | 35 +------------- packages/vite/src/node/server/index.ts | 63 +++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 34 deletions(-) diff --git a/docs/guide/api-javascript.md b/docs/guide/api-javascript.md index 0977e256bd9934..1651923c06cdcb 100644 --- a/docs/guide/api-javascript.md +++ b/docs/guide/api-javascript.md @@ -104,6 +104,12 @@ interface ViteDevServer { * Start the server. */ listen(port?: number, isRestart?: boolean): Promise + /** + * Restart the server. + * + * @param forceOptimize - force the optimizer to re-bundle, same as --force cli flag + */ + restart(forceOptimize?: boolean): Promise /** * Stop the server. */ diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts index f65903c1606347..aff8e3d096c44b 100644 --- a/packages/vite/src/node/server/hmr.ts +++ b/packages/vite/src/node/server/hmr.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import chalk from 'chalk' -import { createServer, ViteDevServer } from '..' +import { ViteDevServer } from '..' import { createDebugger, normalizePath } from '../utils' import { ModuleNode } from './moduleGraph' import { Update } from 'types/hmrPayload' @@ -10,7 +10,6 @@ import { RollupError } from 'rollup' import { isMatch } from 'micromatch' import { Server } from 'http' import { isCSSRequest } from '../plugins/css' -import { performance } from 'perf_hooks' export const debugHmr = createDebugger('vite:hmr') @@ -62,7 +61,7 @@ export async function handleHMRUpdate( ), { clear: true, timestamp: true } ) - await restartServer(server) + await server.restart() return } @@ -462,33 +461,3 @@ async function readModifiedFile(file: string): Promise { return content } } - -async function restartServer(server: ViteDevServer) { - // @ts-ignore - global.__vite_start_time = performance.now() - const { port } = server.config.server - - await server.close() - - let newServer = null - try { - newServer = await createServer(server.config.inlineConfig) - } catch (err: any) { - server.config.logger.error(err.message, { - timestamp: true - }) - return - } - - for (const key in newServer) { - if (key !== 'app') { - // @ts-ignore - server[key] = newServer[key] - } - } - if (!server.config.server.middlewareMode) { - await server.listen(port, true) - } else { - server.config.logger.info('server restarted.', { timestamp: true }) - } -} diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 65db5964b43384..8f922a5471918c 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -60,6 +60,7 @@ import { resolveHostname } from '../utils' import { searchForWorkspaceRoot } from './searchRoot' import { CLIENT_DIR } from '../constants' import { printCommonServerUrls } from '../logger' +import { performance } from 'perf_hooks' import { invalidatePackageData } from '../packages' export { searchForWorkspaceRoot } from './searchRoot' @@ -225,6 +226,12 @@ export interface ViteDevServer { * Print server urls */ printUrls(): void + /** + * Restart the server. + * + * @param forceOptimize - force the optimizer to re-bundle, same as --force cli flag + */ + restart(forceOptimize?: boolean): Promise /** * @internal */ @@ -247,6 +254,14 @@ export interface ViteDevServer { }[] } > + /** + * @internal + */ + _restartPromise: Promise | null + /** + * @internal + */ + _forceOptimizeOnRestart: boolean /** * @internal */ @@ -366,9 +381,22 @@ export async function createServer( throw new Error('cannot print server URLs in middleware mode.') } }, + async restart(forceOptimize: boolean) { + if (!server._restartPromise) { + server._forceOptimizeOnRestart = !!forceOptimize + server._restartPromise = restartServer(server).finally(() => { + server._restartPromise = null + server._forceOptimizeOnRestart = false + }) + } + return server._restartPromise + }, + _optimizeDepsMetadata: null, _ssrExternals: null, _globImporters: Object.create(null), + _restartPromise: null, + _forceOptimizeOnRestart: false, _isRunningOptimizer: false, _registerMissingImport: null, _pendingReload: null, @@ -517,7 +545,10 @@ export async function createServer( if (config.cacheDir) { server._isRunningOptimizer = true try { - server._optimizeDepsMetadata = await optimizeDeps(config) + server._optimizeDepsMetadata = await optimizeDeps( + config, + config.server.force || server._forceOptimizeOnRestart + ) } finally { server._isRunningOptimizer = false } @@ -673,3 +704,33 @@ export function resolveServerOptions( } return server as ResolvedServerOptions } + +async function restartServer(server: ViteDevServer) { + // @ts-ignore + global.__vite_start_time = performance.now() + const { port } = server.config.server + + await server.close() + + let newServer = null + try { + newServer = await createServer(server.config.inlineConfig) + } catch (err: any) { + server.config.logger.error(err.message, { + timestamp: true + }) + return + } + + for (const key in newServer) { + if (key !== 'app') { + // @ts-ignore + server[key] = newServer[key] + } + } + if (!server.config.server.middlewareMode) { + await server.listen(port, true) + } else { + server.config.logger.info('server restarted.', { timestamp: true }) + } +} From 67a465f6dee4d4f989bdf2e3aba340250104a66f Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Fri, 19 Nov 2021 11:15:48 -0600 Subject: [PATCH 084/258] refactor: remove unused const (#5748) --- packages/vite/src/client/client.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts index 15c86910aa3848..188d6f1a5eb01b 100644 --- a/packages/vite/src/client/client.ts +++ b/packages/vite/src/client/client.ts @@ -273,8 +273,6 @@ export function removeStyle(id: string): void { const style = sheetsMap.get(id) if (style) { if (style instanceof CSSStyleSheet) { - // @ts-ignore - const index = document.adoptedStyleSheets.indexOf(style) // @ts-ignore document.adoptedStyleSheets = document.adoptedStyleSheets.filter( (s: CSSStyleSheet) => s !== style From 9d3e4e6ca53ba0e9e5c6efbdd84cd347123f93ed Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Sat, 20 Nov 2021 01:17:38 +0800 Subject: [PATCH 085/258] fix(transformCjsImport): make dev and build get the same result (#5745) --- .../src/node/__tests__/plugins/import.spec.ts | 127 ++++++++++++++++++ .../vite/src/node/plugins/importAnalysis.ts | 33 ++++- 2 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 packages/vite/src/node/__tests__/plugins/import.spec.ts diff --git a/packages/vite/src/node/__tests__/plugins/import.spec.ts b/packages/vite/src/node/__tests__/plugins/import.spec.ts new file mode 100644 index 00000000000000..f0341e81b50f3c --- /dev/null +++ b/packages/vite/src/node/__tests__/plugins/import.spec.ts @@ -0,0 +1,127 @@ +import { transformCjsImport } from '../../plugins/importAnalysis' + +describe('transformCjsImport', () => { + const url = './node_modules/.vite/react.js' + const rawUrl = 'react' + + test('import specifier', () => { + expect( + transformCjsImport( + 'import { useState, Component } from "react"', + url, + rawUrl, + 0 + ) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const useState = __vite__cjsImport0_react["useState"]; ' + + 'const Component = __vite__cjsImport0_react["Component"]' + ) + }) + + test('import default specifier', () => { + expect( + transformCjsImport('import React from "react"', url, rawUrl, 0) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react' + ) + + expect( + transformCjsImport( + 'import { default as React } from "react"', + url, + rawUrl, + 0 + ) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react' + ) + }) + + test('import all specifier', () => { + expect( + transformCjsImport('import * as react from "react"', url, rawUrl, 0) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const react = __vite__cjsImport0_react' + ) + }) + + test('export all specifier', () => { + expect(transformCjsImport('export * from "react"', url, rawUrl, 0)).toBe( + undefined + ) + + expect( + transformCjsImport('export * as react from "react"', url, rawUrl, 0) + ).toBe(undefined) + }) + + test('export name specifier', () => { + expect( + transformCjsImport( + 'export { useState, Component } from "react"', + url, + rawUrl, + 0 + ) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const useState = __vite__cjsImport0_react["useState"]; ' + + 'const Component = __vite__cjsImport0_react["Component"]; ' + + 'export { useState, Component }' + ) + + expect( + transformCjsImport( + 'export { useState as useStateAlias, Component as ComponentAlias } from "react"', + url, + rawUrl, + 0 + ) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const useStateAlias = __vite__cjsImport0_react["useState"]; ' + + 'const ComponentAlias = __vite__cjsImport0_react["Component"]; ' + + 'export { useStateAlias, ComponentAlias }' + ) + }) + + test('export default specifier', () => { + expect( + transformCjsImport('export { default } from "react"', url, rawUrl, 0) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const __vite__cjsExportDefault_0 = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react; ' + + 'export default __vite__cjsExportDefault_0' + ) + + expect( + transformCjsImport( + 'export { default as React} from "react"', + url, + rawUrl, + 0 + ) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react; ' + + 'export { React }' + ) + + expect( + transformCjsImport( + 'export { Component as default } from "react"', + url, + rawUrl, + 0 + ) + ).toBe( + 'import __vite__cjsImport0_react from "./node_modules/.vite/react.js"; ' + + 'const __vite__cjsExportDefault_0 = __vite__cjsImport0_react["Component"]; ' + + 'export default __vite__cjsExportDefault_0' + ) + }) +}) diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts index 341d3cf37d9474..13bb8967279af1 100644 --- a/packages/vite/src/node/plugins/importAnalysis.ts +++ b/packages/vite/src/node/plugins/importAnalysis.ts @@ -614,7 +614,7 @@ type ImportNameSpecifier = { importedName: string; localName: string } * * Credits \@csr632 via #837 */ -function transformCjsImport( +export function transformCjsImport( importExp: string, url: string, rawUrl: string, @@ -627,12 +627,17 @@ function transformCjsImport( }) as any ).body[0] as Node - if (node.type === 'ImportDeclaration') { + if ( + node.type === 'ImportDeclaration' || + node.type === 'ExportNamedDeclaration' + ) { if (!node.specifiers.length) { return `import "${url}"` } const importNames: ImportNameSpecifier[] = [] + const exportNames: string[] = [] + let defaultExports: string = '' for (const spec of node.specifiers) { if ( spec.type === 'ImportSpecifier' && @@ -648,6 +653,23 @@ function transformCjsImport( }) } else if (spec.type === 'ImportNamespaceSpecifier') { importNames.push({ importedName: '*', localName: spec.local.name }) + } else if ( + spec.type === 'ExportSpecifier' && + spec.exported.type === 'Identifier' + ) { + // for ExportSpecifier, local name is same as imported name + const importedName = spec.local.name + // we want to specify exported name as variable and re-export it + const exportedName = spec.exported.name + if (exportedName === 'default') { + defaultExports = makeLegalIdentifier( + `__vite__cjsExportDefault_${importIndex}` + ) + importNames.push({ importedName, localName: defaultExports }) + } else { + importNames.push({ importedName, localName: exportedName }) + exportNames.push(exportedName) + } } } @@ -668,6 +690,13 @@ function transformCjsImport( lines.push(`const ${localName} = ${cjsModuleName}["${importedName}"]`) } }) + if (defaultExports) { + lines.push(`export default ${defaultExports}`) + } + if (exportNames.length) { + lines.push(`export { ${exportNames.join(', ')} }`) + } + return lines.join('; ') } } From 1132041d31468914ce8e0ebdf89c12645182a7e5 Mon Sep 17 00:00:00 2001 From: OneNail <31649110+OneNail@users.noreply.github.com> Date: Sat, 20 Nov 2021 01:18:40 +0800 Subject: [PATCH 086/258] chore: remove invalid condition (#5758) --- packages/plugin-vue/src/main.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index 82ccb9ed5a2c9f..ca2835d41be799 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -271,8 +271,6 @@ async function genScriptCode( '_sfc_main', script.lang === 'ts' ? ['typescript'] - : script.lang === 'tsx' - ? ['typescript', 'jsx'] : undefined ) map = script.map From 1e079f4f72429dd6031db1169622969857f740a5 Mon Sep 17 00:00:00 2001 From: 4quar1usnow <33225026+gllxl@users.noreply.github.com> Date: Sat, 20 Nov 2021 01:20:23 +0800 Subject: [PATCH 087/258] chore: fix typo (#5697) --- docs/guide/features.md | 2 +- packages/vite/CHANGELOG.md | 2 +- packages/vite/src/node/plugins/importAnalysisBuild.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/guide/features.md b/docs/guide/features.md index 7f383d59371358..bd082c3f82254d 100644 --- a/docs/guide/features.md +++ b/docs/guide/features.md @@ -240,7 +240,7 @@ JSON files can be directly imported - named imports are also supported: ```js // import the entire object import json from './example.json' -// import a root field as named exports - helps with treeshaking! +// import a root field as named exports - helps with tree-shaking! import { field } from './example.json' ``` diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 0f98bbb669bac8..8e75dabe775a61 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1564,7 +1564,7 @@ css files. * css [@import](https://github.com/import) alias for windows ([71fcfdf](https://github.com/vitejs/vite/commit/71fcfdf219c0dd2aab6612e6b5ba89af1f63cd85)) * don't override resolver options ([#1740](https://github.com/vitejs/vite/issues/1740)) ([73196e5](https://github.com/vitejs/vite/commit/73196e517643af88a790ab5222d3e6b68dbbf987)) * resolve css [@import](https://github.com/import) relative imports without leading dot ([78eb32c](https://github.com/vitejs/vite/commit/78eb32c17998a96aff0f787cf4629b2683c6cd09)), closes [#1737](https://github.com/vitejs/vite/issues/1737) -* **optimizer:** do not perform treeshaking for pre-bundling ([6b619c4](https://github.com/vitejs/vite/commit/6b619c4be210dbab0164f42ee4b358c3ac34a896)) +* **optimizer:** do not perform tree-shaking for pre-bundling ([6b619c4](https://github.com/vitejs/vite/commit/6b619c4be210dbab0164f42ee4b358c3ac34a896)) ### Code Refactoring diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 0e9278b4d8ee28..070d7fef13ab03 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -175,7 +175,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { // Differentiate CSS imports that use the default export from those that // do not by injecting a ?used query - this allows us to avoid including - // the CSS string when unnecessary (esbuild has trouble treeshaking + // the CSS string when unnecessary (esbuild has trouble tree-shaking // them) if ( specifier && From 59471b186612d3da0083543e23d660747d3287f3 Mon Sep 17 00:00:00 2001 From: Fran Dios Date: Sat, 20 Nov 2021 02:27:09 +0900 Subject: [PATCH 088/258] fix(plugin-react): restore usage of extension instead of id (#5761) --- packages/plugin-react/src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts index 98682d347726ac..16675f774ee8d9 100644 --- a/packages/plugin-react/src/index.ts +++ b/packages/plugin-react/src/index.ts @@ -198,15 +198,15 @@ export default function viteReact(opts: Options = {}): PluginOption[] { 'classPrivateMethods' ] - if (!id.endsWith('.ts')) { + if (!extension.endsWith('.ts')) { parserPlugins.push('jsx') } - if (/\.tsx?$/.test(id)) { + if (/\.tsx?$/.test(extension)) { parserPlugins.push('typescript') } - const isReasonReact = id.endsWith('.bs.js') + const isReasonReact = extension.endsWith('.bs.js') const babelOpts: TransformOptions = { babelrc: false, From d93a9fab8986f3659e79d7b0b065e99ef625a5dd Mon Sep 17 00:00:00 2001 From: Fran Dios Date: Sat, 20 Nov 2021 02:27:29 +0900 Subject: [PATCH 089/258] fix(plugin-react): remove querystring from sourcemap filename (#5760) --- packages/plugin-react/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts index 16675f774ee8d9..5cbfc83c9bbbd5 100644 --- a/packages/plugin-react/src/index.ts +++ b/packages/plugin-react/src/index.ts @@ -215,7 +215,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] { ast: !isReasonReact, root: projectRoot, filename: id, - sourceFileName: id, + sourceFileName: filepath, parserOpts: { ...opts.babel?.parserOpts, sourceType: 'module', From b86a2f35ee538d531db3ee0e2094e671b4e0c405 Mon Sep 17 00:00:00 2001 From: jbmolle Date: Fri, 19 Nov 2021 20:02:38 +0100 Subject: [PATCH 090/258] fix: scoped variable with array destructuring & nested arguments (#5730) Co-authored-by: Svetlana Smorodinova --- .../node/ssr/__tests__/ssrTransform.spec.ts | 42 +++++++++++++++++++ packages/vite/src/node/ssr/ssrTransform.ts | 26 +++++++----- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts index 111b31b890c89e..a5c452d79c60e9 100644 --- a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts +++ b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts @@ -188,6 +188,48 @@ test('do not rewrite when variable is in scope', async () => { expect(result.deps).toEqual(['vue']) }) +// #5472 +test('do not rewrite when variable is in scope with object destructuring', async () => { + const result = await ssrTransform( + `import { fn } from 'vue';function A(){ let {fn, test} = {fn: 'foo', test: 'bar'}; return { fn }; }`, + null, + null + ) + expect(result.code).toMatchInlineSnapshot(` + "const __vite_ssr_import_0__ = await __vite_ssr_import__(\\"vue\\"); + function A(){ let {fn, test} = {fn: 'foo', test: 'bar'}; return { fn }; }" + `) + expect(result.deps).toEqual(['vue']) +}) + +// #5472 +test('do not rewrite when variable is in scope with array destructuring', async () => { + const result = await ssrTransform( + `import { fn } from 'vue';function A(){ let [fn, test] = ['foo', 'bar']; return { fn }; }`, + null, + null + ) + expect(result.code).toMatchInlineSnapshot(` + "const __vite_ssr_import_0__ = await __vite_ssr_import__(\\"vue\\"); + function A(){ let [fn, test] = ['foo', 'bar']; return { fn }; }" + `) + expect(result.deps).toEqual(['vue']) +}) + +// #5727 +test('rewrite variable in string interpolation in function nested arguments', async () => { + const result = await ssrTransform( + `import { fn } from 'vue';function A({foo = \`test\${fn}\`} = {}){ return {}; }`, + null, + null + ) + expect(result.code).toMatchInlineSnapshot(` + "const __vite_ssr_import_0__ = await __vite_ssr_import__(\\"vue\\"); + function A({foo = \`test\${__vite_ssr_import_0__.fn}\`} = {}){ return {}; }" + `) + expect(result.deps).toEqual(['vue']) +}) + test('do not rewrite when function declaration is in scope', async () => { const result = await ssrTransform( `import { fn } from 'vue';function A(){ function fn() {}; return { fn }; }`, diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts index 77754abc52f192..487208560a7e9b 100644 --- a/packages/vite/src/node/ssr/ssrTransform.ts +++ b/packages/vite/src/node/ssr/ssrTransform.ts @@ -315,20 +315,20 @@ function walk( node.params.forEach((p) => (eswalk as any)(p.type === 'AssignmentPattern' ? p.left : p, { enter(child: Node, parent: Node) { + if (child.type !== 'Identifier') return + // do not record as scope variable if is a destructuring keyword + if (isStaticPropertyKey(child, parent)) return + // do not record if this is a default value + // assignment of a destructuring variable if ( - child.type === 'Identifier' && - // do not record as scope variable if is a destructuring key - !isStaticPropertyKey(child, parent) && - // do not record if this is a default value - // assignment of a destructuring variable - !( - parent && - parent.type === 'AssignmentPattern' && - parent.right === child - ) + (parent?.type === 'AssignmentPattern' && + parent?.right === child) || + (parent?.type === 'TemplateLiteral' && + parent?.expressions.includes(child)) ) { - setScope(node, child.name) + return } + setScope(node, child.name) } }) ) @@ -346,6 +346,10 @@ function walk( setScope(parentFunction, (property.value as Identifier).name) } }) + } else if (node.id.type === 'ArrayPattern') { + node.id.elements.forEach((element) => { + setScope(parentFunction, (element as Identifier).name) + }) } else { setScope(parentFunction, (node.id as Identifier).name) } From 37b85a06c1bab4eb61be73f6a6f676ba059d43e5 Mon Sep 17 00:00:00 2001 From: patak-js Date: Fri, 19 Nov 2021 20:24:15 +0100 Subject: [PATCH 091/258] release: v2.7.0-beta.8 --- packages/vite/CHANGELOG.md | 17 +++++++++++++++++ packages/vite/package.json | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 8e75dabe775a61..c7bf4f3fa7f4c7 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,20 @@ +# [2.7.0-beta.8](https://github.com/vitejs/vite/compare/v2.7.0-beta.7...v2.7.0-beta.8) (2021-11-19) + + +### Bug Fixes + +* **hmr:** prevent SSR from setting `isSelfAccepting` to false ([#5377](https://github.com/vitejs/vite/issues/5377)) ([37e5617](https://github.com/vitejs/vite/commit/37e561755030e87383897af3ea28b9a08e8c2773)) +* move package.json cache into ResolvedConfig ([#5388](https://github.com/vitejs/vite/issues/5388)) ([650b56e](https://github.com/vitejs/vite/commit/650b56e0414d772294817bc2dc399e70563ed699)) +* scoped variable with array destructuring & nested arguments ([#5730](https://github.com/vitejs/vite/issues/5730)) ([b86a2f3](https://github.com/vitejs/vite/commit/b86a2f35ee538d531db3ee0e2094e671b4e0c405)) +* **transformCjsImport:** make dev and build get the same result ([#5745](https://github.com/vitejs/vite/issues/5745)) ([9d3e4e6](https://github.com/vitejs/vite/commit/9d3e4e6ca53ba0e9e5c6efbdd84cd347123f93ed)) + + +### Features + +* **dev:** expose restart function on ViteDevServer ([#5723](https://github.com/vitejs/vite/issues/5723)) ([1425a16](https://github.com/vitejs/vite/commit/1425a162e768f569e5d9a3929e31ed5f421a5ca2)) + + + # [2.7.0-beta.7](https://github.com/vitejs/vite/compare/v2.7.0-beta.6...v2.7.0-beta.7) (2021-11-17) diff --git a/packages/vite/package.json b/packages/vite/package.json index a58ce10da58b6f..d2d048d7e9deb0 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.7", + "version": "2.7.0-beta.8", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From ea064d7a31ddc1edf8629b5390cf76f908995b70 Mon Sep 17 00:00:00 2001 From: patak-js Date: Fri, 19 Nov 2021 20:26:16 +0100 Subject: [PATCH 092/258] release: plugin-vue@1.10.0-beta.1 --- packages/plugin-vue/CHANGELOG.md | 11 +++++++++++ packages/plugin-vue/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue/CHANGELOG.md b/packages/plugin-vue/CHANGELOG.md index 37d3f505935fe8..bcd5f44cbcae70 100644 --- a/packages/plugin-vue/CHANGELOG.md +++ b/packages/plugin-vue/CHANGELOG.md @@ -1,3 +1,14 @@ +# [1.10.0-beta.1](https://github.com/vitejs/vite/compare/plugin-vue@1.10.0-beta.0...plugin-vue@1.10.0-beta.1) (2021-11-19) + + +### Bug Fixes + +* plugin-vue dev scripts error in ssr-vue ([#5607](https://github.com/vitejs/vite/issues/5607)) ([502b8f2](https://github.com/vitejs/vite/commit/502b8f2b31f06d4e524d36b5566197db76f6ccda)) +* **plugin-vue:** template src isn't working when script setup ([#5418](https://github.com/vitejs/vite/issues/5418)) ([518da44](https://github.com/vitejs/vite/commit/518da447e573b6f6ec5e2b1ca837332e0e230c14)) +* **plugin-vue:** use __vccOpts for vue-class-component ([#5374](https://github.com/vitejs/vite/issues/5374)) ([c4f9db2](https://github.com/vitejs/vite/commit/c4f9db2cb375729b06f438298560045d4c488c14)) + + + # [1.10.0-beta.0](https://github.com/vitejs/vite/compare/plugin-vue@1.9.4...plugin-vue@1.10.0-beta.0) (2021-10-28) diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 5aad79962543bc..0a658380ddea74 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue", - "version": "1.10.0-beta.0", + "version": "1.10.0-beta.1", "license": "MIT", "author": "Evan You", "files": [ From 992c1009c81178c94b254463896d21bfb9613ea2 Mon Sep 17 00:00:00 2001 From: patak-js Date: Fri, 19 Nov 2021 20:28:33 +0100 Subject: [PATCH 093/258] release: plugin-react@1.1.0-beta.1 --- packages/plugin-react/CHANGELOG.md | 12 ++++++++++++ packages/plugin-react/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md index 61eb5d662ead56..4cc3ce06aeff87 100644 --- a/packages/plugin-react/CHANGELOG.md +++ b/packages/plugin-react/CHANGELOG.md @@ -1,3 +1,15 @@ +# [1.1.0-beta.1](https://github.com/vitejs/vite/compare/plugin-react@1.1.0-beta.0...plugin-react@1.1.0-beta.1) (2021-11-19) + + +### Bug Fixes + +* **plugin-react:** apply `babel.plugins` to project files only ([#5255](https://github.com/vitejs/vite/issues/5255)) ([377d0be](https://github.com/vitejs/vite/commit/377d0be5cf85a50240e160beaaafda77b7199452)) +* **plugin-react:** remove querystring from sourcemap filename ([#5760](https://github.com/vitejs/vite/issues/5760)) ([d93a9fa](https://github.com/vitejs/vite/commit/d93a9fab8986f3659e79d7b0b065e99ef625a5dd)) +* **plugin-react:** restore usage of extension instead of id ([#5761](https://github.com/vitejs/vite/issues/5761)) ([59471b1](https://github.com/vitejs/vite/commit/59471b186612d3da0083543e23d660747d3287f3)) +* **plugin-react:** uncompiled JSX in linked pkgs ([#5669](https://github.com/vitejs/vite/issues/5669)) ([41a7c9c](https://github.com/vitejs/vite/commit/41a7c9ccfbc1a7bc60aec672056eac3966ddd036)) + + + # [1.1.0-beta.0](https://github.com/vitejs/vite/compare/plugin-react@1.0.6...plugin-react@1.1.0-beta.0) (2021-10-28) diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index 52e7430dc74175..bcde7b2d9c9448 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-react", - "version": "1.1.0-beta.0", + "version": "1.1.0-beta.1", "license": "MIT", "author": "Evan You", "contributors": [ From d3831128d1772a0592e8c15f3c8783034ee5d938 Mon Sep 17 00:00:00 2001 From: Forzen FIsh <76603360+sudongyuer@users.noreply.github.com> Date: Sat, 20 Nov 2021 15:05:36 +0800 Subject: [PATCH 094/258] chore: fix typo (#5768) --- packages/vite/src/node/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index fac0890b8f6926..b3721c3fa1190d 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -294,7 +294,7 @@ export async function resolveConfig( customLogger: config.customLogger }) - // user config may provide an alternative mode. But --mode has a higher prority + // user config may provide an alternative mode. But --mode has a higher priority mode = inlineConfig.mode || config.mode || mode configEnv.mode = mode From 4a6cf35ae803fdcea761b0bf555644039c0f60ef Mon Sep 17 00:00:00 2001 From: Forzen FIsh <76603360+sudongyuer@users.noreply.github.com> Date: Sat, 20 Nov 2021 15:06:34 +0800 Subject: [PATCH 095/258] chore: improve local variable url is redundant (#5769) --- packages/vite/src/node/utils.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts index 50f9144b893821..23f41b769b2fe5 100644 --- a/packages/vite/src/node/utils.ts +++ b/packages/vite/src/node/utils.ts @@ -498,13 +498,11 @@ export async function processSrcSet( }) ) - const url = ret.reduce((prev, { url, descriptor }, index) => { + return ret.reduce((prev, { url, descriptor }, index) => { descriptor = descriptor || '' return (prev += url + ` ${descriptor}${index === ret.length - 1 ? '' : ', '}`) }, '') - - return url } // based on https://github.com/sveltejs/svelte/blob/abf11bb02b2afbd3e4cac509a0f70e318c306364/src/compiler/utils/mapped_code.ts#L221 From 857d0a60a9eacf5a4b6b5d1705687843cefb019c Mon Sep 17 00:00:00 2001 From: CHOYSEN Date: Sun, 21 Nov 2021 01:20:11 +0800 Subject: [PATCH 096/258] docs: fix pnpm link usage (#5773) --- docs/guide/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/index.md b/docs/guide/index.md index 040dc7849c5d4c..e060788a94c0a7 100644 --- a/docs/guide/index.md +++ b/docs/guide/index.md @@ -137,10 +137,10 @@ cd vite pnpm install cd packages/vite pnpm run build -pnpm link # you can use your preferred package manager for this step +pnpm link --global # you can use your preferred package manager for this step ``` -Then go to your Vite based project and run `pnpm link vite` (or the package manager that you used to link `vite` globally). Now restart the development server to ride on the bleeding edge! +Then go to your Vite based project and run `pnpm link --global vite` (or the package manager that you used to link `vite` globally). Now restart the development server to ride on the bleeding edge! ## Community From 5588eb93bd30830e045eca662dc14d6802112906 Mon Sep 17 00:00:00 2001 From: sanyuan <39261479+sanyuan0704@users.noreply.github.com> Date: Sun, 21 Nov 2021 01:46:24 +0800 Subject: [PATCH 097/258] chore: delete useless condition (#5772) --- packages/vite/src/node/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index b3721c3fa1190d..376f6863564fba 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -850,7 +850,7 @@ export async function loadConfigFromFile( } } - if (!userConfig && !isTS && !isMjs) { + if (!isTS && !isMjs) { // 1. try to directly require the module (assuming commonjs) try { // clear cache in case of server restart From a32b105390735ce165a3ad113f3e645ffcc6296a Mon Sep 17 00:00:00 2001 From: sanyuan <39261479+sanyuan0704@users.noreply.github.com> Date: Mon, 22 Nov 2021 04:19:23 +0800 Subject: [PATCH 098/258] chore: optimize esm flag (#5778) --- packages/vite/src/node/config.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 376f6863564fba..3b66d555f2a23c 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -775,14 +775,14 @@ export async function loadConfigFromFile( let resolvedPath: string | undefined let isTS = false - let isMjs = false + let isESM = false let dependencies: string[] = [] // check package.json for type: "module" and set `isMjs` to true try { const pkg = lookupFile(configRoot, ['package.json']) if (pkg && JSON.parse(pkg).type === 'module') { - isMjs = true + isESM = true } } catch (e) {} @@ -792,7 +792,7 @@ export async function loadConfigFromFile( isTS = configFile.endsWith('.ts') if (configFile.endsWith('.mjs')) { - isMjs = true + isESM = true } } else { // implicit config file loaded from inline root (if present) @@ -806,7 +806,7 @@ export async function loadConfigFromFile( const mjsconfigFile = path.resolve(configRoot, 'vite.config.mjs') if (fs.existsSync(mjsconfigFile)) { resolvedPath = mjsconfigFile - isMjs = true + isESM = true } } @@ -827,7 +827,7 @@ export async function loadConfigFromFile( try { let userConfig: UserConfigExport | undefined - if (isMjs) { + if (isESM) { const fileUrl = require('url').pathToFileURL(resolvedPath) if (isTS) { // before we can register loaders without requiring users to run node @@ -850,7 +850,7 @@ export async function loadConfigFromFile( } } - if (!isTS && !isMjs) { + if (!isTS && !isESM) { // 1. try to directly require the module (assuming commonjs) try { // clear cache in case of server restart @@ -906,7 +906,7 @@ export async function loadConfigFromFile( async function bundleConfigFile( fileName: string, - mjs = false + isESM = false ): Promise<{ code: string; dependencies: string[] }> { const result = await build({ absWorkingDir: process.cwd(), @@ -915,7 +915,7 @@ async function bundleConfigFile( write: false, platform: 'node', bundle: true, - format: mjs ? 'esm' : 'cjs', + format: isESM ? 'esm' : 'cjs', sourcemap: 'inline', metafile: true, plugins: [ From eee940678b76966647b543e1f10fdb113da64b21 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:27:53 +0100 Subject: [PATCH 099/258] chore(deps): update all non-major dependencies (#5783) --- package.json | 14 +- packages/plugin-legacy/package.json | 2 +- packages/vite/package.json | 8 +- pnpm-lock.yaml | 311 +++++++++++++++------------- 4 files changed, 175 insertions(+), 160 deletions(-) diff --git a/package.json b/package.json index 1d87771fdc3bf3..474f7376e4b7d4 100644 --- a/package.json +++ b/package.json @@ -30,22 +30,22 @@ "devDependencies": { "@microsoft/api-extractor": "^7.18.19", "@types/fs-extra": "^9.0.13", - "@types/jest": "^27.0.2", - "@types/node": "^16.11.7", + "@types/jest": "^27.0.3", + "@types/node": "^16.11.9", "@types/semver": "^7.3.9", - "@typescript-eslint/eslint-plugin": "^5.3.1", - "@typescript-eslint/parser": "^5.3.1", + "@typescript-eslint/eslint-plugin": "^5.4.0", + "@typescript-eslint/parser": "^5.4.0", "chalk": "^4.1.2", "conventional-changelog-cli": "^2.1.1", "cross-env": "^7.0.3", "esbuild": "^0.13.12", - "eslint": "^8.2.0", - "eslint-define-config": "^1.1.3", + "eslint": "^8.3.0", + "eslint-define-config": "^1.1.4", "eslint-plugin-node": "^11.1.0", "execa": "^5.1.1", "fs-extra": "^10.0.0", "jest": "^27.3.1", - "lint-staged": "^12.0.2", + "lint-staged": "^12.1.1", "minimist": "^1.2.5", "node-fetch": "^2.6.6", "npm-run-all": "^4.1.5", diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json index 0f87f160a0e3af..9966fd5b339235 100644 --- a/packages/plugin-legacy/package.json +++ b/packages/plugin-legacy/package.json @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme", "dependencies": { - "@babel/standalone": "^7.16.3", + "@babel/standalone": "^7.16.4", "core-js": "^3.19.1", "magic-string": "^0.25.7", "regenerator-runtime": "^0.13.9", diff --git a/packages/vite/package.json b/packages/vite/package.json index d2d048d7e9deb0..acc7e93c313c70 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@ampproject/remapping": "^1.0.1", - "@babel/parser": "^7.16.3", + "@babel/parser": "^7.16.4", "@babel/types": "^7.16.0", "@rollup/plugin-alias": "^3.1.8", "@rollup/plugin-commonjs": "^21.0.1", @@ -70,13 +70,13 @@ "@types/less": "^3.0.3", "@types/micromatch": "^4.0.2", "@types/mime": "^2.0.3", - "@types/node": "^16.11.7", + "@types/node": "^16.11.9", "@types/resolve": "^1.20.1", "@types/sass": "~1.43.0", "@types/stylus": "^0.48.36", "@types/ws": "^8.2.0", "@vue/compiler-dom": "^3.2.22", - "acorn": "^8.5.0", + "acorn": "^8.6.0", "acorn-class-fields": "^1.0.0", "acorn-static-class-features": "^1.0.0", "builtin-modules": "^3.2.0", @@ -112,7 +112,7 @@ "selfsigned": "^1.10.11", "sirv": "^1.0.18", "source-map": "^0.6.1", - "source-map-support": "^0.5.20", + "source-map-support": "^0.5.21", "strip-ansi": "^6.0.1", "terser": "^5.10.0", "tsconfck": "1.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67e408dfbb5ce9..9d53588a53003e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,22 +10,22 @@ importers: specifiers: '@microsoft/api-extractor': ^7.18.19 '@types/fs-extra': ^9.0.13 - '@types/jest': ^27.0.2 - '@types/node': ^16.11.7 + '@types/jest': ^27.0.3 + '@types/node': ^16.11.9 '@types/semver': ^7.3.9 - '@typescript-eslint/eslint-plugin': ^5.3.1 - '@typescript-eslint/parser': ^5.3.1 + '@typescript-eslint/eslint-plugin': ^5.4.0 + '@typescript-eslint/parser': ^5.4.0 chalk: ^4.1.2 conventional-changelog-cli: ^2.1.1 cross-env: ^7.0.3 esbuild: ^0.13.12 - eslint: ^8.2.0 - eslint-define-config: ^1.1.3 + eslint: ^8.3.0 + eslint-define-config: ^1.1.4 eslint-plugin-node: ^11.1.0 execa: ^5.1.1 fs-extra: ^10.0.0 jest: ^27.3.1 - lint-staged: ^12.0.2 + lint-staged: ^12.1.1 minimist: ^1.2.5 node-fetch: ^2.6.6 npm-run-all: ^4.1.5 @@ -45,22 +45,22 @@ importers: devDependencies: '@microsoft/api-extractor': 7.18.19 '@types/fs-extra': 9.0.13 - '@types/jest': 27.0.2 - '@types/node': 16.11.7 + '@types/jest': 27.0.3 + '@types/node': 16.11.9 '@types/semver': 7.3.9 - '@typescript-eslint/eslint-plugin': 5.3.1_4653b7803b7453f5f37717b7e1448517 - '@typescript-eslint/parser': 5.3.1_eslint@8.2.0+typescript@4.4.4 + '@typescript-eslint/eslint-plugin': 5.4.0_8fbd82ef37e23da98dfca9805cf945cd + '@typescript-eslint/parser': 5.4.0_eslint@8.3.0+typescript@4.4.4 chalk: 4.1.2 conventional-changelog-cli: 2.1.1 cross-env: 7.0.3 esbuild: 0.13.12 - eslint: 8.2.0 - eslint-define-config: 1.1.3 - eslint-plugin-node: 11.1.0_eslint@8.2.0 + eslint: 8.3.0 + eslint-define-config: 1.1.4 + eslint-plugin-node: 11.1.0_eslint@8.3.0 execa: 5.1.1 fs-extra: 10.0.0 jest: 27.3.1_ts-node@10.4.0 - lint-staged: 12.0.2 + lint-staged: 12.1.1 minimist: 1.2.5 node-fetch: 2.6.6 npm-run-all: 4.1.5 @@ -71,8 +71,8 @@ importers: rollup: 2.59.0 semver: 7.3.5 sirv: 1.0.18 - ts-jest: 27.0.7_2c4ca6574207836d1023f54689cc81ac - ts-node: 10.4.0_ee928ac548ac44c173bf0d4654ae2c29 + ts-jest: 27.0.7_b626c82449d36ccae0aa7169b15092e6 + ts-node: 10.4.0_7dd5cf9af763e621261d5cc88a052be2 typescript: 4.4.4 vite: link:packages/vite vitepress: 0.20.1 @@ -600,13 +600,13 @@ importers: packages/plugin-legacy: specifiers: - '@babel/standalone': ^7.16.3 + '@babel/standalone': ^7.16.4 core-js: ^3.19.1 magic-string: ^0.25.7 regenerator-runtime: ^0.13.9 systemjs: ^6.11.0 dependencies: - '@babel/standalone': 7.16.3 + '@babel/standalone': 7.16.4 core-js: 3.19.1 magic-string: 0.25.7 regenerator-runtime: 0.13.9 @@ -673,7 +673,7 @@ importers: packages/vite: specifiers: '@ampproject/remapping': ^1.0.1 - '@babel/parser': ^7.16.3 + '@babel/parser': ^7.16.4 '@babel/types': ^7.16.0 '@rollup/plugin-alias': ^3.1.8 '@rollup/plugin-commonjs': ^21.0.1 @@ -689,13 +689,13 @@ importers: '@types/less': ^3.0.3 '@types/micromatch': ^4.0.2 '@types/mime': ^2.0.3 - '@types/node': ^16.11.7 + '@types/node': ^16.11.9 '@types/resolve': ^1.20.1 '@types/sass': ~1.43.0 '@types/stylus': ^0.48.36 '@types/ws': ^8.2.0 '@vue/compiler-dom': ^3.2.22 - acorn: ^8.5.0 + acorn: ^8.6.0 acorn-class-fields: ^1.0.0 acorn-static-class-features: ^1.0.0 builtin-modules: ^3.2.0 @@ -736,7 +736,7 @@ importers: selfsigned: ^1.10.11 sirv: ^1.0.18 source-map: ^0.6.1 - source-map-support: ^0.5.20 + source-map-support: ^0.5.21 strip-ansi: ^6.0.1 terser: ^5.10.0 tsconfck: 1.1.1 @@ -752,7 +752,7 @@ importers: fsevents: 2.3.2 devDependencies: '@ampproject/remapping': 1.0.1 - '@babel/parser': 7.16.3 + '@babel/parser': 7.16.4 '@babel/types': 7.16.0 '@rollup/plugin-alias': 3.1.8_rollup@2.59.0 '@rollup/plugin-commonjs': 21.0.1_rollup@2.59.0 @@ -768,15 +768,15 @@ importers: '@types/less': 3.0.3 '@types/micromatch': 4.0.2 '@types/mime': 2.0.3 - '@types/node': 16.11.7 + '@types/node': 16.11.9 '@types/resolve': 1.20.1 '@types/sass': 1.43.0 '@types/stylus': 0.48.36 '@types/ws': 8.2.0 '@vue/compiler-dom': 3.2.22 - acorn: 8.5.0 - acorn-class-fields: 1.0.0_acorn@8.5.0 - acorn-static-class-features: 1.0.0_acorn@8.5.0 + acorn: 8.6.0 + acorn-class-fields: 1.0.0_acorn@8.6.0 + acorn-static-class-features: 1.0.0_acorn@8.6.0 builtin-modules: 3.2.0 cac: 6.7.9 chalk: 4.1.2 @@ -810,9 +810,9 @@ importers: selfsigned: 1.10.11 sirv: 1.0.18 source-map: 0.6.1 - source-map-support: 0.5.20 + source-map-support: 0.5.21 strip-ansi: 6.0.1 - terser: 5.10.0_acorn@8.5.0 + terser: 5.10.0_acorn@8.6.0 tsconfck: 1.1.1_typescript@4.4.4 tslib: 2.3.1 types: link:types @@ -1105,8 +1105,8 @@ packages: engines: {node: '>=6.0.0'} hasBin: true - /@babel/parser/7.16.3: - resolution: {integrity: sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==} + /@babel/parser/7.16.4: + resolution: {integrity: sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==} engines: {node: '>=6.0.0'} hasBin: true dev: true @@ -1330,8 +1330,8 @@ packages: dependencies: regenerator-runtime: 0.13.9 - /@babel/standalone/7.16.3: - resolution: {integrity: sha512-hoStDfHl2+EYUv1LNHhZTysa+lMSwIEkkT4HnDNX+F0zqvPdoE2QLF7qtkd45cgCGOwQjrvwe2mOKcX3f6Wr8A==} + /@babel/standalone/7.16.4: + resolution: {integrity: sha512-FDRLwjeQfPm5jaHNuB+vwNyGCp24Ah3kEsbLzKmh0eSru+QCr4DmjgbRPoz71AwXLVtXU+l/i7MlVlIj5XO7Gw==} engines: {node: '>=6.9.0'} dev: false @@ -1498,7 +1498,7 @@ packages: dependencies: ajv: 6.12.6 debug: 4.3.2 - espree: 9.0.0 + espree: 9.1.0 globals: 13.12.0 ignore: 4.0.6 import-fresh: 3.3.0 @@ -1562,7 +1562,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 chalk: 4.1.2 jest-message-util: 27.3.1 jest-util: 27.3.1 @@ -1583,7 +1583,7 @@ packages: '@jest/test-result': 27.3.1 '@jest/transform': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 @@ -1620,7 +1620,7 @@ packages: dependencies: '@jest/fake-timers': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 jest-mock: 27.3.0 dev: true @@ -1630,7 +1630,7 @@ packages: dependencies: '@jest/types': 27.2.5 '@sinonjs/fake-timers': 8.1.0 - '@types/node': 16.11.7 + '@types/node': 16.11.9 jest-message-util: 27.3.1 jest-mock: 27.3.0 jest-util: 27.3.1 @@ -1659,7 +1659,7 @@ packages: '@jest/test-result': 27.3.1 '@jest/transform': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -1743,7 +1743,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.3 '@types/istanbul-reports': 3.0.1 - '@types/node': 16.11.7 + '@types/node': 16.11.9 '@types/yargs': 16.0.4 chalk: 4.1.2 dev: true @@ -2073,19 +2073,19 @@ packages: /@types/etag/1.8.1: resolution: {integrity: sha512-bsKkeSqN7HYyYntFRAmzcwx/dKW4Wa+KVMTInANlI72PWLQmOpZu96j0OqHZGArW4VQwCmJPteQlXaUDeOB0WQ==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/graceful-fs/4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/hash-sum/1.0.0: @@ -2108,8 +2108,8 @@ packages: '@types/istanbul-lib-report': 3.0.0 dev: true - /@types/jest/27.0.2: - resolution: {integrity: sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==} + /@types/jest/27.0.3: + resolution: {integrity: sha512-cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg==} dependencies: jest-diff: 27.3.1 pretty-format: 27.3.1 @@ -2149,8 +2149,8 @@ packages: resolution: {integrity: sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==} dev: true - /@types/node/16.11.7: - resolution: {integrity: sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==} + /@types/node/16.11.9: + resolution: {integrity: sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==} dev: true /@types/normalize-package-data/2.4.1: @@ -2167,7 +2167,7 @@ packages: /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/resolve/1.20.1: @@ -2177,7 +2177,7 @@ packages: /@types/sass/1.43.0: resolution: {integrity: sha512-DPSXNJ1rYLo88GyF9tuB4bsYGfpKI1a4+wOQmc+LI1SUoocm9QLRSpz0GxxuyjmJsYFIQo/dDlRSSpIXngff+w==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/semver/7.3.9: @@ -2195,13 +2195,13 @@ packages: /@types/stylus/0.48.36: resolution: {integrity: sha512-7klEq45BUE8ZJWkYWy1E442DcCs0wi0FkFY1Tjr6EJ7edL77t9w/QmOwlkFumBMqHlatDBtrA2xgfRrGqkUkzg==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/ws/8.2.0: resolution: {integrity: sha512-cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg==} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /@types/yargs-parser/20.2.1: @@ -2218,12 +2218,12 @@ packages: resolution: {integrity: sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==} requiresBuild: true dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true optional: true - /@typescript-eslint/eslint-plugin/5.3.1_4653b7803b7453f5f37717b7e1448517: - resolution: {integrity: sha512-cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw==} + /@typescript-eslint/eslint-plugin/5.4.0_8fbd82ef37e23da98dfca9805cf945cd: + resolution: {integrity: sha512-9/yPSBlwzsetCsGEn9j24D8vGQgJkOTr4oMLas/w886ZtzKIs1iyoqFrwsX2fqYEeUwsdBpC21gcjRGo57u0eg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -2233,11 +2233,11 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 5.3.1_eslint@8.2.0+typescript@4.4.4 - '@typescript-eslint/parser': 5.3.1_eslint@8.2.0+typescript@4.4.4 - '@typescript-eslint/scope-manager': 5.3.1 + '@typescript-eslint/experimental-utils': 5.4.0_eslint@8.3.0+typescript@4.4.4 + '@typescript-eslint/parser': 5.4.0_eslint@8.3.0+typescript@4.4.4 + '@typescript-eslint/scope-manager': 5.4.0 debug: 4.3.2 - eslint: 8.2.0 + eslint: 8.3.0 functional-red-black-tree: 1.0.1 ignore: 5.1.9 regexpp: 3.2.0 @@ -2248,26 +2248,26 @@ packages: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.3.1_eslint@8.2.0+typescript@4.4.4: - resolution: {integrity: sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==} + /@typescript-eslint/experimental-utils/5.4.0_eslint@8.3.0+typescript@4.4.4: + resolution: {integrity: sha512-Nz2JDIQUdmIGd6p33A+naQmwfkU5KVTLb/5lTk+tLVTDacZKoGQisj8UCxk7onJcrgjIvr8xWqkYI+DbI3TfXg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' dependencies: '@types/json-schema': 7.0.9 - '@typescript-eslint/scope-manager': 5.3.1 - '@typescript-eslint/types': 5.3.1 - '@typescript-eslint/typescript-estree': 5.3.1_typescript@4.4.4 - eslint: 8.2.0 + '@typescript-eslint/scope-manager': 5.4.0 + '@typescript-eslint/types': 5.4.0 + '@typescript-eslint/typescript-estree': 5.4.0_typescript@4.4.4 + eslint: 8.3.0 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.2.0 + eslint-utils: 3.0.0_eslint@8.3.0 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/parser/5.3.1_eslint@8.2.0+typescript@4.4.4: - resolution: {integrity: sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw==} + /@typescript-eslint/parser/5.4.0_eslint@8.3.0+typescript@4.4.4: + resolution: {integrity: sha512-JoB41EmxiYpaEsRwpZEYAJ9XQURPFer8hpkIW9GiaspVLX8oqbqNM8P4EP8HOZg96yaALiLEVWllA2E8vwsIKw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -2276,31 +2276,31 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.3.1 - '@typescript-eslint/types': 5.3.1 - '@typescript-eslint/typescript-estree': 5.3.1_typescript@4.4.4 + '@typescript-eslint/scope-manager': 5.4.0 + '@typescript-eslint/types': 5.4.0 + '@typescript-eslint/typescript-estree': 5.4.0_typescript@4.4.4 debug: 4.3.2 - eslint: 8.2.0 + eslint: 8.3.0 typescript: 4.4.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager/5.3.1: - resolution: {integrity: sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==} + /@typescript-eslint/scope-manager/5.4.0: + resolution: {integrity: sha512-pRxFjYwoi8R+n+sibjgF9iUiAELU9ihPBtHzocyW8v8D8G8KeQvXTsW7+CBYIyTYsmhtNk50QPGLE3vrvhM5KA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.3.1 - '@typescript-eslint/visitor-keys': 5.3.1 + '@typescript-eslint/types': 5.4.0 + '@typescript-eslint/visitor-keys': 5.4.0 dev: true - /@typescript-eslint/types/5.3.1: - resolution: {integrity: sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==} + /@typescript-eslint/types/5.4.0: + resolution: {integrity: sha512-GjXNpmn+n1LvnttarX+sPD6+S7giO+9LxDIGlRl4wK3a7qMWALOHYuVSZpPTfEIklYjaWuMtfKdeByx0AcaThA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.3.1_typescript@4.4.4: - resolution: {integrity: sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==} + /@typescript-eslint/typescript-estree/5.4.0_typescript@4.4.4: + resolution: {integrity: sha512-nhlNoBdhKuwiLMx6GrybPT3SFILm5Gij2YBdPEPFlYNFAXUJWX6QRgvi/lwVoadaQEFsizohs6aFRMqsXI2ewA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -2308,8 +2308,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.3.1 - '@typescript-eslint/visitor-keys': 5.3.1 + '@typescript-eslint/types': 5.4.0 + '@typescript-eslint/visitor-keys': 5.4.0 debug: 4.3.2 globby: 11.0.4 is-glob: 4.0.3 @@ -2320,12 +2320,12 @@ packages: - supports-color dev: true - /@typescript-eslint/visitor-keys/5.3.1: - resolution: {integrity: sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==} + /@typescript-eslint/visitor-keys/5.4.0: + resolution: {integrity: sha512-PVbax7MeE7tdLfW5SA0fs8NGVVr+buMPrcj+CWYWPXsZCH8qZ1THufDzbXm1xrZ2b2PA1iENJ0sRq5fuUtvsJg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.3.1 - eslint-visitor-keys: 3.0.0 + '@typescript-eslint/types': 5.4.0 + eslint-visitor-keys: 3.1.0 dev: true /@vue/babel-helper-vue-transform-on/1.0.2: @@ -2534,14 +2534,14 @@ packages: negotiator: 0.6.2 dev: true - /acorn-class-fields/1.0.0_acorn@8.5.0: + /acorn-class-fields/1.0.0_acorn@8.6.0: resolution: {integrity: sha512-l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA==} engines: {node: '>=4.8.2'} peerDependencies: acorn: ^6 || ^7 || ^8 dependencies: - acorn: 8.5.0 - acorn-private-class-elements: 1.0.0_acorn@8.5.0 + acorn: 8.6.0 + acorn-private-class-elements: 1.0.0_acorn@8.6.0 dev: true /acorn-globals/6.0.0: @@ -2551,12 +2551,12 @@ packages: acorn-walk: 7.2.0 dev: true - /acorn-jsx/5.3.2_acorn@8.5.0: + /acorn-jsx/5.3.2_acorn@8.6.0: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.5.0 + acorn: 8.6.0 dev: true /acorn-node/1.8.2: @@ -2567,23 +2567,23 @@ packages: xtend: 4.0.2 dev: false - /acorn-private-class-elements/1.0.0_acorn@8.5.0: + /acorn-private-class-elements/1.0.0_acorn@8.6.0: resolution: {integrity: sha512-zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg==} engines: {node: '>=4.8.2'} peerDependencies: acorn: ^6.1.0 || ^7 || ^8 dependencies: - acorn: 8.5.0 + acorn: 8.6.0 dev: true - /acorn-static-class-features/1.0.0_acorn@8.5.0: + /acorn-static-class-features/1.0.0_acorn@8.6.0: resolution: {integrity: sha512-XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A==} engines: {node: '>=4.8.2'} peerDependencies: acorn: ^6.1.0 || ^7 || ^8 dependencies: - acorn: 8.5.0 - acorn-private-class-elements: 1.0.0_acorn@8.5.0 + acorn: 8.6.0 + acorn-private-class-elements: 1.0.0_acorn@8.6.0 dev: true /acorn-walk/7.2.0: @@ -2606,6 +2606,12 @@ packages: hasBin: true dev: true + /acorn/8.6.0: + resolution: {integrity: sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: true + /add-stream/1.0.0: resolution: {integrity: sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=} dev: true @@ -3533,6 +3539,7 @@ packages: parse-json: 5.2.0 path-type: 4.0.0 yaml: 1.10.2 + dev: false /create-require/1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} @@ -4156,30 +4163,30 @@ packages: source-map: 0.6.1 dev: true - /eslint-define-config/1.1.3: - resolution: {integrity: sha512-QKVZKhZMw+wwjddgHlKM8HZd33RWFDacMfW863a7tNWNHirbKL0vGj5VwF2L4OiiEsK8QqvyAY5DQywyA5IzLw==} + /eslint-define-config/1.1.4: + resolution: {integrity: sha512-B1o0OTL32lPXwjjCpe+HtowrHqAlldInkU9PWVs+BsSi3E1GgjGIsiEz0g/1jHpBjP8zZMWh+DmdaB7gdLjUKQ==} engines: {node: '>= 16.9.0', npm: '>= 7.0.0', pnpm: '>= 6.17.0'} dev: true - /eslint-plugin-es/3.0.1_eslint@8.2.0: + /eslint-plugin-es/3.0.1_eslint@8.3.0: resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=4.19.1' dependencies: - eslint: 8.2.0 + eslint: 8.3.0 eslint-utils: 2.1.0 regexpp: 3.2.0 dev: true - /eslint-plugin-node/11.1.0_eslint@8.2.0: + /eslint-plugin-node/11.1.0_eslint@8.3.0: resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=5.16.0' dependencies: - eslint: 8.2.0 - eslint-plugin-es: 3.0.1_eslint@8.2.0 + eslint: 8.3.0 + eslint-plugin-es: 3.0.1_eslint@8.3.0 eslint-utils: 2.1.0 ignore: 5.1.9 minimatch: 3.0.4 @@ -4195,8 +4202,8 @@ packages: estraverse: 4.3.0 dev: true - /eslint-scope/6.0.0: - resolution: {integrity: sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==} + /eslint-scope/7.1.0: + resolution: {integrity: sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: esrecurse: 4.3.0 @@ -4210,13 +4217,13 @@ packages: eslint-visitor-keys: 1.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.2.0: + /eslint-utils/3.0.0_eslint@8.3.0: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.2.0 + eslint: 8.3.0 eslint-visitor-keys: 2.1.0 dev: true @@ -4230,13 +4237,13 @@ packages: engines: {node: '>=10'} dev: true - /eslint-visitor-keys/3.0.0: - resolution: {integrity: sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==} + /eslint-visitor-keys/3.1.0: + resolution: {integrity: sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.2.0: - resolution: {integrity: sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw==} + /eslint/8.3.0: + resolution: {integrity: sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: @@ -4249,10 +4256,10 @@ packages: doctrine: 3.0.0 enquirer: 2.3.6 escape-string-regexp: 4.0.0 - eslint-scope: 6.0.0 - eslint-utils: 3.0.0_eslint@8.2.0 - eslint-visitor-keys: 3.0.0 - espree: 9.0.0 + eslint-scope: 7.1.0 + eslint-utils: 3.0.0_eslint@8.3.0 + eslint-visitor-keys: 3.1.0 + espree: 9.1.0 esquery: 1.4.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -4282,13 +4289,13 @@ packages: - supports-color dev: true - /espree/9.0.0: - resolution: {integrity: sha512-r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ==} + /espree/9.1.0: + resolution: {integrity: sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.5.0 - acorn-jsx: 5.3.2_acorn@8.5.0 - eslint-visitor-keys: 3.0.0 + acorn: 8.6.0 + acorn-jsx: 5.3.2_acorn@8.6.0 + eslint-visitor-keys: 3.1.0 dev: true /esprima/4.0.1: @@ -5383,7 +5390,7 @@ packages: '@jest/environment': 27.3.1 '@jest/test-result': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -5463,7 +5470,7 @@ packages: jest-validate: 27.3.1 micromatch: 4.0.4 pretty-format: 27.3.1 - ts-node: 10.4.0_ee928ac548ac44c173bf0d4654ae2c29 + ts-node: 10.4.0_7dd5cf9af763e621261d5cc88a052be2 transitivePeerDependencies: - bufferutil - canvas @@ -5506,7 +5513,7 @@ packages: '@jest/environment': 27.3.1 '@jest/fake-timers': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 jest-mock: 27.3.0 jest-util: 27.3.1 jsdom: 16.7.0 @@ -5524,7 +5531,7 @@ packages: '@jest/environment': 27.3.1 '@jest/fake-timers': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 jest-mock: 27.3.0 jest-util: 27.3.1 dev: true @@ -5540,7 +5547,7 @@ packages: dependencies: '@jest/types': 27.2.5 '@types/graceful-fs': 4.1.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 anymatch: 3.1.2 fb-watchman: 2.0.1 graceful-fs: 4.2.8 @@ -5563,7 +5570,7 @@ packages: '@jest/source-map': 27.0.6 '@jest/test-result': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 chalk: 4.1.2 co: 4.6.0 expect: 27.3.1 @@ -5618,7 +5625,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 dev: true /jest-pnp-resolver/1.2.2_jest-resolve@27.3.1: @@ -5674,7 +5681,7 @@ packages: '@jest/test-result': 27.3.1 '@jest/transform': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 chalk: 4.1.2 emittery: 0.8.1 exit: 0.1.2 @@ -5736,7 +5743,7 @@ packages: resolution: {integrity: sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 graceful-fs: 4.2.8 dev: true @@ -5777,7 +5784,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 chalk: 4.1.2 ci-info: 3.2.0 graceful-fs: 4.2.8 @@ -5802,7 +5809,7 @@ packages: dependencies: '@jest/test-result': 27.3.1 '@jest/types': 27.2.5 - '@types/node': 16.11.7 + '@types/node': 16.11.9 ansi-escapes: 4.3.2 chalk: 4.1.2 jest-util: 27.3.1 @@ -5813,7 +5820,7 @@ packages: resolution: {integrity: sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 16.11.7 + '@types/node': 16.11.9 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -5879,7 +5886,7 @@ packages: optional: true dependencies: abab: 2.0.5 - acorn: 8.5.0 + acorn: 8.6.0 acorn-globals: 6.0.0 cssom: 0.4.4 cssstyle: 2.3.0 @@ -6051,28 +6058,28 @@ packages: /lines-and-columns/1.1.6: resolution: {integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=} - /lint-staged/12.0.2: - resolution: {integrity: sha512-tpCvACqc7bykziGJmXG0G8YG2RaCrWiDBwmrP9wU7i/3za9JMOvCECQmXjw/sO4ICC70ApVwyqixS1htQX9Haw==} + /lint-staged/12.1.1: + resolution: {integrity: sha512-zOmteWgJwTfZXcj6vXSnjeDDI/fvkKI2KOqRdc84ZFc2ZMDKXEeiTITtaskE3HiNrHraFmYVBpnMSZHngLoogA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true dependencies: cli-truncate: 3.1.0 colorette: 2.0.16 commander: 8.3.0 - cosmiconfig: 7.0.1 debug: 4.3.2_supports-color@9.0.2 + enquirer: 2.3.6 execa: 5.1.1 - listr2: 3.13.3 + lilconfig: 2.0.4 + listr2: 3.13.3_enquirer@2.3.6 micromatch: 4.0.4 normalize-path: 3.0.0 object-inspect: 1.11.0 string-argv: 0.3.1 supports-color: 9.0.2 - transitivePeerDependencies: - - enquirer + yaml: 1.10.2 dev: true - /listr2/3.13.3: + /listr2/3.13.3_enquirer@2.3.6: resolution: {integrity: sha512-VqAgN+XVfyaEjSaFewGPcDs5/3hBbWVaX1VgWv2f52MF7US45JuARlArULctiB44IIcEk3JF7GtoFCLqEdeuPA==} engines: {node: '>=10.0.0'} peerDependencies: @@ -6081,6 +6088,7 @@ packages: cli-truncate: 2.1.0 clone: 2.1.2 colorette: 2.0.16 + enquirer: 2.3.6 log-update: 4.0.0 p-map: 4.0.0 rxjs: 7.4.0 @@ -6975,7 +6983,7 @@ packages: dependencies: import-cwd: 3.0.0 lilconfig: 2.0.4 - ts-node: 10.4.0_ee928ac548ac44c173bf0d4654ae2c29 + ts-node: 10.4.0_7dd5cf9af763e621261d5cc88a052be2 yaml: 1.10.2 /postcss-modules-extract-imports/3.0.0_postcss@8.3.11: @@ -7880,6 +7888,13 @@ packages: source-map: 0.6.1 dev: true + /source-map-support/0.5.21: + resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} + dependencies: + buffer-from: 1.1.2 + source-map: 0.6.1 + dev: true + /source-map/0.5.7: resolution: {integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=} engines: {node: '>=0.10.0'} @@ -8279,7 +8294,7 @@ packages: supports-hyperlinks: 2.2.0 dev: true - /terser/5.10.0_acorn@8.5.0: + /terser/5.10.0_acorn@8.6.0: resolution: {integrity: sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==} engines: {node: '>=10'} hasBin: true @@ -8289,10 +8304,10 @@ packages: acorn: optional: true dependencies: - acorn: 8.5.0 + acorn: 8.6.0 commander: 2.20.3 source-map: 0.7.3 - source-map-support: 0.5.20 + source-map-support: 0.5.21 dev: true /test-exclude/6.0.0: @@ -8416,7 +8431,7 @@ packages: utf8-byte-length: 1.0.4 dev: true - /ts-jest/27.0.7_2c4ca6574207836d1023f54689cc81ac: + /ts-jest/27.0.7_b626c82449d36ccae0aa7169b15092e6: resolution: {integrity: sha512-O41shibMqzdafpuP+CkrOL7ykbmLh+FqQrXEmV9CydQ5JBk0Sj0uAEF5TNNe94fZWKm3yYvWa/IbyV4Yg1zK2Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -8434,7 +8449,7 @@ packages: babel-jest: optional: true dependencies: - '@types/jest': 27.0.2 + '@types/jest': 27.0.3 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 27.3.1_ts-node@10.4.0 @@ -8447,7 +8462,7 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-node/10.4.0_ee928ac548ac44c173bf0d4654ae2c29: + /ts-node/10.4.0_7dd5cf9af763e621261d5cc88a052be2: resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==} hasBin: true peerDependencies: @@ -8466,7 +8481,7 @@ packages: '@tsconfig/node12': 1.0.9 '@tsconfig/node14': 1.0.1 '@tsconfig/node16': 1.0.2 - '@types/node': 16.11.7 + '@types/node': 16.11.9 acorn: 8.5.0 acorn-walk: 8.2.0 arg: 4.1.3 From 880026e414d5745233ff2b67799cd386001bddd8 Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 22 Nov 2021 12:06:21 +0200 Subject: [PATCH 100/258] fix: replace asset references in CSS returned to JS (#5729) --- packages/playground/css/__tests__/css.spec.ts | 7 +++++++ packages/playground/css/inlined.css | 1 + packages/playground/css/ok.png | Bin 0 -> 4986 bytes packages/vite/src/node/plugins/asset.ts | 18 ++++++++++++------ 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 packages/playground/css/ok.png diff --git a/packages/playground/css/__tests__/css.spec.ts b/packages/playground/css/__tests__/css.spec.ts index 010f028a14ea82..f1eb66e097ad86 100644 --- a/packages/playground/css/__tests__/css.spec.ts +++ b/packages/playground/css/__tests__/css.spec.ts @@ -339,6 +339,13 @@ test('inlined', async () => { expect(await getColor('.inlined')).toBe('black') }) +test('inlined-code', async () => { + const code = await page.textContent('.inlined-code') + // should resolve assets + expect(code).toContain('background:') + expect(code).not.toContain('__VITE_ASSET__') +}) + test('minify css', async () => { if (!isBuild) { return diff --git a/packages/playground/css/inlined.css b/packages/playground/css/inlined.css index 68217369431dbd..1b08950784ee76 100644 --- a/packages/playground/css/inlined.css +++ b/packages/playground/css/inlined.css @@ -1,3 +1,4 @@ .inlined { color: green; + background: url('./ok.png'); } diff --git a/packages/playground/css/ok.png b/packages/playground/css/ok.png new file mode 100644 index 0000000000000000000000000000000000000000..a8d1e52510c41ceeaf3515ee2f594a82557d1685 GIT binary patch literal 4986 zcmZ`*2RK|?*B+e_JxHPrqC^`dI%D+CL?i|g27@8m=!PJK=%R!nQKA!~B)aHPqD6@= zdX1Xs?IXGWz4!UQ|3BwBXT4{y^{#jAwa>H935DsXk^yf40RRA*x|)*SrIo+D1c?bR z?>eFMtN;LT2BoM7Q&&_3!O)IYs3%AOKrJ*Okx2i(;Vu6y%xWZ*nhnJ9i&KruKfWK2 zyFN@q4VQ$YH7MOol~C15pOUIc*gumE7!~CoK~QR@T#8_ck(W0lA{Eo$$I(o}%GP4` z{gywSytz0#03S?ZdM^O!LEBja*Wk4NTIv;iY>g?j^l6RFdwA68IJmpt=64qLbl`Ae zsHN?BVO;}h`p(g-;i~t37w4wWIVro20MJlkF4Bclt)PjRoiK0$63<^MVudWxQnUR? ztoho_SWq+G{A;OB)6bG#&%PGWh~1-t5HsNTbN%!z(+6~jy+}=H(N#W;X`!rmN!&^u zWWfHTiGBy4nBBSQU3d38XJ&=bYo&>}Pz0!3=RB@&sNqoe;qmg0UV@C_NYIRL8yZCj zKDd}nzTn5+49ma4*#Qc-44~@hR@&cs?ESDLmZS5hLN1&ysU*$pC7Ymk*bzD{=nmbs zPhf(b$kKBy=djVV!e4Pck;lVEfh(vYePen*(4_xexEL1)_4uNw7g9S@HCXq4M@ zoTDVHrmue)WDm@>_lft$vMFF2VAM0ROe3a-n4DAHy|C)8k7IB1pvaB7)zjzHy&rVF zUJHu{^p7}>a~h$*J^K$o$65v5*?4{vN26YbORrjtLGtyWT}wPB=`$%X#e9bJ6iU2X z0=-*8A4PbXeAZR z0kwH*@;Bs$eAF&xp*LP@J@yO0MgSi=-}Ir^h8{443rHS60vh&ak;|Sp1K84W3H$MD z8Yz=-cyCK{%@EebLIt^;PVmLL0P#8Q<@&aNZbRBN>~_iRiPph zIKBR)Gr%gGP5+Q|qF;fDW;g1HGAZ$AK|rODyR5PuH_C#3fW#JXj^tTk_}3{oRuxPPfcU$Yax& zEFc{Aw^epacgXODDdy?g@FhoCWfb*0tUz7wCPzPxcpN(IU#zsHDxT4o;h2H>+Opz! z1E|7a5$fFLB;=f=-%YK>n!{L5?{dwB*@b8@+AF%v91FkyPDG57AzHgdpv9qavsKJ| zqQqnr@`IQ>WU$q6ZqhkJf?0sU;Kf9g^b6_8+R*iO-`2QoZ%^quIS3B8X?gz34$*e* zw)jrpPA2|?XF^R0lp2(jXp$6S3~^D=deGBm?t76o8m?R_RD&<YJhyi6i@G1>fr2=#kL(>V|RoR808IB-F{LdAHGCc25bC1PG#!Gb> zcF}aH($<811R5x(muX~cWUDXcbn)^8*lI1p==FZ)Ee>T4tq-w2cvcWv5Y40OmTjA` z<~-~$OeI>ATx67Ilrv8F5zjVph|oqNnWQJ0Go7~I7G;g{b-g|nv#Gc|I5Ke1-#2)2 z6CQjg@Qa$obrEtQshcfpcio8gZtP{RJy_!!#w2m)ki>oIHghm%Moc50re=r)iYQ80 zoJ9oR6u0*2Ps*RoW*y=luo}wKENoc8gM~X3(8HF-}S}_+#k^t*RIq$h~G?SHtAE; zeP@v4VYEe{`KAqlEa8DK!&{EWj{}Z@XSQcLXZP^#2igSs1gZqK2P-L7Ai@w>MD1+J z%ha!rG8a|$R45`yK0mQ|xg$1DK2O1!!&%C?u9d7!s3odZo#U0WmlNI1ZIx;j-ecSC zkYdp@wzRq=-Qx&vq>G|s3+D-6e^rtlmpzKkMUL=w^CcR_8j6jgEMzS7E_`g4 zw_E_MhwvHyETzr9YV@Oxa_?>Ko2@ zPUucX$X}5wgqV;YFs??qFpWr7NI!K$yT?k3N{~r0NODPTIc-{rj3R!J{RkJhLGPIO zK!EEJq*|)ls+QULtfi-me`>>jqLFb>vRM+d^sAbo>gQzP6h;Qltj;Xw{mXL=vnyjK zljeQXo1|{vTXs3gWk7;R@_n6s9df$8PVTVk_}w<@r}7cuA>EPt@z>M0XFO-AhYW|g z$0H{cL=uF2q&B3j_=H5S@ZDY9s(c)nJR~|KZIt_~&CpJkPRQ*+%5X|Uwe?4y4*iq- zE-XDFsa)6*Mxa7TOx{y@h~|gL~8WQr(cePqVN!8Q&~M)?Gto5wg-AEyAUYS<`Fi{82!57b+o4W zD@K!o3jMNQw#CYu$CJxm=U#IBir{&$ooR7{PtWc&?Q7a$-i(A!-U)-7#XRug1}U?> zbJ14ORlDNFiG{?a24jZWijUA-GdKC~9ys5J=?kuR0c%I9izd!wk1;z3Z`LSywJN-PPZYbsV2I|wJZ^I=<`y4-hJYM-n#?h~69@aKjf z5-M^Jhww!g#mL0NlQBkf#x+qyOpcCjcC!10d+$$lR?_mM@}Hsy@66>tyKj;EQz!a^ z`b2PVR_dyq>CpN1lgY7(<>o%OR0@dS&a;c>zJ9JugL347yeR;I6Pc_k}$v6Md_Wa|X@ph%E1=hks zFEv8^D=<9pNAN#MXH$e=^Q0EJ?l zl6q7QM>gt#Fz6BbIba1h8bmhu4s0RRWrBV8DSGcy8l!c?c0K(GI94X*w?{q~0 z$aqR!LVKhu0_17`#KA?%Q6%3t)$Cs{TdS63$~FxbPxL%>5sz!7Z?7Lt^d1Pcm-g@ySqBlums99$8e z{0=Vcf0F!99wnrU1sdh#igI)SUFAiXJG!~bvawwW{eAqY6X}WiN6EqEuW4OQ5PanU z3ke8<|1X*=%Ig22U3vb{e$VTVoXk}+DHzHV`NU8OWq;Y#%hDisC1if9{FmdOI{y$K zxFFGrj`o*4SI9rB@)!Bv&i_sPtqA`|QB3sTivM!_i+D8wDP1(`QVem`L5PqH_`k;f zikAUjwfA4`{0+a#&{bE3XOap7%002R{x{|!U4Z#K+rKN9h9fHTfT6Qa) z4{Y6ddS0CkX-^>( zxOjLJxD?HkmW|f9X(T?J-K>8B5U!8p_M(61HW1B-4GmSN3{~nM*yVCP_|+K4b!KLB z$dic+l{Nn~6Rv(AC z1FKTm+S}V%*C$6{`uey*iK-|21TA0l)Zn!b6Cd>K^JCW9zdDONx>MU-aB#R|I%m~eo6M=u^BIkm z)j>ayAomTE7{2gmxhQ+2kmf5zJ3HR0DsMBH-6mGnlP2pv2SGtW=ux>fyVIU6?ZVQc zqMx6fue;}F&=${^rluz5y(;0X9||qa2pgLh$)jUq^4{J&c?AV%wviuOw zl@44MJUqPcU-29<#^lxwU9BXcLz`{Qj`Z1|?oN)6kH?(#NRED*!n(hFC*idl{~>wO z-PTBIvWDZWRMtXRI8ffy)U>!qL&{JdvX-rHG@yA*_I1o}%g&6K7Of>-& zJPsz)BO@Xt`UuJhtx}x-~LVnovYU1icaewG;TPzZv)Jd+hNg@vGls}^HS%XRuS z^M|k4sqW=@pTZf}f$T7<^l6_Z8-4uI@o^YcwWgX5M6|&;Uxt_XHc+yL5Z^}uFE%vn zHD_V5NyylkAvO?1gV65Lotd3|o-0Q|;j#VmXF@($H!mlL&@?AELqn+i`TL@xmI`4k z2lzop7xdiL_pI+m;uEW9&v0kSmIUODjY&VJ%7yIjlXD9Q1XNVG53!@(q@}g2*ko!o zJJst~!}YJJtDC|^%7VTPf8&#A);uj*sJ~6zDruM_EL;v^XAgJbL)XSTu`zeBBq%?U z2N_mgK)ENYf0DW>E=AYXF@hEg_+pL8V?hgS>|&g^9L_!QaPdw#%(0FvX|hg51=O(+ zT}uN08)f#XS#M%#R#yi*tImpx3PaW|qQ(YlzSz5T;iHzjk)*PuF-%h(9o+mRG&D3N zC4$SYoje;`%9V)(&Ed=+%H~~oh>%2Q4M+3xX6M9L8{i|vF824%=R&;w2fP57lKV)S b37?V{t|cgkE9S{uec08Nb(D$~%%1%R{RRHc literal 0 HcmV?d00001 diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts index a10ec3094229e7..75dc3dcaa3f71d 100644 --- a/packages/vite/src/node/plugins/asset.ts +++ b/packages/vite/src/node/plugins/asset.ts @@ -13,10 +13,6 @@ import { normalizePath } from '../utils' export const assetUrlRE = /__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?/g -// urls in JS must be quoted as strings, so when replacing them we need -// a different regex -const assetUrlQuotedRE = /"__VITE_ASSET__([a-z\d]{8})__(?:\$_(.*?)__)?"/g - const rawRE = /(\?|&)raw(?:&|$)/ const urlRE = /(\?|&)url(?:&|$)/ @@ -85,7 +81,16 @@ export function assetPlugin(config: ResolvedConfig): Plugin { renderChunk(code, chunk) { let match: RegExpExecArray | null let s: MagicString | undefined - while ((match = assetUrlQuotedRE.exec(code))) { + + // Urls added with JS using e.g. + // imgElement.src = "my/file.png" are using quotes + + // Urls added in CSS that is imported in JS end up like + // var inlined = ".inlined{color:green;background:url(__VITE_ASSET__5aa0ddc0__)}\n"; + + // In both cases, the wrapping should already be fine + + while ((match = assetUrlRE.exec(code))) { s = s || (s = new MagicString(code)) const [full, hash, postfix = ''] = match // some internal plugins may still need to emit chunks (e.g. worker) so @@ -96,9 +101,10 @@ export function assetPlugin(config: ResolvedConfig): Plugin { s.overwrite( match.index, match.index + full.length, - JSON.stringify(outputFilepath) + outputFilepath ) } + if (s) { return { code: s.toString(), From 788d8810c6b5d7bd03224255617703b6be78cb3d Mon Sep 17 00:00:00 2001 From: patak-js Date: Mon, 22 Nov 2021 12:01:40 +0100 Subject: [PATCH 101/258] release: plugin-vue@1.10.0 --- packages/plugin-vue/CHANGELOG.md | 4 ++++ packages/plugin-vue/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue/CHANGELOG.md b/packages/plugin-vue/CHANGELOG.md index bcd5f44cbcae70..ac697f9f35712a 100644 --- a/packages/plugin-vue/CHANGELOG.md +++ b/packages/plugin-vue/CHANGELOG.md @@ -1,3 +1,7 @@ +# [1.10.0](https://github.com/vitejs/vite/compare/plugin-vue@1.10.0-beta.1...plugin-vue@1.10.0) (2021-11-22) + + + # [1.10.0-beta.1](https://github.com/vitejs/vite/compare/plugin-vue@1.10.0-beta.0...plugin-vue@1.10.0-beta.1) (2021-11-19) diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 0a658380ddea74..0df88e41d81b66 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue", - "version": "1.10.0-beta.1", + "version": "1.10.0", "license": "MIT", "author": "Evan You", "files": [ From 283d00f5a3dc67a4e86a880368c3649191c79e4f Mon Sep 17 00:00:00 2001 From: patak-js Date: Mon, 22 Nov 2021 12:03:30 +0100 Subject: [PATCH 102/258] release: plugin-vue-jsx@1.3.0 --- packages/plugin-vue-jsx/CHANGELOG.md | 4 ++++ packages/plugin-vue-jsx/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue-jsx/CHANGELOG.md b/packages/plugin-vue-jsx/CHANGELOG.md index f344d30f82200c..310ff252d3be03 100644 --- a/packages/plugin-vue-jsx/CHANGELOG.md +++ b/packages/plugin-vue-jsx/CHANGELOG.md @@ -1,3 +1,7 @@ +# [1.3.0](https://github.com/vitejs/vite/compare/plugin-vue-jsx@1.3.0-beta.0...plugin-vue-jsx@1.3.0) (2021-11-22) + + + # [1.3.0-beta.0](https://github.com/vitejs/vite/compare/plugin-vue-jsx@1.2.0...plugin-vue-jsx@1.3.0-beta.0) (2021-10-28) diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 827f0f56661bb1..7099ded621f79b 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue-jsx", - "version": "1.3.0-beta.0", + "version": "1.3.0", "license": "MIT", "author": "Evan You", "files": [ From faae3311c0193027829b1c9e09fdd4a73ced4963 Mon Sep 17 00:00:00 2001 From: patak-js Date: Mon, 22 Nov 2021 12:05:41 +0100 Subject: [PATCH 103/258] release: plugin-react@1.1.0 --- packages/plugin-react/CHANGELOG.md | 4 ++++ packages/plugin-react/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md index 4cc3ce06aeff87..2ed02eec161858 100644 --- a/packages/plugin-react/CHANGELOG.md +++ b/packages/plugin-react/CHANGELOG.md @@ -1,3 +1,7 @@ +# [1.1.0](https://github.com/vitejs/vite/compare/plugin-react@1.1.0-beta.1...plugin-react@1.1.0) (2021-11-22) + + + # [1.1.0-beta.1](https://github.com/vitejs/vite/compare/plugin-react@1.1.0-beta.0...plugin-react@1.1.0-beta.1) (2021-11-19) diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index bcde7b2d9c9448..5e639904cf88b8 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-react", - "version": "1.1.0-beta.1", + "version": "1.1.0", "license": "MIT", "author": "Evan You", "contributors": [ From 9b8c352c40d99ff59b1231cb8eb686cf9266210e Mon Sep 17 00:00:00 2001 From: patak-js Date: Mon, 22 Nov 2021 14:37:50 +0100 Subject: [PATCH 104/258] release: plugin-legacy@1.6.3 --- packages/plugin-legacy/CHANGELOG.md | 9 +++++++++ packages/plugin-legacy/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/plugin-legacy/CHANGELOG.md b/packages/plugin-legacy/CHANGELOG.md index 92a2a5cac70aca..077f29eaa790c0 100644 --- a/packages/plugin-legacy/CHANGELOG.md +++ b/packages/plugin-legacy/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.6.3](https://github.com/vitejs/vite/compare/plugin-legacy@1.6.2...plugin-legacy@1.6.3) (2021-11-22) + + +### Bug Fixes + +* **build:** resolve `rollupOptions.input` paths ([#5601](https://github.com/vitejs/vite/issues/5601)) ([5b6b016](https://github.com/vitejs/vite/commit/5b6b01693720290e8998b2613f0dcb2d699ee84f)) + + + ## [1.6.2](https://github.com/vitejs/vite/compare/plugin-legacy@1.6.1...plugin-legacy@1.6.2) (2021-10-11) diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json index 9966fd5b339235..3a7f8f9435889b 100644 --- a/packages/plugin-legacy/package.json +++ b/packages/plugin-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-legacy", - "version": "1.6.2", + "version": "1.6.3", "license": "MIT", "author": "Evan You", "files": [ From 757a74aa41f3b12505557637daec2058423cfd23 Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Mon, 22 Nov 2021 22:38:28 +0800 Subject: [PATCH 105/258] fix: unminified build breaks __vitePreload (#5785) --- .../preload/__tests__/preload.spec.ts | 11 +++++++++++ packages/playground/preload/router.js | 5 +++++ .../preload/src/components/Hello.vue | 18 ++++++++++++++++++ .../preload/src/components/Home.vue | 2 ++ .../src/node/plugins/importAnalysisBuild.ts | 19 +++++++++++++++---- 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 packages/playground/preload/src/components/Hello.vue diff --git a/packages/playground/preload/__tests__/preload.spec.ts b/packages/playground/preload/__tests__/preload.spec.ts index 941f1b8e030dba..27a64930487797 100644 --- a/packages/playground/preload/__tests__/preload.spec.ts +++ b/packages/playground/preload/__tests__/preload.spec.ts @@ -11,4 +11,15 @@ if (isBuild) { const appHtml = await page.content() expect(appHtml).toMatch('This is home page.') }) + + test('dynamic import with comments', async () => { + await page.goto(viteTestUrl + '/#/hello') + const html = await page.content() + expect(html).toMatch( + /link rel="modulepreload".*?href="\/assets\/Hello\.\w{8}\.js"/ + ) + expect(html).toMatch( + /link rel="stylesheet".*?href="\/assets\/Hello\.\w{8}\.css"/ + ) + }) } diff --git a/packages/playground/preload/router.js b/packages/playground/preload/router.js index a02628099bf264..d3d5afdc99f6a3 100644 --- a/packages/playground/preload/router.js +++ b/packages/playground/preload/router.js @@ -3,6 +3,11 @@ import Home from './src/components/Home.vue' const routes = [ { path: '/', name: 'Home', component: Home }, + { + path: '/hello', + name: 'Hello', + component: () => import(/* a comment */ './src/components/Hello.vue') + }, { path: '/about', name: 'About', diff --git a/packages/playground/preload/src/components/Hello.vue b/packages/playground/preload/src/components/Hello.vue new file mode 100644 index 00000000000000..33b44d278d305d --- /dev/null +++ b/packages/playground/preload/src/components/Hello.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/packages/playground/preload/src/components/Home.vue b/packages/playground/preload/src/components/Home.vue index aaf792bdc8e213..20f6b4948ac30a 100644 --- a/packages/playground/preload/src/components/Home.vue +++ b/packages/playground/preload/src/components/Home.vue @@ -3,6 +3,8 @@ This is home page.
Go to About page +
+ Go to Hello page
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts index 070d7fef13ab03..d3a7229d4eb777 100644 --- a/packages/vite/src/node/plugins/importAnalysisBuild.ts +++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts @@ -252,13 +252,24 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { if (imports.length) { const s = new MagicString(code) for (let index = 0; index < imports.length; index++) { - const { s: start, e: end, d: dynamicIndex } = imports[index] + // To handle escape sequences in specifier strings, the .n field will be provided where possible. + const { + n: name, + s: start, + e: end, + d: dynamicIndex + } = imports[index] // check the chunk being imported - const url = code.slice(start, end) + let url = name + if (!url) { + const rawUrl = code.slice(start, end) + if (rawUrl[0] === `"` && rawUrl[rawUrl.length - 1] === `"`) + url = rawUrl.slice(1, -1) + } const deps: Set = new Set() let hasRemovedPureCssChunk = false - if (url[0] === `"` && url[url.length - 1] === `"`) { + if (url) { const ownerFilename = chunk.fileName // literal import - trace direct imports and add to deps const analyzed: Set = new Set() @@ -295,7 +306,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin { } const normalizedFile = path.posix.join( path.posix.dirname(chunk.fileName), - url.slice(1, -1) + url ) addDeps(normalizedFile) } From d980ad1b8f8ca4db5ec147ba41b34c47833569ca Mon Sep 17 00:00:00 2001 From: zoomdong <1344492820@qq.com> Date: Tue, 23 Nov 2021 02:34:03 +0800 Subject: [PATCH 106/258] fix: packageManager config set error (#5797) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 474f7376e4b7d4..7ce2344796b294 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "eslint --ext .ts" ] }, - "packageManager": "pnpm", + "packageManager": "pnpm@6.23.0", "pnpm": { "overrides": { "vite": "workspace:*", From 4c172520550fc526e82d1f7d51d4fe3f76e855c0 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 23 Nov 2021 10:57:12 +0800 Subject: [PATCH 107/258] chore: new sponsor --- docs/.vitepress/theme/sponsors.json | 6 ++++++ docs/public/finclip.png | Bin 0 -> 13876 bytes 2 files changed, 6 insertions(+) create mode 100644 docs/public/finclip.png diff --git a/docs/.vitepress/theme/sponsors.json b/docs/.vitepress/theme/sponsors.json index 33e19a2cde3634..8c6dbef4df7057 100644 --- a/docs/.vitepress/theme/sponsors.json +++ b/docs/.vitepress/theme/sponsors.json @@ -35,5 +35,11 @@ "name": "divriots", "href": "https://divriots.com/", "src": "/divriots.png" + }, + { + "id": "finclip", + "name": "FinClip", + "href": "https://finclip.com/?from=vite", + "src": "/finclip.png" } ] diff --git a/docs/public/finclip.png b/docs/public/finclip.png new file mode 100644 index 0000000000000000000000000000000000000000..9110e6d56c164d598209d4b26ed019360efa181f GIT binary patch literal 13876 zcmV-4Hp|J0P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR927@z|H1ONa40RR91Q~&?~0FY#M1ONavo=HSORCodHT?b$k#rogfO8`N^ zMh836q=^L!j|9>ikQnv-?Fx3WJe4A7L{U^aD2fez&+>?XB%}udqED=tAPNGaNN-9_ za(BD?|9!JJo4vcemRv%>UAWBb%s1c6eEZFBzA3vS2#x3xeU&A)VDCL@b@l6FwL>Vm z;e4NTzS7qwTrx{Eq+rh|)oy>ibXX@*Qq{ikZ?03#=;}QzrfB!$F*!R}=5hbos3yMs z(_G3lY1+4L1?n{@UG6n#xI#aFh3XxZ{-dg@OtMH*?T^+iE~aSDQ!z_-vP@$?*rdk4 z^Rr%nw3oi`kev0Ievd-vem5qD8%~1)4d@${*_YoNNPK&T={l%w94pX_PUIFFzHMYK;s>Kmu=xf;dhU+=b1gqA-=4=ZlY!@M^i5I{n*AjRZp< zD|*U!Usu2J@o-)~MV$2Fm#VE=zDcO6`arZhU(T79Fq$U{hf9SC=@F-nTc!?syzr55 zWPZZ&@cEbsZ^SBxfJZdG`2Q}L)DSguYuY@+n7m!8%`W#Xx$YcMsH%RRhc~!8B!9OW zw{+JflyTgA4fqmgey=7^`DU82Fi=3&6_DF|(D3cXIPSkP@urrD+d%hyqSD_bcj%~m zQ(B61yM`2?Ah|obQDEGA8{9x4`S~x@v}ac8fQL+ux+V6wF*aTD8}B_x^;`WhQ9(qf zJg_*m!+HX~;@i5q=~LeLYecomelJgnk~U|VM5S-!8TF1D?znVFMsH5TU1JmGwB%kI zm3a}rCt4kWC0Th~sCKMEm?%2XEdclmALyeOD0TeG^MxbFIDY{V$0}AXZb1Q@Va1BY zkvc&D4=*6n>Xf=bWSwK?S{V?xe z`0|M2E-Ga2=;1GGg%vBfDM3kk4@zH7;k;0$Y!ct7c#ss9B2%CHVhR<+l&~HGb;)qv z1^4uxBiZE<$`hDzC!W6C_#46l7TtoX%_#kR+>Fg?Ds)_N0(Xu$71@ z+WY7bbe%Cd+tq|6f9Uuc|G}n-!~;eu>&cjZ=9;kDgTa7^GKgn-l?j(`VWybNmgd(J#~$j<*q@ocQpux1H!Q( zSs*?{%Aq}NRGykMD_Jk6fsIeE-borMVhi{FOHq|6Dw<4FF`{dJYTI8ZKJLTKDm5GG zvx@HM=9ST+QGK?7Ow4@w>vok#t9Pc1UG|WqD06dOioM^+9|`pi));Q|n^l}DivDZ~ zhC6Az(#ABt{9DT3(xZrPgiSopDXYKnKr>!m-4YQiiadoZ2+^(%%ujC3gp#>HZ6aWR zNrOx?q3}$|&3^KVUC^5T5_kyJ&ijmU!-LvJVl^@++D<4HsJRABz&@gx-PudTag z`J&%BUyLua%pQWN#w<%}C&n+_I!S~;o^RRjj_S1{|YG^VF;iZ_Ot z`Hgh2uCmN%Oa()PMH%P30Oy5-`5PW}I-EZxyuKF3sn~bvy_c|zlP0fLlO}zk!Yq6* z_nCj(PH9p{m#FIDYC&?U)0fOle2l{C<6^=Yoc<5bC*7%er)F!BAs3!e0LF3{g=h2| zX#z@@6DQ67;a=6@oJ)Xflf^4?$6oOb#SI_7vb)3K_=x~FcS?NF{5ao+c6|xUvm7B; zB>9CeZv)oM7iG-t5D=5AD3c(R@t(}B`;$-tA!`iDUSV6 z{w_@@WZ+?{H14Bc8+35zuWaFr3rR3TAQS=JG^|>oH2oZrx@^K3KB*PXf*o&OK?{b> zWyw$uXi8~%XV!d*|9OE(LJ|?4IB#A4@vcmR=TAbRiQt$|x9QF1_OdO_ctPUl{rCy_ z6W`g`nund}Zb0B9p)jpLlc6m+bRlOY(<-69dSk#`=xCEsS2kMds@iZMPF-@W8fnKLZ zC}=+RLx-uUNQ#EA9uBwLW|wdvXn8U>e9(EUcxcbbH8WBcsO^PH*enR ztAY;>F`*#PC={acC5S+Lp}Q;Au2>w+^Wm;nQ^KAHZSsP8pR^8or4HJw8Ky|8u(|NA z?xsTFOqXW;!_`|ULfT`6g*=?QR9NGWhkLqISzh5|$BrH3@jQ&**TVfn=b;KwX6d~I zBLdB|F4!F-$(ZA_c4mw`!>Bo#@gX|Qfyl<6XIk%jajSP&?L#1xb0{?z4lrxICpRy_ zlqR&fi@=tCu?v3FK~$2&RurZ>l?xN+{E*|x$av3|I$WTQ`IrP_9Qi9&EQ&DxJmUl1 z_lmx5Xds%<;zciT_7V&+EFB84g%Frki-k!FE4aDKp;MYjXOq?-E;VV&H>L(1&B>5< zk$*YTv3{xN!CQt}9CzN$dBa;AruKo<8qSAlv6_pVK zzkx)#7i$YZYvsH);BJdI8g3`usG`DsAktT=L(PwYnt_Ym6?_ zGH6OLWeXYu5@$dtWVqp%Kjtbu9hOK~IBc8cIaA|@1e59Uq9MUh-nwS_DTv>uWK37^ zNPl#)8mJ~eyNYFyI&QfJv;f=2E)-T5QFstdZm+RkzWn-=_eJ0to;(pk0glk*H=mEm zo!a;(!9D8{=sswT;f(U09*EvbvvbHj8HGZ14OwHjfNJZ;=I@?>E`5-osQ)V&+TrQi z^0Cq#9|<&w!o(Er9jVIBc~BBTB&!PM4s+2G$sU9aGPd~o^Cur45m>o~B7u5U7;GlF zSCO&N9!f$33pT&!ah*8>XHk#z9 z0yK$~q)Q8ic3i`&7`tFgU+g_!L&&3}5BxBppDP&I!|JZMpc;`IR)vWz-19KT{WCNL z0CG_G0|l_zguX?ooyvXHJK??cy%ncY&Zan2A+PZ6o_?oIeetov>t6z4Q5e3Du?8hz zn?P5ZsJ7nu!`jjQCjFwt%N^UCm8^RbgxB!K!UKAw!83erd7DbRyqlB=LzXFdkM@7U z5N&ynlLYFdFtLTZpTzTgiP;}e5N@N`MCp>EwD#+ab)vP)>VwCQVy;cIS!nK$**3ze z!jV1xVWb`U>e|kBhhr<}M=qfi7HwuO9Wx-L7t8qUi;=%SKh4t6dML7spfwDduJ=bD zYFyu_>!M^;F7umC6so(mj%b;koo(lI#(H?pB(XJCRmJ8=(TN%Mpx?ORyhCwor7-Av z#-Zz(#4=(J6Fw+FQ=8Z$FQo(Rch#?3igvZwz3<2ojy@`lilAkft5{w*vZvpvzLaS{ zbX1(x+qmK|Z?ni8Tg={i64(YLHkKYO9$JrPqw2!no#0;MWydV18L`$Mih4A ze!3(|Td*Q^EoAhNTRd){w2wk*X9TJTy&Z>_XTw%r&vNklkQ8P};ob>Ah>0vQLkG=9 ziHMBsR+!k@?S-by1z7lZ9zN{;uz@OyP*^mgdm=ADFmC$vZ`)TNsoJ3_3`DCb98Dt4 z%bhe>e?8fZ7Z)^W18&df>5+z(T<*k=HXi7cc)bT@%v1%1y%&)Y-N&}Dtb8A6&fw|D zjc6XxW=%o1+q5Y!1I0rD)8%z63R z!=B}!d!wLjVyiQ3LUn{BI3t86w#aHhju2%jQWBJiHOsQu3pJi;j1R}i%PcP*hIu6? ze;L!5Mv|l(u&-$Wrwhe3@-dc)c=(Dlh6lu`e_Ixs!~khh;GYF$U_Rsd1?SbxR^S+6#JO8a*(Uahjt;nMIdIf zdhk!IrfOF;(|@+GiINKFGB#nSO&1;=$Q7FkZ7Yfw?=jNx2ZSP-%C)x2V$7q~eo@$r z-9Hz3rmrcpdKb20{an6c(Ns?wp78`vQUQ1llO@MENvfqhJGV&;1U<*zA?`0Lu0i!L-PPruk3J2>st+j$)J zb3af~w&*o}Ut1TgCDE_KO5$vEnXd=pACkgwX0C<8$?^Z$^e+sPr?AlrwO_^lW5OFh zVrQ1xr*LGi3Zl;*(UUB2aoF@Vr`u)cpGda4PB!x5&!+9Q07sljB;W8ozo%6A#hS=UMO~bv~5WHT)L0ijpm^qAc5Oglm#q4+?6Oq*MFw zB)qw96o$Gpxs5{)nUp9}5HHOc)mL9TqU1NtTHW%`!^%OncSKO%T{>alon~xlpW30r ze;uSnN(}#|ESZ*AtC?O17tjP2XhCbs76pV{v$E7j7=3A|va)g-cn^T(eKFkMP|6R} zqk2!w%F3cLn_j)5Gy98*{1FtdOCW{eibae9(VAvv5*QYR;e7Eep!=Z+uWH>7l!j0T z_C|zFy*%f!E5GG*o^A%dWmjD-|Evww)lz)ozzuOc>8<|36aTT4XYye*g8OPVAaCBk?TS6dG82Z5;nw&d5ajYjF>%Q?wAgo=IuWF?}zv>pn zuDtJ#Bv2qiA5tPweJ*E8!qdLeTj7mI0u7=t#_A3ov+OCn;TjEu`D)24aZefJEWafI zO9CgE1R4}!67%=;bEwK_jHDzi`b{k!)=oEoPcpflwAE=ag~7KckHLmHrDn*@j9^De z#yL$+TIrsI6>AWM!Kbwqpo++qg;to^$jLQ}+fe6GoP^J>!K)P1;$vM(g%5}@WuZ+^ zY)gWNvXBz7Z4C=1S9am}-^B?IV0T*5^+oOdQNKfsJAC=0V`fJFSWE1b@98XaBn7SeUBZX+wM<1JNCi_*!*Iy0YMTk^-=eP=dOv zG_7NM&q~C7`0ENN#~=+cYPzi^ZBB2Io7&-+C%y4L`IWCWsR#GQr<^kX`p#9J^uF%%#}4S4^4u5e(fYb_9+Y?LQ)Ms%)PPFki?6?MJRCq7 zdo|@di60cicUP3J63-x$k{4mh@RD1#~Y3=e)3VO#4ZzEKTZ=pOuZJ_Xr5uhH+CCpaiveNfmdLq?#zp$D2RL!*wYO1PNs!Lsx1a(QN)5=LfAU zysS$nT!W8(t3R`DjVT|VC)~6#%jm(@$E6{!qTXR-PRc^}aBuZg78Z`LuR}q8@kkTR z?@GJ_w@?Tf}EoRt?1$bCde%7P2%{tA^#trl=}kD7|0(;&Z#K>rpY z7ri6p!O!PyPzZxn=k@e}*aepji&bTNNm|EFo}80D*>a_$TE2#qgp`UDh0?YpD_=#Y8isJ@i5f5ORt!W3)Yq{{I%EM>k`?A16+~iD;NEn z(>0`v@_E@t#{6B!qG*l87-8ZM4q>P}po^4+6hRS`(o}C{Arfb`T+HkZrYxG$G-=(c z1x{kEwXzUjx^gED>WSuE#fI;szfeXP#cm(;VT2}s(0{#tq{_LUS{WIjboQ=Ywr`@> zPgTXa-Xw|tAcA?kehNsBAQ#tBo&X;nc#r(}aKS@740ri8{^R6xm02^S#S&vFsOvP| z`|<~;Fg!Jsg&~cq&f`H|t}3)7TZ1DE(FYn0dGYWQfXy{i8N#``MW&p7=<6$rYyum5AnG4p{`VE29F{QslY0uTs3!iT#^vao)9MItP zEMr66&h;rak-e3Ymdpfod$l)TXbi) zzId2W8XD5!4~>-YJF>I7`k`4Hn|jg*x`(oC1+tt&3PRnGhF+?Gqws<*f1o_-Bi?gn zxliGhFMAf6Z{#hcOe88rM3vv7Z5Aql)>IL>Eg3ZS6}Jvf}P+727IcX?(~ba&6b zi2p%DBg9fVDB33H!KzS{26HWcAZ=%jPYr63vcMhz)5d<)j7AhiUKka1yVqi?XAOEs z5C5=cX4f;ecK5`uZ`AFl^VIl+?0sm)@9=xrWlOleyx5FhSOd(23IX?ufo? zcVZ|DElFTBVz~CJ2P^vyzV2#6kee6ZqWcWJEt@S4x6;s8M2RQ;U{k$j%owxEL4B|? zWQCzjN^Zmn@GhhwmnnlRw@G;GC%4a#5^dpwef#6pf$y|#3Hs&wyvLqhyDI%DP1?BS zJCLR$%ZG4;b!!-+&rA+#f{F5OESF@9a2p)Rvit>ma8VhPv4tXmCKch9Y7bHv=)c_R z<^2*fy>>DBO9S-y&0joyzt~^AF|Jk$Lk#E)QP%3oP$86||FY6L@r@t%8Z#h&{=@w* z1I;%uKp0ABN~Q{Xx9_Ml>z-1_F5iiBmfCB|;_8NwN4=d?>sjD1-P!s|v_@SH*6KdhMlmoeO*zt##v zOmP^Nh?!QGVXHk@D9zdUblE=7Obh;X`4w1u`kIuBcP->U>!FJrp0rSuty&kxdD98L z^>nPUSLSX3rVjY>op3qxyNhT9Pt(^_Li34IsM9$6sU1 z!qJ*$1xc-YsV}5xdXNiq==N(;hASZ_f0D8_WuBg$0&C zqgEIye&Va;3g$~-5Cb#_ao}P}|F68qFZXLyr94%(6AN|i2%(y_ZP7gYv8%nNu>*_8 zqVSYJeJG4uKk1oasP_dA^dWva(hz>2`#Bxmkk9G+)N#vpVFtGyTNi?oRc}9h%*+rD zwJa8W{YW6J3PVMN-J&ZEM;eTHPEVfnKQBu>b^P+(0F}11XNJupLt)52dsNNKZ1q!Z zi)(Eq5O#&3f)qS}uHTDxTNh z))mDgRCiU9o(Pu=>hMzcZhD zK^QL3rDF%!aAcoCN&-7YM-m-%xUxWREM?(RYus+VDhyRUZ^AWD8cgx(XyQT@+MYm) zM9MNX-a?kfttWcv>Rn+dr=?l{ut72OlV!Q`U{X%Dltq6QCxoX#6ow>``&`s%k`U1c zu<~Dg1^g30%C%6I;CB3-5TdjSX-UA6fF%J-0(FwWNoi}w7w+z(DC#u)1~a=FB4Rr` zNmOKe(@zk-j8w$O3NkvarW@QZvY-` z2qlTqGX=MHnW#}%e=P}E5(rfSCltWM7VdcfFJ;UzvrJeRStWGA#d_)in@x%-7}{}- z7FhE)@sr>B$quCyY4AB^hBVBYA-@Jz8t~MBmN2nsME7TEI9NVQ0+s}Vk-!N7Ffm1Y z9)cw@iwesoZUG?7?{eKhLJ;;NE(T}q{18Y0u^()~rzM=F0Hm`RxKIKHIB>z60gN7o z?@38gue=dGexxAlvLs+hAg}})HNXrh*fR<(ekN=5sEe0%LG=R=Xz}8H8(w5DO7B!2 zxZ3U%3Ge;d8y{3#23}`t08?WL(LIJ%`C_Lg>Bcjh+&NfxmIN#bm`R{f0!&Qd-bb+F zGo2NfTNKRIEEfg>1T5OM4fn81lqx6THf+MYneKc_I?%@Hq)S{p-y%^PP>Yj~+R?93XfJ4WlsM^Gg0B z{h#!vv_dQi{Jka6C;$e_&Hus+Zd2H!V1@~wY~^mv3J;q7UNJIaaB)hzfO8?43;sCe zki)(NKoCp7!of*%*^p~);T>Hc@CPPF^%y?4yiJv?F30MXcEW=`JOdT{*swP>@A1nX zH>R=tmIVIJ5;(2^6H~DJ3AFo{^#{PL6WqaN1*3av#JB(~dvNsL;G(ql>sWxFKQ3U& zg>^B6^J2@;8Y@^s2EYOzn>nnA*91K+@xuNYZC=P#UX)d{Xrvi= zqpt}0n{oc~H;cnZf?PWV&0@n5Cho-N-8v8_IxrO#{s@mG0)Q;z`P@{WC+&u#^qdD- zq+0pKktlZ*o)SCjipTqR#hs}4o6W?Cx!9ABp&KiwE3Xv*^^z~j zy$i=@v=4Ln8=urK#ldUP(!ZIW%`&_O*{Wo2d25YzN>0TsTqEsO+D z%;WpGM6nb{*~Ri$vuA=Q?{ykIr$5whCE8c3708*ov}+Zf8Z9JrfIHYJ?UR zA6A8)#;VY>Zp>W30_9XdrM(QW#*W0)>gux22v=P)AP{14g79YU3xn^e zEzp=LGx*kv1%tfICY0$!9@E~v*PwJ9@Z!<)i{hs!pA%q!3FBZd@mE_DG2w@jg&WOM z^c^xhR(1--W^oAnvx%+A<=-v;?`9wIAqCUCj$l7>pDIR_tu4#`&MdLnGYJM@LYMFG zL&*O$V;P`Ft1+2;Ra8{wsRvYfEI|7)=v*@+jfwvd7Ehjy=yKNV@8-?(K1j$UK`23_ z=V7~Ii+9JVvRHry=B;$D;R9I|G;F~v`3^yhj4DZOW2!iwg^K-X^IQPQy{wT^LuEfu zxm;Ee@P_izDbh<@p4tr?9VjyB+S-e0h_L;CL{Tb@1eyWDxl zf=v^ME^Oa8jVszW3DD z5Hs+Z_|ec2ufxpo{73YPO8*_;seeXezj)|nbXH#Af*z(yXwu@Uh6a~9$s-Jj(Y>}| zbB;z{qPPp~VjWsX74+?VMD;L68~sRssr}I2qp%9&ept4+#28mwf7k#9=PyGs43`mH z;3sT>Wl>g|+HtUfDxf#<|rGY6aO&`!!>e4%zO-fY90D~zF+PY%aF0%eZWWC1`S5kL-F`2jerJ}x;O z|DqCrhyIX)F1NVV6I{%amakki8gS+nx}#6Vu*URHZty( zWV$bKp*qlTNMI{e$s>V+2UzE91JD2TAISui*(_a#|&F4imy=qTC@voHu~ zT$TnJRdnp4Keh>xLUc)L=b+|Zmfm#X#`u44%t1p;<9vv>=MpgDUrl)Z$GCIEo|*IR zIleFm7nhL7+nA?Nn+T(2@Ivl#C*jkT8541FZ8-H z*wR2m0cp|o!t@vVdGk~+@eVurLoh;^S-xyhS+F(zs^Eh|eTJmpqB@1;-f2|7JCD8T z%|pUw!4$`z{V8^?#-oSEQESMI8jh>+kgN676s~kstK?r|7yQ0GY0d%|lKOEMR%^BTvybFII-)bT6NPZ?ACo2)pu zV8!b^CI`w6W!7Xv0E{1~>Tq&R&z-kU*1>wd#Vj zF{N8oyZu*KEax&HWT2>l2?IeYFN(^_DvEC|nVBTv_kN)ITk+l!=-9l&lR)Pqo-q(_ z^8@O^m7d`z|Gn}^|Cr2kLaL{tykbTVlOQbe3oF3zf|jIpoLD-n6DF_4@zlt)hNS@j zPU%DABCv7&6s5glSJub>XVcE)kALgVd6>Dm|JQXNCUW~UZz`RQ)rRsKpy50`Gt3}Ibp;; zyn;}8LF5_3W{>Jp9f)@@@o8CQ7b(@s3Ro*0_4y`BXsDyH8~~QrFcf+)T%cmM9F4ly z*G4;%q}LV7J{UaP4Op4z=EcM$02}pw$HVjLjm`4w7nO0DQ&qk(VZ(xu@8^+1v*F*Z z_-LOm8h_yc7TbnB@+|b~w2Gx);QIvXGer-8$LyJ)O9}X@fO)#m_Q4p-!Tch9K34n` zjjVzVpH$_1+^0ZS{mxNEL_}P@W?8nMozY%7`3zuf(PwO!BjP{Wg14xZ$qWQ|!>2q5 z3}|>mUb1*tzSuM*$%Bh-@41fM`uUUmTE!WdV8*v~g-bQS0zdrM_z_?2-q6^K+q7*v zw6?Df49{A1v0PPMhW#rYcs|T3qcR%nLSToiam~q@nG~>BVU!{KF;hy^`ELg>B(lWB zhnj9bw(T>B`-%V}TmWErF3=Ke-`I>Uid}e66_h)`&uz!7JO7$bT2MHafANy3+R8|S z{Psm&+`5Cmow8=nl6aT_Duw%^r?}c)0H5#A6kA@iV#WNB=W=}I8Maj!5}@G{a=0>xx2f^|lW;v6sNVv~b`0SI zU7|1s8~;33|HL<;Y>yk0BEPfk8}{0Hp0Hq#Vj})jBTYE`;JdElDINQ7tK5$7SO<7X z)0H7W#Q{Z~5qWCstZ?q&<@IS$fZ>_qP%|!TfR>P&=lU^%jX`4Pao~~7gAlG`Np@cjvY~p!TSmhEMUg0B>ZJog=@oG?6D)t zv9xDDADr{dwPlF%d8IzJ{8`0W^)y*X1c(GI48*9s;ElX$EGAK!kuxLVQJ>7Lhm8x?>_yAN``*U0x-qPoiQ;XYp7l_Ak0T^DW!rQt|gMV7$+v^`e z`y=miADS)Mp&&3>4iG5HVl^LZ>u_C1#!M4~Gh&>V0Uq4{5_ z0gVO>#F6bkk;M6zkH7Y=ERk)0qhOy`?xexbWR5PGR;{Q-;B_Sta_ftO4$3$+cV?1X z@8y$Wcp^wT4CgpId`&oru9s5>@1l2{ipO&Ya%+NmHo-HnA@zKp93=5w$oK{nkChM4 zz=8B{_@wuYkc9WJR5}g~gz}+_UW=d4d_nwi^~V1MDgA`r(HR*Se&3DqM1fV%TNu#8 zW2i2?ZHs6!XHCh+JBU}HYi-%0Q5dp4vAuHp9F+eq(7Qb&v-Ba$*Nllt82FNoP`QID zy9tXr1qG~low$dXIC0*(hhSOEf+|4=@P}CkEpT*CKCPN?rIj)-r{THW&Sp@T&z>i{Y%CXZiPGClE0 zFGf~?C4qX9fY}@jbaowvUVbNV>!~OVJGSAUgV-QMU!$1WN8;a1q zt6NaiKSe=`&3nB6cRYPJad)U8S8H zUspb`@|QJhe`;#5lfiy7vmz}Cgh2upz=T1FoJG>C@9t4$VJ;d!@Wll#aJZk*5g6ct z-EmNq)VQUiul||^`1vz5>$4t;!?_%o)m8&A;*A8ZJh;o}T5N)N<)_mV0`m2fr4?mK zAS@EF046MAbZ3$@<=YY1moN`QCvE1C4VMTH2pBXA2Nn;TdV(gG3aWiMETJ}R3Jhr(zz`t^DhhM)$ByJza;C>yb1a^MwC<0a1OPBTzi4;d3T2XU zqnv{=DW_Xd^2@95MEifs2sApdFbhOmNa2_tUwU)pM4KTdcDHB)SiXqXv02!1oT>2>IA6=PBw$IPZW1^t0EUYoE$g$J0UYlESTHKm zEER5*aI1w}FW?cxiMdnbp5c5f*OGuGf$&J+qyiW&5?UQno$^$CIw66Dxxj|c$M}*!&9?%V#{D Date: Wed, 24 Nov 2021 02:51:05 +0800 Subject: [PATCH 108/258] fix: resolve addons using nodeResolve() (#5809) --- .../ssr-vue/__tests__/ssr-vue.spec.ts | 6 + packages/playground/ssr-vue/package.json | 1 + .../playground/ssr-vue/src/pages/Home.vue | 8 +- packages/playground/ssr-vue/vite.config.js | 3 + packages/vite/src/node/ssr/ssrModuleLoader.ts | 4 +- pnpm-lock.yaml | 175 ++++++++++++++++-- 6 files changed, 175 insertions(+), 22 deletions(-) diff --git a/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts b/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts index 567396ba1674ca..bff643fea82f0e 100644 --- a/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts +++ b/packages/playground/ssr-vue/__tests__/ssr-vue.spec.ts @@ -163,3 +163,9 @@ test('deep import built-in module', async () => { await page.goto(url) expect(await page.textContent('.file-message')).toMatch('fs/promises') }) + +test('msg should encrypted', async () => { + // raw http request + const homeHtml = await (await fetch(url + '/')).text() + expect(homeHtml).not.toMatch('Secret Message!') +}) diff --git a/packages/playground/ssr-vue/package.json b/packages/playground/ssr-vue/package.json index e9e52ff862417a..bab7b8c408e817 100644 --- a/packages/playground/ssr-vue/package.json +++ b/packages/playground/ssr-vue/package.json @@ -14,6 +14,7 @@ "debug": "node --inspect-brk server" }, "dependencies": { + "bcrypt": "^5.0.1", "example-external-component": "file:example-external-component", "vue": "^3.2.21", "vue-router": "^4.0.0", diff --git a/packages/playground/ssr-vue/src/pages/Home.vue b/packages/playground/ssr-vue/src/pages/Home.vue index 5797edaf3c7232..1ef187c0361ffb 100644 --- a/packages/playground/ssr-vue/src/pages/Home.vue +++ b/packages/playground/ssr-vue/src/pages/Home.vue @@ -9,6 +9,7 @@

this will be styled with a font-face

{{ state.url }}

{{ state.protocol }}

+
encrypted message:

{{ encryptedMsg }}

@@ -27,10 +28,15 @@ const url = import.meta.env.SSR ? import.meta.url : document.querySelector('.import-meta-url').textContent const protocol = new URL(url).protocol +const encryptedMsg = import.meta.env.SSR + ? await (await import('bcrypt')).hash('Secret Message!', 10) + : document.querySelector('.encrypted-msg').textContent + const state = reactive({ count: 0, protocol, - url + url, + encryptedMsg }) diff --git a/packages/playground/ssr-vue/vite.config.js b/packages/playground/ssr-vue/vite.config.js index 897b47ca7c2ec8..1ff2cac01ff1bd 100644 --- a/packages/playground/ssr-vue/vite.config.js +++ b/packages/playground/ssr-vue/vite.config.js @@ -5,6 +5,9 @@ const vueJsx = require('@vitejs/plugin-vue-jsx') * @type {import('vite').UserConfig} */ module.exports = { + optimizeDeps: { + exclude: ['bcrypt'] + }, plugins: [ vuePlugin(), vueJsx(), diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 91ab6c10eafad3..07deb0a44c3a7c 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -228,7 +228,9 @@ async function nodeImport( // When an ESM module imports an ESM dependency, this hook is *not* used. const unhookNodeResolve = hookNodeResolve( (nodeResolve) => (id, parent, isMain, options) => { - if (id[0] === '.' || isBuiltin(id)) { + // Fix #5709, use require to resolve files with the '.node' file extension. + // See detail, https://nodejs.org/api/addons.html#addons_loading_addons_using_require + if (id[0] === '.' || isBuiltin(id) || id.endsWith('.node')) { return nodeResolve(id, parent, isMain, options) } if (parent) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d53588a53003e..41ce625bef4061 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -499,6 +499,7 @@ importers: specifiers: '@vitejs/plugin-vue': workspace:* '@vitejs/plugin-vue-jsx': workspace:* + bcrypt: ^5.0.1 compression: ^1.7.4 cross-env: ^7.0.3 dep-import-type: link:./dep-import-type @@ -509,6 +510,7 @@ importers: vue-router: ^4.0.0 vuex: ^4.0.2 dependencies: + bcrypt: 5.0.1 example-external-component: link:example-external-component vue: 3.2.21 vue-router: 4.0.12_vue@3.2.21 @@ -1753,6 +1755,23 @@ packages: engines: {node: '>=6.0.0'} dev: true + /@mapbox/node-pre-gyp/1.0.7: + resolution: {integrity: sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==} + hasBin: true + dependencies: + detect-libc: 1.0.3 + https-proxy-agent: 5.0.0 + make-dir: 3.1.0 + node-fetch: 2.6.6 + nopt: 5.0.0 + npmlog: 6.0.0 + rimraf: 3.0.2 + semver: 7.3.5 + tar: 6.1.11 + transitivePeerDependencies: + - supports-color + dev: false + /@microsoft/api-extractor-model/7.13.16: resolution: {integrity: sha512-ttdxVXsTWL5dd26W1YNLe3LgDsE0EE273aZlcLe58W0opymBybCYU1Mn+OHQM8BuErrdvdN8LdpWAAbkiOEN/Q==} dependencies: @@ -2526,6 +2545,10 @@ packages: resolution: {integrity: sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==} dev: true + /abbrev/1.1.1: + resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} + dev: false + /accepts/1.3.7: resolution: {integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==} engines: {node: '>= 0.6'} @@ -2623,7 +2646,6 @@ packages: debug: 4.3.2 transitivePeerDependencies: - supports-color - dev: true /aggregate-error/3.1.0: resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} @@ -2676,7 +2698,6 @@ packages: /ansi-regex/5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - dev: true /ansi-regex/6.0.1: resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} @@ -2712,6 +2733,18 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.0 + /aproba/2.0.0: + resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} + dev: false + + /are-we-there-yet/2.0.0: + resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} + engines: {node: '>=10'} + dependencies: + delegates: 1.0.0 + readable-stream: 3.6.0 + dev: false + /arg/4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} dev: true @@ -2902,6 +2935,17 @@ packages: engines: {node: '>=6.0.0'} dev: true + /bcrypt/5.0.1: + resolution: {integrity: sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==} + engines: {node: '>= 10.0.0'} + requiresBuild: true + dependencies: + '@mapbox/node-pre-gyp': 1.0.7 + node-addon-api: 3.2.1 + transitivePeerDependencies: + - supports-color + dev: false + /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: true @@ -3077,6 +3121,11 @@ packages: optionalDependencies: fsevents: 2.3.2 + /chownr/2.0.0: + resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} + engines: {node: '>=10'} + dev: false + /ci-info/1.6.0: resolution: {integrity: sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==} dev: true @@ -3195,6 +3244,11 @@ packages: simple-swizzle: 0.2.2 dev: false + /color-support/1.1.3: + resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} + hasBin: true + dev: false + /color/4.0.1: resolution: {integrity: sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==} dependencies: @@ -3300,6 +3354,10 @@ packages: utils-merge: 1.0.1 dev: true + /console-control-strings/1.1.0: + resolution: {integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=} + dev: false + /constantinople/4.0.1: resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==} dependencies: @@ -3762,6 +3820,10 @@ packages: resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==} dev: false + /delegates/1.0.0: + resolution: {integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=} + dev: false + /denque/1.5.1: resolution: {integrity: sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==} engines: {node: '>=0.10'} @@ -3776,6 +3838,12 @@ packages: resolution: {integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=} dev: true + /detect-libc/1.0.3: + resolution: {integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=} + engines: {node: '>=0.10'} + hasBin: true + dev: false + /detect-newline/3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} @@ -3876,7 +3944,6 @@ packages: /emoji-regex/8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - dev: true /emoji-regex/9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} @@ -4607,6 +4674,13 @@ packages: universalify: 0.1.2 dev: true + /fs-minipass/2.1.0: + resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.1.5 + dev: false + /fs.realpath/1.0.0: resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=} @@ -4624,6 +4698,21 @@ packages: resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=} dev: true + /gauge/4.0.0: + resolution: {integrity: sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16} + dependencies: + ansi-regex: 5.0.1 + aproba: 2.0.0 + color-support: 1.1.3 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + signal-exit: 3.0.5 + string-width: 4.2.3 + strip-ansi: 6.0.1 + wide-align: 1.1.5 + dev: false + /generic-names/2.0.1: resolution: {integrity: sha512-kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ==} dependencies: @@ -4824,6 +4913,10 @@ packages: has-symbols: 1.0.2 dev: true + /has-unicode/2.0.1: + resolution: {integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=} + dev: false + /has/1.0.3: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} @@ -4954,7 +5047,6 @@ packages: debug: 4.3.2 transitivePeerDependencies: - supports-color - dev: true /human-signals/2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} @@ -5178,7 +5270,6 @@ packages: /is-fullwidth-code-point/3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - dev: true /is-fullwidth-code-point/4.0.0: resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} @@ -6206,7 +6297,6 @@ packages: engines: {node: '>=10'} dependencies: yallist: 4.0.0 - dev: true /magic-string/0.25.7: resolution: {integrity: sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==} @@ -6228,7 +6318,6 @@ packages: engines: {node: '>=8'} dependencies: semver: 6.3.0 - dev: true /make-error/1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} @@ -6420,11 +6509,25 @@ packages: /minimist/1.2.5: resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==} + /minipass/3.1.5: + resolution: {integrity: sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==} + engines: {node: '>=8'} + dependencies: + yallist: 4.0.0 + dev: false + + /minizlib/2.1.2: + resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.1.5 + yallist: 4.0.0 + dev: false + /mkdirp/1.0.4: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} hasBin: true - dev: true /modern-normalize/1.1.0: resolution: {integrity: sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==} @@ -6499,6 +6602,10 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true + /node-addon-api/3.2.1: + resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==} + dev: false + /node-cron/2.0.3: resolution: {integrity: sha512-eJI+QitXlwcgiZwNNSRbqsjeZMp5shyajMR81RZCqeW0ZDEj4zU9tpd4nTh/1JsBiKbF8d08FCewiipDmVIYjg==} engines: {node: '>=6.0.0'} @@ -6519,7 +6626,6 @@ packages: engines: {node: 4.x || >=6.0.0} dependencies: whatwg-url: 5.0.0 - dev: true /node-forge/0.10.0: resolution: {integrity: sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==} @@ -6538,6 +6644,14 @@ packages: /node-releases/2.0.1: resolution: {integrity: sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==} + /nopt/5.0.0: + resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} + engines: {node: '>=6'} + hasBin: true + dependencies: + abbrev: 1.1.1 + dev: false + /normalize-package-data/2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: @@ -6605,6 +6719,16 @@ packages: path-key: 3.1.1 dev: true + /npmlog/6.0.0: + resolution: {integrity: sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==} + engines: {node: ^12.13.0 || ^14.15.0 || >=16} + dependencies: + are-we-there-yet: 2.0.0 + console-control-strings: 1.1.0 + gauge: 4.0.0 + set-blocking: 2.0.0 + dev: false + /nwsapi/2.2.0: resolution: {integrity: sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==} dev: true @@ -7474,7 +7598,6 @@ packages: inherits: 2.0.4 string_decoder: 1.3.0 util-deprecate: 1.0.2 - dev: true /readdirp/3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} @@ -7649,7 +7772,6 @@ packages: /safe-buffer/5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - dev: true /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} @@ -7717,7 +7839,6 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 - dev: true /send/0.17.1: resolution: {integrity: sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==} @@ -7748,6 +7869,10 @@ packages: send: 0.17.1 dev: true + /set-blocking/2.0.0: + resolution: {integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc=} + dev: false + /setprototypeof/1.1.1: resolution: {integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==} dev: true @@ -7790,7 +7915,6 @@ packages: /signal-exit/3.0.5: resolution: {integrity: sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==} - dev: true /simple-swizzle/0.2.2: resolution: {integrity: sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=} @@ -8024,7 +8148,6 @@ packages: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - dev: true /string-width/5.0.1: resolution: {integrity: sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==} @@ -8068,14 +8191,12 @@ packages: resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} dependencies: safe-buffer: 5.2.1 - dev: true /strip-ansi/6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} dependencies: ansi-regex: 5.0.1 - dev: true /strip-ansi/7.0.1: resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==} @@ -8273,6 +8394,18 @@ packages: - ts-node dev: false + /tar/6.1.11: + resolution: {integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==} + engines: {node: '>= 10'} + dependencies: + chownr: 2.0.0 + fs-minipass: 2.1.0 + minipass: 3.1.5 + minizlib: 2.1.2 + mkdirp: 1.0.4 + yallist: 4.0.0 + dev: false + /temp-dir/2.0.0: resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} engines: {node: '>=8'} @@ -8411,7 +8544,6 @@ packages: /tr46/0.0.3: resolution: {integrity: sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=} - dev: true /tr46/2.1.0: resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==} @@ -8800,7 +8932,6 @@ packages: /webidl-conversions/3.0.1: resolution: {integrity: sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=} - dev: true /webidl-conversions/5.0.0: resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==} @@ -8827,7 +8958,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /whatwg-url/8.7.0: resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==} @@ -8863,6 +8993,12 @@ packages: isexe: 2.0.0 dev: true + /wide-align/1.1.5: + resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} + dependencies: + string-width: 4.2.3 + dev: false + /with/7.0.2: resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==} engines: {node: '>= 10.0.0'} @@ -8961,7 +9097,6 @@ packages: /yallist/4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true /yaml/1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} From f6fcd2190e18f2ad20766a164411351b2220cf52 Mon Sep 17 00:00:00 2001 From: Sam Richard Date: Thu, 25 Nov 2021 01:12:55 -0500 Subject: [PATCH 109/258] fix: throw full error causing preprocessor to not load (#5816) --- packages/vite/src/node/plugins/css.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index a7cd3fd6cc11fa..19181acd66f430 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -1001,9 +1001,13 @@ function loadPreprocessor(lang: PreprocessLang, root: string): any { const resolved = require.resolve(lang, { paths: [root, ...fallbackPaths] }) return (loadedPreprocessors[lang] = require(resolved)) } catch (e) { - throw new Error( - `Preprocessor dependency "${lang}" not found. Did you install it?` - ) + if (e.code === 'MODULE_NOT_FOUND') { + throw new Error(`Preprocessor dependency "${lang}" not found. Did you install it?`); + } else { + const message = new Error(`Preprocessor dependency "${lang}" failed to load:\n${e.message}`); + message.stack = e.stack + '\n' + message.stack; + throw message; + } } } From 20481950dce58e21d06d0d7da0325a3788e683c5 Mon Sep 17 00:00:00 2001 From: yArna <82231420+yArna@users.noreply.github.com> Date: Thu, 25 Nov 2021 16:24:35 +0800 Subject: [PATCH 110/258] fix: unicode path html entry point (#5821) (#5823) --- packages/playground/html/__tests__/html.spec.ts | 14 ++++++++++++++ .../index.html" | 2 ++ packages/playground/html/vite.config.js | 6 +++++- .../vite/src/node/server/middlewares/indexHtml.ts | 4 ++-- .../src/node/server/middlewares/spaFallback.ts | 4 +++- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 "packages/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" diff --git a/packages/playground/html/__tests__/html.spec.ts b/packages/playground/html/__tests__/html.spec.ts index dec0821f607409..823e2f4784ad7a 100644 --- a/packages/playground/html/__tests__/html.spec.ts +++ b/packages/playground/html/__tests__/html.spec.ts @@ -196,3 +196,17 @@ describe('noBody', () => { expect(await kw.innerHTML()).toMatch(``) }) }) + +describe('unicode path', () => { + test('direct access', async () => { + await page.goto( + viteTestUrl + '/unicode-path/中文-にほんご-한글-🌕🌖🌗/index.html' + ) + expect(await page.textContent('h1')).toBe('unicode-path') + }) + + test('spa fallback', async () => { + await page.goto(viteTestUrl + '/unicode-path/中文-にほんご-한글-🌕🌖🌗/') + expect(await page.textContent('h1')).toBe('unicode-path') + }) +}) diff --git "a/packages/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" "b/packages/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" new file mode 100644 index 00000000000000..083283dab90380 --- /dev/null +++ "b/packages/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" @@ -0,0 +1,2 @@ +

unicode-path

+ diff --git a/packages/playground/html/vite.config.js b/packages/playground/html/vite.config.js index 4caec59d195ad3..09fb2fd337e7ee 100644 --- a/packages/playground/html/vite.config.js +++ b/packages/playground/html/vite.config.js @@ -16,7 +16,11 @@ module.exports = { noBody: resolve(__dirname, 'noBody.html'), inline1: resolve(__dirname, 'inline/shared-1.html'), inline2: resolve(__dirname, 'inline/shared-2.html'), - inline3: resolve(__dirname, 'inline/unique.html') + inline3: resolve(__dirname, 'inline/unique.html'), + unicodePath: resolve( + __dirname, + 'unicode-path/中文-にほんご-한글-🌕🌖🌗/index.html' + ) } } }, diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts index c6702e3966779e..1c4028d10378ab 100644 --- a/packages/vite/src/node/server/middlewares/indexHtml.ts +++ b/packages/vite/src/node/server/middlewares/indexHtml.ts @@ -34,9 +34,9 @@ export function createDevHtmlTransformFn( function getHtmlFilename(url: string, server: ViteDevServer) { if (url.startsWith(FS_PREFIX)) { - return fsPathFromId(url) + return decodeURIComponent(fsPathFromId(url)) } else { - return path.join(server.config.root, url.slice(1)) + return decodeURIComponent(path.join(server.config.root, url.slice(1))) } } diff --git a/packages/vite/src/node/server/middlewares/spaFallback.ts b/packages/vite/src/node/server/middlewares/spaFallback.ts index 73c0ad8cb2e92f..5d6e4ff8c5b5c4 100644 --- a/packages/vite/src/node/server/middlewares/spaFallback.ts +++ b/packages/vite/src/node/server/middlewares/spaFallback.ts @@ -14,7 +14,9 @@ export function spaFallbackMiddleware( { from: /\/$/, to({ parsedUrl }: any) { - const rewritten = parsedUrl.pathname + 'index.html' + const rewritten = + decodeURIComponent(parsedUrl.pathname) + 'index.html' + if (fs.existsSync(path.join(root, rewritten))) { return rewritten } else { From 00d8c9b7ffcfa2a3f888ef5752f57682cdea91b2 Mon Sep 17 00:00:00 2001 From: OneNail <31649110+OneNail@users.noreply.github.com> Date: Thu, 25 Nov 2021 17:26:02 +0800 Subject: [PATCH 111/258] fix: circular dependency hmr causes refresh crash (#4589) --- .../src/node/server/middlewares/indexHtml.ts | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts index 1c4028d10378ab..a5f46ab31f4e00 100644 --- a/packages/vite/src/node/server/middlewares/indexHtml.ts +++ b/packages/vite/src/node/server/middlewares/indexHtml.ts @@ -15,7 +15,8 @@ import { import { ResolvedConfig, ViteDevServer } from '../..' import { send } from '../send' import { CLIENT_PUBLIC_PATH, FS_PREFIX } from '../../constants' -import { cleanUrl, fsPathFromId, normalizePath } from '../../utils' +import { cleanUrl, fsPathFromId, normalizePath, injectQuery } from '../../utils' +import type { ModuleGraph } from '../moduleGraph' export function createDevHtmlTransformFn( server: ViteDevServer @@ -46,9 +47,17 @@ const processNodeUrl = ( s: MagicString, config: ResolvedConfig, htmlPath: string, - originalUrl?: string + originalUrl?: string, + moduleGraph?: ModuleGraph ) => { - const url = node.value?.content || '' + let url = node.value?.content || '' + + if (moduleGraph) { + const mod = moduleGraph.urlToModuleMap.get(url) + if (mod && mod.lastHMRTimestamp > 0) { + url = injectQuery(url, `t=${mod.lastHMRTimestamp}`) + } + } if (startsWithSingleSlashRE.test(url)) { // prefix with base s.overwrite( @@ -80,10 +89,7 @@ const devHtmlHook: IndexHtmlTransformHook = async ( html, { path: htmlPath, server, originalUrl } ) => { - // TODO: solve this design issue - // Optional chain expressions can return undefined by design - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - const config = server?.config! + const { config, moduleGraph } = server! const base = config.base || '/' const s = new MagicString(html) @@ -103,7 +109,7 @@ const devHtmlHook: IndexHtmlTransformHook = async ( } if (src) { - processNodeUrl(src, s, config, htmlPath, originalUrl) + processNodeUrl(src, s, config, htmlPath, originalUrl, moduleGraph) } else if (isModule) { const url = filePath.replace(normalizePath(config.root), '') From 494e3586fef5865ddc99f3cff48856495c4373f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Thu, 25 Nov 2021 21:17:05 +0100 Subject: [PATCH 112/258] feat: lint for missing type="module" attribute (#5837) (#5838) Co-authored-by: Alec Larson <1925840+aleclarson@users.noreply.github.com> --- packages/vite/src/node/plugins/html.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts index 1731a8aad57e5e..9aa4e4f4a289e0 100644 --- a/packages/vite/src/node/plugins/html.ts +++ b/packages/vite/src/node/plugins/html.ts @@ -210,7 +210,8 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin { const { src, isModule, isAsync } = getScriptInfo(node) const url = src && src.value && src.value.content - if (url && checkPublicFile(url, config)) { + const isPublicFile = !!(url && checkPublicFile(url, config)) + if (isPublicFile) { // referencing public dir url, prefix with base s.overwrite( src!.value!.loc.start.offset, @@ -245,6 +246,10 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin { everyScriptIsAsync &&= isAsync someScriptsAreAsync ||= isAsync someScriptsAreDefer ||= !isAsync + } else if (url && !isPublicFile) { + config.logger.warn( + ` diff --git a/packages/playground/ssr-vue/vite.config.js b/packages/playground/ssr-vue/vite.config.js index 1ff2cac01ff1bd..897b47ca7c2ec8 100644 --- a/packages/playground/ssr-vue/vite.config.js +++ b/packages/playground/ssr-vue/vite.config.js @@ -5,9 +5,6 @@ const vueJsx = require('@vitejs/plugin-vue-jsx') * @type {import('vite').UserConfig} */ module.exports = { - optimizeDeps: { - exclude: ['bcrypt'] - }, plugins: [ vuePlugin(), vueJsx(), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7011891db1cbc..210c92ed29b5b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -454,6 +454,28 @@ importers: packages/playground/resolve/inline-package: specifiers: {} + packages/playground/ssr-deps: + specifiers: + cross-env: ^7.0.3 + express: ^4.17.1 + node-addon: link:./node-addon + read-file-content: file:./read-file-content + dependencies: + node-addon: link:node-addon + read-file-content: link:read-file-content + devDependencies: + cross-env: 7.0.3 + express: 4.17.1 + + packages/playground/ssr-deps/node-addon: + specifiers: + node-gyp: ^8.4.1 + dependencies: + node-gyp: 8.4.1 + + packages/playground/ssr-deps/read-file-content: + specifiers: {} + packages/playground/ssr-html: specifiers: cross-env: ^7.0.3 @@ -499,7 +521,6 @@ importers: specifiers: '@vitejs/plugin-vue': workspace:* '@vitejs/plugin-vue-jsx': workspace:* - bcrypt: ^5.0.1 compression: ^1.7.4 cross-env: ^7.0.3 dep-import-type: link:./dep-import-type @@ -510,7 +531,6 @@ importers: vue-router: ^4.0.0 vuex: ^4.0.2 dependencies: - bcrypt: 5.0.1 example-external-component: link:example-external-component vue: 3.2.23 vue-router: 4.0.12_vue@3.2.23 @@ -1516,6 +1536,10 @@ packages: resolution: {integrity: sha512-bprfNmYt1opFUFEtD2XfY/kEsm13bzHQgU80uMjhuK0DJ914IjolT1GytpkdM6tJ4MBvyiJPP+bTtWO+BZ7c7w==} dev: true + /@gar/promisify/1.1.2: + resolution: {integrity: sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==} + dev: false + /@humanwhocodes/config-array/0.6.0: resolution: {integrity: sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==} engines: {node: '>=10.10.0'} @@ -1752,23 +1776,6 @@ packages: engines: {node: '>=6.0.0'} dev: true - /@mapbox/node-pre-gyp/1.0.7: - resolution: {integrity: sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==} - hasBin: true - dependencies: - detect-libc: 1.0.3 - https-proxy-agent: 5.0.0 - make-dir: 3.1.0 - node-fetch: 2.6.6 - nopt: 5.0.0 - npmlog: 6.0.0 - rimraf: 3.0.2 - semver: 7.3.5 - tar: 6.1.11 - transitivePeerDependencies: - - supports-color - dev: false - /@microsoft/api-extractor-model/7.13.16: resolution: {integrity: sha512-ttdxVXsTWL5dd26W1YNLe3LgDsE0EE273aZlcLe58W0opymBybCYU1Mn+OHQM8BuErrdvdN8LdpWAAbkiOEN/Q==} dependencies: @@ -1836,6 +1843,21 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.13.0 + /@npmcli/fs/1.0.0: + resolution: {integrity: sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==} + dependencies: + '@gar/promisify': 1.1.2 + semver: 7.3.5 + dev: false + + /@npmcli/move-file/1.1.2: + resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==} + engines: {node: '>=10'} + dependencies: + mkdirp: 1.0.4 + rimraf: 3.0.2 + dev: false + /@peculiar/asn1-schema/2.0.38: resolution: {integrity: sha512-zZ64UpCTm9me15nuCpPgJghSdbEm8atcDQPCyK+bKXjZAQ1735NCZXCSCfbckbQ4MH36Rm9403n/qMq77LFDzQ==} dependencies: @@ -2009,7 +2031,6 @@ packages: /@tootallnate/once/1.1.2: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} engines: {node: '>= 6'} - dev: true /@tsconfig/node10/1.0.8: resolution: {integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==} @@ -2664,13 +2685,23 @@ packages: transitivePeerDependencies: - supports-color + /agentkeepalive/4.1.4: + resolution: {integrity: sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==} + engines: {node: '>= 8.0.0'} + dependencies: + debug: 4.3.2 + depd: 1.1.2 + humanize-ms: 1.2.1 + transitivePeerDependencies: + - supports-color + dev: false + /aggregate-error/3.1.0: resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} engines: {node: '>=8'} dependencies: clean-stack: 2.2.0 indent-string: 4.0.0 - dev: true /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} @@ -2952,17 +2983,6 @@ packages: engines: {node: '>=6.0.0'} dev: true - /bcrypt/5.0.1: - resolution: {integrity: sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==} - engines: {node: '>= 10.0.0'} - requiresBuild: true - dependencies: - '@mapbox/node-pre-gyp': 1.0.7 - node-addon-api: 3.2.1 - transitivePeerDependencies: - - supports-color - dev: false - /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: true @@ -3061,6 +3081,30 @@ packages: engines: {node: '>=8'} dev: true + /cacache/15.3.0: + resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==} + engines: {node: '>= 10'} + dependencies: + '@npmcli/fs': 1.0.0 + '@npmcli/move-file': 1.1.2 + chownr: 2.0.0 + fs-minipass: 2.1.0 + glob: 7.2.0 + infer-owner: 1.0.4 + lru-cache: 6.0.0 + minipass: 3.1.5 + minipass-collect: 1.0.2 + minipass-flush: 1.0.5 + minipass-pipeline: 1.2.4 + mkdirp: 1.0.4 + p-map: 4.0.0 + promise-inflight: 1.0.1 + rimraf: 3.0.2 + ssri: 8.0.1 + tar: 6.1.11 + unique-filename: 1.1.1 + dev: false + /call-bind/1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: @@ -3177,7 +3221,6 @@ packages: /clean-stack/2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} - dev: true /cli-cursor/3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} @@ -3849,18 +3892,11 @@ packages: /depd/1.1.2: resolution: {integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=} engines: {node: '>= 0.6'} - dev: true /destroy/1.0.4: resolution: {integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=} dev: true - /detect-libc/1.0.3: - resolution: {integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=} - engines: {node: '>=0.10'} - hasBin: true - dev: false - /detect-newline/3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} @@ -3976,6 +4012,14 @@ packages: engines: {node: '>= 0.8'} dev: true + /encoding/0.1.13: + resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} + requiresBuild: true + dependencies: + iconv-lite: 0.6.3 + dev: false + optional: true + /end-of-stream/1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} dependencies: @@ -3992,7 +4036,10 @@ packages: /env-paths/2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - dev: true + + /err-code/2.0.3: + resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} + dev: false /errno/0.1.8: resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==} @@ -5010,7 +5057,6 @@ packages: /http-cache-semantics/4.1.0: resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} - dev: true /http-errors/1.7.2: resolution: {integrity: sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==} @@ -5043,7 +5089,6 @@ packages: debug: 4.3.2 transitivePeerDependencies: - supports-color - dev: true /http-proxy/1.18.1_debug@4.3.2: resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} @@ -5070,6 +5115,12 @@ packages: engines: {node: '>=10.17.0'} dev: true + /humanize-ms/1.2.1: + resolution: {integrity: sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=} + dependencies: + ms: 2.1.3 + dev: false + /iconv-lite/0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -5077,6 +5128,14 @@ packages: safer-buffer: 2.1.2 dev: true + /iconv-lite/0.6.3: + resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} + engines: {node: '>=0.10.0'} + dependencies: + safer-buffer: 2.1.2 + dev: false + optional: true + /icss-replace-symbols/1.1.0: resolution: {integrity: sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=} dev: true @@ -5144,12 +5203,14 @@ packages: /imurmurhash/0.1.4: resolution: {integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o=} engines: {node: '>=0.8.19'} - dev: true /indent-string/4.0.0: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} - dev: true + + /infer-owner/1.0.4: + resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} + dev: false /inflight/1.0.6: resolution: {integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=} @@ -5198,7 +5259,6 @@ packages: /ip/1.1.5: resolution: {integrity: sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=} - dev: true /ipaddr.js/1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} @@ -5304,6 +5364,10 @@ packages: dependencies: is-extglob: 2.1.1 + /is-lambda/1.0.1: + resolution: {integrity: sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=} + dev: false + /is-module/1.0.0: resolution: {integrity: sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=} dev: true @@ -5422,7 +5486,6 @@ packages: /isexe/2.0.0: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} - dev: true /istanbul-lib-coverage/3.2.0: resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==} @@ -6335,11 +6398,36 @@ packages: engines: {node: '>=8'} dependencies: semver: 6.3.0 + dev: true /make-error/1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} dev: true + /make-fetch-happen/9.1.0: + resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==} + engines: {node: '>= 10'} + dependencies: + agentkeepalive: 4.1.4 + cacache: 15.3.0 + http-cache-semantics: 4.1.0 + http-proxy-agent: 4.0.1 + https-proxy-agent: 5.0.0 + is-lambda: 1.0.1 + lru-cache: 6.0.0 + minipass: 3.1.5 + minipass-collect: 1.0.2 + minipass-fetch: 1.4.1 + minipass-flush: 1.0.5 + minipass-pipeline: 1.2.4 + negotiator: 0.6.2 + promise-retry: 2.0.1 + socks-proxy-agent: 6.1.0 + ssri: 8.0.1 + transitivePeerDependencies: + - supports-color + dev: false + /makeerror/1.0.12: resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} dependencies: @@ -6526,6 +6614,45 @@ packages: /minimist/1.2.5: resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==} + /minipass-collect/1.0.2: + resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.1.5 + dev: false + + /minipass-fetch/1.4.1: + resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==} + engines: {node: '>=8'} + dependencies: + minipass: 3.1.5 + minipass-sized: 1.0.3 + minizlib: 2.1.2 + optionalDependencies: + encoding: 0.1.13 + dev: false + + /minipass-flush/1.0.5: + resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.1.5 + dev: false + + /minipass-pipeline/1.2.4: + resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} + engines: {node: '>=8'} + dependencies: + minipass: 3.1.5 + dev: false + + /minipass-sized/1.0.3: + resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} + engines: {node: '>=8'} + dependencies: + minipass: 3.1.5 + dev: false + /minipass/3.1.5: resolution: {integrity: sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==} engines: {node: '>=8'} @@ -6573,8 +6700,6 @@ packages: /ms/2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - dev: true - optional: true /mustache/4.2.0: resolution: {integrity: sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==} @@ -6605,7 +6730,6 @@ packages: /negotiator/0.6.2: resolution: {integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==} engines: {node: '>= 0.6'} - dev: true /neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} @@ -6619,10 +6743,6 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true - /node-addon-api/3.2.1: - resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==} - dev: false - /node-cron/2.0.3: resolution: {integrity: sha512-eJI+QitXlwcgiZwNNSRbqsjeZMp5shyajMR81RZCqeW0ZDEj4zU9tpd4nTh/1JsBiKbF8d08FCewiipDmVIYjg==} engines: {node: '>=6.0.0'} @@ -6643,12 +6763,32 @@ packages: engines: {node: 4.x || >=6.0.0} dependencies: whatwg-url: 5.0.0 + dev: true /node-forge/0.10.0: resolution: {integrity: sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==} engines: {node: '>= 6.0.0'} dev: true + /node-gyp/8.4.1: + resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==} + engines: {node: '>= 10.12.0'} + hasBin: true + dependencies: + env-paths: 2.2.1 + glob: 7.2.0 + graceful-fs: 4.2.8 + make-fetch-happen: 9.1.0 + nopt: 5.0.0 + npmlog: 6.0.0 + rimraf: 3.0.2 + semver: 7.3.5 + tar: 6.1.11 + which: 2.0.2 + transitivePeerDependencies: + - supports-color + dev: false + /node-int64/0.4.0: resolution: {integrity: sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=} dev: true @@ -6888,7 +7028,6 @@ packages: engines: {node: '>=10'} dependencies: aggregate-error: 3.1.0 - dev: true /p-try/1.0.0: resolution: {integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=} @@ -7262,6 +7401,18 @@ packages: engines: {node: '>=0.4.0'} dev: true + /promise-inflight/1.0.1: + resolution: {integrity: sha1-mEcocL8igTL8vdhoEputEsPAKeM=} + dev: false + + /promise-retry/2.0.1: + resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} + engines: {node: '>=10'} + dependencies: + err-code: 2.0.3 + retry: 0.12.0 + dev: false + /promise/7.3.1: resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==} dependencies: @@ -7728,7 +7879,6 @@ packages: /retry/0.12.0: resolution: {integrity: sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=} engines: {node: '>= 4'} - dev: true /reusify/1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} @@ -7792,7 +7942,6 @@ packages: /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - dev: true /sanitize-filename/1.6.3: resolution: {integrity: sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==} @@ -7990,7 +8139,6 @@ packages: /smart-buffer/4.2.0: resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} - dev: true /socks-proxy-agent/6.1.0: resolution: {integrity: sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg==} @@ -8001,7 +8149,6 @@ packages: socks: 2.6.1 transitivePeerDependencies: - supports-color - dev: true /socks/2.6.1: resolution: {integrity: sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==} @@ -8009,7 +8156,6 @@ packages: dependencies: ip: 1.1.5 smart-buffer: 4.2.0 - dev: true /source-map-js/0.6.2: resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==} @@ -8116,6 +8262,13 @@ packages: resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=} dev: true + /ssri/8.0.1: + resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.1.5 + dev: false + /stack-trace/0.0.10: resolution: {integrity: sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=} dev: true @@ -8561,6 +8714,7 @@ packages: /tr46/0.0.3: resolution: {integrity: sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=} + dev: true /tr46/2.1.0: resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==} @@ -8783,6 +8937,18 @@ packages: which-boxed-primitive: 1.0.2 dev: true + /unique-filename/1.1.1: + resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==} + dependencies: + unique-slug: 2.0.2 + dev: false + + /unique-slug/2.0.2: + resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==} + dependencies: + imurmurhash: 0.1.4 + dev: false + /universalify/0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -8949,6 +9115,7 @@ packages: /webidl-conversions/3.0.1: resolution: {integrity: sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=} + dev: true /webidl-conversions/5.0.0: resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==} @@ -8975,6 +9142,7 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 + dev: true /whatwg-url/8.7.0: resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==} @@ -9008,7 +9176,6 @@ packages: hasBin: true dependencies: isexe: 2.0.0 - dev: true /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} From 5b8c58bf9d2fe141cea9bde9492ccbedf9b76213 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Thu, 2 Dec 2021 10:19:55 -0500 Subject: [PATCH 138/258] fix: invalidate inlined proxy scripts on change (#5891) --- .../vite/src/node/server/middlewares/indexHtml.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts index a5f46ab31f4e00..e257628a35a746 100644 --- a/packages/vite/src/node/server/middlewares/indexHtml.ts +++ b/packages/vite/src/node/server/middlewares/indexHtml.ts @@ -121,12 +121,20 @@ const devHtmlHook: IndexHtmlTransformHook = async ( addToHTMLProxyCache(config, url, scriptModuleIndex, contents) // inline js module. convert to src="proxy" + const modulePath = `${ + config.base + htmlPath.slice(1) + }?html-proxy&index=${scriptModuleIndex}.js` + + // invalidate the module so the newly cached contents will be served + const module = server?.moduleGraph.getModuleById(modulePath) + if (module) { + server?.moduleGraph.invalidateModule(module) + } + s.overwrite( node.loc.start.offset, node.loc.end.offset, - `` + `` ) } } From 7edabb46de3ce63e078e0cda7cd3ed9e5cdd0f2a Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 2 Dec 2021 07:26:04 -0800 Subject: [PATCH 139/258] fix: read the correct package.json in ssrExternal (#5927) Fixes #5890 --- packages/vite/src/node/ssr/ssrExternal.ts | 33 ++++++++++++++++------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts index f846c64edd1aaa..3549d5653dfc95 100644 --- a/packages/vite/src/node/ssr/ssrExternal.ts +++ b/packages/vite/src/node/ssr/ssrExternal.ts @@ -8,7 +8,7 @@ import { normalizePath, resolveFrom } from '../utils' -import { ResolvedConfig } from '..' +import { Logger, ResolvedConfig } from '..' import { createFilter } from '@rollup/pluginutils' const debug = createDebugger('vite:ssr-external') @@ -37,7 +37,8 @@ export function resolveSSRExternal( config.root, config.resolve.preserveSymlinks, ssrExternals, - seen + seen, + config.logger ) const importedDeps = knownImports.map(getNpmPackageName).filter(isDefined) @@ -68,17 +69,18 @@ function collectExternals( root: string, preserveSymlinks: boolean | undefined, ssrExternals: Set, - seen: Set + seen: Set, + logger: Logger ) { - const pkgContent = lookupFile(root, ['package.json']) - if (!pkgContent) { + const rootPkgContent = lookupFile(root, ['package.json']) + if (!rootPkgContent) { return } - const pkg = JSON.parse(pkgContent) + const rootPkg = JSON.parse(rootPkgContent) const deps = { - ...pkg.devDependencies, - ...pkg.dependencies + ...rootPkg.devDependencies, + ...rootPkg.dependencies } const resolveOptions: InternalResolveOptions = { @@ -141,6 +143,14 @@ function collectExternals( // or are there others like SystemJS / AMD that we'd need to handle? // for now, we'll just leave this as is else if (/\.m?js$/.test(esmEntry)) { + const pkgPath = resolveFrom(`${id}/package.json`, root) + const pkgContent = fs.readFileSync(pkgPath, 'utf-8') + + if (!pkgContent) { + continue + } + const pkg = JSON.parse(pkgContent) + if (pkg.type === 'module' || esmEntry.endsWith('.mjs')) { ssrExternals.add(id) continue @@ -149,12 +159,17 @@ function collectExternals( const content = fs.readFileSync(esmEntry, 'utf-8') if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) { ssrExternals.add(id) + continue } + + logger.warn( + `${id} is incorrectly packaged. Please contact the package author to fix.` + ) } } for (const depRoot of depsToTrace) { - collectExternals(depRoot, preserveSymlinks, ssrExternals, seen) + collectExternals(depRoot, preserveSymlinks, ssrExternals, seen, logger) } } From 21d79d753af145f2c7ebb7dd5b0b1a4a298f96c5 Mon Sep 17 00:00:00 2001 From: Rom Brillout Date: Thu, 2 Dec 2021 21:53:12 +0100 Subject: [PATCH 140/258] fix: SSR import in dev can't resolve default import (fix #5706) (#5923) --- packages/vite/src/node/ssr/ssrModuleLoader.ts | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 07deb0a44c3a7c..ffd6838790af8e 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -263,19 +263,15 @@ async function nodeImport( try { const mod = await dynamicImport(url) - return proxyESM(id, mod) + return proxyESM(mod) } finally { unhookNodeResolve() } } // rollup-style default import interop for cjs -function proxyESM(id: string, mod: any) { - const defaultExport = mod.__esModule - ? mod.default - : mod.default - ? mod.default - : mod +function proxyESM(mod: any) { + const defaultExport = getDefaultExport(mod) return new Proxy(mod, { get(mod, prop) { if (prop === 'default') return defaultExport @@ -283,3 +279,34 @@ function proxyESM(id: string, mod: any) { } }) } + +function getDefaultExport(moduleExports: any) { + // `moduleExports` is one of the following: + // - `const moduleExports = require(file)` + // - `const moduleExports = await import(file)` + let defaultExport = + 'default' in moduleExports ? moduleExports.default : moduleExports + + // Node.js doesn't support `__esModule`, see https://github.com/nodejs/node/issues/40891 + // This means we need to unwrap the `__esModule` wrapper ourselves. + // + // For example: + // ```ts + // export default 'hi' + // ``` + // + // Which TypeScript transpiles to: + // ```js + // use strict"; + // exports.__esModule = true; + // exports["default"] = 'hi'; + // ``` + // + // This means that `moduleExports.default` denotes `{ __esModule, default: 'hi }` thus the actual + // default lives in `moduleExports.default.default`. + if (defaultExport && '__esModule' in defaultExport) { + defaultExport = defaultExport.default + } + + return defaultExport +} From aaa26a32501c857d854e9d9daca2a88a9e086392 Mon Sep 17 00:00:00 2001 From: patak-js Date: Thu, 2 Dec 2021 22:08:55 +0100 Subject: [PATCH 141/258] release: v2.7.0-beta.10 --- .../ssr-deps/node-addon/build/Makefile | 324 ++++++++++++++++ .../Release/.deps/Release/cpp_addon.node.d | 1 + .../.deps/Release/obj.target/cpp_addon.node.d | 1 + .../Release/obj.target/cpp_addon/main.o.d | 23 ++ .../node-addon/build/Release/cpp_addon.node | Bin 0 -> 13288 bytes .../build/Release/obj.target/cpp_addon.node | Bin 0 -> 13288 bytes .../build/Release/obj.target/cpp_addon/main.o | Bin 0 -> 4368 bytes .../node-addon/build/binding.Makefile | 6 + .../ssr-deps/node-addon/build/config.gypi | 351 ++++++++++++++++++ .../node-addon/build/cpp_addon.target.mk | 159 ++++++++ packages/vite/CHANGELOG.md | 14 + packages/vite/package.json | 2 +- 12 files changed, 880 insertions(+), 1 deletion(-) create mode 100644 packages/playground/ssr-deps/node-addon/build/Makefile create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d create mode 100755 packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node create mode 100755 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o create mode 100644 packages/playground/ssr-deps/node-addon/build/binding.Makefile create mode 100644 packages/playground/ssr-deps/node-addon/build/config.gypi create mode 100644 packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk diff --git a/packages/playground/ssr-deps/node-addon/build/Makefile b/packages/playground/ssr-deps/node-addon/build/Makefile new file mode 100644 index 00000000000000..83ce3f09d28c03 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Makefile @@ -0,0 +1,324 @@ +# We borrow heavily from the kernel build setup, though we are simpler since +# we don't have Kconfig tweaking settings on us. + +# The implicit make rules have it looking for RCS files, among other things. +# We instead explicitly write all the rules we care about. +# It's even quicker (saves ~200ms) to pass -r on the command line. +MAKEFLAGS=-r + +# The source directory tree. +srcdir := .. +abs_srcdir := $(abspath $(srcdir)) + +# The name of the builddir. +builddir_name ?= . + +# The V=1 flag on command line makes us verbosely print command lines. +ifdef V + quiet= +else + quiet=quiet_ +endif + +# Specify BUILDTYPE=Release on the command line for a release build. +BUILDTYPE ?= Release + +# Directory all our build output goes into. +# Note that this must be two directories beneath src/ for unit tests to pass, +# as they reach into the src/ directory for data with relative paths. +builddir ?= $(builddir_name)/$(BUILDTYPE) +abs_builddir := $(abspath $(builddir)) +depsdir := $(builddir)/.deps + +# Object output directory. +obj := $(builddir)/obj +abs_obj := $(abspath $(obj)) + +# We build up a list of every single one of the targets so we can slurp in the +# generated dependency rule Makefiles in one pass. +all_deps := + + + +CC.target ?= $(CC) +CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS) +CXX.target ?= $(CXX) +CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS) +LINK.target ?= $(LINK) +LDFLAGS.target ?= $(LDFLAGS) +AR.target ?= $(AR) + +# C++ apps need to be linked with g++. +LINK ?= $(CXX.target) + +# TODO(evan): move all cross-compilation logic to gyp-time so we don't need +# to replicate this environment fallback in make as well. +CC.host ?= gcc +CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host) +CXX.host ?= g++ +CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host) +LINK.host ?= $(CXX.host) +LDFLAGS.host ?= $(LDFLAGS_host) +AR.host ?= ar + +# Define a dir function that can handle spaces. +# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions +# "leading spaces cannot appear in the text of the first argument as written. +# These characters can be put into the argument value by variable substitution." +empty := +space := $(empty) $(empty) + +# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces +replace_spaces = $(subst $(space),?,$1) +unreplace_spaces = $(subst ?,$(space),$1) +dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1))) + +# Flags to make gcc output dependency info. Note that you need to be +# careful here to use the flags that ccache and distcc can understand. +# We write to a dep file on the side first and then rename at the end +# so we can't end up with a broken dep file. +depfile = $(depsdir)/$(call replace_spaces,$@).d +DEPFLAGS = -MMD -MF $(depfile).raw + +# We have to fixup the deps output in a few ways. +# (1) the file output should mention the proper .o file. +# ccache or distcc lose the path to the target, so we convert a rule of +# the form: +# foobar.o: DEP1 DEP2 +# into +# path/to/foobar.o: DEP1 DEP2 +# (2) we want missing files not to cause us to fail to build. +# We want to rewrite +# foobar.o: DEP1 DEP2 \ +# DEP3 +# to +# DEP1: +# DEP2: +# DEP3: +# so if the files are missing, they're just considered phony rules. +# We have to do some pretty insane escaping to get those backslashes +# and dollar signs past make, the shell, and sed at the same time. +# Doesn't work with spaces, but that's fine: .d files have spaces in +# their names replaced with other characters. +define fixup_dep +# The depfile may not exist if the input file didn't have any #includes. +touch $(depfile).raw +# Fixup path as in (1). +sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) +# Add extra rules as in (2). +# We remove slashes and replace spaces with new lines; +# remove blank lines; +# delete the first line and append a colon to the remaining lines. +sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\ + grep -v '^$$' |\ + sed -e 1d -e 's|$$|:|' \ + >> $(depfile) +rm $(depfile).raw +endef + +# Command definitions: +# - cmd_foo is the actual command to run; +# - quiet_cmd_foo is the brief-output summary of the command. + +quiet_cmd_cc = CC($(TOOLSET)) $@ +cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c + +quiet_cmd_cxx = CXX($(TOOLSET)) $@ +cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c + +quiet_cmd_touch = TOUCH $@ +cmd_touch = touch $@ + +quiet_cmd_copy = COPY $@ +# send stderr to /dev/null to ignore messages when linking directories. +cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") + +quiet_cmd_alink = AR($(TOOLSET)) $@ +cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) + +quiet_cmd_alink_thin = AR($(TOOLSET)) $@ +cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) + +# Due to circular dependencies between libraries :(, we wrap the +# special "figure out circular dependencies" flags around the entire +# input list during linking. +quiet_cmd_link = LINK($(TOOLSET)) $@ +cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group + +# We support two kinds of shared objects (.so): +# 1) shared_library, which is just bundling together many dependent libraries +# into a link line. +# 2) loadable_module, which is generating a module intended for dlopen(). +# +# They differ only slightly: +# In the former case, we want to package all dependent code into the .so. +# In the latter case, we want to package just the API exposed by the +# outermost module. +# This means shared_library uses --whole-archive, while loadable_module doesn't. +# (Note that --whole-archive is incompatible with the --start-group used in +# normal linking.) + +# Other shared-object link notes: +# - Set SONAME to the library filename so our binaries don't reference +# the local, absolute paths used on the link command-line. +quiet_cmd_solink = SOLINK($(TOOLSET)) $@ +cmd_solink = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) + +quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ +cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS) + + +# Define an escape_quotes function to escape single quotes. +# This allows us to handle quotes properly as long as we always use +# use single quotes and escape_quotes. +escape_quotes = $(subst ','\'',$(1)) +# This comment is here just to include a ' to unconfuse syntax highlighting. +# Define an escape_vars function to escape '$' variable syntax. +# This allows us to read/write command lines with shell variables (e.g. +# $LD_LIBRARY_PATH), without triggering make substitution. +escape_vars = $(subst $$,$$$$,$(1)) +# Helper that expands to a shell command to echo a string exactly as it is in +# make. This uses printf instead of echo because printf's behaviour with respect +# to escape sequences is more portable than echo's across different shells +# (e.g., dash, bash). +exact_echo = printf '%s\n' '$(call escape_quotes,$(1))' + +# Helper to compare the command we're about to run against the command +# we logged the last time we ran the command. Produces an empty +# string (false) when the commands match. +# Tricky point: Make has no string-equality test function. +# The kernel uses the following, but it seems like it would have false +# positives, where one string reordered its arguments. +# arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ +# $(filter-out $(cmd_$@), $(cmd_$(1)))) +# We instead substitute each for the empty string into the other, and +# say they're equal if both substitutions produce the empty string. +# .d files contain ? instead of spaces, take that into account. +command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\ + $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1)))) + +# Helper that is non-empty when a prerequisite changes. +# Normally make does this implicitly, but we force rules to always run +# so we can check their command lines. +# $? -- new prerequisites +# $| -- order-only dependencies +prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?)) + +# Helper that executes all postbuilds until one fails. +define do_postbuilds + @E=0;\ + for p in $(POSTBUILDS); do\ + eval $$p;\ + E=$$?;\ + if [ $$E -ne 0 ]; then\ + break;\ + fi;\ + done;\ + if [ $$E -ne 0 ]; then\ + rm -rf "$@";\ + exit $$E;\ + fi +endef + +# do_cmd: run a command via the above cmd_foo names, if necessary. +# Should always run for a given target to handle command-line changes. +# Second argument, if non-zero, makes it do asm/C/C++ dependency munging. +# Third argument, if non-zero, makes it do POSTBUILDS processing. +# Note: We intentionally do NOT call dirx for depfile, since it contains ? for +# spaces already and dirx strips the ? characters. +define do_cmd +$(if $(or $(command_changed),$(prereq_changed)), + @$(call exact_echo, $($(quiet)cmd_$(1))) + @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))" + $(if $(findstring flock,$(word 1,$(cmd_$1))), + @$(cmd_$(1)) + @echo " $(quiet_cmd_$(1)): Finished", + @$(cmd_$(1)) + ) + @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile) + @$(if $(2),$(fixup_dep)) + $(if $(and $(3), $(POSTBUILDS)), + $(call do_postbuilds) + ) +) +endef + +# Declare the "all" target first so it is the default, +# even though we don't have the deps yet. +.PHONY: all +all: + +# make looks for ways to re-generate included makefiles, but in our case, we +# don't have a direct way. Explicitly telling make that it has nothing to do +# for them makes it go faster. +%.d: ; + +# Use FORCE_DO_CMD to force a target to run. Should be coupled with +# do_cmd. +.PHONY: FORCE_DO_CMD +FORCE_DO_CMD: + +TOOLSET := target +# Suffix rules, putting all outputs into $(obj). +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + +# Try building from generated source, too. +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + +$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + + +ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ + $(findstring $(join ^,$(prefix)),\ + $(join ^,cpp_addon.target.mk)))),) + include cpp_addon.target.mk +endif + +quiet_cmd_regen_makefile = ACTION Regenerating $@ +cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/matias/.cache/node-gyp/16.9.1" "-Dnode_gyp_dir=/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp" "-Dnode_lib_file=/home/matias/.cache/node-gyp/16.9.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/matias/vite/packages/playground/ssr-deps/node-addon" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/matias/vite/packages/playground/ssr-deps/node-addon/build/config.gypi -I/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi -I/home/matias/.cache/node-gyp/16.9.1/include/node/common.gypi "--toplevel-dir=." binding.gyp +Makefile: $(srcdir)/../../../../../.cache/node-gyp/16.9.1/include/node/common.gypi $(srcdir)/../../../../../../../usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi + $(call do_cmd,regen_makefile) + +# "all" is a concatenation of the "all" targets from all the included +# sub-makefiles. This is just here to clarify. +all: + +# Add in dependency-tracking rules. $(all_deps) is the list of every single +# target in our tree. Only consider the ones with .d (dependency) info: +d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d)) +ifneq ($(d_files),) + include $(d_files) +endif diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d new file mode 100644 index 00000000000000..4be797e6cbdf6e --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d @@ -0,0 +1 @@ +cmd_Release/cpp_addon.node := ln -f "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node" 2>/dev/null || (rm -rf "Release/cpp_addon.node" && cp -af "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node") diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d new file mode 100644 index 00000000000000..9f4d87550d1f0a --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d @@ -0,0 +1 @@ +cmd_Release/obj.target/cpp_addon.node := g++ -o Release/obj.target/cpp_addon.node -shared -pthread -rdynamic -m64 -Wl,-soname=cpp_addon.node -Wl,--start-group Release/obj.target/cpp_addon/main.o -Wl,--end-group diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d new file mode 100644 index 00000000000000..2955b089117c85 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d @@ -0,0 +1,23 @@ +cmd_Release/obj.target/cpp_addon/main.o := g++ -o Release/obj.target/cpp_addon/main.o ../main.cpp '-DNODE_GYP_MODULE_NAME=cpp_addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/home/matias/.cache/node-gyp/16.9.1/include/node -I/home/matias/.cache/node-gyp/16.9.1/src -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++14 -MMD -MF ./Release/.deps/Release/obj.target/cpp_addon/main.o.d.raw -c +Release/obj.target/cpp_addon/main.o: ../main.cpp \ + /home/matias/.cache/node-gyp/16.9.1/include/node/node.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h +../main.cpp: +/home/matias/.cache/node-gyp/16.9.1/include/node/node.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: diff --git a/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node new file mode 100755 index 0000000000000000000000000000000000000000..67c3f500cb518bfb96782ef1aeab0acc72d09ef3 GIT binary patch literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b literal 0 HcmV?d00001 diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node new file mode 100755 index 0000000000000000000000000000000000000000..67c3f500cb518bfb96782ef1aeab0acc72d09ef3 GIT binary patch literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b literal 0 HcmV?d00001 diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o new file mode 100644 index 0000000000000000000000000000000000000000..088f7174574579a7049a29fc9c0372a4205fa7b7 GIT binary patch literal 4368 zcmbtWU2GIp6u#|3sr*(Dh#E|YFUCZYdd{7DwztDWwQ)Ai94$qx=8p zbAPnzwKaNeru8?R)h{e~TlHF-UW@7e$TofMTI;EatDD;6ESLtkHqs_dO>JsFkA~pi zznwUq7*C8PM$_}9%bAqF1l~JydTrINPIT>Si|PV*llJfG{#D(-9ys-X7S8zs&ocE} zXg4%HaqX`vOc~J9)yhMPk6=nSF@{M1e3Ktn8<>|0{>m{x7=! zJ-A8xOB^`A;Aya&fM3%Vb9zs(+-jdbZ{0kVcqK8Bcr{^Q5#9#Jf#*B5OWfklr}g}U z@fU$3t5|e8jyrBK_Y}+HfGNt}l3B2oY`M&!8D=i$*yxW0_U8cVP{xVh36%N?Nq-=9 zD4BerqjPMsYJ1g=ex*<8+S60zBlS&nKbdTg8wk~oPP-XqPNC^u2-=?m!cT4$R~uc82q9n2A-lM##Tqc;HBk0d@Uf& z63%l0>`7=%3}*w0lLCE=MQ0e3_!1rX8{}bKkFkw)os{Rea{v1G3OveFj7gV>aMTO^ zW~rWh?*S`9YZDx~d#3^Zbp!kdz|sF{=u!BYf&Lz}DF54G8c4REsozN0zX&xr=O z-vD21fZu9>FEzm1;AlqW#p>6G;aX=370+^w<%`5PneI1APOe(Cn37I*;h)NklWLca z*AKsnjvXHEo*wA#8m!t`ui)58vsj!ov*%Lwl#?3H7=7brv1)0W#*Cr#k%Nh}ab$2X zqm3G)iGyj)0B>l&FXOod`;4j%TdxhePHD`W8qh|-ygyZOil%32BZspvRC|CBa7Sm$ zmR1n<-Qxpl_o$P0vSv{$mAzSQ8fJP^cELmUeS89!v+u~{Su5-D_3+3PKWY3GVoChL@~q`GoNB6QtB|FVOmV|&(&AX{cq! z_z$JjfF@GP^corr69y)?KT|kkn_kt$dKUmt_rppmo?Fd&j(gC`o6`lyMQgP;Q^;A` z)D+Z$7jgtc?@!V)VYhg7)cY2$s*q-#21d)Z?WeSHv$^>I5&JWiH*A(HY2{!lc71s> z#P0L}dnHqHJ)BW_vh{7!G$V!K{a>)VK@qaTmep=!lTRfZie4~Gq>jfw|n)yU@0 z8B=DV$ZRKPi4$LcAn@Lx8yp@leoNlNuN{!5aS{aQH$x*lfglLtTc8pC9)cixazS_U+n4T4#PMy1Yem7@q99J+G&t_WKM>+$43rN3AFK!0M4}4? zF>I&Bct-Sy$?IWCWwzv*lhAu^(C0~Wt)i*mwZoL0>6uKKtW=odIygYOs;Dp|5+J7Q zRm%b@z)fkGu4~Q;fLj5ZDOsmff=iJpw&PjK(D2wE{?G`Xl{cnbc(TQU|7X_$_E@_W zIm0*(4W)>alFUUFoVs;5bw8I$T`n?Po z-Xr1s{}%Cy4-_smral8`RQy)_msD2T2%ZF z5nmU4jE^M=$FBf}@u^Ora*5-E41)KyETSy+eS8BZ36pteg}scS9_D^1urR$WfJ-3< zw0?pwf)bT~J|chIXR@dI<9foexo_GK(c?L!J;Zsk$H$bYh}T6N=v|@7aQ^5wMBy$j Oi}in8cNi#P`+otuZNl#W literal 0 HcmV?d00001 diff --git a/packages/playground/ssr-deps/node-addon/build/binding.Makefile b/packages/playground/ssr-deps/node-addon/build/binding.Makefile new file mode 100644 index 00000000000000..9521a57df40291 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/binding.Makefile @@ -0,0 +1,6 @@ +# This file is generated by gyp; do not edit. + +export builddir_name ?= ./build/. +.PHONY: all +all: + $(MAKE) cpp_addon diff --git a/packages/playground/ssr-deps/node-addon/build/config.gypi b/packages/playground/ssr-deps/node-addon/build/config.gypi new file mode 100644 index 00000000000000..815e24a35e5c83 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/config.gypi @@ -0,0 +1,351 @@ +# Do not edit. File was generated by node-gyp's "configure" step +{ + "target_defaults": { + "cflags": [], + "default_configuration": "Release", + "defines": [], + "include_dirs": [], + "libraries": [] + }, + "variables": { + "asan": 0, + "coverage": "false", + "dcheck_always_on": 0, + "debug_nghttp2": "false", + "debug_node": "false", + "enable_lto": "false", + "enable_pgo_generate": "false", + "enable_pgo_use": "false", + "error_on_warn": "false", + "force_dynamic_crt": 0, + "gas_version": "2.30", + "host_arch": "x64", + "icu_data_in": "../../deps/icu-tmp/icudt69l.dat", + "icu_endianness": "l", + "icu_gyp_path": "tools/icu/icu-generic.gyp", + "icu_path": "deps/icu-small", + "icu_small": "false", + "icu_ver_major": "69", + "is_debug": 0, + "llvm_version": "0.0", + "napi_build_version": "8", + "node_byteorder": "little", + "node_debug_lib": "false", + "node_enable_d8": "false", + "node_install_npm": "true", + "node_library_files": [ + "lib/diagnostics_channel.js", + "lib/path.js", + "lib/punycode.js", + "lib/tty.js", + "lib/_stream_wrap.js", + "lib/querystring.js", + "lib/_tls_common.js", + "lib/_tls_wrap.js", + "lib/assert.js", + "lib/async_hooks.js", + "lib/child_process.js", + "lib/cluster.js", + "lib/dns.js", + "lib/util.js", + "lib/vm.js", + "lib/worker_threads.js", + "lib/url.js", + "lib/buffer.js", + "lib/wasi.js", + "lib/process.js", + "lib/console.js", + "lib/constants.js", + "lib/events.js", + "lib/fs.js", + "lib/_stream_duplex.js", + "lib/module.js", + "lib/domain.js", + "lib/zlib.js", + "lib/_http_client.js", + "lib/_http_server.js", + "lib/_stream_writable.js", + "lib/http.js", + "lib/https.js", + "lib/inspector.js", + "lib/trace_events.js", + "lib/_http_incoming.js", + "lib/http2.js", + "lib/os.js", + "lib/string_decoder.js", + "lib/_stream_passthrough.js", + "lib/_stream_readable.js", + "lib/_stream_transform.js", + "lib/crypto.js", + "lib/timers.js", + "lib/repl.js", + "lib/_http_agent.js", + "lib/_http_common.js", + "lib/_http_outgoing.js", + "lib/net.js", + "lib/perf_hooks.js", + "lib/readline.js", + "lib/v8.js", + "lib/sys.js", + "lib/tls.js", + "lib/stream.js", + "lib/dgram.js", + "lib/dns/promises.js", + "lib/stream/consumers.js", + "lib/stream/promises.js", + "lib/stream/web.js", + "lib/assert/strict.js", + "lib/internal/async_hooks.js", + "lib/internal/heap_utils.js", + "lib/internal/blob.js", + "lib/internal/freeze_intrinsics.js", + "lib/internal/inspector_async_hook.js", + "lib/internal/linkedlist.js", + "lib/internal/js_stream_socket.js", + "lib/internal/url.js", + "lib/internal/socketaddress.js", + "lib/internal/util.js", + "lib/internal/options.js", + "lib/internal/repl.js", + "lib/internal/child_process.js", + "lib/internal/errors.js", + "lib/internal/event_target.js", + "lib/internal/v8_prof_polyfill.js", + "lib/internal/v8_prof_processor.js", + "lib/internal/validators.js", + "lib/internal/buffer.js", + "lib/internal/encoding.js", + "lib/internal/watchdog.js", + "lib/internal/trace_events_async_hooks.js", + "lib/internal/constants.js", + "lib/internal/abort_controller.js", + "lib/internal/blocklist.js", + "lib/internal/querystring.js", + "lib/internal/net.js", + "lib/internal/cli_table.js", + "lib/internal/fixed_queue.js", + "lib/internal/priority_queue.js", + "lib/internal/tty.js", + "lib/internal/assert.js", + "lib/internal/timers.js", + "lib/internal/socket_list.js", + "lib/internal/error_serdes.js", + "lib/internal/freelist.js", + "lib/internal/dgram.js", + "lib/internal/histogram.js", + "lib/internal/http.js", + "lib/internal/idna.js", + "lib/internal/worker.js", + "lib/internal/dtrace.js", + "lib/internal/stream_base_commons.js", + "lib/internal/bootstrap/environment.js", + "lib/internal/bootstrap/loaders.js", + "lib/internal/bootstrap/pre_execution.js", + "lib/internal/bootstrap/node.js", + "lib/internal/bootstrap/switches/does_not_own_process_state.js", + "lib/internal/bootstrap/switches/is_not_main_thread.js", + "lib/internal/bootstrap/switches/does_own_process_state.js", + "lib/internal/bootstrap/switches/is_main_thread.js", + "lib/internal/debugger/inspect_repl.js", + "lib/internal/debugger/inspect.js", + "lib/internal/debugger/inspect_client.js", + "lib/internal/cluster/shared_handle.js", + "lib/internal/cluster/child.js", + "lib/internal/cluster/primary.js", + "lib/internal/cluster/round_robin_handle.js", + "lib/internal/cluster/utils.js", + "lib/internal/cluster/worker.js", + "lib/internal/crypto/aes.js", + "lib/internal/crypto/certificate.js", + "lib/internal/crypto/cipher.js", + "lib/internal/crypto/diffiehellman.js", + "lib/internal/crypto/hash.js", + "lib/internal/crypto/hashnames.js", + "lib/internal/crypto/hkdf.js", + "lib/internal/crypto/keys.js", + "lib/internal/crypto/mac.js", + "lib/internal/crypto/pbkdf2.js", + "lib/internal/crypto/random.js", + "lib/internal/crypto/scrypt.js", + "lib/internal/crypto/sig.js", + "lib/internal/crypto/util.js", + "lib/internal/crypto/webcrypto.js", + "lib/internal/crypto/x509.js", + "lib/internal/crypto/dsa.js", + "lib/internal/crypto/ec.js", + "lib/internal/crypto/keygen.js", + "lib/internal/crypto/rsa.js", + "lib/internal/dns/promises.js", + "lib/internal/dns/utils.js", + "lib/internal/fs/dir.js", + "lib/internal/fs/read_file_context.js", + "lib/internal/fs/streams.js", + "lib/internal/fs/sync_write_stream.js", + "lib/internal/fs/utils.js", + "lib/internal/fs/watchers.js", + "lib/internal/fs/promises.js", + "lib/internal/fs/rimraf.js", + "lib/internal/fs/cp/cp-sync.js", + "lib/internal/fs/cp/cp.js", + "lib/internal/http2/compat.js", + "lib/internal/http2/util.js", + "lib/internal/http2/core.js", + "lib/internal/modules/package_json_reader.js", + "lib/internal/modules/run_main.js", + "lib/internal/modules/cjs/loader.js", + "lib/internal/modules/cjs/helpers.js", + "lib/internal/modules/esm/loader.js", + "lib/internal/modules/esm/transform_source.js", + "lib/internal/modules/esm/module_job.js", + "lib/internal/modules/esm/module_map.js", + "lib/internal/modules/esm/resolve.js", + "lib/internal/modules/esm/translators.js", + "lib/internal/modules/esm/get_format.js", + "lib/internal/modules/esm/create_dynamic_module.js", + "lib/internal/modules/esm/get_source.js", + "lib/internal/legacy/processbinding.js", + "lib/internal/process/policy.js", + "lib/internal/process/worker_thread_only.js", + "lib/internal/process/esm_loader.js", + "lib/internal/process/execution.js", + "lib/internal/process/per_thread.js", + "lib/internal/process/promises.js", + "lib/internal/process/report.js", + "lib/internal/process/signal.js", + "lib/internal/process/task_queues.js", + "lib/internal/process/warning.js", + "lib/internal/repl/history.js", + "lib/internal/repl/utils.js", + "lib/internal/repl/await.js", + "lib/internal/streams/legacy.js", + "lib/internal/streams/passthrough.js", + "lib/internal/streams/buffer_list.js", + "lib/internal/streams/from.js", + "lib/internal/streams/lazy_transform.js", + "lib/internal/streams/state.js", + "lib/internal/streams/transform.js", + "lib/internal/streams/add-abort-signal.js", + "lib/internal/streams/compose.js", + "lib/internal/streams/destroy.js", + "lib/internal/streams/duplex.js", + "lib/internal/streams/duplexify.js", + "lib/internal/streams/end-of-stream.js", + "lib/internal/streams/pipeline.js", + "lib/internal/streams/readable.js", + "lib/internal/streams/utils.js", + "lib/internal/streams/writable.js", + "lib/internal/test/binding.js", + "lib/internal/test/transfer.js", + "lib/internal/util/comparisons.js", + "lib/internal/util/debuglog.js", + "lib/internal/util/inspect.js", + "lib/internal/util/inspector.js", + "lib/internal/util/iterable_weak_map.js", + "lib/internal/util/types.js", + "lib/internal/main/check_syntax.js", + "lib/internal/main/eval_stdin.js", + "lib/internal/main/prof_process.js", + "lib/internal/main/run_main_module.js", + "lib/internal/main/print_help.js", + "lib/internal/main/repl.js", + "lib/internal/main/inspect.js", + "lib/internal/main/worker_thread.js", + "lib/internal/main/eval_string.js", + "lib/internal/tls/parse-cert-string.js", + "lib/internal/tls/secure-context.js", + "lib/internal/tls/secure-pair.js", + "lib/internal/vm/module.js", + "lib/internal/child_process/serialization.js", + "lib/internal/per_context/domexception.js", + "lib/internal/per_context/messageport.js", + "lib/internal/per_context/primordials.js", + "lib/internal/worker/io.js", + "lib/internal/worker/js_transferable.js", + "lib/internal/assert/calltracker.js", + "lib/internal/assert/assertion_error.js", + "lib/internal/perf/event_loop_delay.js", + "lib/internal/perf/event_loop_utilization.js", + "lib/internal/perf/nodetiming.js", + "lib/internal/perf/observe.js", + "lib/internal/perf/performance.js", + "lib/internal/perf/performance_entry.js", + "lib/internal/perf/timerify.js", + "lib/internal/perf/usertiming.js", + "lib/internal/perf/utils.js", + "lib/internal/webstreams/encoding.js", + "lib/internal/webstreams/queuingstrategies.js", + "lib/internal/webstreams/readablestream.js", + "lib/internal/webstreams/transfer.js", + "lib/internal/webstreams/transformstream.js", + "lib/internal/webstreams/util.js", + "lib/internal/webstreams/writablestream.js", + "lib/internal/source_map/source_map.js", + "lib/internal/source_map/source_map_cache.js", + "lib/internal/source_map/prepare_stack_trace.js", + "lib/internal/console/global.js", + "lib/internal/console/constructor.js", + "lib/internal/readline/utils.js", + "lib/internal/readline/callbacks.js", + "lib/internal/readline/emitKeypressEvents.js", + "lib/internal/policy/manifest.js", + "lib/internal/policy/sri.js", + "lib/fs/promises.js", + "lib/util/types.js", + "lib/path/posix.js", + "lib/path/win32.js", + "lib/timers/promises.js" + ], + "node_module_version": 93, + "node_no_browser_globals": "false", + "node_prefix": "/", + "node_release_urlbase": "https://nodejs.org/download/release/", + "node_section_ordering_info": "", + "node_shared": "false", + "node_shared_brotli": "false", + "node_shared_cares": "false", + "node_shared_http_parser": "false", + "node_shared_libuv": "false", + "node_shared_nghttp2": "false", + "node_shared_nghttp3": "false", + "node_shared_ngtcp2": "false", + "node_shared_openssl": "false", + "node_shared_zlib": "false", + "node_tag": "", + "node_target_type": "executable", + "node_use_bundled_v8": "true", + "node_use_dtrace": "false", + "node_use_etw": "false", + "node_use_node_code_cache": "true", + "node_use_node_snapshot": "true", + "node_use_openssl": "true", + "node_use_v8_platform": "true", + "node_with_ltcg": "false", + "node_without_node_options": "false", + "openssl_fips": "", + "openssl_is_fips": "false", + "openssl_quic": "true", + "ossfuzz": "false", + "shlib_suffix": "so.93", + "target_arch": "x64", + "v8_enable_31bit_smis_on_64bit_arch": 0, + "v8_enable_gdbjit": 0, + "v8_enable_i18n_support": 1, + "v8_enable_inspector": 1, + "v8_enable_lite_mode": 0, + "v8_enable_object_print": 1, + "v8_enable_pointer_compression": 0, + "v8_enable_webassembly": 1, + "v8_no_strict_aliasing": 1, + "v8_optimized_debug": 1, + "v8_promise_internal_field_count": 1, + "v8_random_seed": 0, + "v8_trace_maps": 0, + "v8_use_siphash": 1, + "want_separate_host_toolset": 0, + "nodedir": "/home/matias/.cache/node-gyp/16.9.1", + "standalone_static_library": 1, + "user_agent": "pnpm/6.21.0 npm/? node/v16.9.1 linux x64", + "registry": "https://registry.npmjs.org/", + "node_gyp": "/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/bin/node-gyp.js" + } +} diff --git a/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk b/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk new file mode 100644 index 00000000000000..4a2de286352df8 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk @@ -0,0 +1,159 @@ +# This file is generated by gyp; do not edit. + +TOOLSET := target +TARGET := cpp_addon +DEFS_Debug := \ + '-DNODE_GYP_MODULE_NAME=cpp_addon' \ + '-DUSING_UV_SHARED=1' \ + '-DUSING_V8_SHARED=1' \ + '-DV8_DEPRECATION_WARNINGS=1' \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ + '-D_GLIBCXX_USE_CXX11_ABI=1' \ + '-D_LARGEFILE_SOURCE' \ + '-D_FILE_OFFSET_BITS=64' \ + '-D__STDC_FORMAT_MACROS' \ + '-DOPENSSL_NO_PINSHARED' \ + '-DOPENSSL_THREADS' \ + '-DBUILDING_NODE_EXTENSION' \ + '-DDEBUG' \ + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' + +# Flags passed to all source files. +CFLAGS_Debug := \ + -fPIC \ + -pthread \ + -Wall \ + -Wextra \ + -Wno-unused-parameter \ + -m64 \ + -g \ + -O0 + +# Flags passed to only C files. +CFLAGS_C_Debug := + +# Flags passed to only C++ files. +CFLAGS_CC_Debug := \ + -fno-rtti \ + -fno-exceptions \ + -std=gnu++14 + +INCS_Debug := \ + -I/home/matias/.cache/node-gyp/16.9.1/include/node \ + -I/home/matias/.cache/node-gyp/16.9.1/src \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include + +DEFS_Release := \ + '-DNODE_GYP_MODULE_NAME=cpp_addon' \ + '-DUSING_UV_SHARED=1' \ + '-DUSING_V8_SHARED=1' \ + '-DV8_DEPRECATION_WARNINGS=1' \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ + '-D_GLIBCXX_USE_CXX11_ABI=1' \ + '-D_LARGEFILE_SOURCE' \ + '-D_FILE_OFFSET_BITS=64' \ + '-D__STDC_FORMAT_MACROS' \ + '-DOPENSSL_NO_PINSHARED' \ + '-DOPENSSL_THREADS' \ + '-DBUILDING_NODE_EXTENSION' + +# Flags passed to all source files. +CFLAGS_Release := \ + -fPIC \ + -pthread \ + -Wall \ + -Wextra \ + -Wno-unused-parameter \ + -m64 \ + -O3 \ + -fno-omit-frame-pointer + +# Flags passed to only C files. +CFLAGS_C_Release := + +# Flags passed to only C++ files. +CFLAGS_CC_Release := \ + -fno-rtti \ + -fno-exceptions \ + -std=gnu++14 + +INCS_Release := \ + -I/home/matias/.cache/node-gyp/16.9.1/include/node \ + -I/home/matias/.cache/node-gyp/16.9.1/src \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include + +OBJS := \ + $(obj).target/$(TARGET)/main.o + +# Add to the list of files we specially track dependencies for. +all_deps += $(OBJS) + +# CFLAGS et al overrides must be target-local. +# See "Target-specific Variable Values" in the GNU Make manual. +$(OBJS): TOOLSET := $(TOOLSET) +$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) +$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) + +# Suffix rules, putting all outputs into $(obj). + +$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) + +# Try building from generated source, too. + +$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) + +$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) + +# End of this set of suffix rules +### Rules for final target. +LDFLAGS_Debug := \ + -pthread \ + -rdynamic \ + -m64 + +LDFLAGS_Release := \ + -pthread \ + -rdynamic \ + -m64 + +LIBS := + +$(obj).target/cpp_addon.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE)) +$(obj).target/cpp_addon.node: LIBS := $(LIBS) +$(obj).target/cpp_addon.node: TOOLSET := $(TOOLSET) +$(obj).target/cpp_addon.node: $(OBJS) FORCE_DO_CMD + $(call do_cmd,solink_module) + +all_deps += $(obj).target/cpp_addon.node +# Add target alias +.PHONY: cpp_addon +cpp_addon: $(builddir)/cpp_addon.node + +# Copy this to the executable output path. +$(builddir)/cpp_addon.node: TOOLSET := $(TOOLSET) +$(builddir)/cpp_addon.node: $(obj).target/cpp_addon.node FORCE_DO_CMD + $(call do_cmd,copy) + +all_deps += $(builddir)/cpp_addon.node +# Short alias for building this executable. +.PHONY: cpp_addon.node +cpp_addon.node: $(obj).target/cpp_addon.node $(builddir)/cpp_addon.node + +# Add executable to "all" target. +.PHONY: all +all: $(builddir)/cpp_addon.node + diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index d52439248ce9bc..acaad87b075002 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,17 @@ +# [2.7.0-beta.10](https://github.com/vitejs/vite/compare/v2.7.0-beta.9...v2.7.0-beta.10) (2021-12-02) + + +### Bug Fixes + +* invalidate inlined proxy scripts on change ([#5891](https://github.com/vitejs/vite/issues/5891)) ([5b8c58b](https://github.com/vitejs/vite/commit/5b8c58bf9d2fe141cea9bde9492ccbedf9b76213)) +* read the correct package.json in ssrExternal ([#5927](https://github.com/vitejs/vite/issues/5927)) ([7edabb4](https://github.com/vitejs/vite/commit/7edabb46de3ce63e078e0cda7cd3ed9e5cdd0f2a)), closes [#5890](https://github.com/vitejs/vite/issues/5890) +* **resolve:** dont overwrite `isRequire` from `baseOptions` ([#5872](https://github.com/vitejs/vite/issues/5872)) ([2b91e5a](https://github.com/vitejs/vite/commit/2b91e5aadaee0947eb9864367ae85762573a8dc4)) +* **scan:** handle local scripts with lang=ts ([#5850](https://github.com/vitejs/vite/issues/5850)) ([7ed8702](https://github.com/vitejs/vite/commit/7ed870273206b5e9dcedda6f0149b7b3324dea45)) +* SSR import in dev can't resolve default import (fix [#5706](https://github.com/vitejs/vite/issues/5706)) ([#5923](https://github.com/vitejs/vite/issues/5923)) ([21d79d7](https://github.com/vitejs/vite/commit/21d79d753af145f2c7ebb7dd5b0b1a4a298f96c5)) +* **ssr:** skip dedupe require if noExternal true ([#5928](https://github.com/vitejs/vite/issues/5928)) ([f6aa7fe](https://github.com/vitejs/vite/commit/f6aa7fe401737ef584ccf34b6042a32b8e5e8c5d)) + + + # [2.7.0-beta.9](https://github.com/vitejs/vite/compare/v2.7.0-beta.8...v2.7.0-beta.9) (2021-11-27) diff --git a/packages/vite/package.json b/packages/vite/package.json index efb6ed33c4986f..25a678fba08b84 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.9", + "version": "2.7.0-beta.10", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From fb12992988940bf278fce5444f9b908b848560b0 Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Fri, 3 Dec 2021 17:42:20 +0800 Subject: [PATCH 142/258] chore: git ignores the compilation output dir (#5951) --- .gitignore | 3 +- .../ssr-deps/node-addon/build/Makefile | 324 ---------------- .../Release/.deps/Release/cpp_addon.node.d | 1 - .../.deps/Release/obj.target/cpp_addon.node.d | 1 - .../Release/obj.target/cpp_addon/main.o.d | 23 -- .../node-addon/build/Release/cpp_addon.node | Bin 13288 -> 0 bytes .../build/Release/obj.target/cpp_addon.node | Bin 13288 -> 0 bytes .../build/Release/obj.target/cpp_addon/main.o | Bin 4368 -> 0 bytes .../node-addon/build/binding.Makefile | 6 - .../ssr-deps/node-addon/build/config.gypi | 351 ------------------ .../node-addon/build/cpp_addon.target.mk | 159 -------- 11 files changed, 2 insertions(+), 866 deletions(-) delete mode 100644 packages/playground/ssr-deps/node-addon/build/Makefile delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d delete mode 100755 packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node delete mode 100755 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o delete mode 100644 packages/playground/ssr-deps/node-addon/build/binding.Makefile delete mode 100644 packages/playground/ssr-deps/node-addon/build/config.gypi delete mode 100644 packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk diff --git a/.gitignore b/.gitignore index 57d35eff1d78b7..200acefca621e6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ explorations *.local /packages/vite/LICENSE *.cpuprofile -/.vscode/ \ No newline at end of file +/.vscode/ +/packages/playground/ssr-deps/node-addon/build/ diff --git a/packages/playground/ssr-deps/node-addon/build/Makefile b/packages/playground/ssr-deps/node-addon/build/Makefile deleted file mode 100644 index 83ce3f09d28c03..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Makefile +++ /dev/null @@ -1,324 +0,0 @@ -# We borrow heavily from the kernel build setup, though we are simpler since -# we don't have Kconfig tweaking settings on us. - -# The implicit make rules have it looking for RCS files, among other things. -# We instead explicitly write all the rules we care about. -# It's even quicker (saves ~200ms) to pass -r on the command line. -MAKEFLAGS=-r - -# The source directory tree. -srcdir := .. -abs_srcdir := $(abspath $(srcdir)) - -# The name of the builddir. -builddir_name ?= . - -# The V=1 flag on command line makes us verbosely print command lines. -ifdef V - quiet= -else - quiet=quiet_ -endif - -# Specify BUILDTYPE=Release on the command line for a release build. -BUILDTYPE ?= Release - -# Directory all our build output goes into. -# Note that this must be two directories beneath src/ for unit tests to pass, -# as they reach into the src/ directory for data with relative paths. -builddir ?= $(builddir_name)/$(BUILDTYPE) -abs_builddir := $(abspath $(builddir)) -depsdir := $(builddir)/.deps - -# Object output directory. -obj := $(builddir)/obj -abs_obj := $(abspath $(obj)) - -# We build up a list of every single one of the targets so we can slurp in the -# generated dependency rule Makefiles in one pass. -all_deps := - - - -CC.target ?= $(CC) -CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS) -CXX.target ?= $(CXX) -CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS) -LINK.target ?= $(LINK) -LDFLAGS.target ?= $(LDFLAGS) -AR.target ?= $(AR) - -# C++ apps need to be linked with g++. -LINK ?= $(CXX.target) - -# TODO(evan): move all cross-compilation logic to gyp-time so we don't need -# to replicate this environment fallback in make as well. -CC.host ?= gcc -CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host) -CXX.host ?= g++ -CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host) -LINK.host ?= $(CXX.host) -LDFLAGS.host ?= $(LDFLAGS_host) -AR.host ?= ar - -# Define a dir function that can handle spaces. -# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions -# "leading spaces cannot appear in the text of the first argument as written. -# These characters can be put into the argument value by variable substitution." -empty := -space := $(empty) $(empty) - -# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces -replace_spaces = $(subst $(space),?,$1) -unreplace_spaces = $(subst ?,$(space),$1) -dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1))) - -# Flags to make gcc output dependency info. Note that you need to be -# careful here to use the flags that ccache and distcc can understand. -# We write to a dep file on the side first and then rename at the end -# so we can't end up with a broken dep file. -depfile = $(depsdir)/$(call replace_spaces,$@).d -DEPFLAGS = -MMD -MF $(depfile).raw - -# We have to fixup the deps output in a few ways. -# (1) the file output should mention the proper .o file. -# ccache or distcc lose the path to the target, so we convert a rule of -# the form: -# foobar.o: DEP1 DEP2 -# into -# path/to/foobar.o: DEP1 DEP2 -# (2) we want missing files not to cause us to fail to build. -# We want to rewrite -# foobar.o: DEP1 DEP2 \ -# DEP3 -# to -# DEP1: -# DEP2: -# DEP3: -# so if the files are missing, they're just considered phony rules. -# We have to do some pretty insane escaping to get those backslashes -# and dollar signs past make, the shell, and sed at the same time. -# Doesn't work with spaces, but that's fine: .d files have spaces in -# their names replaced with other characters. -define fixup_dep -# The depfile may not exist if the input file didn't have any #includes. -touch $(depfile).raw -# Fixup path as in (1). -sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) -# Add extra rules as in (2). -# We remove slashes and replace spaces with new lines; -# remove blank lines; -# delete the first line and append a colon to the remaining lines. -sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\ - grep -v '^$$' |\ - sed -e 1d -e 's|$$|:|' \ - >> $(depfile) -rm $(depfile).raw -endef - -# Command definitions: -# - cmd_foo is the actual command to run; -# - quiet_cmd_foo is the brief-output summary of the command. - -quiet_cmd_cc = CC($(TOOLSET)) $@ -cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c - -quiet_cmd_cxx = CXX($(TOOLSET)) $@ -cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c - -quiet_cmd_touch = TOUCH $@ -cmd_touch = touch $@ - -quiet_cmd_copy = COPY $@ -# send stderr to /dev/null to ignore messages when linking directories. -cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") - -quiet_cmd_alink = AR($(TOOLSET)) $@ -cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) - -quiet_cmd_alink_thin = AR($(TOOLSET)) $@ -cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) - -# Due to circular dependencies between libraries :(, we wrap the -# special "figure out circular dependencies" flags around the entire -# input list during linking. -quiet_cmd_link = LINK($(TOOLSET)) $@ -cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group - -# We support two kinds of shared objects (.so): -# 1) shared_library, which is just bundling together many dependent libraries -# into a link line. -# 2) loadable_module, which is generating a module intended for dlopen(). -# -# They differ only slightly: -# In the former case, we want to package all dependent code into the .so. -# In the latter case, we want to package just the API exposed by the -# outermost module. -# This means shared_library uses --whole-archive, while loadable_module doesn't. -# (Note that --whole-archive is incompatible with the --start-group used in -# normal linking.) - -# Other shared-object link notes: -# - Set SONAME to the library filename so our binaries don't reference -# the local, absolute paths used on the link command-line. -quiet_cmd_solink = SOLINK($(TOOLSET)) $@ -cmd_solink = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) - -quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ -cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS) - - -# Define an escape_quotes function to escape single quotes. -# This allows us to handle quotes properly as long as we always use -# use single quotes and escape_quotes. -escape_quotes = $(subst ','\'',$(1)) -# This comment is here just to include a ' to unconfuse syntax highlighting. -# Define an escape_vars function to escape '$' variable syntax. -# This allows us to read/write command lines with shell variables (e.g. -# $LD_LIBRARY_PATH), without triggering make substitution. -escape_vars = $(subst $$,$$$$,$(1)) -# Helper that expands to a shell command to echo a string exactly as it is in -# make. This uses printf instead of echo because printf's behaviour with respect -# to escape sequences is more portable than echo's across different shells -# (e.g., dash, bash). -exact_echo = printf '%s\n' '$(call escape_quotes,$(1))' - -# Helper to compare the command we're about to run against the command -# we logged the last time we ran the command. Produces an empty -# string (false) when the commands match. -# Tricky point: Make has no string-equality test function. -# The kernel uses the following, but it seems like it would have false -# positives, where one string reordered its arguments. -# arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ -# $(filter-out $(cmd_$@), $(cmd_$(1)))) -# We instead substitute each for the empty string into the other, and -# say they're equal if both substitutions produce the empty string. -# .d files contain ? instead of spaces, take that into account. -command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\ - $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1)))) - -# Helper that is non-empty when a prerequisite changes. -# Normally make does this implicitly, but we force rules to always run -# so we can check their command lines. -# $? -- new prerequisites -# $| -- order-only dependencies -prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?)) - -# Helper that executes all postbuilds until one fails. -define do_postbuilds - @E=0;\ - for p in $(POSTBUILDS); do\ - eval $$p;\ - E=$$?;\ - if [ $$E -ne 0 ]; then\ - break;\ - fi;\ - done;\ - if [ $$E -ne 0 ]; then\ - rm -rf "$@";\ - exit $$E;\ - fi -endef - -# do_cmd: run a command via the above cmd_foo names, if necessary. -# Should always run for a given target to handle command-line changes. -# Second argument, if non-zero, makes it do asm/C/C++ dependency munging. -# Third argument, if non-zero, makes it do POSTBUILDS processing. -# Note: We intentionally do NOT call dirx for depfile, since it contains ? for -# spaces already and dirx strips the ? characters. -define do_cmd -$(if $(or $(command_changed),$(prereq_changed)), - @$(call exact_echo, $($(quiet)cmd_$(1))) - @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))" - $(if $(findstring flock,$(word 1,$(cmd_$1))), - @$(cmd_$(1)) - @echo " $(quiet_cmd_$(1)): Finished", - @$(cmd_$(1)) - ) - @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile) - @$(if $(2),$(fixup_dep)) - $(if $(and $(3), $(POSTBUILDS)), - $(call do_postbuilds) - ) -) -endef - -# Declare the "all" target first so it is the default, -# even though we don't have the deps yet. -.PHONY: all -all: - -# make looks for ways to re-generate included makefiles, but in our case, we -# don't have a direct way. Explicitly telling make that it has nothing to do -# for them makes it go faster. -%.d: ; - -# Use FORCE_DO_CMD to force a target to run. Should be coupled with -# do_cmd. -.PHONY: FORCE_DO_CMD -FORCE_DO_CMD: - -TOOLSET := target -# Suffix rules, putting all outputs into $(obj). -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD - @$(call do_cmd,cc,1) - -# Try building from generated source, too. -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD - @$(call do_cmd,cc,1) - -$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD - @$(call do_cmd,cc,1) - - -ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ - $(findstring $(join ^,$(prefix)),\ - $(join ^,cpp_addon.target.mk)))),) - include cpp_addon.target.mk -endif - -quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/matias/.cache/node-gyp/16.9.1" "-Dnode_gyp_dir=/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp" "-Dnode_lib_file=/home/matias/.cache/node-gyp/16.9.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/matias/vite/packages/playground/ssr-deps/node-addon" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/matias/vite/packages/playground/ssr-deps/node-addon/build/config.gypi -I/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi -I/home/matias/.cache/node-gyp/16.9.1/include/node/common.gypi "--toplevel-dir=." binding.gyp -Makefile: $(srcdir)/../../../../../.cache/node-gyp/16.9.1/include/node/common.gypi $(srcdir)/../../../../../../../usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi - $(call do_cmd,regen_makefile) - -# "all" is a concatenation of the "all" targets from all the included -# sub-makefiles. This is just here to clarify. -all: - -# Add in dependency-tracking rules. $(all_deps) is the list of every single -# target in our tree. Only consider the ones with .d (dependency) info: -d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d)) -ifneq ($(d_files),) - include $(d_files) -endif diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d deleted file mode 100644 index 4be797e6cbdf6e..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d +++ /dev/null @@ -1 +0,0 @@ -cmd_Release/cpp_addon.node := ln -f "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node" 2>/dev/null || (rm -rf "Release/cpp_addon.node" && cp -af "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node") diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d deleted file mode 100644 index 9f4d87550d1f0a..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d +++ /dev/null @@ -1 +0,0 @@ -cmd_Release/obj.target/cpp_addon.node := g++ -o Release/obj.target/cpp_addon.node -shared -pthread -rdynamic -m64 -Wl,-soname=cpp_addon.node -Wl,--start-group Release/obj.target/cpp_addon/main.o -Wl,--end-group diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d deleted file mode 100644 index 2955b089117c85..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d +++ /dev/null @@ -1,23 +0,0 @@ -cmd_Release/obj.target/cpp_addon/main.o := g++ -o Release/obj.target/cpp_addon/main.o ../main.cpp '-DNODE_GYP_MODULE_NAME=cpp_addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/home/matias/.cache/node-gyp/16.9.1/include/node -I/home/matias/.cache/node-gyp/16.9.1/src -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++14 -MMD -MF ./Release/.deps/Release/obj.target/cpp_addon/main.o.d.raw -c -Release/obj.target/cpp_addon/main.o: ../main.cpp \ - /home/matias/.cache/node-gyp/16.9.1/include/node/node.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h -../main.cpp: -/home/matias/.cache/node-gyp/16.9.1/include/node/node.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: diff --git a/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node deleted file mode 100755 index 67c3f500cb518bfb96782ef1aeab0acc72d09ef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node deleted file mode 100755 index 67c3f500cb518bfb96782ef1aeab0acc72d09ef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o deleted file mode 100644 index 088f7174574579a7049a29fc9c0372a4205fa7b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4368 zcmbtWU2GIp6u#|3sr*(Dh#E|YFUCZYdd{7DwztDWwQ)Ai94$qx=8p zbAPnzwKaNeru8?R)h{e~TlHF-UW@7e$TofMTI;EatDD;6ESLtkHqs_dO>JsFkA~pi zznwUq7*C8PM$_}9%bAqF1l~JydTrINPIT>Si|PV*llJfG{#D(-9ys-X7S8zs&ocE} zXg4%HaqX`vOc~J9)yhMPk6=nSF@{M1e3Ktn8<>|0{>m{x7=! zJ-A8xOB^`A;Aya&fM3%Vb9zs(+-jdbZ{0kVcqK8Bcr{^Q5#9#Jf#*B5OWfklr}g}U z@fU$3t5|e8jyrBK_Y}+HfGNt}l3B2oY`M&!8D=i$*yxW0_U8cVP{xVh36%N?Nq-=9 zD4BerqjPMsYJ1g=ex*<8+S60zBlS&nKbdTg8wk~oPP-XqPNC^u2-=?m!cT4$R~uc82q9n2A-lM##Tqc;HBk0d@Uf& z63%l0>`7=%3}*w0lLCE=MQ0e3_!1rX8{}bKkFkw)os{Rea{v1G3OveFj7gV>aMTO^ zW~rWh?*S`9YZDx~d#3^Zbp!kdz|sF{=u!BYf&Lz}DF54G8c4REsozN0zX&xr=O z-vD21fZu9>FEzm1;AlqW#p>6G;aX=370+^w<%`5PneI1APOe(Cn37I*;h)NklWLca z*AKsnjvXHEo*wA#8m!t`ui)58vsj!ov*%Lwl#?3H7=7brv1)0W#*Cr#k%Nh}ab$2X zqm3G)iGyj)0B>l&FXOod`;4j%TdxhePHD`W8qh|-ygyZOil%32BZspvRC|CBa7Sm$ zmR1n<-Qxpl_o$P0vSv{$mAzSQ8fJP^cELmUeS89!v+u~{Su5-D_3+3PKWY3GVoChL@~q`GoNB6QtB|FVOmV|&(&AX{cq! z_z$JjfF@GP^corr69y)?KT|kkn_kt$dKUmt_rppmo?Fd&j(gC`o6`lyMQgP;Q^;A` z)D+Z$7jgtc?@!V)VYhg7)cY2$s*q-#21d)Z?WeSHv$^>I5&JWiH*A(HY2{!lc71s> z#P0L}dnHqHJ)BW_vh{7!G$V!K{a>)VK@qaTmep=!lTRfZie4~Gq>jfw|n)yU@0 z8B=DV$ZRKPi4$LcAn@Lx8yp@leoNlNuN{!5aS{aQH$x*lfglLtTc8pC9)cixazS_U+n4T4#PMy1Yem7@q99J+G&t_WKM>+$43rN3AFK!0M4}4? zF>I&Bct-Sy$?IWCWwzv*lhAu^(C0~Wt)i*mwZoL0>6uKKtW=odIygYOs;Dp|5+J7Q zRm%b@z)fkGu4~Q;fLj5ZDOsmff=iJpw&PjK(D2wE{?G`Xl{cnbc(TQU|7X_$_E@_W zIm0*(4W)>alFUUFoVs;5bw8I$T`n?Po z-Xr1s{}%Cy4-_smral8`RQy)_msD2T2%ZF z5nmU4jE^M=$FBf}@u^Ora*5-E41)KyETSy+eS8BZ36pteg}scS9_D^1urR$WfJ-3< zw0?pwf)bT~J|chIXR@dI<9foexo_GK(c?L!J;Zsk$H$bYh}T6N=v|@7aQ^5wMBy$j Oi}in8cNi#P`+otuZNl#W diff --git a/packages/playground/ssr-deps/node-addon/build/binding.Makefile b/packages/playground/ssr-deps/node-addon/build/binding.Makefile deleted file mode 100644 index 9521a57df40291..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/binding.Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# This file is generated by gyp; do not edit. - -export builddir_name ?= ./build/. -.PHONY: all -all: - $(MAKE) cpp_addon diff --git a/packages/playground/ssr-deps/node-addon/build/config.gypi b/packages/playground/ssr-deps/node-addon/build/config.gypi deleted file mode 100644 index 815e24a35e5c83..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/config.gypi +++ /dev/null @@ -1,351 +0,0 @@ -# Do not edit. File was generated by node-gyp's "configure" step -{ - "target_defaults": { - "cflags": [], - "default_configuration": "Release", - "defines": [], - "include_dirs": [], - "libraries": [] - }, - "variables": { - "asan": 0, - "coverage": "false", - "dcheck_always_on": 0, - "debug_nghttp2": "false", - "debug_node": "false", - "enable_lto": "false", - "enable_pgo_generate": "false", - "enable_pgo_use": "false", - "error_on_warn": "false", - "force_dynamic_crt": 0, - "gas_version": "2.30", - "host_arch": "x64", - "icu_data_in": "../../deps/icu-tmp/icudt69l.dat", - "icu_endianness": "l", - "icu_gyp_path": "tools/icu/icu-generic.gyp", - "icu_path": "deps/icu-small", - "icu_small": "false", - "icu_ver_major": "69", - "is_debug": 0, - "llvm_version": "0.0", - "napi_build_version": "8", - "node_byteorder": "little", - "node_debug_lib": "false", - "node_enable_d8": "false", - "node_install_npm": "true", - "node_library_files": [ - "lib/diagnostics_channel.js", - "lib/path.js", - "lib/punycode.js", - "lib/tty.js", - "lib/_stream_wrap.js", - "lib/querystring.js", - "lib/_tls_common.js", - "lib/_tls_wrap.js", - "lib/assert.js", - "lib/async_hooks.js", - "lib/child_process.js", - "lib/cluster.js", - "lib/dns.js", - "lib/util.js", - "lib/vm.js", - "lib/worker_threads.js", - "lib/url.js", - "lib/buffer.js", - "lib/wasi.js", - "lib/process.js", - "lib/console.js", - "lib/constants.js", - "lib/events.js", - "lib/fs.js", - "lib/_stream_duplex.js", - "lib/module.js", - "lib/domain.js", - "lib/zlib.js", - "lib/_http_client.js", - "lib/_http_server.js", - "lib/_stream_writable.js", - "lib/http.js", - "lib/https.js", - "lib/inspector.js", - "lib/trace_events.js", - "lib/_http_incoming.js", - "lib/http2.js", - "lib/os.js", - "lib/string_decoder.js", - "lib/_stream_passthrough.js", - "lib/_stream_readable.js", - "lib/_stream_transform.js", - "lib/crypto.js", - "lib/timers.js", - "lib/repl.js", - "lib/_http_agent.js", - "lib/_http_common.js", - "lib/_http_outgoing.js", - "lib/net.js", - "lib/perf_hooks.js", - "lib/readline.js", - "lib/v8.js", - "lib/sys.js", - "lib/tls.js", - "lib/stream.js", - "lib/dgram.js", - "lib/dns/promises.js", - "lib/stream/consumers.js", - "lib/stream/promises.js", - "lib/stream/web.js", - "lib/assert/strict.js", - "lib/internal/async_hooks.js", - "lib/internal/heap_utils.js", - "lib/internal/blob.js", - "lib/internal/freeze_intrinsics.js", - "lib/internal/inspector_async_hook.js", - "lib/internal/linkedlist.js", - "lib/internal/js_stream_socket.js", - "lib/internal/url.js", - "lib/internal/socketaddress.js", - "lib/internal/util.js", - "lib/internal/options.js", - "lib/internal/repl.js", - "lib/internal/child_process.js", - "lib/internal/errors.js", - "lib/internal/event_target.js", - "lib/internal/v8_prof_polyfill.js", - "lib/internal/v8_prof_processor.js", - "lib/internal/validators.js", - "lib/internal/buffer.js", - "lib/internal/encoding.js", - "lib/internal/watchdog.js", - "lib/internal/trace_events_async_hooks.js", - "lib/internal/constants.js", - "lib/internal/abort_controller.js", - "lib/internal/blocklist.js", - "lib/internal/querystring.js", - "lib/internal/net.js", - "lib/internal/cli_table.js", - "lib/internal/fixed_queue.js", - "lib/internal/priority_queue.js", - "lib/internal/tty.js", - "lib/internal/assert.js", - "lib/internal/timers.js", - "lib/internal/socket_list.js", - "lib/internal/error_serdes.js", - "lib/internal/freelist.js", - "lib/internal/dgram.js", - "lib/internal/histogram.js", - "lib/internal/http.js", - "lib/internal/idna.js", - "lib/internal/worker.js", - "lib/internal/dtrace.js", - "lib/internal/stream_base_commons.js", - "lib/internal/bootstrap/environment.js", - "lib/internal/bootstrap/loaders.js", - "lib/internal/bootstrap/pre_execution.js", - "lib/internal/bootstrap/node.js", - "lib/internal/bootstrap/switches/does_not_own_process_state.js", - "lib/internal/bootstrap/switches/is_not_main_thread.js", - "lib/internal/bootstrap/switches/does_own_process_state.js", - "lib/internal/bootstrap/switches/is_main_thread.js", - "lib/internal/debugger/inspect_repl.js", - "lib/internal/debugger/inspect.js", - "lib/internal/debugger/inspect_client.js", - "lib/internal/cluster/shared_handle.js", - "lib/internal/cluster/child.js", - "lib/internal/cluster/primary.js", - "lib/internal/cluster/round_robin_handle.js", - "lib/internal/cluster/utils.js", - "lib/internal/cluster/worker.js", - "lib/internal/crypto/aes.js", - "lib/internal/crypto/certificate.js", - "lib/internal/crypto/cipher.js", - "lib/internal/crypto/diffiehellman.js", - "lib/internal/crypto/hash.js", - "lib/internal/crypto/hashnames.js", - "lib/internal/crypto/hkdf.js", - "lib/internal/crypto/keys.js", - "lib/internal/crypto/mac.js", - "lib/internal/crypto/pbkdf2.js", - "lib/internal/crypto/random.js", - "lib/internal/crypto/scrypt.js", - "lib/internal/crypto/sig.js", - "lib/internal/crypto/util.js", - "lib/internal/crypto/webcrypto.js", - "lib/internal/crypto/x509.js", - "lib/internal/crypto/dsa.js", - "lib/internal/crypto/ec.js", - "lib/internal/crypto/keygen.js", - "lib/internal/crypto/rsa.js", - "lib/internal/dns/promises.js", - "lib/internal/dns/utils.js", - "lib/internal/fs/dir.js", - "lib/internal/fs/read_file_context.js", - "lib/internal/fs/streams.js", - "lib/internal/fs/sync_write_stream.js", - "lib/internal/fs/utils.js", - "lib/internal/fs/watchers.js", - "lib/internal/fs/promises.js", - "lib/internal/fs/rimraf.js", - "lib/internal/fs/cp/cp-sync.js", - "lib/internal/fs/cp/cp.js", - "lib/internal/http2/compat.js", - "lib/internal/http2/util.js", - "lib/internal/http2/core.js", - "lib/internal/modules/package_json_reader.js", - "lib/internal/modules/run_main.js", - "lib/internal/modules/cjs/loader.js", - "lib/internal/modules/cjs/helpers.js", - "lib/internal/modules/esm/loader.js", - "lib/internal/modules/esm/transform_source.js", - "lib/internal/modules/esm/module_job.js", - "lib/internal/modules/esm/module_map.js", - "lib/internal/modules/esm/resolve.js", - "lib/internal/modules/esm/translators.js", - "lib/internal/modules/esm/get_format.js", - "lib/internal/modules/esm/create_dynamic_module.js", - "lib/internal/modules/esm/get_source.js", - "lib/internal/legacy/processbinding.js", - "lib/internal/process/policy.js", - "lib/internal/process/worker_thread_only.js", - "lib/internal/process/esm_loader.js", - "lib/internal/process/execution.js", - "lib/internal/process/per_thread.js", - "lib/internal/process/promises.js", - "lib/internal/process/report.js", - "lib/internal/process/signal.js", - "lib/internal/process/task_queues.js", - "lib/internal/process/warning.js", - "lib/internal/repl/history.js", - "lib/internal/repl/utils.js", - "lib/internal/repl/await.js", - "lib/internal/streams/legacy.js", - "lib/internal/streams/passthrough.js", - "lib/internal/streams/buffer_list.js", - "lib/internal/streams/from.js", - "lib/internal/streams/lazy_transform.js", - "lib/internal/streams/state.js", - "lib/internal/streams/transform.js", - "lib/internal/streams/add-abort-signal.js", - "lib/internal/streams/compose.js", - "lib/internal/streams/destroy.js", - "lib/internal/streams/duplex.js", - "lib/internal/streams/duplexify.js", - "lib/internal/streams/end-of-stream.js", - "lib/internal/streams/pipeline.js", - "lib/internal/streams/readable.js", - "lib/internal/streams/utils.js", - "lib/internal/streams/writable.js", - "lib/internal/test/binding.js", - "lib/internal/test/transfer.js", - "lib/internal/util/comparisons.js", - "lib/internal/util/debuglog.js", - "lib/internal/util/inspect.js", - "lib/internal/util/inspector.js", - "lib/internal/util/iterable_weak_map.js", - "lib/internal/util/types.js", - "lib/internal/main/check_syntax.js", - "lib/internal/main/eval_stdin.js", - "lib/internal/main/prof_process.js", - "lib/internal/main/run_main_module.js", - "lib/internal/main/print_help.js", - "lib/internal/main/repl.js", - "lib/internal/main/inspect.js", - "lib/internal/main/worker_thread.js", - "lib/internal/main/eval_string.js", - "lib/internal/tls/parse-cert-string.js", - "lib/internal/tls/secure-context.js", - "lib/internal/tls/secure-pair.js", - "lib/internal/vm/module.js", - "lib/internal/child_process/serialization.js", - "lib/internal/per_context/domexception.js", - "lib/internal/per_context/messageport.js", - "lib/internal/per_context/primordials.js", - "lib/internal/worker/io.js", - "lib/internal/worker/js_transferable.js", - "lib/internal/assert/calltracker.js", - "lib/internal/assert/assertion_error.js", - "lib/internal/perf/event_loop_delay.js", - "lib/internal/perf/event_loop_utilization.js", - "lib/internal/perf/nodetiming.js", - "lib/internal/perf/observe.js", - "lib/internal/perf/performance.js", - "lib/internal/perf/performance_entry.js", - "lib/internal/perf/timerify.js", - "lib/internal/perf/usertiming.js", - "lib/internal/perf/utils.js", - "lib/internal/webstreams/encoding.js", - "lib/internal/webstreams/queuingstrategies.js", - "lib/internal/webstreams/readablestream.js", - "lib/internal/webstreams/transfer.js", - "lib/internal/webstreams/transformstream.js", - "lib/internal/webstreams/util.js", - "lib/internal/webstreams/writablestream.js", - "lib/internal/source_map/source_map.js", - "lib/internal/source_map/source_map_cache.js", - "lib/internal/source_map/prepare_stack_trace.js", - "lib/internal/console/global.js", - "lib/internal/console/constructor.js", - "lib/internal/readline/utils.js", - "lib/internal/readline/callbacks.js", - "lib/internal/readline/emitKeypressEvents.js", - "lib/internal/policy/manifest.js", - "lib/internal/policy/sri.js", - "lib/fs/promises.js", - "lib/util/types.js", - "lib/path/posix.js", - "lib/path/win32.js", - "lib/timers/promises.js" - ], - "node_module_version": 93, - "node_no_browser_globals": "false", - "node_prefix": "/", - "node_release_urlbase": "https://nodejs.org/download/release/", - "node_section_ordering_info": "", - "node_shared": "false", - "node_shared_brotli": "false", - "node_shared_cares": "false", - "node_shared_http_parser": "false", - "node_shared_libuv": "false", - "node_shared_nghttp2": "false", - "node_shared_nghttp3": "false", - "node_shared_ngtcp2": "false", - "node_shared_openssl": "false", - "node_shared_zlib": "false", - "node_tag": "", - "node_target_type": "executable", - "node_use_bundled_v8": "true", - "node_use_dtrace": "false", - "node_use_etw": "false", - "node_use_node_code_cache": "true", - "node_use_node_snapshot": "true", - "node_use_openssl": "true", - "node_use_v8_platform": "true", - "node_with_ltcg": "false", - "node_without_node_options": "false", - "openssl_fips": "", - "openssl_is_fips": "false", - "openssl_quic": "true", - "ossfuzz": "false", - "shlib_suffix": "so.93", - "target_arch": "x64", - "v8_enable_31bit_smis_on_64bit_arch": 0, - "v8_enable_gdbjit": 0, - "v8_enable_i18n_support": 1, - "v8_enable_inspector": 1, - "v8_enable_lite_mode": 0, - "v8_enable_object_print": 1, - "v8_enable_pointer_compression": 0, - "v8_enable_webassembly": 1, - "v8_no_strict_aliasing": 1, - "v8_optimized_debug": 1, - "v8_promise_internal_field_count": 1, - "v8_random_seed": 0, - "v8_trace_maps": 0, - "v8_use_siphash": 1, - "want_separate_host_toolset": 0, - "nodedir": "/home/matias/.cache/node-gyp/16.9.1", - "standalone_static_library": 1, - "user_agent": "pnpm/6.21.0 npm/? node/v16.9.1 linux x64", - "registry": "https://registry.npmjs.org/", - "node_gyp": "/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/bin/node-gyp.js" - } -} diff --git a/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk b/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk deleted file mode 100644 index 4a2de286352df8..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk +++ /dev/null @@ -1,159 +0,0 @@ -# This file is generated by gyp; do not edit. - -TOOLSET := target -TARGET := cpp_addon -DEFS_Debug := \ - '-DNODE_GYP_MODULE_NAME=cpp_addon' \ - '-DUSING_UV_SHARED=1' \ - '-DUSING_V8_SHARED=1' \ - '-DV8_DEPRECATION_WARNINGS=1' \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ - '-D_GLIBCXX_USE_CXX11_ABI=1' \ - '-D_LARGEFILE_SOURCE' \ - '-D_FILE_OFFSET_BITS=64' \ - '-D__STDC_FORMAT_MACROS' \ - '-DOPENSSL_NO_PINSHARED' \ - '-DOPENSSL_THREADS' \ - '-DBUILDING_NODE_EXTENSION' \ - '-DDEBUG' \ - '-D_DEBUG' \ - '-DV8_ENABLE_CHECKS' - -# Flags passed to all source files. -CFLAGS_Debug := \ - -fPIC \ - -pthread \ - -Wall \ - -Wextra \ - -Wno-unused-parameter \ - -m64 \ - -g \ - -O0 - -# Flags passed to only C files. -CFLAGS_C_Debug := - -# Flags passed to only C++ files. -CFLAGS_CC_Debug := \ - -fno-rtti \ - -fno-exceptions \ - -std=gnu++14 - -INCS_Debug := \ - -I/home/matias/.cache/node-gyp/16.9.1/include/node \ - -I/home/matias/.cache/node-gyp/16.9.1/src \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include - -DEFS_Release := \ - '-DNODE_GYP_MODULE_NAME=cpp_addon' \ - '-DUSING_UV_SHARED=1' \ - '-DUSING_V8_SHARED=1' \ - '-DV8_DEPRECATION_WARNINGS=1' \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ - '-D_GLIBCXX_USE_CXX11_ABI=1' \ - '-D_LARGEFILE_SOURCE' \ - '-D_FILE_OFFSET_BITS=64' \ - '-D__STDC_FORMAT_MACROS' \ - '-DOPENSSL_NO_PINSHARED' \ - '-DOPENSSL_THREADS' \ - '-DBUILDING_NODE_EXTENSION' - -# Flags passed to all source files. -CFLAGS_Release := \ - -fPIC \ - -pthread \ - -Wall \ - -Wextra \ - -Wno-unused-parameter \ - -m64 \ - -O3 \ - -fno-omit-frame-pointer - -# Flags passed to only C files. -CFLAGS_C_Release := - -# Flags passed to only C++ files. -CFLAGS_CC_Release := \ - -fno-rtti \ - -fno-exceptions \ - -std=gnu++14 - -INCS_Release := \ - -I/home/matias/.cache/node-gyp/16.9.1/include/node \ - -I/home/matias/.cache/node-gyp/16.9.1/src \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include - -OBJS := \ - $(obj).target/$(TARGET)/main.o - -# Add to the list of files we specially track dependencies for. -all_deps += $(OBJS) - -# CFLAGS et al overrides must be target-local. -# See "Target-specific Variable Values" in the GNU Make manual. -$(OBJS): TOOLSET := $(TOOLSET) -$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) -$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) - -# Suffix rules, putting all outputs into $(obj). - -$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) - -# Try building from generated source, too. - -$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) - -$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) - -# End of this set of suffix rules -### Rules for final target. -LDFLAGS_Debug := \ - -pthread \ - -rdynamic \ - -m64 - -LDFLAGS_Release := \ - -pthread \ - -rdynamic \ - -m64 - -LIBS := - -$(obj).target/cpp_addon.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE)) -$(obj).target/cpp_addon.node: LIBS := $(LIBS) -$(obj).target/cpp_addon.node: TOOLSET := $(TOOLSET) -$(obj).target/cpp_addon.node: $(OBJS) FORCE_DO_CMD - $(call do_cmd,solink_module) - -all_deps += $(obj).target/cpp_addon.node -# Add target alias -.PHONY: cpp_addon -cpp_addon: $(builddir)/cpp_addon.node - -# Copy this to the executable output path. -$(builddir)/cpp_addon.node: TOOLSET := $(TOOLSET) -$(builddir)/cpp_addon.node: $(obj).target/cpp_addon.node FORCE_DO_CMD - $(call do_cmd,copy) - -all_deps += $(builddir)/cpp_addon.node -# Short alias for building this executable. -.PHONY: cpp_addon.node -cpp_addon.node: $(obj).target/cpp_addon.node $(builddir)/cpp_addon.node - -# Add executable to "all" target. -.PHONY: all -all: $(builddir)/cpp_addon.node - From ae3a44357896dd73d0eaf67fa42e8920bfa2c601 Mon Sep 17 00:00:00 2001 From: shj Date: Sat, 4 Dec 2021 04:51:25 +0900 Subject: [PATCH 143/258] docs: remove newlines & use main branch instead of master (#5957) --- docs/config/index.md | 3 +-- docs/guide/static-deploy.md | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/config/index.md b/docs/config/index.md index 4074fa0fad71cb..f870503d1987d5 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -926,8 +926,7 @@ export default defineConfig({ Options to pass to esbuild during the dep scanning and optimization. - Certain options are omitted since changing them would not be compatible - with Vite's dep optimization. + Certain options are omitted since changing them would not be compatible with Vite's dep optimization. - `external` is also omitted, use Vite's `optimizeDeps.exclude` option - `plugins` are merged with Vite's dep plugin diff --git a/docs/guide/static-deploy.md b/docs/guide/static-deploy.md index fbb94fe9f75149..95f7b0ae5ed174 100644 --- a/docs/guide/static-deploy.md +++ b/docs/guide/static-deploy.md @@ -87,7 +87,7 @@ Now the `preview` method will launch the server at http://localhost:8080. # git push -f git@github.com:/.github.io.git main # if you are deploying to https://.github.io/ - # git push -f git@github.com:/.git master:gh-pages + # git push -f git@github.com:/.git main:gh-pages cd - ``` @@ -127,7 +127,7 @@ You can also run the above script in your CI setup to enable automatic deploymen github_token: $GITHUB_TOKEN keep_history: true on: - branch: master + branch: main ``` ## GitLab Pages and GitLab CI @@ -259,7 +259,7 @@ You can also deploy to a [custom domain](http://surge.sh/help/adding-a-custom-do ```bash # publish site - $ git push heroku master + $ git push heroku main # opens a browser to view the Dashboard version of Heroku CI $ heroku open From c768ffd266a85d8ea5dcaf790dd99cd37fff7bf2 Mon Sep 17 00:00:00 2001 From: Saurabh Daware Date: Sat, 4 Dec 2021 01:33:38 +0530 Subject: [PATCH 144/258] docs(ssr): add server.js entry to folder structure (#5960) --- docs/guide/ssr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/guide/ssr.md b/docs/guide/ssr.md index bfad7dc71ab961..c5ee7206e51126 100644 --- a/docs/guide/ssr.md +++ b/docs/guide/ssr.md @@ -31,6 +31,7 @@ A typical SSR application will have the following source file structure: ``` - index.html +- server.js # main application server - src/ - main.js # exports env-agnostic (universal) app code - entry-client.js # mounts the app to a DOM element From 4ece719229ac606aac93e5a267228582f54574bc Mon Sep 17 00:00:00 2001 From: Saurabh Daware Date: Sat, 4 Dec 2021 17:30:24 +0530 Subject: [PATCH 145/258] docs(ssr): update middlewareMode comment (#5959) --- docs/guide/ssr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/ssr.md b/docs/guide/ssr.md index c5ee7206e51126..115517ffddde25 100644 --- a/docs/guide/ssr.md +++ b/docs/guide/ssr.md @@ -77,8 +77,8 @@ async function createServer() { // Create Vite server in middleware mode. This disables Vite's own HTML // serving logic and let the parent server take control. // - // If you want to use Vite's own HTML serving logic (using Vite as - // a development middleware), using 'html' instead. + // In middleware mode, if you want to use Vite's own HTML serving logic + // use `'html'` as the `middlewareMode` (ref https://vitejs.dev/config/#server-middlewaremode) const vite = await createViteServer({ server: { middlewareMode: 'ssr' } }) From a47b663ad06af8c5bf87128035f6b112de0ecd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20Ayg=C3=BCn?= Date: Mon, 6 Dec 2021 10:15:01 +0300 Subject: [PATCH 146/258] fix(ssr): allow primitive default exports and forwarded exports (#5973) --- .../ssr-deps/__tests__/ssr-deps.spec.ts | 31 +++++++++++++ .../ssr-deps/forwarded-export/index.js | 2 + .../ssr-deps/forwarded-export/package.json | 5 +++ .../ssr-deps/object-assigned-exports/index.js | 9 ++++ .../object-assigned-exports/package.json | 5 +++ packages/playground/ssr-deps/package.json | 6 ++- .../ssr-deps/primitive-export/index.js | 1 + .../ssr-deps/primitive-export/package.json | 5 +++ packages/playground/ssr-deps/src/app.js | 18 ++++++++ .../ssr-deps/ts-transpiled-exports/index.js | 8 ++++ .../ts-transpiled-exports/package.json | 5 +++ packages/vite/src/node/ssr/ssrModuleLoader.ts | 44 ++++++------------- pnpm-lock.yaml | 20 +++++++++ 13 files changed, 128 insertions(+), 31 deletions(-) create mode 100644 packages/playground/ssr-deps/forwarded-export/index.js create mode 100644 packages/playground/ssr-deps/forwarded-export/package.json create mode 100644 packages/playground/ssr-deps/object-assigned-exports/index.js create mode 100644 packages/playground/ssr-deps/object-assigned-exports/package.json create mode 100644 packages/playground/ssr-deps/primitive-export/index.js create mode 100644 packages/playground/ssr-deps/primitive-export/package.json create mode 100644 packages/playground/ssr-deps/ts-transpiled-exports/index.js create mode 100644 packages/playground/ssr-deps/ts-transpiled-exports/package.json diff --git a/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts b/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts index 5559bb1e9adb83..4873b55eb82461 100644 --- a/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts +++ b/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts @@ -17,3 +17,34 @@ test('msg read by fs/promises', async () => { await page.goto(url) expect(await page.textContent('.file-message')).toMatch('File Content!') }) + +test('msg from primitive export', async () => { + await page.goto(url) + expect(await page.textContent('.primitive-export-message')).toMatch( + 'Hello World!' + ) +}) + +test('msg from TS transpiled exports', async () => { + await page.goto(url) + expect(await page.textContent('.ts-default-export-message')).toMatch( + 'Hello World!' + ) + expect(await page.textContent('.ts-named-export-message')).toMatch( + 'Hello World!' + ) +}) + +test('msg from Object.assign exports', async () => { + await page.goto(url) + expect(await page.textContent('.object-assigned-exports-message')).toMatch( + 'Hello World!' + ) +}) + +test('msg from forwarded exports', async () => { + await page.goto(url) + expect(await page.textContent('.forwarded-export-message')).toMatch( + 'Hello World!' + ) +}) diff --git a/packages/playground/ssr-deps/forwarded-export/index.js b/packages/playground/ssr-deps/forwarded-export/index.js new file mode 100644 index 00000000000000..0b9f314d00015e --- /dev/null +++ b/packages/playground/ssr-deps/forwarded-export/index.js @@ -0,0 +1,2 @@ +const original = require('object-assigned-exports') +module.exports = original diff --git a/packages/playground/ssr-deps/forwarded-export/package.json b/packages/playground/ssr-deps/forwarded-export/package.json new file mode 100644 index 00000000000000..49b7f792ba9c1d --- /dev/null +++ b/packages/playground/ssr-deps/forwarded-export/package.json @@ -0,0 +1,5 @@ +{ + "name": "forwarded-export", + "version": "0.0.0", + "private": true +} diff --git a/packages/playground/ssr-deps/object-assigned-exports/index.js b/packages/playground/ssr-deps/object-assigned-exports/index.js new file mode 100644 index 00000000000000..d6510e38f3a36f --- /dev/null +++ b/packages/playground/ssr-deps/object-assigned-exports/index.js @@ -0,0 +1,9 @@ +Object.defineProperty(exports, '__esModule', { value: true }) + +const obj = { + hello() { + return 'Hello World!' + } +} + +Object.assign(exports, obj) diff --git a/packages/playground/ssr-deps/object-assigned-exports/package.json b/packages/playground/ssr-deps/object-assigned-exports/package.json new file mode 100644 index 00000000000000..cdbb4d04c95bbf --- /dev/null +++ b/packages/playground/ssr-deps/object-assigned-exports/package.json @@ -0,0 +1,5 @@ +{ + "name": "object-assigned-exports", + "version": "0.0.0", + "private": true +} diff --git a/packages/playground/ssr-deps/package.json b/packages/playground/ssr-deps/package.json index 2e1f7a9deba490..ab6b29a9fb59eb 100644 --- a/packages/playground/ssr-deps/package.json +++ b/packages/playground/ssr-deps/package.json @@ -10,7 +10,11 @@ }, "dependencies": { "node-addon": "link:./node-addon", - "read-file-content": "file:./read-file-content" + "primitive-export": "link:./primitive-export", + "read-file-content": "file:./read-file-content", + "ts-transpiled-exports": "link:./ts-transpiled-exports", + "object-assigned-exports": "link:./object-assigned-exports", + "forwarded-export": "link:./forwarded-export" }, "devDependencies": { "cross-env": "^7.0.3", diff --git a/packages/playground/ssr-deps/primitive-export/index.js b/packages/playground/ssr-deps/primitive-export/index.js new file mode 100644 index 00000000000000..0701a4664b7537 --- /dev/null +++ b/packages/playground/ssr-deps/primitive-export/index.js @@ -0,0 +1 @@ +module.exports = 'Hello World!' diff --git a/packages/playground/ssr-deps/primitive-export/package.json b/packages/playground/ssr-deps/primitive-export/package.json new file mode 100644 index 00000000000000..c7a766db70b2e1 --- /dev/null +++ b/packages/playground/ssr-deps/primitive-export/package.json @@ -0,0 +1,5 @@ +{ + "name": "primitive-export", + "version": "0.0.0", + "private": true +} diff --git a/packages/playground/ssr-deps/src/app.js b/packages/playground/ssr-deps/src/app.js index 46cca814e08444..c7748978264fc9 100644 --- a/packages/playground/ssr-deps/src/app.js +++ b/packages/playground/ssr-deps/src/app.js @@ -1,6 +1,10 @@ import path from 'path' import { hello } from 'node-addon' import readFileContent from 'read-file-content' +import primitiveExport from 'primitive-export' +import tsDefaultExport, { hello as tsNamedExport } from 'ts-transpiled-exports' +import objectAssignedExports from 'object-assigned-exports' +import forwardedExport from 'forwarded-export' export async function render(url, rootDir) { let html = '' @@ -11,5 +15,19 @@ export async function render(url, rootDir) { const fileContent = await readFileContent(path.resolve(rootDir, 'message')) html += `\n

msg read via fs/promises: ${fileContent}

` + html += `\n

message from primitive export: ${primitiveExport}

` + + const tsDefaultExportMessage = tsDefaultExport() + html += `\n

message from ts-default-export: ${tsDefaultExportMessage}

` + + const tsNamedExportMessage = tsNamedExport() + html += `\n

message from ts-named-export: ${tsNamedExportMessage}

` + + const objectAssignedExportsMessage = objectAssignedExports.hello() + html += `\n

message from object-assigned-exports: ${objectAssignedExportsMessage}

` + + const forwardedExportMessage = forwardedExport.hello() + html += `\n

message from forwarded-export: ${forwardedExportMessage}

` + return html + '\n' } diff --git a/packages/playground/ssr-deps/ts-transpiled-exports/index.js b/packages/playground/ssr-deps/ts-transpiled-exports/index.js new file mode 100644 index 00000000000000..882c5fee653a8b --- /dev/null +++ b/packages/playground/ssr-deps/ts-transpiled-exports/index.js @@ -0,0 +1,8 @@ +'use strict' +Object.defineProperty(exports, '__esModule', { value: true }) +exports.hello = void 0 +function hello() { + return 'Hello World!' +} +exports.hello = hello +exports.default = hello diff --git a/packages/playground/ssr-deps/ts-transpiled-exports/package.json b/packages/playground/ssr-deps/ts-transpiled-exports/package.json new file mode 100644 index 00000000000000..f975d9d736c7f2 --- /dev/null +++ b/packages/playground/ssr-deps/ts-transpiled-exports/package.json @@ -0,0 +1,5 @@ +{ + "name": "ts-transpiled-exports", + "version": "0.0.0", + "private": true +} diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index ffd6838790af8e..0627e1e98ae4f9 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -271,7 +271,18 @@ async function nodeImport( // rollup-style default import interop for cjs function proxyESM(mod: any) { - const defaultExport = getDefaultExport(mod) + // This is the only sensible option when the exports object is a primitve + if (isPrimitive(mod)) return { default: mod } + + let defaultExport = 'default' in mod ? mod.default : mod + + if (!isPrimitive(defaultExport) && '__esModule' in defaultExport) { + mod = defaultExport + if ('default' in defaultExport) { + defaultExport = defaultExport.default + } + } + return new Proxy(mod, { get(mod, prop) { if (prop === 'default') return defaultExport @@ -280,33 +291,6 @@ function proxyESM(mod: any) { }) } -function getDefaultExport(moduleExports: any) { - // `moduleExports` is one of the following: - // - `const moduleExports = require(file)` - // - `const moduleExports = await import(file)` - let defaultExport = - 'default' in moduleExports ? moduleExports.default : moduleExports - - // Node.js doesn't support `__esModule`, see https://github.com/nodejs/node/issues/40891 - // This means we need to unwrap the `__esModule` wrapper ourselves. - // - // For example: - // ```ts - // export default 'hi' - // ``` - // - // Which TypeScript transpiles to: - // ```js - // use strict"; - // exports.__esModule = true; - // exports["default"] = 'hi'; - // ``` - // - // This means that `moduleExports.default` denotes `{ __esModule, default: 'hi }` thus the actual - // default lives in `moduleExports.default.default`. - if (defaultExport && '__esModule' in defaultExport) { - defaultExport = defaultExport.default - } - - return defaultExport +function isPrimitive(value: any) { + return !value || (typeof value !== 'object' && typeof value !== 'function') } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 210c92ed29b5b7..65883837bdd6dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -458,24 +458,44 @@ importers: specifiers: cross-env: ^7.0.3 express: ^4.17.1 + forwarded-export: link:./forwarded-export node-addon: link:./node-addon + object-assigned-exports: link:./object-assigned-exports + primitive-export: link:./primitive-export read-file-content: file:./read-file-content + ts-transpiled-exports: link:./ts-transpiled-exports dependencies: + forwarded-export: link:forwarded-export node-addon: link:node-addon + object-assigned-exports: link:object-assigned-exports + primitive-export: link:primitive-export read-file-content: link:read-file-content + ts-transpiled-exports: link:ts-transpiled-exports devDependencies: cross-env: 7.0.3 express: 4.17.1 + packages/playground/ssr-deps/forwarded-export: + specifiers: {} + packages/playground/ssr-deps/node-addon: specifiers: node-gyp: ^8.4.1 dependencies: node-gyp: 8.4.1 + packages/playground/ssr-deps/object-assigned-exports: + specifiers: {} + + packages/playground/ssr-deps/primitive-export: + specifiers: {} + packages/playground/ssr-deps/read-file-content: specifiers: {} + packages/playground/ssr-deps/ts-transpiled-exports: + specifiers: {} + packages/playground/ssr-html: specifiers: cross-env: ^7.0.3 From 49f28e23cae0ad588fc89374918d3a5e942c5075 Mon Sep 17 00:00:00 2001 From: patak-js Date: Mon, 6 Dec 2021 08:32:20 +0100 Subject: [PATCH 147/258] release: v2.7.0-beta.11 --- packages/vite/CHANGELOG.md | 9 +++++++++ packages/vite/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index acaad87b075002..71dc2f7ebd95cb 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,12 @@ +# [2.7.0-beta.11](https://github.com/vitejs/vite/compare/v2.7.0-beta.10...v2.7.0-beta.11) (2021-12-06) + + +### Bug Fixes + +* **ssr:** allow primitive default exports and forwarded exports ([#5973](https://github.com/vitejs/vite/issues/5973)) ([a47b663](https://github.com/vitejs/vite/commit/a47b663ad06af8c5bf87128035f6b112de0ecd16)) + + + # [2.7.0-beta.10](https://github.com/vitejs/vite/compare/v2.7.0-beta.9...v2.7.0-beta.10) (2021-12-02) diff --git a/packages/vite/package.json b/packages/vite/package.json index 25a678fba08b84..549037d8ddfc9f 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.10", + "version": "2.7.0-beta.11", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From 8184feba29c6a89d58bc4437977d22658e946e0c Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 7 Dec 2021 14:34:12 +0800 Subject: [PATCH 148/258] feat: expose `ssrTransform` to server (#5983) Co-authored-by: patak --- packages/vite/src/node/server/index.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 8f922a5471918c..b17180c81d5e64 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -55,6 +55,7 @@ import { rebindErrorStacktrace, ssrRewriteStacktrace } from '../ssr/ssrStacktrace' +import { ssrTransform } from '../ssr/ssrTransform' import { createMissingImporterRegisterFn } from '../optimizer/registerMissing' import { resolveHostname } from '../utils' import { searchForWorkspaceRoot } from './searchRoot' @@ -62,6 +63,7 @@ import { CLIENT_DIR } from '../constants' import { printCommonServerUrls } from '../logger' import { performance } from 'perf_hooks' import { invalidatePackageData } from '../packages' +import { SourceMap } from 'rollup' export { searchForWorkspaceRoot } from './searchRoot' @@ -206,6 +208,15 @@ export interface ViteDevServer { options?: EsbuildTransformOptions, inMap?: object ): Promise + /** + * Transform module code into SSR format. + * @experimental + */ + ssrTransform( + code: string, + inMap: SourceMap | null, + url: string + ): Promise /** * Load a given URL as an instantiated module for SSR. */ @@ -337,6 +348,7 @@ export async function createServer( pluginContainer: container, ws, moduleGraph, + ssrTransform, transformWithEsbuild, transformRequest(url, options) { return transformRequest(url, server, options) From 075128a8dd0a2680540179dad2277a797f793199 Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 09:57:48 +0100 Subject: [PATCH 149/258] release: v2.7.0 --- packages/vite/CHANGELOG.md | 9 +++++++++ packages/vite/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 71dc2f7ebd95cb..13817465f09763 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,12 @@ +# [2.7.0](https://github.com/vitejs/vite/compare/v2.7.0-beta.11...v2.7.0) (2021-12-07) + + +### Features + +* expose `ssrTransform` to server ([#5983](https://github.com/vitejs/vite/issues/5983)) ([8184feb](https://github.com/vitejs/vite/commit/8184feba29c6a89d58bc4437977d22658e946e0c)) + + + # [2.7.0-beta.11](https://github.com/vitejs/vite/compare/v2.7.0-beta.10...v2.7.0-beta.11) (2021-12-06) diff --git a/packages/vite/package.json b/packages/vite/package.json index 549037d8ddfc9f..2dafab95ae3b12 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0-beta.11", + "version": "2.7.0", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From a7a986f9b74157c20adec89a24b78e434b902152 Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 10:00:37 +0100 Subject: [PATCH 150/258] release: plugin-vue@1.10.2 --- packages/plugin-vue/CHANGELOG.md | 9 +++++++++ packages/plugin-vue/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue/CHANGELOG.md b/packages/plugin-vue/CHANGELOG.md index 15cfcbecef213b..afa7152989f48a 100644 --- a/packages/plugin-vue/CHANGELOG.md +++ b/packages/plugin-vue/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.10.2](https://github.com/vitejs/vite/compare/plugin-vue@1.10.1...plugin-vue@1.10.2) (2021-12-07) + + +### Bug Fixes + +* **plugin-vue:** misleading error thrown after refresh or hmr ([#5870](https://github.com/vitejs/vite/issues/5870)) ([5c07cec](https://github.com/vitejs/vite/commit/5c07cec7214948da73fbbc33c7f5c83bf7f6cd2e)) + + + ## [1.10.1](https://github.com/vitejs/vite/compare/plugin-vue@1.10.0...plugin-vue@1.10.1) (2021-11-26) diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 41001dc51e2e9f..2d82864408cf1c 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue", - "version": "1.10.1", + "version": "1.10.2", "license": "MIT", "author": "Evan You", "files": [ From cc642afba9bf1b5c7408c22a279e84b18519e65e Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 10:04:08 +0100 Subject: [PATCH 151/258] release: plugin-vue-jsx@1.3.1 --- packages/plugin-vue-jsx/CHANGELOG.md | 4 ++++ packages/plugin-vue-jsx/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue-jsx/CHANGELOG.md b/packages/plugin-vue-jsx/CHANGELOG.md index 310ff252d3be03..7bd6d06debcac6 100644 --- a/packages/plugin-vue-jsx/CHANGELOG.md +++ b/packages/plugin-vue-jsx/CHANGELOG.md @@ -1,3 +1,7 @@ +## [1.3.1](https://github.com/vitejs/vite/compare/plugin-vue-jsx@1.3.0...plugin-vue-jsx@1.3.1) (2021-12-07) + + + # [1.3.0](https://github.com/vitejs/vite/compare/plugin-vue-jsx@1.3.0-beta.0...plugin-vue-jsx@1.3.0) (2021-11-22) diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 3a400dda99bd32..9d0e73583c2e51 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue-jsx", - "version": "1.3.0", + "version": "1.3.1", "license": "MIT", "author": "Evan You", "files": [ From a3be90cfff092819576263e378915d69c5292b8f Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 10:05:34 +0100 Subject: [PATCH 152/258] release: plugin-react@1.1.1 --- packages/plugin-react/CHANGELOG.md | 4 ++++ packages/plugin-react/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md index 2ed02eec161858..c3887f6943b521 100644 --- a/packages/plugin-react/CHANGELOG.md +++ b/packages/plugin-react/CHANGELOG.md @@ -1,3 +1,7 @@ +## [1.1.1](https://github.com/vitejs/vite/compare/plugin-react@1.1.0...plugin-react@1.1.1) (2021-12-07) + + + # [1.1.0](https://github.com/vitejs/vite/compare/plugin-react@1.1.0-beta.1...plugin-react@1.1.0) (2021-11-22) diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index a8942b2abf9e41..5e60ed73b10833 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-react", - "version": "1.1.0", + "version": "1.1.1", "license": "MIT", "author": "Evan You", "contributors": [ From 79cf69e7b2987982f02beef0e7e15bb27500dfd7 Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 10:07:31 +0100 Subject: [PATCH 153/258] release: plugin-legacy@1.6.4 --- packages/plugin-legacy/CHANGELOG.md | 4 ++++ packages/plugin-legacy/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-legacy/CHANGELOG.md b/packages/plugin-legacy/CHANGELOG.md index 077f29eaa790c0..4a97f73fa2b1a3 100644 --- a/packages/plugin-legacy/CHANGELOG.md +++ b/packages/plugin-legacy/CHANGELOG.md @@ -1,3 +1,7 @@ +## [1.6.4](https://github.com/vitejs/vite/compare/plugin-legacy@1.6.3...plugin-legacy@1.6.4) (2021-12-07) + + + ## [1.6.3](https://github.com/vitejs/vite/compare/plugin-legacy@1.6.2...plugin-legacy@1.6.3) (2021-11-22) diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json index 2ab7f597861915..2c08940d5f335d 100644 --- a/packages/plugin-legacy/package.json +++ b/packages/plugin-legacy/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-legacy", - "version": "1.6.3", + "version": "1.6.4", "license": "MIT", "author": "Evan You", "files": [ From 8d9b3939b033f014ff2eaf0c4b175fff1d0a9864 Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 10:08:12 +0100 Subject: [PATCH 154/258] release: create-vite@2.7.0 --- packages/create-vite/CHANGELOG.md | 9 +++++++++ packages/create-vite/package.json | 2 +- packages/create-vite/template-lit-ts/package.json | 2 +- packages/create-vite/template-lit/package.json | 2 +- packages/create-vite/template-preact-ts/package.json | 2 +- packages/create-vite/template-preact/package.json | 2 +- packages/create-vite/template-react-ts/package.json | 2 +- packages/create-vite/template-react/package.json | 2 +- packages/create-vite/template-svelte-ts/package.json | 2 +- packages/create-vite/template-svelte/package.json | 2 +- packages/create-vite/template-vanilla-ts/package.json | 2 +- packages/create-vite/template-vanilla/package.json | 2 +- packages/create-vite/template-vue-ts/package.json | 4 ++-- packages/create-vite/template-vue/package.json | 4 ++-- 14 files changed, 24 insertions(+), 15 deletions(-) diff --git a/packages/create-vite/CHANGELOG.md b/packages/create-vite/CHANGELOG.md index 9ab9031c9dbc5e..15177ce5f95fe2 100644 --- a/packages/create-vite/CHANGELOG.md +++ b/packages/create-vite/CHANGELOG.md @@ -1,3 +1,12 @@ +# [2.7.0](https://github.com/vitejs/vite/compare/create-vite@2.6.6...create-vite@2.7.0) (2021-12-07) + + +### Bug Fixes + +* **create-vite:** update vue-tsc for dts flags ([#5453](https://github.com/vitejs/vite/issues/5453)) ([c93bc3d](https://github.com/vitejs/vite/commit/c93bc3df90b5c4e8e25ffd864ae53a3ae7559315)) + + + ## [2.6.6](https://github.com/vitejs/vite/compare/create-vite@2.6.5...create-vite@2.6.6) (2021-10-07) diff --git a/packages/create-vite/package.json b/packages/create-vite/package.json index 6c50d4a4284217..148917ba383642 100644 --- a/packages/create-vite/package.json +++ b/packages/create-vite/package.json @@ -1,6 +1,6 @@ { "name": "create-vite", - "version": "2.6.6", + "version": "2.7.0", "license": "MIT", "author": "Evan You", "bin": { diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json index cb1223e353ba87..fcc4d78b72bf0b 100644 --- a/packages/create-vite/template-lit-ts/package.json +++ b/packages/create-vite/template-lit-ts/package.json @@ -18,7 +18,7 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.6.13", + "vite": "^2.7.0", "typescript": "^4.4.4" } } diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json index 1db755e53d6793..9864c7b7e2fcc5 100644 --- a/packages/create-vite/template-lit/package.json +++ b/packages/create-vite/template-lit/package.json @@ -16,6 +16,6 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json index 232a4928f400a7..091c1356335cdf 100644 --- a/packages/create-vite/template-preact-ts/package.json +++ b/packages/create-vite/template-preact-ts/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@preact/preset-vite": "^2.1.5", "typescript": "^4.4.4", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-preact/package.json b/packages/create-vite/template-preact/package.json index 581350d5797c85..1ba3ee754d4f32 100644 --- a/packages/create-vite/template-preact/package.json +++ b/packages/create-vite/template-preact/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@preact/preset-vite": "^2.1.5", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json index f85994c5273f1a..a15b23787a5dd7 100644 --- a/packages/create-vite/template-react-ts/package.json +++ b/packages/create-vite/template-react-ts/package.json @@ -15,6 +15,6 @@ "@types/react-dom": "^17.0.10", "@vitejs/plugin-react": "^1.0.7", "typescript": "^4.4.4", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json index 302ea55153ea11..dd4dcddef1191e 100644 --- a/packages/create-vite/template-react/package.json +++ b/packages/create-vite/template-react/package.json @@ -12,6 +12,6 @@ }, "devDependencies": { "@vitejs/plugin-react": "^1.0.7", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json index 1f6009d7fbf4c6..30ac18e133e52a 100644 --- a/packages/create-vite/template-svelte-ts/package.json +++ b/packages/create-vite/template-svelte-ts/package.json @@ -16,6 +16,6 @@ "svelte-preprocess": "^4.9.8", "tslib": "^2.3.1", "typescript": "^4.4.4", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json index f438d1acbdc972..46847c242ed996 100644 --- a/packages/create-vite/template-svelte/package.json +++ b/packages/create-vite/template-svelte/package.json @@ -10,6 +10,6 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30", "svelte": "^3.44.0", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json index f5ead1b62c6066..7256a8e2e3c10e 100644 --- a/packages/create-vite/template-vanilla-ts/package.json +++ b/packages/create-vite/template-vanilla-ts/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "typescript": "^4.4.4", - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-vanilla/package.json b/packages/create-vite/template-vanilla/package.json index 89411d9e9146ab..eee96669c91888 100644 --- a/packages/create-vite/template-vanilla/package.json +++ b/packages/create-vite/template-vanilla/package.json @@ -7,6 +7,6 @@ "preview": "vite preview" }, "devDependencies": { - "vite": "^2.6.13" + "vite": "^2.7.0" } } diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json index 7a531c83934185..cdf88c987fbe9f 100644 --- a/packages/create-vite/template-vue-ts/package.json +++ b/packages/create-vite/template-vue-ts/package.json @@ -10,9 +10,9 @@ "vue": "^3.2.23" }, "devDependencies": { - "@vitejs/plugin-vue": "^1.9.4", + "@vitejs/plugin-vue": "^1.10.2", "typescript": "^4.4.4", - "vite": "^2.6.13", + "vite": "^2.7.0", "vue-tsc": "^0.28.10" } } diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json index 1ae577be5931b6..e47a7484ea000e 100644 --- a/packages/create-vite/template-vue/package.json +++ b/packages/create-vite/template-vue/package.json @@ -10,7 +10,7 @@ "vue": "^3.2.23" }, "devDependencies": { - "@vitejs/plugin-vue": "^1.9.4", - "vite": "^2.6.13" + "@vitejs/plugin-vue": "^1.10.2", + "vite": "^2.7.0" } } From dc0845c582de96a94166c6d027a91d19876f2219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E6=B8=B8=E5=90=9B?= Date: Tue, 7 Dec 2021 17:23:59 +0800 Subject: [PATCH 155/258] docs(ssr): fix tip Note block render (#5984) --- docs/guide/ssr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/ssr.md b/docs/guide/ssr.md index 115517ffddde25..e60f06e12789ed 100644 --- a/docs/guide/ssr.md +++ b/docs/guide/ssr.md @@ -251,7 +251,7 @@ export function mySSRPlugin() { The options object in `load` and `transform` is optional, rollup is not currently using this object but may extend these hooks with additional metadata in the future. -::: tip Note +:::tip Note Before Vite 2.7, this was informed to plugin hooks with a positional `ssr` param instead of using the `options` object. All major frameworks and plugins are updated but you may find outdated posts using the previous API. ::: From 11027892aa601c6600f98a03c0e141439cea1240 Mon Sep 17 00:00:00 2001 From: patak Date: Tue, 7 Dec 2021 11:28:24 +0100 Subject: [PATCH 156/258] chore: update changelog for 2.7 (#5985) --- packages/vite/CHANGELOG.md | 61 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 13817465f09763..1bd80b9028b7f9 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,5 +1,37 @@ # [2.7.0](https://github.com/vitejs/vite/compare/v2.7.0-beta.11...v2.7.0) (2021-12-07) +- 🎉 Revamped SSR dependency handling +- 🧩 API consolidation +- 🛑 server.fs.strict by default + +### BREAKING CHANGES + +- `server.fs.strict` is `true` by default ([#5341](https://github.com/vitejs/vite/pull/5341)) + See [server filesystem restriction docs](https://vitejs.dev/config/#server-fs-strict) for more details. +- Plugin hooks `ssr` param to object in `resolveId`, `load`, and `transform` ([#5253](https://github.com/vitejs/vite/pull/5253)) + Previous to this release, the `ssr` param was passed as a `boolean` in the last parameter of each hook. The new interface for these hooks is now: + ```ts + export interface Plugin extends RollupPlugin { + // ... other hooks + resolveId?(this: PluginContext, source: string, importer: string | undefined, options: { + custom?: CustomPluginOptions; + ssr?: boolean; + }): Promise | ResolveIdResult; + load?(this: PluginContext, id: string, options?: { + ssr?: boolean; + }): Promise | LoadResult; + transform?(this: TransformPluginContext, code: string, id: string, options?: { + ssr?: boolean; + }): Promise | TransformResult; + } + ``` + In your plugins, you can check if the last param is a boolean or an object to be backward compatible with 2.6 and give some time to users to migrate to Vite 2.7. +- `server.pluginContainer` options object for `resolveId`, `load`, and `transform` ([#5294](https://github.com/vitejs/vite/pull/5294)) +- Normalize scripts and commands naming ([#5207](https://github.com/vitejs/vite/pull/5207)) + Adds a new `vite dev` command alias for `vite serve`, preparing for the new release of create-vite where package scripts are renamed to `dev`, `build`, and `preview`. +- Align experimental `preview` api ([#5407](https://github.com/vitejs/vite/pull/5407)) + This API was first introduced in 2.6 and it is still in flux. +- resolve `rollupOptions.input` paths ([#5601](https://github.com/vitejs/vite/pull/5601)) ### Features @@ -160,35 +192,6 @@ # [2.7.0-beta.0](https://github.com/vitejs/vite/compare/v2.6.13...v2.7.0-beta.0) (2021-10-28) - -### BREAKING CHANGES - -- `server.fs.strict` is `true` by default ([#5341](https://github.com/vitejs/vite/pull/5341)) - See [server filesystem restriction docs](https://vitejs.dev/config/#server-fs-strict) for more details. -- Plugin hooks `ssr` param to object in `resolveId`, `load`, and `transform` ([#5253](https://github.com/vitejs/vite/pull/5253)) - Previous to this release, the `ssr` param was passed as a `boolean` in the last parameter of each hook. The new interface for these hooks is now: - ```ts - export interface Plugin extends RollupPlugin { - // ... other hooks - resolveId?(this: PluginContext, source: string, importer: string | undefined, options: { - custom?: CustomPluginOptions; - ssr?: boolean; - }): Promise | ResolveIdResult; - load?(this: PluginContext, id: string, options?: { - ssr?: boolean; - }): Promise | LoadResult; - transform?(this: TransformPluginContext, code: string, id: string, options?: { - ssr?: boolean; - }): Promise | TransformResult; - } - ``` - In your plugins, you can check if the last param is a boolean or an object to be backward compatible with 2.6 and give some time to users to migrate to Vite 2.7. -- `server.pluginContainer` options object for `resolveId`, `load`, and `transform` ([#5294](https://github.com/vitejs/vite/pull/5294)) -- Normalize scripts and commands naming ([#5207](https://github.com/vitejs/vite/pull/5207)) - Adds a new `vite dev` command alias for `vite serve`, preparing for the new release of create-vite where package scripts are renamed to `dev`, `build`, and `preview`. -- Align experimental `preview` api ([#5407](https://github.com/vitejs/vite/pull/5407)) - This API was first introduced in 2.6 and it is still in flux. - ### Bug Fixes * add `import` support to `ssrModuleLoader` ([#5197](https://github.com/vitejs/vite/issues/5197)) ([baba1f9](https://github.com/vitejs/vite/commit/baba1f9e8fb22254b3858bcc1ffe89b334736068)) From 79aa68744cf17553448bce5c175a25f785e4a743 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 7 Dec 2021 23:51:17 +0800 Subject: [PATCH 157/258] fix(ssr): `ssrTransform` handling for empty ArrayPattern (#5988) --- packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts | 6 ++++++ packages/vite/src/node/ssr/ssrTransform.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts index a5c452d79c60e9..f63c9f5036767f 100644 --- a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts +++ b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts @@ -375,3 +375,9 @@ test('overwrite bindings', async () => { " `) }) + +test('Empty array pattern', async () => { + expect( + (await ssrTransform(`const [, LHS, RHS] = inMatch;`, null, null)).code + ).toMatchInlineSnapshot(`"const [, LHS, RHS] = inMatch;"`) +}) diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts index 487208560a7e9b..394906816453f9 100644 --- a/packages/vite/src/node/ssr/ssrTransform.ts +++ b/packages/vite/src/node/ssr/ssrTransform.ts @@ -347,7 +347,7 @@ function walk( } }) } else if (node.id.type === 'ArrayPattern') { - node.id.elements.forEach((element) => { + node.id.elements.filter(Boolean).forEach((element) => { setScope(parentFunction, (element as Identifier).name) }) } else { From b625a2cf3730fda94d934b23bcec0c859bfa0b24 Mon Sep 17 00:00:00 2001 From: patak-js Date: Tue, 7 Dec 2021 18:28:22 +0100 Subject: [PATCH 158/258] release: v2.7.1 --- packages/vite/CHANGELOG.md | 9 +++++++++ packages/vite/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 1bd80b9028b7f9..382ae98efe085d 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,12 @@ +## [2.7.1](https://github.com/vitejs/vite/compare/v2.7.0...v2.7.1) (2021-12-07) + + +### Bug Fixes + +* **ssr:** `ssrTransform` handling for empty ArrayPattern ([#5988](https://github.com/vitejs/vite/issues/5988)) ([79aa687](https://github.com/vitejs/vite/commit/79aa68744cf17553448bce5c175a25f785e4a743)) + + + # [2.7.0](https://github.com/vitejs/vite/compare/v2.7.0-beta.11...v2.7.0) (2021-12-07) - 🎉 Revamped SSR dependency handling diff --git a/packages/vite/package.json b/packages/vite/package.json index 2dafab95ae3b12..3fcee0399cd05d 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.0", + "version": "2.7.1", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From df7aec7d2a567af1dfbab76e5765aba80dc3cb5c Mon Sep 17 00:00:00 2001 From: poyoho <36070057+poyoho@users.noreply.github.com> Date: Wed, 8 Dec 2021 22:42:42 +0800 Subject: [PATCH 159/258] fix(plugin-vue): multiple vue files using the same src file (fix #5925, #5447) (#5994) --- packages/playground/vue/src-import/SrcImport.vue | 3 ++- packages/playground/vue/src-import/script.ts | 6 ++++++ .../playground/vue/src-import/srcImportStyle.vue | 7 +++++++ .../playground/vue/src-import/srcImportStyle2.vue | 4 ++++ packages/playground/vue/src-import/style2.css | 3 +++ packages/playground/vue/src-import/template.html | 2 ++ packages/plugin-vue/src/index.ts | 7 +++++-- packages/plugin-vue/src/main.ts | 10 +++++----- packages/plugin-vue/src/utils/descriptorCache.ts | 15 ++++++++++++--- packages/plugin-vue/src/utils/query.ts | 5 +---- 10 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 packages/playground/vue/src-import/srcImportStyle.vue create mode 100644 packages/playground/vue/src-import/srcImportStyle2.vue create mode 100644 packages/playground/vue/src-import/style2.css diff --git a/packages/playground/vue/src-import/SrcImport.vue b/packages/playground/vue/src-import/SrcImport.vue index ac7ec78c869e65..d70e1f48a84331 100644 --- a/packages/playground/vue/src-import/SrcImport.vue +++ b/packages/playground/vue/src-import/SrcImport.vue @@ -1,3 +1,4 @@ + + - diff --git a/packages/playground/vue/src-import/script.ts b/packages/playground/vue/src-import/script.ts index c7712fc4b755b6..54e6e35db41f46 100644 --- a/packages/playground/vue/src-import/script.ts +++ b/packages/playground/vue/src-import/script.ts @@ -1,6 +1,12 @@ import { defineComponent } from 'vue' +import SrcImportStyle from './srcImportStyle.vue' +import SrcImportStyle2 from './srcImportStyle2.vue' export default defineComponent({ + components: { + SrcImportStyle, + SrcImportStyle2 + }, setup() { return { msg: 'hello from script src!' diff --git a/packages/playground/vue/src-import/srcImportStyle.vue b/packages/playground/vue/src-import/srcImportStyle.vue new file mode 100644 index 00000000000000..de91769858fe93 --- /dev/null +++ b/packages/playground/vue/src-import/srcImportStyle.vue @@ -0,0 +1,7 @@ + + + diff --git a/packages/playground/vue/src-import/srcImportStyle2.vue b/packages/playground/vue/src-import/srcImportStyle2.vue new file mode 100644 index 00000000000000..1e0f327413103e --- /dev/null +++ b/packages/playground/vue/src-import/srcImportStyle2.vue @@ -0,0 +1,4 @@ + + diff --git a/packages/playground/vue/src-import/style2.css b/packages/playground/vue/src-import/style2.css new file mode 100644 index 00000000000000..8c93cb983cc09d --- /dev/null +++ b/packages/playground/vue/src-import/style2.css @@ -0,0 +1,3 @@ +.src-imports-script { + color: #0088ff; +} diff --git a/packages/playground/vue/src-import/template.html b/packages/playground/vue/src-import/template.html index 305bbad0fbc2f6..6b55c545daac6a 100644 --- a/packages/playground/vue/src-import/template.html +++ b/packages/playground/vue/src-import/template.html @@ -1,3 +1,5 @@

SFC Src Imports

{{ msg }}
This should be tan
+ + diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 71ec6e7a4bef47..9862a9daaf9044 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -9,7 +9,7 @@ import { } from '@vue/compiler-sfc' import { compiler } from './compiler' import { parseVueRequest } from './utils/query' -import { getDescriptor } from './utils/descriptorCache' +import { getDescriptor, getSrcDescriptor } from './utils/descriptorCache' import { getResolvedScript } from './script' import { transformMain } from './main' import { handleHotUpdate } from './handleHotUpdate' @@ -223,7 +223,10 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { ) } else { // sub block request - const descriptor = getDescriptor(filename, options)! + const descriptor = query.src + ? getSrcDescriptor(filename, query)! + : getDescriptor(filename, options)! + if (query.type === 'template') { return transformTemplateAsModule(code, descriptor, options, this, ssr) } else if (query.type === 'style') { diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index bb3076763844bd..9df5ba44da9043 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -6,7 +6,7 @@ import { ResolvedOptions } from '.' import { createDescriptor, getPrevDescriptor, - setDescriptor + setSrcDescriptor } from './utils/descriptorCache' import { PluginContext, SourceMap, TransformPluginContext } from 'rollup' import { normalizePath } from '@rollup/pluginutils' @@ -237,7 +237,7 @@ async function genTemplateCode( await linkSrcToDescriptor(template.src, descriptor, pluginContext) } const src = template.src || descriptor.filename - const srcQuery = template.src ? `&src` : `` + const srcQuery = template.src ? `&src=${descriptor.id}` : `` const attrsQuery = attrsToQuery(template.attrs, 'js', true) const query = `?vue&type=template${srcQuery}${attrsQuery}` const request = JSON.stringify(src + query) @@ -279,7 +279,7 @@ async function genScriptCode( const src = script.src || descriptor.filename const langFallback = (script.src && path.extname(src).slice(1)) || 'js' const attrsQuery = attrsToQuery(script.attrs, langFallback) - const srcQuery = script.src ? `&src` : `` + const srcQuery = script.src ? `&src=${descriptor.id}` : `` const query = `?vue&type=script${srcQuery}${attrsQuery}` const request = JSON.stringify(src + query) scriptCode = @@ -310,7 +310,7 @@ async function genStyleCode( // do not include module in default query, since we use it to indicate // that the module needs to export the modules json const attrsQuery = attrsToQuery(style.attrs, 'css') - const srcQuery = style.src ? `&src` : `` + const srcQuery = style.src ? `&src=${descriptor.id}` : `` const directQuery = asCustomElement ? `&inline` : `` const query = `?vue&type=style&index=${i}${srcQuery}${directQuery}` const styleRequest = src + query + attrsQuery @@ -397,7 +397,7 @@ async function linkSrcToDescriptor( (await pluginContext.resolve(src, descriptor.filename))?.id || src // #1812 if the src points to a dep file, the resolved id may contain a // version query. - setDescriptor(srcFile.replace(/\?.*$/, ''), descriptor) + setSrcDescriptor(srcFile.replace(/\?.*$/, ''), descriptor) } // these are built-in query parameters so should be ignored diff --git a/packages/plugin-vue/src/utils/descriptorCache.ts b/packages/plugin-vue/src/utils/descriptorCache.ts index dde91e21d077e5..432b5f8f792255 100644 --- a/packages/plugin-vue/src/utils/descriptorCache.ts +++ b/packages/plugin-vue/src/utils/descriptorCache.ts @@ -3,7 +3,7 @@ import path from 'path' import slash from 'slash' import hash from 'hash-sum' import { CompilerError, SFCDescriptor } from '@vue/compiler-sfc' -import { ResolvedOptions } from '..' +import { ResolvedOptions, VueQuery } from '..' import { compiler } from '../compiler' // node_modules/@vue/compiler-sfc/dist/compiler-sfc.d.ts SFCParseResult should be exported so it can be re-used @@ -66,6 +66,15 @@ export function getDescriptor( } } -export function setDescriptor(filename: string, entry: SFCDescriptor): void { - cache.set(filename, entry) +export function getSrcDescriptor( + filename: string, + query: VueQuery +): SFCDescriptor { + return cache.get(`${filename}?src=${query.src}`)! +} + +export function setSrcDescriptor(filename: string, entry: SFCDescriptor): void { + // if multiple Vue files use the same src file, they will be overwritten + // should use other key + cache.set(`${filename}?src=${entry.id}`, entry) } diff --git a/packages/plugin-vue/src/utils/query.ts b/packages/plugin-vue/src/utils/query.ts index bd99ab6fa8bb55..d41cb1be2cf536 100644 --- a/packages/plugin-vue/src/utils/query.ts +++ b/packages/plugin-vue/src/utils/query.ts @@ -2,7 +2,7 @@ import qs from 'querystring' export interface VueQuery { vue?: boolean - src?: boolean + src?: string type?: 'script' | 'template' | 'style' | 'custom' index?: number lang?: string @@ -18,9 +18,6 @@ export function parseVueRequest(id: string): { if (query.vue != null) { query.vue = true } - if (query.src != null) { - query.src = true - } if (query.index != null) { query.index = Number(query.index) } From 8161d4a9359ebb17ed80be8143a697427ab132a7 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Thu, 9 Dec 2021 04:02:27 -0500 Subject: [PATCH 160/258] chore: use node tsconfig in all src/node builds (#6019) --- packages/vite/rollup.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vite/rollup.config.js b/packages/vite/rollup.config.js index f7fb887a09c809..8d125102d7d8dd 100644 --- a/packages/vite/rollup.config.js +++ b/packages/vite/rollup.config.js @@ -124,6 +124,8 @@ const createNodeConfig = (isProduction) => { }), nodeResolve({ preferBuiltins: true }), typescript({ + tsconfig: 'src/node/tsconfig.json', + module: 'esnext', target: 'es2019', include: ['src/**/*.ts', 'types/**'], exclude: ['src/**/__tests__/**'], @@ -133,7 +135,6 @@ const createNodeConfig = (isProduction) => { ...(isProduction ? {} : { - tsconfig: 'tsconfig.base.json', declaration: true, declarationDir: path.resolve(__dirname, 'dist/') }) From e1d82fc853e67943faa395b9b4ff0575cf614bd0 Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Thu, 9 Dec 2021 21:36:21 +0800 Subject: [PATCH 161/258] test: use `bcrypt` instead of `node-addon` (#6036) --- .gitignore | 1 - .../ssr-deps/__tests__/ssr-deps.spec.ts | 6 +- .../playground/ssr-deps/node-addon/README.md | 3 - .../ssr-deps/node-addon/binding.gyp | 10 - .../playground/ssr-deps/node-addon/index.js | 3 - .../playground/ssr-deps/node-addon/main.cpp | 15 - .../ssr-deps/node-addon/package.json | 11 - packages/playground/ssr-deps/package.json | 10 +- packages/playground/ssr-deps/src/app.js | 6 +- packages/playground/ssr-deps/vite.config.js | 7 +- pnpm-lock.yaml | 379 +++++++----------- 11 files changed, 166 insertions(+), 285 deletions(-) delete mode 100644 packages/playground/ssr-deps/node-addon/README.md delete mode 100644 packages/playground/ssr-deps/node-addon/binding.gyp delete mode 100644 packages/playground/ssr-deps/node-addon/index.js delete mode 100644 packages/playground/ssr-deps/node-addon/main.cpp delete mode 100644 packages/playground/ssr-deps/node-addon/package.json diff --git a/.gitignore b/.gitignore index 200acefca621e6..6a9f8063929462 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ explorations /packages/vite/LICENSE *.cpuprofile /.vscode/ -/packages/playground/ssr-deps/node-addon/build/ diff --git a/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts b/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts index 4873b55eb82461..4922310a8b0ca8 100644 --- a/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts +++ b/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts @@ -8,9 +8,11 @@ const url = `http://localhost:${port}` * NOTE: This test will always succeed now, unless the temporary workaround for Jest can be removed * See https://github.com/vitejs/vite/pull/5197#issuecomment-938054077 */ -test('msg from node addon', async () => { +test('msg should be encrypted', async () => { await page.goto(url) - expect(await page.textContent('.node-addon-msg')).toMatch('Hello World!') + expect(await page.textContent('.encrypted-msg')).not.toMatch( + 'Secret Message!' + ) }) test('msg read by fs/promises', async () => { diff --git a/packages/playground/ssr-deps/node-addon/README.md b/packages/playground/ssr-deps/node-addon/README.md deleted file mode 100644 index 824c79ebc5a832..00000000000000 --- a/packages/playground/ssr-deps/node-addon/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This test aim to correctly resolve the `.node` file when loading CJS and ESM using dynamic import - -Steps to build `.node` file, refer to [here](https://nodejs.org/api/addons.html#building) diff --git a/packages/playground/ssr-deps/node-addon/binding.gyp b/packages/playground/ssr-deps/node-addon/binding.gyp deleted file mode 100644 index e141d88eb32edb..00000000000000 --- a/packages/playground/ssr-deps/node-addon/binding.gyp +++ /dev/null @@ -1,10 +0,0 @@ -{ - "targets": [ - { - "target_name": "cpp_addon", - "sources": [ - "main.cpp" - ] - } - ] -} diff --git a/packages/playground/ssr-deps/node-addon/index.js b/packages/playground/ssr-deps/node-addon/index.js deleted file mode 100644 index 75bf8b92e50ebb..00000000000000 --- a/packages/playground/ssr-deps/node-addon/index.js +++ /dev/null @@ -1,3 +0,0 @@ -const path = require('path') -const cpp = require(path.resolve(__dirname, './build/Release/cpp_addon.node')) -exports.hello = cpp.hello diff --git a/packages/playground/ssr-deps/node-addon/main.cpp b/packages/playground/ssr-deps/node-addon/main.cpp deleted file mode 100644 index fcc5de956aae7e..00000000000000 --- a/packages/playground/ssr-deps/node-addon/main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -using namespace v8; - -void HelloWorld(const FunctionCallbackInfo& args) { - Isolate* isolate = args.GetIsolate(); - Local hello = String::NewFromUtf8(isolate, "Hello World!", NewStringType::kNormal).ToLocalChecked(); - args.GetReturnValue().Set(hello); -} - -void Init(Local exports) { - NODE_SET_METHOD(exports, "hello", HelloWorld); -} - -NODE_MODULE(cpp_addon, Init) diff --git a/packages/playground/ssr-deps/node-addon/package.json b/packages/playground/ssr-deps/node-addon/package.json deleted file mode 100644 index 50a4ab21c20419..00000000000000 --- a/packages/playground/ssr-deps/node-addon/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "node-addon", - "version": "0.0.0", - "private": true, - "scripts": { - "install": "node-gyp install && node-gyp rebuild" - }, - "dependencies": { - "node-gyp": "^8.4.1" - } -} diff --git a/packages/playground/ssr-deps/package.json b/packages/playground/ssr-deps/package.json index ab6b29a9fb59eb..4ba3c45031731b 100644 --- a/packages/playground/ssr-deps/package.json +++ b/packages/playground/ssr-deps/package.json @@ -9,12 +9,12 @@ "postinstall": "node ../../../scripts/patchFileDeps.cjs" }, "dependencies": { - "node-addon": "link:./node-addon", - "primitive-export": "link:./primitive-export", + "bcrypt": "^5.0.1", + "forwarded-export": "file:./forwarded-export", + "object-assigned-exports": "file:./object-assigned-exports", + "primitive-export": "file:./primitive-export", "read-file-content": "file:./read-file-content", - "ts-transpiled-exports": "link:./ts-transpiled-exports", - "object-assigned-exports": "link:./object-assigned-exports", - "forwarded-export": "link:./forwarded-export" + "ts-transpiled-exports": "file:./ts-transpiled-exports" }, "devDependencies": { "cross-env": "^7.0.3", diff --git a/packages/playground/ssr-deps/src/app.js b/packages/playground/ssr-deps/src/app.js index c7748978264fc9..bbe6ec7f396219 100644 --- a/packages/playground/ssr-deps/src/app.js +++ b/packages/playground/ssr-deps/src/app.js @@ -1,16 +1,16 @@ import path from 'path' -import { hello } from 'node-addon' import readFileContent from 'read-file-content' import primitiveExport from 'primitive-export' import tsDefaultExport, { hello as tsNamedExport } from 'ts-transpiled-exports' import objectAssignedExports from 'object-assigned-exports' import forwardedExport from 'forwarded-export' +import bcrypt from 'bcrypt' export async function render(url, rootDir) { let html = '' - const nodeAddonMsg = hello() - html += `\n

message from node addon: ${nodeAddonMsg}

` + const encryptedMsg = await bcrypt.hash('Secret Message!', 10) + html += `\n

encrypted message: ${encryptedMsg}

` const fileContent = await readFileContent(path.resolve(rootDir, 'message')) html += `\n

msg read via fs/promises: ${fileContent}

` diff --git a/packages/playground/ssr-deps/vite.config.js b/packages/playground/ssr-deps/vite.config.js index 491f4c924a8c62..96a2eb87f4cb2d 100644 --- a/packages/playground/ssr-deps/vite.config.js +++ b/packages/playground/ssr-deps/vite.config.js @@ -2,10 +2,7 @@ * @type {import('vite').UserConfig} */ module.exports = { - resolve: { - // The dependency `node-addon` needs to be linked to node_modules and preserve symlinks, - // because the `.node` file cannot be unlinked in Windows after being filed to node_modules - // ref: https://github.com/nodejs/node/issues/24878/ - preserveSymlinks: true + ssr: { + external: ['object-assigned-exports'] } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65883837bdd6dc..e8410cd78ab97c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -456,17 +456,17 @@ importers: packages/playground/ssr-deps: specifiers: + bcrypt: ^5.0.1 cross-env: ^7.0.3 express: ^4.17.1 - forwarded-export: link:./forwarded-export - node-addon: link:./node-addon - object-assigned-exports: link:./object-assigned-exports - primitive-export: link:./primitive-export + forwarded-export: file:./forwarded-export + object-assigned-exports: file:./object-assigned-exports + primitive-export: file:./primitive-export read-file-content: file:./read-file-content - ts-transpiled-exports: link:./ts-transpiled-exports + ts-transpiled-exports: file:./ts-transpiled-exports dependencies: + bcrypt: 5.0.1 forwarded-export: link:forwarded-export - node-addon: link:node-addon object-assigned-exports: link:object-assigned-exports primitive-export: link:primitive-export read-file-content: link:read-file-content @@ -478,12 +478,6 @@ importers: packages/playground/ssr-deps/forwarded-export: specifiers: {} - packages/playground/ssr-deps/node-addon: - specifiers: - node-gyp: ^8.4.1 - dependencies: - node-gyp: 8.4.1 - packages/playground/ssr-deps/object-assigned-exports: specifiers: {} @@ -1556,10 +1550,6 @@ packages: resolution: {integrity: sha512-bprfNmYt1opFUFEtD2XfY/kEsm13bzHQgU80uMjhuK0DJ914IjolT1GytpkdM6tJ4MBvyiJPP+bTtWO+BZ7c7w==} dev: true - /@gar/promisify/1.1.2: - resolution: {integrity: sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==} - dev: false - /@humanwhocodes/config-array/0.6.0: resolution: {integrity: sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==} engines: {node: '>=10.10.0'} @@ -1667,6 +1657,16 @@ packages: jest-mock: 27.3.0 dev: true + /@jest/environment/27.4.2: + resolution: {integrity: sha512-uSljKxh/rGlHlmhyeG4ZoVK9hOec+EPBkwTHkHKQ2EqDu5K+MaG9uJZ8o1CbRsSdZqSuhXvJCYhBWsORPPg6qw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/fake-timers': 27.4.2 + '@jest/types': 27.4.2 + '@types/node': 16.11.9 + jest-mock: 27.4.2 + dev: true + /@jest/fake-timers/27.3.1: resolution: {integrity: sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -1679,6 +1679,18 @@ packages: jest-util: 27.3.1 dev: true + /@jest/fake-timers/27.4.2: + resolution: {integrity: sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.4.2 + '@sinonjs/fake-timers': 8.1.0 + '@types/node': 16.11.9 + jest-message-util: 27.4.2 + jest-mock: 27.4.2 + jest-util: 27.4.2 + dev: true + /@jest/globals/27.3.1: resolution: {integrity: sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -1791,11 +1803,39 @@ packages: chalk: 4.1.2 dev: true + /@jest/types/27.4.2: + resolution: {integrity: sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@types/istanbul-lib-coverage': 2.0.3 + '@types/istanbul-reports': 3.0.1 + '@types/node': 16.11.9 + '@types/yargs': 16.0.4 + chalk: 4.1.2 + dev: true + /@jridgewell/resolve-uri/1.0.0: resolution: {integrity: sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==} engines: {node: '>=6.0.0'} dev: true + /@mapbox/node-pre-gyp/1.0.7: + resolution: {integrity: sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==} + hasBin: true + dependencies: + detect-libc: 1.0.3 + https-proxy-agent: 5.0.0 + make-dir: 3.1.0 + node-fetch: 2.6.6 + nopt: 5.0.0 + npmlog: 6.0.0 + rimraf: 3.0.2 + semver: 7.3.5 + tar: 6.1.11 + transitivePeerDependencies: + - supports-color + dev: false + /@microsoft/api-extractor-model/7.13.16: resolution: {integrity: sha512-ttdxVXsTWL5dd26W1YNLe3LgDsE0EE273aZlcLe58W0opymBybCYU1Mn+OHQM8BuErrdvdN8LdpWAAbkiOEN/Q==} dependencies: @@ -1863,21 +1903,6 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.13.0 - /@npmcli/fs/1.0.0: - resolution: {integrity: sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==} - dependencies: - '@gar/promisify': 1.1.2 - semver: 7.3.5 - dev: false - - /@npmcli/move-file/1.1.2: - resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==} - engines: {node: '>=10'} - dependencies: - mkdirp: 1.0.4 - rimraf: 3.0.2 - dev: false - /@peculiar/asn1-schema/2.0.38: resolution: {integrity: sha512-zZ64UpCTm9me15nuCpPgJghSdbEm8atcDQPCyK+bKXjZAQ1735NCZXCSCfbckbQ4MH36Rm9403n/qMq77LFDzQ==} dependencies: @@ -2051,6 +2076,7 @@ packages: /@tootallnate/once/1.1.2: resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} engines: {node: '>= 6'} + dev: true /@tsconfig/node10/1.0.8: resolution: {integrity: sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==} @@ -2705,23 +2731,13 @@ packages: transitivePeerDependencies: - supports-color - /agentkeepalive/4.1.4: - resolution: {integrity: sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==} - engines: {node: '>= 8.0.0'} - dependencies: - debug: 4.3.2 - depd: 1.1.2 - humanize-ms: 1.2.1 - transitivePeerDependencies: - - supports-color - dev: false - /aggregate-error/3.1.0: resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} engines: {node: '>=8'} dependencies: clean-stack: 2.2.0 indent-string: 4.0.0 + dev: true /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} @@ -3003,6 +3019,17 @@ packages: engines: {node: '>=6.0.0'} dev: true + /bcrypt/5.0.1: + resolution: {integrity: sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==} + engines: {node: '>= 10.0.0'} + requiresBuild: true + dependencies: + '@mapbox/node-pre-gyp': 1.0.7 + node-addon-api: 3.2.1 + transitivePeerDependencies: + - supports-color + dev: false + /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: true @@ -3101,30 +3128,6 @@ packages: engines: {node: '>=8'} dev: true - /cacache/15.3.0: - resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==} - engines: {node: '>= 10'} - dependencies: - '@npmcli/fs': 1.0.0 - '@npmcli/move-file': 1.1.2 - chownr: 2.0.0 - fs-minipass: 2.1.0 - glob: 7.2.0 - infer-owner: 1.0.4 - lru-cache: 6.0.0 - minipass: 3.1.5 - minipass-collect: 1.0.2 - minipass-flush: 1.0.5 - minipass-pipeline: 1.2.4 - mkdirp: 1.0.4 - p-map: 4.0.0 - promise-inflight: 1.0.1 - rimraf: 3.0.2 - ssri: 8.0.1 - tar: 6.1.11 - unique-filename: 1.1.1 - dev: false - /call-bind/1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: @@ -3241,6 +3244,7 @@ packages: /clean-stack/2.2.0: resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} engines: {node: '>=6'} + dev: true /cli-cursor/3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} @@ -3912,11 +3916,18 @@ packages: /depd/1.1.2: resolution: {integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=} engines: {node: '>= 0.6'} + dev: true /destroy/1.0.4: resolution: {integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=} dev: true + /detect-libc/1.0.3: + resolution: {integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=} + engines: {node: '>=0.10'} + hasBin: true + dev: false + /detect-newline/3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} @@ -4032,14 +4043,6 @@ packages: engines: {node: '>= 0.8'} dev: true - /encoding/0.1.13: - resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} - requiresBuild: true - dependencies: - iconv-lite: 0.6.3 - dev: false - optional: true - /end-of-stream/1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} dependencies: @@ -4056,10 +4059,7 @@ packages: /env-paths/2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} - - /err-code/2.0.3: - resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} - dev: false + dev: true /errno/0.1.8: resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==} @@ -5077,6 +5077,7 @@ packages: /http-cache-semantics/4.1.0: resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==} + dev: true /http-errors/1.7.2: resolution: {integrity: sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==} @@ -5109,6 +5110,7 @@ packages: debug: 4.3.2 transitivePeerDependencies: - supports-color + dev: true /http-proxy/1.18.1_debug@4.3.2: resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} @@ -5135,12 +5137,6 @@ packages: engines: {node: '>=10.17.0'} dev: true - /humanize-ms/1.2.1: - resolution: {integrity: sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=} - dependencies: - ms: 2.1.3 - dev: false - /iconv-lite/0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -5148,14 +5144,6 @@ packages: safer-buffer: 2.1.2 dev: true - /iconv-lite/0.6.3: - resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} - engines: {node: '>=0.10.0'} - dependencies: - safer-buffer: 2.1.2 - dev: false - optional: true - /icss-replace-symbols/1.1.0: resolution: {integrity: sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=} dev: true @@ -5223,14 +5211,12 @@ packages: /imurmurhash/0.1.4: resolution: {integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o=} engines: {node: '>=0.8.19'} + dev: true /indent-string/4.0.0: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} - - /infer-owner/1.0.4: - resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} - dev: false + dev: true /inflight/1.0.6: resolution: {integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=} @@ -5279,6 +5265,7 @@ packages: /ip/1.1.5: resolution: {integrity: sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=} + dev: true /ipaddr.js/1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} @@ -5384,10 +5371,6 @@ packages: dependencies: is-extglob: 2.1.1 - /is-lambda/1.0.1: - resolution: {integrity: sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=} - dev: false - /is-module/1.0.0: resolution: {integrity: sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=} dev: true @@ -5506,6 +5489,7 @@ packages: /isexe/2.0.0: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} + dev: true /istanbul-lib-coverage/3.2.0: resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==} @@ -5651,7 +5635,7 @@ packages: graceful-fs: 4.2.8 jest-circus: 27.3.1 jest-environment-jsdom: 27.3.1 - jest-environment-node: 27.3.1 + jest-environment-node: 27.4.2 jest-get-type: 27.3.1 jest-jasmine2: 27.3.1 jest-regex-util: 27.0.6 @@ -5715,16 +5699,16 @@ packages: - utf-8-validate dev: true - /jest-environment-node/27.3.1: - resolution: {integrity: sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw==} + /jest-environment-node/27.4.2: + resolution: {integrity: sha512-nzTZ5nJ+FabuZPH2YVci7SZIHpvtNRHPt8+vipLkCnAgXGjVzHm7XJWdnNqXbAkExIgiKeVEkVMNZOZE/LeiIg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.3.1 - '@jest/fake-timers': 27.3.1 - '@jest/types': 27.2.5 + '@jest/environment': 27.4.2 + '@jest/fake-timers': 27.4.2 + '@jest/types': 27.4.2 '@types/node': 16.11.9 - jest-mock: 27.3.0 - jest-util: 27.3.1 + jest-mock: 27.4.2 + jest-util: 27.4.2 dev: true /jest-get-type/27.3.1: @@ -5811,6 +5795,21 @@ packages: stack-utils: 2.0.5 dev: true + /jest-message-util/27.4.2: + resolution: {integrity: sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@babel/code-frame': 7.16.0 + '@jest/types': 27.4.2 + '@types/stack-utils': 2.0.1 + chalk: 4.1.2 + graceful-fs: 4.2.8 + micromatch: 4.0.4 + pretty-format: 27.4.2 + slash: 3.0.0 + stack-utils: 2.0.5 + dev: true + /jest-mock/27.3.0: resolution: {integrity: sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -5819,6 +5818,14 @@ packages: '@types/node': 16.11.9 dev: true + /jest-mock/27.4.2: + resolution: {integrity: sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.4.2 + '@types/node': 16.11.9 + dev: true + /jest-pnp-resolver/1.2.2_jest-resolve@27.3.1: resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==} engines: {node: '>=6'} @@ -5879,7 +5886,7 @@ packages: graceful-fs: 4.2.8 jest-docblock: 27.0.6 jest-environment-jsdom: 27.3.1 - jest-environment-node: 27.3.1 + jest-environment-node: 27.4.2 jest-haste-map: 27.3.1 jest-leak-detector: 27.3.1 jest-message-util: 27.3.1 @@ -5982,6 +5989,18 @@ packages: picomatch: 2.3.0 dev: true + /jest-util/27.4.2: + resolution: {integrity: sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.4.2 + '@types/node': 16.11.9 + chalk: 4.1.2 + ci-info: 3.2.0 + graceful-fs: 4.2.8 + picomatch: 2.3.0 + dev: true + /jest-validate/27.3.1: resolution: {integrity: sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -6418,36 +6437,11 @@ packages: engines: {node: '>=8'} dependencies: semver: 6.3.0 - dev: true /make-error/1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} dev: true - /make-fetch-happen/9.1.0: - resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==} - engines: {node: '>= 10'} - dependencies: - agentkeepalive: 4.1.4 - cacache: 15.3.0 - http-cache-semantics: 4.1.0 - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.0 - is-lambda: 1.0.1 - lru-cache: 6.0.0 - minipass: 3.1.5 - minipass-collect: 1.0.2 - minipass-fetch: 1.4.1 - minipass-flush: 1.0.5 - minipass-pipeline: 1.2.4 - negotiator: 0.6.2 - promise-retry: 2.0.1 - socks-proxy-agent: 6.1.0 - ssri: 8.0.1 - transitivePeerDependencies: - - supports-color - dev: false - /makeerror/1.0.12: resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} dependencies: @@ -6634,45 +6628,6 @@ packages: /minimist/1.2.5: resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==} - /minipass-collect/1.0.2: - resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==} - engines: {node: '>= 8'} - dependencies: - minipass: 3.1.5 - dev: false - - /minipass-fetch/1.4.1: - resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==} - engines: {node: '>=8'} - dependencies: - minipass: 3.1.5 - minipass-sized: 1.0.3 - minizlib: 2.1.2 - optionalDependencies: - encoding: 0.1.13 - dev: false - - /minipass-flush/1.0.5: - resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} - engines: {node: '>= 8'} - dependencies: - minipass: 3.1.5 - dev: false - - /minipass-pipeline/1.2.4: - resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} - engines: {node: '>=8'} - dependencies: - minipass: 3.1.5 - dev: false - - /minipass-sized/1.0.3: - resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} - engines: {node: '>=8'} - dependencies: - minipass: 3.1.5 - dev: false - /minipass/3.1.5: resolution: {integrity: sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==} engines: {node: '>=8'} @@ -6720,6 +6675,8 @@ packages: /ms/2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + dev: true + optional: true /mustache/4.2.0: resolution: {integrity: sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==} @@ -6750,6 +6707,7 @@ packages: /negotiator/0.6.2: resolution: {integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==} engines: {node: '>= 0.6'} + dev: true /neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} @@ -6763,6 +6721,10 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true + /node-addon-api/3.2.1: + resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==} + dev: false + /node-cron/2.0.3: resolution: {integrity: sha512-eJI+QitXlwcgiZwNNSRbqsjeZMp5shyajMR81RZCqeW0ZDEj4zU9tpd4nTh/1JsBiKbF8d08FCewiipDmVIYjg==} engines: {node: '>=6.0.0'} @@ -6783,32 +6745,12 @@ packages: engines: {node: 4.x || >=6.0.0} dependencies: whatwg-url: 5.0.0 - dev: true /node-forge/0.10.0: resolution: {integrity: sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==} engines: {node: '>= 6.0.0'} dev: true - /node-gyp/8.4.1: - resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==} - engines: {node: '>= 10.12.0'} - hasBin: true - dependencies: - env-paths: 2.2.1 - glob: 7.2.0 - graceful-fs: 4.2.8 - make-fetch-happen: 9.1.0 - nopt: 5.0.0 - npmlog: 6.0.0 - rimraf: 3.0.2 - semver: 7.3.5 - tar: 6.1.11 - which: 2.0.2 - transitivePeerDependencies: - - supports-color - dev: false - /node-int64/0.4.0: resolution: {integrity: sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=} dev: true @@ -7048,6 +6990,7 @@ packages: engines: {node: '>=10'} dependencies: aggregate-error: 3.1.0 + dev: true /p-try/1.0.0: resolution: {integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=} @@ -7403,6 +7346,16 @@ packages: react-is: 17.0.2 dev: true + /pretty-format/27.4.2: + resolution: {integrity: sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + '@jest/types': 27.4.2 + ansi-regex: 5.0.1 + ansi-styles: 5.2.0 + react-is: 17.0.2 + dev: true + /pretty-hrtime/1.0.3: resolution: {integrity: sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=} engines: {node: '>= 0.8'} @@ -7421,18 +7374,6 @@ packages: engines: {node: '>=0.4.0'} dev: true - /promise-inflight/1.0.1: - resolution: {integrity: sha1-mEcocL8igTL8vdhoEputEsPAKeM=} - dev: false - - /promise-retry/2.0.1: - resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} - engines: {node: '>=10'} - dependencies: - err-code: 2.0.3 - retry: 0.12.0 - dev: false - /promise/7.3.1: resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==} dependencies: @@ -7899,6 +7840,7 @@ packages: /retry/0.12.0: resolution: {integrity: sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=} engines: {node: '>= 4'} + dev: true /reusify/1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} @@ -7962,6 +7904,7 @@ packages: /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + dev: true /sanitize-filename/1.6.3: resolution: {integrity: sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==} @@ -8159,6 +8102,7 @@ packages: /smart-buffer/4.2.0: resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} + dev: true /socks-proxy-agent/6.1.0: resolution: {integrity: sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg==} @@ -8169,6 +8113,7 @@ packages: socks: 2.6.1 transitivePeerDependencies: - supports-color + dev: true /socks/2.6.1: resolution: {integrity: sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==} @@ -8176,6 +8121,7 @@ packages: dependencies: ip: 1.1.5 smart-buffer: 4.2.0 + dev: true /source-map-js/0.6.2: resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==} @@ -8282,13 +8228,6 @@ packages: resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=} dev: true - /ssri/8.0.1: - resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==} - engines: {node: '>= 8'} - dependencies: - minipass: 3.1.5 - dev: false - /stack-trace/0.0.10: resolution: {integrity: sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=} dev: true @@ -8734,7 +8673,6 @@ packages: /tr46/0.0.3: resolution: {integrity: sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=} - dev: true /tr46/2.1.0: resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==} @@ -8957,18 +8895,6 @@ packages: which-boxed-primitive: 1.0.2 dev: true - /unique-filename/1.1.1: - resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==} - dependencies: - unique-slug: 2.0.2 - dev: false - - /unique-slug/2.0.2: - resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==} - dependencies: - imurmurhash: 0.1.4 - dev: false - /universalify/0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -9135,7 +9061,6 @@ packages: /webidl-conversions/3.0.1: resolution: {integrity: sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=} - dev: true /webidl-conversions/5.0.0: resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==} @@ -9162,7 +9087,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /whatwg-url/8.7.0: resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==} @@ -9196,6 +9120,7 @@ packages: hasBin: true dependencies: isexe: 2.0.0 + dev: true /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} From d4c5cff551ad9fb721243f8abdbf0c78f5b5a7ec Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Sat, 11 Dec 2021 02:52:51 +0800 Subject: [PATCH 162/258] fix(lexGlobPattern): edge case of glob import (#6022) --- docs/guide/features.md | 1 + packages/playground/glob-import/index.html | 8 ++++- packages/vite/src/node/importGlob.ts | 34 +++++++++++++++++++++- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/docs/guide/features.md b/docs/guide/features.md index bd082c3f82254d..d46b3cdcc80f23 100644 --- a/docs/guide/features.md +++ b/docs/guide/features.md @@ -296,6 +296,7 @@ Note that: - The glob patterns are treated like import specifiers: they must be either relative (start with `./`) or absolute (start with `/`, resolved relative to project root). - The glob matching is done via `fast-glob` - check out its documentation for [supported glob patterns](https://github.com/mrmlnc/fast-glob#pattern-syntax). - You should also be aware that glob imports do not accept variables, you need to directly pass the string pattern. +- The glob patterns cannot contain the same quote string (i.e. `'`, `"`, `` ` ``) as outer quotes, e.g. `'/Tom\'s files/**'`, use `"/Tom's files/**"` instead. ## WebAssembly diff --git a/packages/playground/glob-import/index.html b/packages/playground/glob-import/index.html index b38a194e21b4f2..2262c65414db67 100644 --- a/packages/playground/glob-import/index.html +++ b/packages/playground/glob-import/index.html @@ -2,7 +2,13 @@ diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts index 9aa4e4f4a289e0..119ec49d5afdc0 100644 --- a/packages/vite/src/node/plugins/html.ts +++ b/packages/vite/src/node/plugins/html.ts @@ -58,7 +58,7 @@ export function htmlInlineScriptProxyPlugin(config: ResolvedConfig): Plugin { const file = cleanUrl(id) const url = file.replace(normalizePath(config.root), '') const result = htmlProxyMap.get(config)!.get(url)![index] - if (result) { + if (typeof result === 'string') { return result } else { throw new Error(`No matching HTML proxy module found from ${id}`) From 5f3f6b7b406cb3371084057c74814eb36175e5cf Mon Sep 17 00:00:00 2001 From: Jeff Yang <32727188+ydcjeff@users.noreply.github.com> Date: Sun, 12 Dec 2021 13:09:53 +0630 Subject: [PATCH 165/258] fix: allow overwriting `define` options in vue & vue-jsx plugins (#6072) --- packages/plugin-vue-jsx/index.js | 11 ++++++++--- packages/plugin-vue/src/index.ts | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/plugin-vue-jsx/index.js b/packages/plugin-vue-jsx/index.js index a520ae176dd770..56c50fe2ff5e6d 100644 --- a/packages/plugin-vue-jsx/index.js +++ b/packages/plugin-vue-jsx/index.js @@ -48,6 +48,12 @@ function vueJsxPlugin(options = {}) { name: 'vite:vue-jsx', config(config) { + const optionsApi = config.define + ? config.define.__VUE_OPTIONS_API__ + : undefined + const devTools = config.define + ? config.define.__VUE_PROD_DEVTOOLS__ + : undefined return { // only apply esbuild to ts files // since we are handling jsx and tsx now @@ -55,9 +61,8 @@ function vueJsxPlugin(options = {}) { include: /\.ts$/ }, define: { - __VUE_OPTIONS_API__: true, - __VUE_PROD_DEVTOOLS__: false, - ...config.define + __VUE_OPTIONS_API__: optionsApi != null ? optionsApi : true, + __VUE_PROD_DEVTOOLS__: devTools != null ? devTools : false } } }, diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 4df81155719459..26e2709b580c21 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -130,8 +130,8 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { config() { return { define: { - __VUE_OPTIONS_API__: true, - __VUE_PROD_DEVTOOLS__: false + __VUE_OPTIONS_API__: config.define?.__VUE_OPTIONS_API__ ?? true, + __VUE_PROD_DEVTOOLS__: config.define?.__VUE_PROD_DEVTOOLS__ ?? false }, ssr: { external: ['vue', '@vue/server-renderer'] From 5e60562254e47d2ad0aaa246d3c5016e498d98bf Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 14:44:53 +0800 Subject: [PATCH 166/258] chore: bump vue version --- .../create-vite/template-vue-ts/package.json | 2 +- .../create-vite/template-vue/package.json | 2 +- packages/playground/alias/package.json | 2 +- packages/playground/extensions/package.json | 2 +- packages/playground/json/package.json | 2 +- .../playground/optimize-deps/package.json | 2 +- packages/playground/preload/package.json | 2 +- packages/playground/ssr-vue/package.json | 2 +- packages/playground/tailwind/package.json | 2 +- packages/playground/vue-jsx/package.json | 2 +- packages/playground/vue/package.json | 2 +- pnpm-lock.yaml | 164 +++++++++--------- 12 files changed, 93 insertions(+), 93 deletions(-) diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json index cdf88c987fbe9f..7636704b2fca3c 100644 --- a/packages/create-vite/template-vue-ts/package.json +++ b/packages/create-vite/template-vue-ts/package.json @@ -7,7 +7,7 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.23" + "vue": "^3.2.25" }, "devDependencies": { "@vitejs/plugin-vue": "^1.10.2", diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json index e47a7484ea000e..8ed9d0c6a6d2ae 100644 --- a/packages/create-vite/template-vue/package.json +++ b/packages/create-vite/template-vue/package.json @@ -7,7 +7,7 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.23" + "vue": "^3.2.25" }, "devDependencies": { "@vitejs/plugin-vue": "^1.10.2", diff --git a/packages/playground/alias/package.json b/packages/playground/alias/package.json index 1d208eb68d6513..6d17bbe99eac6d 100644 --- a/packages/playground/alias/package.json +++ b/packages/playground/alias/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "aliased-module": "file:./dir/module", - "vue": "^3.2.23" + "vue": "^3.2.25" }, "devDependencies": { "resolve-linked": "workspace:*" diff --git a/packages/playground/extensions/package.json b/packages/playground/extensions/package.json index 389a6e9c3cdff9..d09b7da4d5300b 100644 --- a/packages/playground/extensions/package.json +++ b/packages/playground/extensions/package.json @@ -9,6 +9,6 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.23" + "vue": "^3.2.25" } } diff --git a/packages/playground/json/package.json b/packages/playground/json/package.json index a051accdb4883f..ae49085bf36367 100644 --- a/packages/playground/json/package.json +++ b/packages/playground/json/package.json @@ -9,6 +9,6 @@ "preview": "vite preview" }, "devDependencies": { - "vue": "^3.2.23" + "vue": "^3.2.25" } } diff --git a/packages/playground/optimize-deps/package.json b/packages/playground/optimize-deps/package.json index 67410700820be5..ca3bbd8e5b7c1f 100644 --- a/packages/playground/optimize-deps/package.json +++ b/packages/playground/optimize-deps/package.json @@ -23,7 +23,7 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "resolve-linked": "workspace:0.0.0", - "vue": "^3.2.23", + "vue": "^3.2.25", "vuex": "^4.0.0" }, "devDependencies": { diff --git a/packages/playground/preload/package.json b/packages/playground/preload/package.json index 96d5c7b01f30e3..5e65dafc8099c4 100644 --- a/packages/playground/preload/package.json +++ b/packages/playground/preload/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.23", + "vue": "^3.2.25", "vue-router": "^4.0.0" }, "devDependencies": { diff --git a/packages/playground/ssr-vue/package.json b/packages/playground/ssr-vue/package.json index 70c108aa89dcc6..4a385336a97603 100644 --- a/packages/playground/ssr-vue/package.json +++ b/packages/playground/ssr-vue/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "example-external-component": "file:example-external-component", - "vue": "^3.2.23", + "vue": "^3.2.25", "vue-router": "^4.0.0", "vuex": "^4.0.2" }, diff --git a/packages/playground/tailwind/package.json b/packages/playground/tailwind/package.json index 70c65b5fc69eff..ff79908d386e96 100644 --- a/packages/playground/tailwind/package.json +++ b/packages/playground/tailwind/package.json @@ -11,7 +11,7 @@ "dependencies": { "autoprefixer": "^10.4.0", "tailwindcss": "^2.2.19", - "vue": "^3.2.23", + "vue": "^3.2.25", "vue-router": "^4.0.0" }, "devDependencies": { diff --git a/packages/playground/vue-jsx/package.json b/packages/playground/vue-jsx/package.json index 5ffc6f21c58270..4b2135906b2833 100644 --- a/packages/playground/vue-jsx/package.json +++ b/packages/playground/vue-jsx/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "vue": "^3.2.23" + "vue": "^3.2.25" }, "devDependencies": { "@vitejs/plugin-vue": "workspace:*", diff --git a/packages/playground/vue/package.json b/packages/playground/vue/package.json index 473a63afa9a289..f493e9028b6ec3 100644 --- a/packages/playground/vue/package.json +++ b/packages/playground/vue/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "lodash-es": "^4.17.21", - "vue": "^3.2.23" + "vue": "^3.2.25" }, "devDependencies": { "@vitejs/plugin-vue": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ec461353e2985..8e775dd4470891 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,10 +106,10 @@ importers: specifiers: aliased-module: file:./dir/module resolve-linked: workspace:* - vue: ^3.2.23 + vue: ^3.2.25 dependencies: aliased-module: link:dir/module - vue: 3.2.23 + vue: 3.2.25 devDependencies: resolve-linked: link:../resolve-linked @@ -180,9 +180,9 @@ importers: packages/playground/extensions: specifiers: - vue: ^3.2.23 + vue: ^3.2.25 dependencies: - vue: 3.2.23 + vue: 3.2.25 packages/playground/file-delete-restore: specifiers: @@ -209,9 +209,9 @@ importers: packages/playground/json: specifiers: - vue: ^3.2.23 + vue: ^3.2.25 devDependencies: - vue: 3.2.23 + vue: 3.2.25 packages/playground/legacy: specifiers: @@ -290,7 +290,7 @@ importers: react: ^17.0.2 react-dom: ^17.0.2 resolve-linked: workspace:0.0.0 - vue: ^3.2.23 + vue: ^3.2.25 vuex: ^4.0.0 dependencies: axios: 0.24.0 @@ -306,8 +306,8 @@ importers: react: 17.0.2 react-dom: 17.0.2_react@17.0.2 resolve-linked: link:../resolve-linked - vue: 3.2.23 - vuex: 4.0.2_vue@3.2.23 + vue: 3.2.25 + vuex: 4.0.2_vue@3.2.25 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -364,11 +364,11 @@ importers: packages/playground/preload: specifiers: '@vitejs/plugin-vue': workspace:* - vue: ^3.2.23 + vue: ^3.2.25 vue-router: ^4.0.0 dependencies: - vue: 3.2.23 - vue-router: 4.0.12_vue@3.2.23 + vue: 3.2.25 + vue-router: 4.0.12_vue@3.2.25 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -541,14 +541,14 @@ importers: example-external-component: file:example-external-component express: ^4.17.1 serve-static: ^1.14.1 - vue: ^3.2.23 + vue: ^3.2.25 vue-router: ^4.0.0 vuex: ^4.0.2 dependencies: example-external-component: link:example-external-component - vue: 3.2.23 - vue-router: 4.0.12_vue@3.2.23 - vuex: 4.0.2_vue@3.2.23 + vue: 3.2.25 + vue-router: 4.0.12_vue@3.2.25 + vuex: 4.0.2_vue@3.2.25 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx @@ -580,13 +580,13 @@ importers: '@vitejs/plugin-vue': workspace:* autoprefixer: ^10.4.0 tailwindcss: ^2.2.19 - vue: ^3.2.23 + vue: ^3.2.25 vue-router: ^4.0.0 dependencies: autoprefixer: 10.4.0 tailwindcss: 2.2.19_6d1fa3babc9cc84b994ff99ef39d1aff - vue: 3.2.23 - vue-router: 4.0.12_vue@3.2.23 + vue: 3.2.25 + vue-router: 4.0.12_vue@3.2.25 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue @@ -605,10 +605,10 @@ importers: pug: ^3.0.2 sass: ^1.43.4 stylus: ^0.55.0 - vue: ^3.2.23 + vue: ^3.2.25 dependencies: lodash-es: 4.17.21 - vue: 3.2.23 + vue: 3.2.25 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue js-yaml: 4.1.0 @@ -621,9 +621,9 @@ importers: specifiers: '@vitejs/plugin-vue': workspace:* '@vitejs/plugin-vue-jsx': workspace:* - vue: ^3.2.23 + vue: ^3.2.25 dependencies: - vue: 3.2.23 + vue: 3.2.25 devDependencies: '@vitejs/plugin-vue': link:../../plugin-vue '@vitejs/plugin-vue-jsx': link:../../plugin-vue-jsx @@ -677,7 +677,7 @@ importers: rollup: ^2.59.0 slash: ^4.0.0 source-map: ^0.6.1 - vue: ^3.2.23 + vue: ^3.2.25 devDependencies: '@rollup/pluginutils': 4.1.1 '@types/hash-sum': 1.0.0 @@ -686,7 +686,7 @@ importers: rollup: 2.59.0 slash: 4.0.0 source-map: 0.6.1 - vue: 3.2.23 + vue: 3.2.25 packages/plugin-vue-jsx: specifiers: @@ -2448,11 +2448,11 @@ packages: source-map: 0.6.1 dev: true - /@vue/compiler-core/3.2.23: - resolution: {integrity: sha512-4ZhiI/orx+7EJ1B+0zjgvXMV2uRN+XBfG06UN2sJfND9rH5gtEQT3QmO4erum1o6Irl7y754W8/KSaDJh4EUQg==} + /@vue/compiler-core/3.2.25: + resolution: {integrity: sha512-FlffKezIqztTCTyG0klkYRwhdyL6b1PTTCIerPb4p2R9qQaczccTX5g9ysi9w6tpLQ48a1WiXnFDJhWD7XoqwA==} dependencies: '@babel/parser': 7.16.4 - '@vue/shared': 3.2.23 + '@vue/shared': 3.2.25 estree-walker: 2.0.2 source-map: 0.6.1 @@ -2470,11 +2470,11 @@ packages: '@vue/shared': 3.2.22 dev: true - /@vue/compiler-dom/3.2.23: - resolution: {integrity: sha512-X2Nw8QFc5lgoK3kio5ktM95nqmLUH+q+N/PbV4kCHzF1avqv/EGLnAhaaF0Iu4bewNvHJAAhhwPZFeoV/22nbw==} + /@vue/compiler-dom/3.2.25: + resolution: {integrity: sha512-4JrburkRg4VWbc8AKpzKFWbNY4MDXshqjFl53+vINq7zaw3Z7aSqnLv0EkKh8B8ynf/MYsAdygGutyVbEWYxOw==} dependencies: - '@vue/compiler-core': 3.2.23 - '@vue/shared': 3.2.23 + '@vue/compiler-core': 3.2.25 + '@vue/shared': 3.2.25 /@vue/compiler-sfc/3.2.21: resolution: {integrity: sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ==} @@ -2491,15 +2491,15 @@ packages: source-map: 0.6.1 dev: true - /@vue/compiler-sfc/3.2.23: - resolution: {integrity: sha512-Aw+pb50Q5zTjyvWod8mNKmYZDRGHJBptmNNWE+84ZxrzEztPgMz8cNYIzWGbwcFVkmJlhvioAMvKnB+LM/sjSA==} + /@vue/compiler-sfc/3.2.25: + resolution: {integrity: sha512-PminuOYIcFI7UZn+mdy2OPbogyAb0IHkVuqwmLDJiSRFhc/QAXQnO9KdS4nez3bQ9XlQmoAveQzcZuekHzdb5w==} dependencies: '@babel/parser': 7.16.4 - '@vue/compiler-core': 3.2.23 - '@vue/compiler-dom': 3.2.23 - '@vue/compiler-ssr': 3.2.23 - '@vue/ref-transform': 3.2.23 - '@vue/shared': 3.2.23 + '@vue/compiler-core': 3.2.25 + '@vue/compiler-dom': 3.2.25 + '@vue/compiler-ssr': 3.2.25 + '@vue/reactivity-transform': 3.2.25 + '@vue/shared': 3.2.25 estree-walker: 2.0.2 magic-string: 0.25.7 postcss: 8.3.11 @@ -2512,26 +2512,35 @@ packages: '@vue/shared': 3.2.21 dev: true - /@vue/compiler-ssr/3.2.23: - resolution: {integrity: sha512-Bqzn4jFyXPK1Ehqiq7e/czS8n62gtYF1Zfeu0DrR5uv+SBllh7LIvZjZU6+c8qbocAd3/T3I3gn2cZGmnDb6zg==} + /@vue/compiler-ssr/3.2.25: + resolution: {integrity: sha512-+BAl8U5D3JkGR6086PFx1BQQ5km3z9fT88hy/7lzf8i3vEDdPQodadnX2t6tndFjIux05MEKg43DeocOojT0mw==} dependencies: - '@vue/compiler-dom': 3.2.23 - '@vue/shared': 3.2.23 + '@vue/compiler-dom': 3.2.25 + '@vue/shared': 3.2.25 /@vue/devtools-api/6.0.0-beta.20: resolution: {integrity: sha512-21u2jFOk8jbAneeGpDwZQ0W66RJa0IBDUyVl6SgKnn2cRFjLWzKj+ukXjpLhYr1KASyCe5E5U4jXwChVo0YUAw==} dev: false + /@vue/reactivity-transform/3.2.25: + resolution: {integrity: sha512-fOiW67PUalicMfMr4Sc9l8mUtkN7ZD+G1/zJV8blzQ8GEZSeRcJm11gqve6Ps623ju5YORu7V/Q1gZoOJ9WO4g==} + dependencies: + '@babel/parser': 7.16.4 + '@vue/compiler-core': 3.2.25 + '@vue/shared': 3.2.25 + estree-walker: 2.0.2 + magic-string: 0.25.7 + /@vue/reactivity/3.2.21: resolution: {integrity: sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==} dependencies: '@vue/shared': 3.2.21 dev: true - /@vue/reactivity/3.2.23: - resolution: {integrity: sha512-8RGVr/5Kpgb/EkCjgHXqttgA5IMc6n0lIXFY4TVbMkzdXrvaIhzBd7Te44oIDsTSYVKZLpfHd6/wEnuDqE8vFw==} + /@vue/reactivity/3.2.25: + resolution: {integrity: sha512-Dxc/u/dxoneIDqyfmuwPVBR0G3OQJqe3Dtz4z3NGt+CGj4UuOZQfN5raJPmp6xGYgrtC6PAWoCgHhyrgr1qCtg==} dependencies: - '@vue/shared': 3.2.23 + '@vue/shared': 3.2.25 /@vue/ref-transform/3.2.21: resolution: {integrity: sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ==} @@ -2543,15 +2552,6 @@ packages: magic-string: 0.25.7 dev: true - /@vue/ref-transform/3.2.23: - resolution: {integrity: sha512-gW0GD2PSAs/th7mC7tPB/UwpIQxclbApVtsDtscDmOJXb2+cdu60ny+SuHNgfrlUT/JqWKQHq7jFKO4woxLNaA==} - dependencies: - '@babel/parser': 7.16.4 - '@vue/compiler-core': 3.2.23 - '@vue/shared': 3.2.23 - estree-walker: 2.0.2 - magic-string: 0.25.7 - /@vue/runtime-core/3.2.21: resolution: {integrity: sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==} dependencies: @@ -2559,11 +2559,11 @@ packages: '@vue/shared': 3.2.21 dev: true - /@vue/runtime-core/3.2.23: - resolution: {integrity: sha512-wSI5lmY2kCGLf89iiygqxVh6/5bsawz78Me9n1x4U2bHnN0yf3PWyuhN0WgIE8VfEaF7e75E333uboNEIFjgkg==} + /@vue/runtime-core/3.2.25: + resolution: {integrity: sha512-2+fo5+lofT4xr8W2rtjyz+AM+UB1U/UNLH6ISFdHWNWuveSWxF+vkCQaATmhp6O3XA7QJAbHoRqIZor20EWSfQ==} dependencies: - '@vue/reactivity': 3.2.23 - '@vue/shared': 3.2.23 + '@vue/reactivity': 3.2.25 + '@vue/shared': 3.2.25 /@vue/runtime-dom/3.2.21: resolution: {integrity: sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==} @@ -2573,11 +2573,11 @@ packages: csstype: 2.6.18 dev: true - /@vue/runtime-dom/3.2.23: - resolution: {integrity: sha512-z6lp0888NkLmxD9j2sGoll8Kb7J743s8s6w7GbiyUc4WZwm0KJ35B4qTFDMoIU0G7CatS6Z+yRTpPHc6srtByg==} + /@vue/runtime-dom/3.2.25: + resolution: {integrity: sha512-3gGeyHnygn4yG6bssRKhQIxnE8vgB8FtYUUwoYoA/Pm0vZ+bGPoZax4TbtZD9eW9rvs8CY8boNp4t/sJaPJrRQ==} dependencies: - '@vue/runtime-core': 3.2.23 - '@vue/shared': 3.2.23 + '@vue/runtime-core': 3.2.25 + '@vue/shared': 3.2.25 csstype: 2.6.18 /@vue/server-renderer/3.2.21_vue@3.2.21: @@ -2590,14 +2590,14 @@ packages: vue: 3.2.21 dev: true - /@vue/server-renderer/3.2.23_vue@3.2.23: - resolution: {integrity: sha512-mgQ2VAE5WjeZELJKNbwE69uiBNpN+3LyL0ZDki1bJWVwHD2fhPfx7pwyYuiucE81xz2LxVsyGxhKKUL997g8vw==} + /@vue/server-renderer/3.2.25_vue@3.2.25: + resolution: {integrity: sha512-qFRmcyeyyhWbnTPn6cbCZ4bjeuPLSkUpFa98p4LEJtFBFbxjGnrHXHOjYxCY3Lznmxe0kMM3qG4t3GnjcXP12w==} peerDependencies: - vue: 3.2.23 + vue: 3.2.25 dependencies: - '@vue/compiler-ssr': 3.2.23 - '@vue/shared': 3.2.23 - vue: 3.2.23 + '@vue/compiler-ssr': 3.2.25 + '@vue/shared': 3.2.25 + vue: 3.2.25 /@vue/shared/3.2.21: resolution: {integrity: sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA==} @@ -2607,8 +2607,8 @@ packages: resolution: {integrity: sha512-qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ==} dev: true - /@vue/shared/3.2.23: - resolution: {integrity: sha512-U+/Jefa0QfXUF2qVy9Dqlrb6HKJSr9/wJcM66wXmWcTOoqg7hOWzF4qruDle51pyF4x3wMn6TSH54UdjKjCKMA==} + /@vue/shared/3.2.25: + resolution: {integrity: sha512-DkHJFV2gw9WBRmUCa21eyG0WvlF0l1QFOgTkWj29O4mt2Tv3BSE5PQOKhUruZIym4bBYCqx9ZGtoD1WohDprow==} /@wessberg/stringutil/1.0.19: resolution: {integrity: sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg==} @@ -8986,13 +8986,13 @@ packages: engines: {node: '>=0.10.0'} dev: true - /vue-router/4.0.12_vue@3.2.23: + /vue-router/4.0.12_vue@3.2.25: resolution: {integrity: sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==} peerDependencies: vue: ^3.0.0 dependencies: '@vue/devtools-api': 6.0.0-beta.20 - vue: 3.2.23 + vue: 3.2.25 dev: false /vue/3.2.21: @@ -9005,22 +9005,22 @@ packages: '@vue/shared': 3.2.21 dev: true - /vue/3.2.23: - resolution: {integrity: sha512-MGp9JZC37lzGhwSu6c1tQxrQbXbw7XKFqtYh7SFwNrNK899FPxGAHwSHMZijMChTSC3uZrD2BGO/3EHOgMJ0cw==} + /vue/3.2.25: + resolution: {integrity: sha512-jU3t7fyQDHoCWCqhmRrnSmYZvHC35tOJTP704di7HGfq5EcFA1cU/1ZPjUV1eCxJev65Khjyfni+vk9oa+eTtw==} dependencies: - '@vue/compiler-dom': 3.2.23 - '@vue/compiler-sfc': 3.2.23 - '@vue/runtime-dom': 3.2.23 - '@vue/server-renderer': 3.2.23_vue@3.2.23 - '@vue/shared': 3.2.23 + '@vue/compiler-dom': 3.2.25 + '@vue/compiler-sfc': 3.2.25 + '@vue/runtime-dom': 3.2.25 + '@vue/server-renderer': 3.2.25_vue@3.2.25 + '@vue/shared': 3.2.25 - /vuex/4.0.2_vue@3.2.23: + /vuex/4.0.2_vue@3.2.25: resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==} peerDependencies: vue: ^3.0.2 dependencies: '@vue/devtools-api': 6.0.0-beta.20 - vue: 3.2.23 + vue: 3.2.25 dev: false /w3c-hr-time/1.0.2: From 955d0fecd936b8175d7a7e4355eab855eb4567f8 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 14:57:32 +0800 Subject: [PATCH 167/258] feat(plugin-vue): add `reactivityTransform` option. Enabling this option will apply both ref transform and props destructure transform. BREAKING CHANGE: `refTransform` option has been replaced by `reactivityTransform` option. Now also requires vue@^3.2.25. --- packages/playground/vue/Main.vue | 4 ++-- ...fTransform.vue => ReactivityTransform.vue} | 5 +++- packages/playground/vue/vite.config.ts | 3 +-- packages/plugin-vue/package.json | 4 ++-- packages/plugin-vue/src/index.ts | 23 +++++++++++-------- packages/plugin-vue/src/script.ts | 2 +- pnpm-lock.yaml | 2 ++ 7 files changed, 26 insertions(+), 17 deletions(-) rename packages/playground/vue/{RefTransform.vue => ReactivityTransform.vue} (58%) diff --git a/packages/playground/vue/Main.vue b/packages/playground/vue/Main.vue index a65c9d7480920e..d10ae401f7aa8e 100644 --- a/packages/playground/vue/Main.vue +++ b/packages/playground/vue/Main.vue @@ -18,7 +18,7 @@ - + @@ -33,7 +33,7 @@ import SrcImport from './src-import/SrcImport.vue' import Slotted from './Slotted.vue' import ScanDep from './ScanDep.vue' import AsyncComponent from './AsyncComponent.vue' -import RefTransform from './RefTransform.vue' +import ReactivityTransform from './ReactivityTransform.vue' import SetupImportTemplate from './setup-import-template/SetupImportTemplate.vue' import { ref } from 'vue' diff --git a/packages/playground/vue/RefTransform.vue b/packages/playground/vue/ReactivityTransform.vue similarity index 58% rename from packages/playground/vue/RefTransform.vue rename to packages/playground/vue/ReactivityTransform.vue index ef7942fdc0e5c3..0dc2b09343d641 100644 --- a/packages/playground/vue/RefTransform.vue +++ b/packages/playground/vue/ReactivityTransform.vue @@ -1,9 +1,12 @@ diff --git a/packages/playground/vue/vite.config.ts b/packages/playground/vue/vite.config.ts index 4245af73426958..82efdac5e9f876 100644 --- a/packages/playground/vue/vite.config.ts +++ b/packages/playground/vue/vite.config.ts @@ -1,4 +1,3 @@ -import path from 'path' import { defineConfig } from 'vite' import vuePlugin from '@vitejs/plugin-vue' import { vueI18nPlugin } from './CustomBlockPlugin' @@ -11,7 +10,7 @@ export default defineConfig({ }, plugins: [ vuePlugin({ - refTransform: true + reactivityTransform: true }), vueI18nPlugin ], diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 07dde9cdcf6bb6..3cae7402a4113e 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -32,7 +32,7 @@ "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue#readme", "peerDependencies": { "vite": "^2.5.10", - "vue": "^3.2.13" + "vue": "^3.2.25" }, "devDependencies": { "@rollup/pluginutils": "^4.1.1", @@ -42,6 +42,6 @@ "rollup": "^2.59.0", "slash": "^4.0.0", "source-map": "^0.6.1", - "vue": "^3.2.23" + "vue": "^3.2.25" } } diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 26e2709b580c21..7535a8c9a978e6 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -42,10 +42,10 @@ export interface Options { customElement?: boolean | string | RegExp | (string | RegExp)[] /** - * Enable Vue ref transform (experimental). - * https://github.com/vuejs/vue-next/tree/master/packages/ref-transform + * Enable Vue reactivity transform (experimental). + * https://github.com/vuejs/vue-next/tree/master/packages/reactivity-transform * - * **requires Vue \>= 3.2.5** + * **requires vue\@^3.2.25** * * - `true`: transform will be enabled for all vue,js(x),ts(x) files except * those inside node_modules @@ -55,7 +55,12 @@ export interface Options { * * @default false */ - refTransform?: boolean | string | RegExp | (string | RegExp)[] + reactivityTransform?: boolean | string | RegExp | (string | RegExp)[] + + /** + * @deprecated use `reactivityTransform` instead. + */ + refTransform?: any /** * @deprecated the plugin now auto-detects whether it's being invoked for ssr. @@ -80,7 +85,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { include = /\.vue$/, exclude, customElement = /\.ce\.vue$/, - refTransform = false + reactivityTransform = false } = rawOptions const filter = createFilter(include, exclude) @@ -91,11 +96,11 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { : createFilter(customElement) const refTransformFilter = - refTransform === false + reactivityTransform === false ? () => false - : refTransform === true + : reactivityTransform === true ? createFilter(/\.(j|t)sx?$/, /node_modules/) - : createFilter(refTransform) + : createFilter(reactivityTransform) let options: ResolvedOptions = { isProduction: process.env.NODE_ENV === 'production', @@ -103,7 +108,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { include, exclude, customElement, - refTransform, + reactivityTransform, root: process.cwd(), sourceMap: true, compiler: null as any // to be set in configResolved diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts index aa4f9a7a1b4af8..241eca21eefea1 100644 --- a/packages/plugin-vue/src/script.ts +++ b/packages/plugin-vue/src/script.ts @@ -53,7 +53,7 @@ export function resolveScript( id: descriptor.id, isProd: options.isProduction, inlineTemplate: isUseInlineTemplate(descriptor, !options.devServer), - refTransform: options.refTransform !== false, + reactivityTransform: options.reactivityTransform !== false, templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr), sourceMap: options.sourceMap }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e775dd4470891..6ce38611d7168a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -99,8 +99,10 @@ importers: packages/playground: specifiers: css-color-names: ^1.0.1 + vue: ^3.2.25 devDependencies: css-color-names: 1.0.1 + vue: 3.2.25 packages/playground/alias: specifiers: From d50edacb7c56c362bdd0c64b8038ee7c9c36e25c Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 15:26:48 +0800 Subject: [PATCH 168/258] chore: fix lockfile + missing args --- packages/plugin-vue/src/index.ts | 2 +- pnpm-lock.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 7535a8c9a978e6..f407e578f99188 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -132,7 +132,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { return handleHotUpdate(ctx, options) }, - config() { + config(config) { return { define: { __VUE_OPTIONS_API__: config.define?.__VUE_OPTIONS_API__ ?? true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6ce38611d7168a..8e775dd4470891 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -99,10 +99,8 @@ importers: packages/playground: specifiers: css-color-names: ^1.0.1 - vue: ^3.2.25 devDependencies: css-color-names: 1.0.1 - vue: 3.2.25 packages/playground/alias: specifiers: From 51138cc31826468aaa7369c656bae960c144ec59 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 15:29:56 +0800 Subject: [PATCH 169/258] chore(plugin-vue): remove deprecated options --- packages/plugin-vue/src/index.ts | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index f407e578f99188..60e73ead755591 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -57,16 +57,6 @@ export interface Options { */ reactivityTransform?: boolean | string | RegExp | (string | RegExp)[] - /** - * @deprecated use `reactivityTransform` instead. - */ - refTransform?: any - - /** - * @deprecated the plugin now auto-detects whether it's being invoked for ssr. - */ - ssr?: boolean - /** * Use custom compiler-sfc instance. Can be used to force a specific version. */ @@ -117,7 +107,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin { // Temporal handling for 2.7 breaking change const isSSR = (opt: { ssr?: boolean } | boolean | undefined) => opt === undefined - ? !!options.ssr + ? false : typeof opt === 'boolean' ? opt : opt?.ssr === true From 69106f4e434bd931c921e78310c4336477d1e5b5 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 15:32:23 +0800 Subject: [PATCH 170/258] chore(plugin-vue): comments and readme --- packages/plugin-vue/README.md | 10 ++++------ packages/plugin-vue/src/index.ts | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/plugin-vue/README.md b/packages/plugin-vue/README.md index 96f9cbb1414a84..b8889fbaae35a6 100644 --- a/packages/plugin-vue/README.md +++ b/packages/plugin-vue/README.md @@ -22,7 +22,7 @@ export interface Options { isProduction?: boolean /** - * Transform Vue SFCs into custom elements (requires Vue >= 3.2.0) + * Transform Vue SFCs into custom elements (requires vue@^3.2.0) * - `true` -> all `*.vue` imports are converted into custom elements * - `string | RegExp` -> matched files are converted into custom elements * @@ -31,10 +31,8 @@ export interface Options { customElement?: boolean | string | RegExp | (string | RegExp)[] /** - * Enable Vue ref transform (experimental). - * https://github.com/vuejs/vue-next/tree/master/packages/ref-transform - * - * **requires Vue \>= 3.2.5** + * Enable Vue reactivity transform (experimental, requires vue@^3.2.25). + * https://github.com/vuejs/vue-next/tree/master/packages/reactivity-transform * * - `true`: transform will be enabled for all vue,js(x),ts(x) files except * those inside node_modules @@ -44,7 +42,7 @@ export interface Options { * * @default false */ - refTransform?: boolean | string | RegExp | (string | RegExp)[] + reactivityTransform?: boolean | string | RegExp | (string | RegExp)[] // options to pass on to vue/compiler-sfc script?: Partial diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 60e73ead755591..51ac057232aef0 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -33,7 +33,6 @@ export interface Options { /** * Transform Vue SFCs into custom elements. - * **requires Vue \>= 3.2.0 & Vite \>= 2.4.4** * - `true`: all `*.vue` imports are converted into custom elements * - `string | RegExp`: matched files are converted into custom elements * @@ -44,9 +43,6 @@ export interface Options { /** * Enable Vue reactivity transform (experimental). * https://github.com/vuejs/vue-next/tree/master/packages/reactivity-transform - * - * **requires vue\@^3.2.25** - * * - `true`: transform will be enabled for all vue,js(x),ts(x) files except * those inside node_modules * - `string | RegExp`: apply to vue + only matched files (will include From 73c08ff6375e800975ea1bfdc9ba62421b5c73d5 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 15:59:49 +0800 Subject: [PATCH 171/258] release: plugin-vue@2.0.0 --- packages/plugin-vue/CHANGELOG.md | 27 +++++++++++++++++++++++++++ packages/plugin-vue/package.json | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue/CHANGELOG.md b/packages/plugin-vue/CHANGELOG.md index afa7152989f48a..1fdb317038839d 100644 --- a/packages/plugin-vue/CHANGELOG.md +++ b/packages/plugin-vue/CHANGELOG.md @@ -1,3 +1,30 @@ +# [2.0.0](https://github.com/vitejs/vite/compare/plugin-vue@1.10.2...plugin-vue@2.0.0) (2021-12-12) + + +### Bug Fixes + +* allow overwriting `define` options in vue & vue-jsx plugins ([#6072](https://github.com/vitejs/vite/issues/6072)) ([5f3f6b7](https://github.com/vitejs/vite/commit/5f3f6b7b406cb3371084057c74814eb36175e5cf)) +* **plugin-vue:** multiple vue files using the same src file (fix [#5925](https://github.com/vitejs/vite/issues/5925), [#5447](https://github.com/vitejs/vite/issues/5447)) ([#5994](https://github.com/vitejs/vite/issues/5994)) ([df7aec7](https://github.com/vitejs/vite/commit/df7aec7d2a567af1dfbab76e5765aba80dc3cb5c)) + + +### Code Refactoring + +* **plugin-vue:** resolve vue/compiler-sfc from project root ([ce8b0fe](https://github.com/vitejs/vite/commit/ce8b0feae334cc224b3f4d2fdb2bffbb62322acf)) + + +### Features + +* **plugin-vue:** add `reactivityTransform` option. ([955d0fe](https://github.com/vitejs/vite/commit/955d0fecd936b8175d7a7e4355eab855eb4567f8)) + + +### BREAKING CHANGES + +* **plugin-vue:** `refTransform` option has been replaced by +`reactivityTransform` option. Now also requires vue@^3.2.25. +* **plugin-vue:** now requires vue@^3.2.13 as peer dep + + + ## [1.10.2](https://github.com/vitejs/vite/compare/plugin-vue@1.10.1...plugin-vue@1.10.2) (2021-12-07) diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 3cae7402a4113e..0a07360c48fb5c 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue", - "version": "1.10.2", + "version": "2.0.0", "license": "MIT", "author": "Evan You", "files": [ From cdebb49c558864cb09019dd3e62a2f5335a05ee8 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 16:03:15 +0800 Subject: [PATCH 172/258] chore: update create-vite templates --- packages/create-vite/template-lit-ts/package.json | 2 +- packages/create-vite/template-lit/package.json | 2 +- packages/create-vite/template-preact-ts/package.json | 2 +- packages/create-vite/template-preact/package.json | 2 +- packages/create-vite/template-react-ts/package.json | 2 +- packages/create-vite/template-react/package.json | 2 +- packages/create-vite/template-svelte-ts/package.json | 2 +- packages/create-vite/template-svelte/package.json | 2 +- packages/create-vite/template-vanilla-ts/package.json | 2 +- packages/create-vite/template-vanilla/package.json | 2 +- packages/create-vite/template-vue-ts/package.json | 6 +++--- packages/create-vite/template-vue/package.json | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json index fcc4d78b72bf0b..6ee9ff7bb21359 100644 --- a/packages/create-vite/template-lit-ts/package.json +++ b/packages/create-vite/template-lit-ts/package.json @@ -18,7 +18,7 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.7.0", + "vite": "^2.7.1", "typescript": "^4.4.4" } } diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json index 9864c7b7e2fcc5..7cc9fd8c5e2598 100644 --- a/packages/create-vite/template-lit/package.json +++ b/packages/create-vite/template-lit/package.json @@ -16,6 +16,6 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json index 091c1356335cdf..db136f5be2181d 100644 --- a/packages/create-vite/template-preact-ts/package.json +++ b/packages/create-vite/template-preact-ts/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@preact/preset-vite": "^2.1.5", "typescript": "^4.4.4", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-preact/package.json b/packages/create-vite/template-preact/package.json index 1ba3ee754d4f32..2dd16f7cd73171 100644 --- a/packages/create-vite/template-preact/package.json +++ b/packages/create-vite/template-preact/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@preact/preset-vite": "^2.1.5", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json index a15b23787a5dd7..0800f4ef314907 100644 --- a/packages/create-vite/template-react-ts/package.json +++ b/packages/create-vite/template-react-ts/package.json @@ -15,6 +15,6 @@ "@types/react-dom": "^17.0.10", "@vitejs/plugin-react": "^1.0.7", "typescript": "^4.4.4", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json index dd4dcddef1191e..d461e794cbb2c5 100644 --- a/packages/create-vite/template-react/package.json +++ b/packages/create-vite/template-react/package.json @@ -12,6 +12,6 @@ }, "devDependencies": { "@vitejs/plugin-react": "^1.0.7", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json index 30ac18e133e52a..23b556b0e63858 100644 --- a/packages/create-vite/template-svelte-ts/package.json +++ b/packages/create-vite/template-svelte-ts/package.json @@ -16,6 +16,6 @@ "svelte-preprocess": "^4.9.8", "tslib": "^2.3.1", "typescript": "^4.4.4", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json index 46847c242ed996..b13662d77c4fd0 100644 --- a/packages/create-vite/template-svelte/package.json +++ b/packages/create-vite/template-svelte/package.json @@ -10,6 +10,6 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30", "svelte": "^3.44.0", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json index 7256a8e2e3c10e..4f9c527b2861da 100644 --- a/packages/create-vite/template-vanilla-ts/package.json +++ b/packages/create-vite/template-vanilla-ts/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "typescript": "^4.4.4", - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-vanilla/package.json b/packages/create-vite/template-vanilla/package.json index eee96669c91888..33f927b4d8ee81 100644 --- a/packages/create-vite/template-vanilla/package.json +++ b/packages/create-vite/template-vanilla/package.json @@ -7,6 +7,6 @@ "preview": "vite preview" }, "devDependencies": { - "vite": "^2.7.0" + "vite": "^2.7.1" } } diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json index 7636704b2fca3c..8dfaf6aadc4712 100644 --- a/packages/create-vite/template-vue-ts/package.json +++ b/packages/create-vite/template-vue-ts/package.json @@ -10,9 +10,9 @@ "vue": "^3.2.25" }, "devDependencies": { - "@vitejs/plugin-vue": "^1.10.2", + "@vitejs/plugin-vue": "^2.0.0", "typescript": "^4.4.4", - "vite": "^2.7.0", - "vue-tsc": "^0.28.10" + "vite": "^2.7.1", + "vue-tsc": "^0.29.8" } } diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json index 8ed9d0c6a6d2ae..e28e07d17a0b94 100644 --- a/packages/create-vite/template-vue/package.json +++ b/packages/create-vite/template-vue/package.json @@ -10,7 +10,7 @@ "vue": "^3.2.25" }, "devDependencies": { - "@vitejs/plugin-vue": "^1.10.2", - "vite": "^2.7.0" + "@vitejs/plugin-vue": "^2.0.0", + "vite": "^2.7.1" } } From 745c2ec42e11d4da77482be59d7092cb9ab3eed9 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 12 Dec 2021 16:03:26 +0800 Subject: [PATCH 173/258] release: create-vite@2.7.1 --- packages/create-vite/CHANGELOG.md | 4 ++++ packages/create-vite/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/create-vite/CHANGELOG.md b/packages/create-vite/CHANGELOG.md index 15177ce5f95fe2..2fabb6b3699f0c 100644 --- a/packages/create-vite/CHANGELOG.md +++ b/packages/create-vite/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.7.1](https://github.com/vitejs/vite/compare/create-vite@2.7.0...create-vite@2.7.1) (2021-12-12) + + + # [2.7.0](https://github.com/vitejs/vite/compare/create-vite@2.6.6...create-vite@2.7.0) (2021-12-07) diff --git a/packages/create-vite/package.json b/packages/create-vite/package.json index 148917ba383642..6c505735f90bcd 100644 --- a/packages/create-vite/package.json +++ b/packages/create-vite/package.json @@ -1,6 +1,6 @@ { "name": "create-vite", - "version": "2.7.0", + "version": "2.7.1", "license": "MIT", "author": "Evan You", "bin": { From 1ded1a835bfb64f2c70c8c153e979b7911c9a8c1 Mon Sep 17 00:00:00 2001 From: Niputi <7137178+Niputi@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:15:13 +0100 Subject: [PATCH 174/258] fix: ws types (#6083) --- packages/vite/package.json | 4 +- packages/vite/src/node/index.ts | 2 +- packages/vite/src/node/server/ws.ts | 5 +- packages/vite/types/ws.d.ts | 558 ++++++++++++++-------------- pnpm-lock.yaml | 22 +- 5 files changed, 297 insertions(+), 294 deletions(-) diff --git a/packages/vite/package.json b/packages/vite/package.json index 3fcee0399cd05d..56df1eedb6e609 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -74,7 +74,7 @@ "@types/resolve": "^1.20.1", "@types/sass": "~1.43.0", "@types/stylus": "^0.48.36", - "@types/ws": "^8.2.0", + "@types/ws": "^8.2.2", "@vue/compiler-dom": "^3.2.22", "acorn": "^8.6.0", "acorn-class-fields": "^1.0.0", @@ -117,7 +117,7 @@ "tsconfck": "1.1.1", "tslib": "^2.3.1", "types": "link:./types", - "ws": "^8.2.3" + "ws": "^8.3.0" }, "peerDependencies": { "less": "*", diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts index 5b92990f83a221..306d651d2ce07c 100644 --- a/packages/vite/src/node/index.ts +++ b/packages/vite/src/node/index.ts @@ -83,7 +83,7 @@ export type { ErrorPayload } from 'types/hmrPayload' export type { Connect } from 'types/connect' -export type { WebSocket } from 'types/ws' +export type { WebSocket, WebSocketAlias } from 'types/ws' export type { HttpProxy } from 'types/http-proxy' export type { FSWatcher, WatchOptions } from 'types/chokidar' export type { Terser } from 'types/terser' diff --git a/packages/vite/src/node/server/ws.ts b/packages/vite/src/node/server/ws.ts index 74b4ad8142e81a..8e0bbe7058bcb8 100644 --- a/packages/vite/src/node/server/ws.ts +++ b/packages/vite/src/node/server/ws.ts @@ -5,6 +5,7 @@ import { ServerOptions as HttpsServerOptions } from 'https' import { WebSocketServer as WebSocket, ServerOptions } from 'ws' +import { WebSocket as WebSocketTypes } from 'types/ws' import { ErrorPayload, HMRPayload } from 'types/hmrPayload' import { ResolvedConfig } from '..' import { isObject } from '../utils' @@ -12,8 +13,8 @@ import { Socket } from 'net' export const HMR_HEADER = 'vite-hmr' export interface WebSocketServer { - on: WebSocket['on'] - off: WebSocket['off'] + on: WebSocketTypes.Server['on'] + off: WebSocketTypes.Server['off'] send(payload: HMRPayload): void close(): Promise } diff --git a/packages/vite/types/ws.d.ts b/packages/vite/types/ws.d.ts index 3a174f9df47ea7..6c14174e098f0b 100644 --- a/packages/vite/types/ws.d.ts +++ b/packages/vite/types/ws.d.ts @@ -1,7 +1,4 @@ -// Inlined to avoid extra dependency -// MIT Licensed https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/LICENSE - -// Type definitions for ws 7.4 +// Type definitions for ws 8.2 // Project: https://github.com/websockets/ws // Definitions by: Paul Loyd // Margus Lamp @@ -24,286 +21,273 @@ import { Server as HTTPServer } from 'http' import { Server as HTTPSServer } from 'https' -import { Socket } from 'net' import { Duplex, DuplexOptions } from 'stream' import { SecureContextOptions } from 'tls' import { URL } from 'url' import { ZlibOptions } from 'zlib' -export declare namespace WebSocket { - // WebSocket socket. - export class WebSocket extends EventEmitter { - /** The connection is not yet open. */ - static readonly CONNECTING: 0 - /** The connection is open and ready to communicate. */ - static readonly OPEN: 1 - /** The connection is in the process of closing. */ - static readonly CLOSING: 2 - /** The connection is closed. */ - static readonly CLOSED: 3 - - binaryType: 'nodebuffer' | 'arraybuffer' | 'fragments' - readonly bufferedAmount: number - readonly extensions: string - readonly protocol: string - /** The current state of the connection */ - readonly readyState: - | typeof WebSocket.CONNECTING - | typeof WebSocket.OPEN - | typeof WebSocket.CLOSING - | typeof WebSocket.CLOSED - readonly url: string - - /** The connection is not yet open. */ - readonly CONNECTING: 0 - /** The connection is open and ready to communicate. */ - readonly OPEN: 1 - /** The connection is in the process of closing. */ - readonly CLOSING: 2 - /** The connection is closed. */ - readonly CLOSED: 3 - - onopen: (event: WebSocket.OpenEvent) => void - onerror: (event: WebSocket.ErrorEvent) => void - onclose: (event: WebSocket.CloseEvent) => void - onmessage: (event: WebSocket.MessageEvent) => void - - constructor( - address: string | URL, - options?: WebSocket.ClientOptions | ClientRequestArgs - ) - constructor( - address: string | URL, - protocols?: string | string[], - options?: WebSocket.ClientOptions | ClientRequestArgs - ) - - close(code?: number, data?: string): void - ping(data?: any, mask?: boolean, cb?: (err: Error) => void): void - pong(data?: any, mask?: boolean, cb?: (err: Error) => void): void - send(data: any, cb?: (err?: Error) => void): void - send( - data: any, - options: { - mask?: boolean | undefined - binary?: boolean | undefined - compress?: boolean | undefined - fin?: boolean | undefined - }, - cb?: (err?: Error) => void - ): void - terminate(): void - - // HTML5 WebSocket events - addEventListener( - method: 'message', - cb: (event: { data: any; type: string; target: WebSocket }) => void, - options?: WebSocket.EventListenerOptions - ): void - addEventListener( - method: 'close', - cb: (event: { - wasClean: boolean - code: number - reason: string - target: WebSocket - }) => void, - options?: WebSocket.EventListenerOptions - ): void - addEventListener( - method: 'error', - cb: (event: { - error: any - message: any - type: string - target: WebSocket - }) => void, - options?: WebSocket.EventListenerOptions - ): void - addEventListener( - method: 'open', - cb: (event: { target: WebSocket }) => void, - options?: WebSocket.EventListenerOptions - ): void - addEventListener( - method: string, - listener: () => void, - options?: WebSocket.EventListenerOptions - ): void - - removeEventListener( - method: 'message', - cb?: (event: { data: any; type: string; target: WebSocket }) => void - ): void - removeEventListener( - method: 'close', - cb?: (event: { - wasClean: boolean - code: number - reason: string - target: WebSocket - }) => void - ): void - removeEventListener( - method: 'error', - cb?: (event: { - error: any - message: any - type: string - target: WebSocket - }) => void - ): void - removeEventListener( - method: 'open', - cb?: (event: { target: WebSocket }) => void - ): void - removeEventListener(method: string, listener?: () => void): void - - // Events - on( - event: 'close', - listener: (this: WebSocket, code: number, reason: string) => void - ): this - on(event: 'error', listener: (this: WebSocket, err: Error) => void): this - on( - event: 'upgrade', - listener: (this: WebSocket, request: IncomingMessage) => void - ): this - on( - event: 'message', - listener: (this: WebSocket, data: WebSocket.Data) => void - ): this - on(event: 'open', listener: (this: WebSocket) => void): this - on( - event: 'ping' | 'pong', - listener: (this: WebSocket, data: Buffer) => void - ): this - on( - event: 'unexpected-response', - listener: ( - this: WebSocket, - request: ClientRequest, - response: IncomingMessage - ) => void - ): this - on( - event: string | symbol, - listener: (this: WebSocket, ...args: any[]) => void - ): this - - once( - event: 'close', - listener: (this: WebSocket, code: number, reason: string) => void - ): this - once(event: 'error', listener: (this: WebSocket, err: Error) => void): this - once( - event: 'upgrade', - listener: (this: WebSocket, request: IncomingMessage) => void - ): this - once( - event: 'message', - listener: (this: WebSocket, data: WebSocket.Data) => void - ): this - once(event: 'open', listener: (this: WebSocket) => void): this - once( - event: 'ping' | 'pong', - listener: (this: WebSocket, data: Buffer) => void - ): this - once( - event: 'unexpected-response', - listener: ( - this: WebSocket, - request: ClientRequest, - response: IncomingMessage - ) => void - ): this - once( - event: string | symbol, - listener: (this: WebSocket, ...args: any[]) => void - ): this - - off( - event: 'close', - listener: (this: WebSocket, code: number, reason: string) => void - ): this - off(event: 'error', listener: (this: WebSocket, err: Error) => void): this - off( - event: 'upgrade', - listener: (this: WebSocket, request: IncomingMessage) => void - ): this - off( - event: 'message', - listener: (this: WebSocket, data: WebSocket.Data) => void - ): this - off(event: 'open', listener: (this: WebSocket) => void): this - off( - event: 'ping' | 'pong', - listener: (this: WebSocket, data: Buffer) => void - ): this - off( - event: 'unexpected-response', - listener: ( - this: WebSocket, - request: ClientRequest, - response: IncomingMessage - ) => void - ): this - off( - event: string | symbol, - listener: (this: WebSocket, ...args: any[]) => void - ): this +// WebSocket socket. +declare class WebSocket extends EventEmitter { + /** The connection is not yet open. */ + static readonly CONNECTING: 0 + /** The connection is open and ready to communicate. */ + static readonly OPEN: 1 + /** The connection is in the process of closing. */ + static readonly CLOSING: 2 + /** The connection is closed. */ + static readonly CLOSED: 3 + + binaryType: 'nodebuffer' | 'arraybuffer' | 'fragments' + readonly bufferedAmount: number + readonly extensions: string + readonly protocol: string + /** The current state of the connection */ + readonly readyState: + | typeof WebSocket.CONNECTING + | typeof WebSocket.OPEN + | typeof WebSocket.CLOSING + | typeof WebSocket.CLOSED + readonly url: string + + /** The connection is not yet open. */ + readonly CONNECTING: 0 + /** The connection is open and ready to communicate. */ + readonly OPEN: 1 + /** The connection is in the process of closing. */ + readonly CLOSING: 2 + /** The connection is closed. */ + readonly CLOSED: 3 + + onopen: (event: WebSocket.Event) => void + onerror: (event: WebSocket.ErrorEvent) => void + onclose: (event: WebSocket.CloseEvent) => void + onmessage: (event: WebSocket.MessageEvent) => void + + constructor( + address: string | URL, + options?: WebSocket.ClientOptions | ClientRequestArgs + ) + constructor( + address: string | URL, + protocols?: string | string[], + options?: WebSocket.ClientOptions | ClientRequestArgs + ) + + close(code?: number, data?: string | Buffer): void + ping(data?: any, mask?: boolean, cb?: (err: Error) => void): void + pong(data?: any, mask?: boolean, cb?: (err: Error) => void): void + send(data: any, cb?: (err?: Error) => void): void + send( + data: any, + options: { + mask?: boolean | undefined + binary?: boolean | undefined + compress?: boolean | undefined + fin?: boolean | undefined + }, + cb?: (err?: Error) => void + ): void + terminate(): void + + // HTML5 WebSocket events + addEventListener( + method: 'message', + cb: (event: WebSocket.MessageEvent) => void, + options?: WebSocket.EventListenerOptions + ): void + addEventListener( + method: 'close', + cb: (event: WebSocket.CloseEvent) => void, + options?: WebSocket.EventListenerOptions + ): void + addEventListener( + method: 'error', + cb: (event: WebSocket.ErrorEvent) => void, + options?: WebSocket.EventListenerOptions + ): void + addEventListener( + method: 'open', + cb: (event: WebSocket.Event) => void, + options?: WebSocket.EventListenerOptions + ): void + + removeEventListener( + method: 'message', + cb: (event: WebSocket.MessageEvent) => void + ): void + removeEventListener( + method: 'close', + cb: (event: WebSocket.CloseEvent) => void + ): void + removeEventListener( + method: 'error', + cb: (event: WebSocket.ErrorEvent) => void + ): void + removeEventListener( + method: 'open', + cb: (event: WebSocket.Event) => void + ): void + + // Events + on( + event: 'close', + listener: (this: WebSocket, code: number, reason: Buffer) => void + ): this + on(event: 'error', listener: (this: WebSocket, err: Error) => void): this + on( + event: 'upgrade', + listener: (this: WebSocket, request: IncomingMessage) => void + ): this + on( + event: 'message', + listener: ( + this: WebSocket, + data: WebSocket.RawData, + isBinary: boolean + ) => void + ): this + on(event: 'open', listener: (this: WebSocket) => void): this + on( + event: 'ping' | 'pong', + listener: (this: WebSocket, data: Buffer) => void + ): this + on( + event: 'unexpected-response', + listener: ( + this: WebSocket, + request: ClientRequest, + response: IncomingMessage + ) => void + ): this + on( + event: string | symbol, + listener: (this: WebSocket, ...args: any[]) => void + ): this + + once( + event: 'close', + listener: (this: WebSocket, code: number, reason: Buffer) => void + ): this + once(event: 'error', listener: (this: WebSocket, err: Error) => void): this + once( + event: 'upgrade', + listener: (this: WebSocket, request: IncomingMessage) => void + ): this + once( + event: 'message', + listener: ( + this: WebSocket, + data: WebSocket.RawData, + isBinary: boolean + ) => void + ): this + once(event: 'open', listener: (this: WebSocket) => void): this + once( + event: 'ping' | 'pong', + listener: (this: WebSocket, data: Buffer) => void + ): this + once( + event: 'unexpected-response', + listener: ( + this: WebSocket, + request: ClientRequest, + response: IncomingMessage + ) => void + ): this + once( + event: string | symbol, + listener: (this: WebSocket, ...args: any[]) => void + ): this + + off( + event: 'close', + listener: (this: WebSocket, code: number, reason: Buffer) => void + ): this + off(event: 'error', listener: (this: WebSocket, err: Error) => void): this + off( + event: 'upgrade', + listener: (this: WebSocket, request: IncomingMessage) => void + ): this + off( + event: 'message', + listener: ( + this: WebSocket, + data: WebSocket.RawData, + isBinary: boolean + ) => void + ): this + off(event: 'open', listener: (this: WebSocket) => void): this + off( + event: 'ping' | 'pong', + listener: (this: WebSocket, data: Buffer) => void + ): this + off( + event: 'unexpected-response', + listener: ( + this: WebSocket, + request: ClientRequest, + response: IncomingMessage + ) => void + ): this + off( + event: string | symbol, + listener: (this: WebSocket, ...args: any[]) => void + ): this + + addListener( + event: 'close', + listener: (code: number, reason: Buffer) => void + ): this + addListener(event: 'error', listener: (err: Error) => void): this + addListener( + event: 'upgrade', + listener: (request: IncomingMessage) => void + ): this + addListener( + event: 'message', + listener: (data: WebSocket.RawData, isBinary: boolean) => void + ): this + addListener(event: 'open', listener: () => void): this + addListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this + addListener( + event: 'unexpected-response', + listener: (request: ClientRequest, response: IncomingMessage) => void + ): this + addListener(event: string | symbol, listener: (...args: any[]) => void): this + + removeListener( + event: 'close', + listener: (code: number, reason: Buffer) => void + ): this + removeListener(event: 'error', listener: (err: Error) => void): this + removeListener( + event: 'upgrade', + listener: (request: IncomingMessage) => void + ): this + removeListener( + event: 'message', + listener: (data: WebSocket.RawData, isBinary: boolean) => void + ): this + removeListener(event: 'open', listener: () => void): this + removeListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this + removeListener( + event: 'unexpected-response', + listener: (request: ClientRequest, response: IncomingMessage) => void + ): this + removeListener( + event: string | symbol, + listener: (...args: any[]) => void + ): this +} - addListener( - event: 'close', - listener: (code: number, message: string) => void - ): this - addListener(event: 'error', listener: (err: Error) => void): this - addListener( - event: 'upgrade', - listener: (request: IncomingMessage) => void - ): this - addListener( - event: 'message', - listener: (data: WebSocket.Data) => void - ): this - addListener(event: 'open', listener: () => void): this - addListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this - addListener( - event: 'unexpected-response', - listener: (request: ClientRequest, response: IncomingMessage) => void - ): this - addListener( - event: string | symbol, - listener: (...args: any[]) => void - ): this +declare const WebSocketAlias: typeof WebSocket +type WebSocketAlias = WebSocket - removeListener( - event: 'close', - listener: (code: number, message: string) => void - ): this - removeListener(event: 'error', listener: (err: Error) => void): this - removeListener( - event: 'upgrade', - listener: (request: IncomingMessage) => void - ): this - removeListener( - event: 'message', - listener: (data: WebSocket.Data) => void - ): this - removeListener(event: 'open', listener: () => void): this - removeListener( - event: 'ping' | 'pong', - listener: (data: Buffer) => void - ): this - removeListener( - event: 'unexpected-response', - listener: (request: ClientRequest, response: IncomingMessage) => void - ): this - removeListener( - event: string | symbol, - listener: (...args: any[]) => void - ): this - } +declare namespace WebSocket { + /** + * Data represents the raw message payload received over the WebSocket. + */ + type RawData = Buffer | ArrayBuffer | Buffer[] /** * Data represents the message payload received over the WebSocket. @@ -382,7 +366,7 @@ export declare namespace WebSocket { concurrencyLimit?: number | undefined } - interface OpenEvent { + interface Event { type: string target: WebSocket } @@ -421,12 +405,16 @@ export declare namespace WebSocket { | VerifyClientCallbackAsync | VerifyClientCallbackSync | undefined - handleProtocols?: any + handleProtocols?: ( + protocols: Set, + request: IncomingMessage + ) => string | false path?: string | undefined noServer?: boolean | undefined clientTracking?: boolean | undefined perMessageDeflate?: boolean | PerMessageDeflateOptions | undefined maxPayload?: number | undefined + skipUTF8Validation?: boolean | undefined } interface AddressInfo { @@ -436,7 +424,7 @@ export declare namespace WebSocket { } // WebSocket Server - export class Server extends EventEmitter { + class Server extends EventEmitter { options: ServerOptions path: string clients: Set @@ -447,7 +435,7 @@ export declare namespace WebSocket { close(cb?: (err?: Error) => void): void handleUpgrade( request: IncomingMessage, - socket: Socket, + socket: Duplex, upgradeHead: Buffer, callback: (client: WebSocket, request: IncomingMessage) => void ): void @@ -524,9 +512,17 @@ export declare namespace WebSocket { ): this } + const WebSocketServer: typeof Server + type WebSocketServer = Server + const WebSocket: typeof WebSocketAlias + type WebSocket = WebSocketAlias + // WebSocket stream function createWebSocketStream( websocket: WebSocket, options?: DuplexOptions ): Duplex } + +//export = WebSocket; +export { WebSocket, WebSocketAlias } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e775dd4470891..572696f0c3bbd9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -704,6 +704,12 @@ importers: '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.16.0 hash-sum: 2.0.0 + packages/temp: + specifiers: + css-color-names: ^1.0.1 + devDependencies: + css-color-names: 1.0.1 + packages/vite: specifiers: '@ampproject/remapping': ^1.0.1 @@ -727,7 +733,7 @@ importers: '@types/resolve': ^1.20.1 '@types/sass': ~1.43.0 '@types/stylus': ^0.48.36 - '@types/ws': ^8.2.0 + '@types/ws': ^8.2.2 '@vue/compiler-dom': ^3.2.22 acorn: ^8.6.0 acorn-class-fields: ^1.0.0 @@ -775,7 +781,7 @@ importers: tsconfck: 1.1.1 tslib: ^2.3.1 types: link:./types - ws: ^8.2.3 + ws: ^8.3.0 dependencies: esbuild: 0.13.12 postcss: 8.3.11 @@ -805,7 +811,7 @@ importers: '@types/resolve': 1.20.1 '@types/sass': 1.43.0 '@types/stylus': 0.48.36 - '@types/ws': 8.2.0 + '@types/ws': 8.2.2 '@vue/compiler-dom': 3.2.22 acorn: 8.6.0 acorn-class-fields: 1.0.0_acorn@8.6.0 @@ -848,7 +854,7 @@ importers: tsconfck: 1.1.1_typescript@4.4.4 tslib: 2.3.1 types: link:types - ws: 8.2.3 + ws: 8.3.0 packages: @@ -2279,8 +2285,8 @@ packages: '@types/node': 16.11.9 dev: true - /@types/ws/8.2.0: - resolution: {integrity: sha512-cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg==} + /@types/ws/8.2.2: + resolution: {integrity: sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==} dependencies: '@types/node': 16.11.9 dev: true @@ -9188,8 +9194,8 @@ packages: optional: true dev: true - /ws/8.2.3: - resolution: {integrity: sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==} + /ws/8.3.0: + resolution: {integrity: sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 From 9c2843cf0506844ee32f042a04c22c440434df2a Mon Sep 17 00:00:00 2001 From: Aaron Bassett Date: Sun, 12 Dec 2021 13:09:30 -0500 Subject: [PATCH 175/258] fix: ignore babel config when running restore-jsx (#6047) --- packages/plugin-react/src/jsx-runtime/restore-jsx.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/plugin-react/src/jsx-runtime/restore-jsx.ts b/packages/plugin-react/src/jsx-runtime/restore-jsx.ts index 250fe43ce4d0c8..095f7c586e43a1 100644 --- a/packages/plugin-react/src/jsx-runtime/restore-jsx.ts +++ b/packages/plugin-react/src/jsx-runtime/restore-jsx.ts @@ -48,6 +48,8 @@ export async function restoreJSX( babelRestoreJSX ||= import('./babel-restore-jsx') const result = await babel.transformAsync(code, { + babelrc: false, + configFile: false, ast: true, code: false, filename, From 61d076ae0ce724ffc5242358d067f7b1438d24bb Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Sun, 12 Dec 2021 11:45:30 -0800 Subject: [PATCH 176/258] docs: improve instructions for testing local changes against other packages (#6084) --- CONTRIBUTING.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54ac9f4d4ddc81..fe17b0f3befe36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,24 +12,24 @@ To develop and test the core `vite` package: 2. Go to `packages/vite` and run `pnpm run dev`. This starts `rollup` in watch mode. -3. Run `pnpm link --global` in `packages/vite`. This links `vite` globally so that you can: - - - Run `pnpm link --global vite` in another Vite project to use the locally built Vite; - - Use the `vite` binary anywhere. - - If your project has `vite` as a nested dependency, you can customize the dependency resolution instead depending on the package manager used. For pnpm, add this in your project's root `package.json`: - - ```json - { - "pnpm": { - "overrides": { - "vite": "link:../path/to/vite/packages/vite" - } - } - } - ``` +## Testing Vite against external packages + +You may wish to test your locally-modified copy of Vite against another package that is built with Vite. For pnpm, after building Vite, you can use [`pnpm.overrides`](https://pnpm.io/package_json#pnpmoverrides). Please note that `pnpm.overrides` must be specified in the root `package.json` and you must first list the package as a dependency in the root `package.json`: + +```json +{ + "dependencies": { + "vite": "^2.0.0" + }, + "pnpm": { + "overrides": { + "vite": "link:../path/to/vite/packages/vite" + } + } +} +``` - And re-run `pnpm install` to link the package. +And re-run `pnpm install` to link the package. ## Running Tests From 2d9a684ee60728eba23f34b02521b0c5cc831629 Mon Sep 17 00:00:00 2001 From: patak-dev Date: Mon, 13 Dec 2021 11:38:34 +0100 Subject: [PATCH 177/258] release: plugin-vue-jsx@1.3.2 --- .../ssr-deps/node-addon/build/Makefile | 324 ++++++++++++++++ .../Release/.deps/Release/cpp_addon.node.d | 1 + .../.deps/Release/obj.target/cpp_addon.node.d | 1 + .../Release/obj.target/cpp_addon/main.o.d | 23 ++ .../node-addon/build/Release/cpp_addon.node | Bin 0 -> 13288 bytes .../build/Release/obj.target/cpp_addon.node | Bin 0 -> 13288 bytes .../build/Release/obj.target/cpp_addon/main.o | Bin 0 -> 4368 bytes .../node-addon/build/binding.Makefile | 6 + .../ssr-deps/node-addon/build/config.gypi | 351 ++++++++++++++++++ .../node-addon/build/cpp_addon.target.mk | 159 ++++++++ packages/plugin-vue-jsx/CHANGELOG.md | 9 + packages/plugin-vue-jsx/package.json | 2 +- pnpm-lock.yaml | 6 - 13 files changed, 875 insertions(+), 7 deletions(-) create mode 100644 packages/playground/ssr-deps/node-addon/build/Makefile create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d create mode 100755 packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node create mode 100755 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node create mode 100644 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o create mode 100644 packages/playground/ssr-deps/node-addon/build/binding.Makefile create mode 100644 packages/playground/ssr-deps/node-addon/build/config.gypi create mode 100644 packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk diff --git a/packages/playground/ssr-deps/node-addon/build/Makefile b/packages/playground/ssr-deps/node-addon/build/Makefile new file mode 100644 index 00000000000000..83ce3f09d28c03 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Makefile @@ -0,0 +1,324 @@ +# We borrow heavily from the kernel build setup, though we are simpler since +# we don't have Kconfig tweaking settings on us. + +# The implicit make rules have it looking for RCS files, among other things. +# We instead explicitly write all the rules we care about. +# It's even quicker (saves ~200ms) to pass -r on the command line. +MAKEFLAGS=-r + +# The source directory tree. +srcdir := .. +abs_srcdir := $(abspath $(srcdir)) + +# The name of the builddir. +builddir_name ?= . + +# The V=1 flag on command line makes us verbosely print command lines. +ifdef V + quiet= +else + quiet=quiet_ +endif + +# Specify BUILDTYPE=Release on the command line for a release build. +BUILDTYPE ?= Release + +# Directory all our build output goes into. +# Note that this must be two directories beneath src/ for unit tests to pass, +# as they reach into the src/ directory for data with relative paths. +builddir ?= $(builddir_name)/$(BUILDTYPE) +abs_builddir := $(abspath $(builddir)) +depsdir := $(builddir)/.deps + +# Object output directory. +obj := $(builddir)/obj +abs_obj := $(abspath $(obj)) + +# We build up a list of every single one of the targets so we can slurp in the +# generated dependency rule Makefiles in one pass. +all_deps := + + + +CC.target ?= $(CC) +CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS) +CXX.target ?= $(CXX) +CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS) +LINK.target ?= $(LINK) +LDFLAGS.target ?= $(LDFLAGS) +AR.target ?= $(AR) + +# C++ apps need to be linked with g++. +LINK ?= $(CXX.target) + +# TODO(evan): move all cross-compilation logic to gyp-time so we don't need +# to replicate this environment fallback in make as well. +CC.host ?= gcc +CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host) +CXX.host ?= g++ +CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host) +LINK.host ?= $(CXX.host) +LDFLAGS.host ?= $(LDFLAGS_host) +AR.host ?= ar + +# Define a dir function that can handle spaces. +# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions +# "leading spaces cannot appear in the text of the first argument as written. +# These characters can be put into the argument value by variable substitution." +empty := +space := $(empty) $(empty) + +# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces +replace_spaces = $(subst $(space),?,$1) +unreplace_spaces = $(subst ?,$(space),$1) +dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1))) + +# Flags to make gcc output dependency info. Note that you need to be +# careful here to use the flags that ccache and distcc can understand. +# We write to a dep file on the side first and then rename at the end +# so we can't end up with a broken dep file. +depfile = $(depsdir)/$(call replace_spaces,$@).d +DEPFLAGS = -MMD -MF $(depfile).raw + +# We have to fixup the deps output in a few ways. +# (1) the file output should mention the proper .o file. +# ccache or distcc lose the path to the target, so we convert a rule of +# the form: +# foobar.o: DEP1 DEP2 +# into +# path/to/foobar.o: DEP1 DEP2 +# (2) we want missing files not to cause us to fail to build. +# We want to rewrite +# foobar.o: DEP1 DEP2 \ +# DEP3 +# to +# DEP1: +# DEP2: +# DEP3: +# so if the files are missing, they're just considered phony rules. +# We have to do some pretty insane escaping to get those backslashes +# and dollar signs past make, the shell, and sed at the same time. +# Doesn't work with spaces, but that's fine: .d files have spaces in +# their names replaced with other characters. +define fixup_dep +# The depfile may not exist if the input file didn't have any #includes. +touch $(depfile).raw +# Fixup path as in (1). +sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) +# Add extra rules as in (2). +# We remove slashes and replace spaces with new lines; +# remove blank lines; +# delete the first line and append a colon to the remaining lines. +sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\ + grep -v '^$$' |\ + sed -e 1d -e 's|$$|:|' \ + >> $(depfile) +rm $(depfile).raw +endef + +# Command definitions: +# - cmd_foo is the actual command to run; +# - quiet_cmd_foo is the brief-output summary of the command. + +quiet_cmd_cc = CC($(TOOLSET)) $@ +cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c + +quiet_cmd_cxx = CXX($(TOOLSET)) $@ +cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c + +quiet_cmd_touch = TOUCH $@ +cmd_touch = touch $@ + +quiet_cmd_copy = COPY $@ +# send stderr to /dev/null to ignore messages when linking directories. +cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") + +quiet_cmd_alink = AR($(TOOLSET)) $@ +cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) + +quiet_cmd_alink_thin = AR($(TOOLSET)) $@ +cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) + +# Due to circular dependencies between libraries :(, we wrap the +# special "figure out circular dependencies" flags around the entire +# input list during linking. +quiet_cmd_link = LINK($(TOOLSET)) $@ +cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group + +# We support two kinds of shared objects (.so): +# 1) shared_library, which is just bundling together many dependent libraries +# into a link line. +# 2) loadable_module, which is generating a module intended for dlopen(). +# +# They differ only slightly: +# In the former case, we want to package all dependent code into the .so. +# In the latter case, we want to package just the API exposed by the +# outermost module. +# This means shared_library uses --whole-archive, while loadable_module doesn't. +# (Note that --whole-archive is incompatible with the --start-group used in +# normal linking.) + +# Other shared-object link notes: +# - Set SONAME to the library filename so our binaries don't reference +# the local, absolute paths used on the link command-line. +quiet_cmd_solink = SOLINK($(TOOLSET)) $@ +cmd_solink = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) + +quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ +cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS) + + +# Define an escape_quotes function to escape single quotes. +# This allows us to handle quotes properly as long as we always use +# use single quotes and escape_quotes. +escape_quotes = $(subst ','\'',$(1)) +# This comment is here just to include a ' to unconfuse syntax highlighting. +# Define an escape_vars function to escape '$' variable syntax. +# This allows us to read/write command lines with shell variables (e.g. +# $LD_LIBRARY_PATH), without triggering make substitution. +escape_vars = $(subst $$,$$$$,$(1)) +# Helper that expands to a shell command to echo a string exactly as it is in +# make. This uses printf instead of echo because printf's behaviour with respect +# to escape sequences is more portable than echo's across different shells +# (e.g., dash, bash). +exact_echo = printf '%s\n' '$(call escape_quotes,$(1))' + +# Helper to compare the command we're about to run against the command +# we logged the last time we ran the command. Produces an empty +# string (false) when the commands match. +# Tricky point: Make has no string-equality test function. +# The kernel uses the following, but it seems like it would have false +# positives, where one string reordered its arguments. +# arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ +# $(filter-out $(cmd_$@), $(cmd_$(1)))) +# We instead substitute each for the empty string into the other, and +# say they're equal if both substitutions produce the empty string. +# .d files contain ? instead of spaces, take that into account. +command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\ + $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1)))) + +# Helper that is non-empty when a prerequisite changes. +# Normally make does this implicitly, but we force rules to always run +# so we can check their command lines. +# $? -- new prerequisites +# $| -- order-only dependencies +prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?)) + +# Helper that executes all postbuilds until one fails. +define do_postbuilds + @E=0;\ + for p in $(POSTBUILDS); do\ + eval $$p;\ + E=$$?;\ + if [ $$E -ne 0 ]; then\ + break;\ + fi;\ + done;\ + if [ $$E -ne 0 ]; then\ + rm -rf "$@";\ + exit $$E;\ + fi +endef + +# do_cmd: run a command via the above cmd_foo names, if necessary. +# Should always run for a given target to handle command-line changes. +# Second argument, if non-zero, makes it do asm/C/C++ dependency munging. +# Third argument, if non-zero, makes it do POSTBUILDS processing. +# Note: We intentionally do NOT call dirx for depfile, since it contains ? for +# spaces already and dirx strips the ? characters. +define do_cmd +$(if $(or $(command_changed),$(prereq_changed)), + @$(call exact_echo, $($(quiet)cmd_$(1))) + @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))" + $(if $(findstring flock,$(word 1,$(cmd_$1))), + @$(cmd_$(1)) + @echo " $(quiet_cmd_$(1)): Finished", + @$(cmd_$(1)) + ) + @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile) + @$(if $(2),$(fixup_dep)) + $(if $(and $(3), $(POSTBUILDS)), + $(call do_postbuilds) + ) +) +endef + +# Declare the "all" target first so it is the default, +# even though we don't have the deps yet. +.PHONY: all +all: + +# make looks for ways to re-generate included makefiles, but in our case, we +# don't have a direct way. Explicitly telling make that it has nothing to do +# for them makes it go faster. +%.d: ; + +# Use FORCE_DO_CMD to force a target to run. Should be coupled with +# do_cmd. +.PHONY: FORCE_DO_CMD +FORCE_DO_CMD: + +TOOLSET := target +# Suffix rules, putting all outputs into $(obj). +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + +# Try building from generated source, too. +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + +$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD + @$(call do_cmd,cxx,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD + @$(call do_cmd,cc,1) +$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD + @$(call do_cmd,cc,1) + + +ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ + $(findstring $(join ^,$(prefix)),\ + $(join ^,cpp_addon.target.mk)))),) + include cpp_addon.target.mk +endif + +quiet_cmd_regen_makefile = ACTION Regenerating $@ +cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/matias/.cache/node-gyp/16.9.1" "-Dnode_gyp_dir=/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp" "-Dnode_lib_file=/home/matias/.cache/node-gyp/16.9.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/matias/vite/packages/playground/ssr-deps/node-addon" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/matias/vite/packages/playground/ssr-deps/node-addon/build/config.gypi -I/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi -I/home/matias/.cache/node-gyp/16.9.1/include/node/common.gypi "--toplevel-dir=." binding.gyp +Makefile: $(srcdir)/../../../../../.cache/node-gyp/16.9.1/include/node/common.gypi $(srcdir)/../../../../../../../usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi + $(call do_cmd,regen_makefile) + +# "all" is a concatenation of the "all" targets from all the included +# sub-makefiles. This is just here to clarify. +all: + +# Add in dependency-tracking rules. $(all_deps) is the list of every single +# target in our tree. Only consider the ones with .d (dependency) info: +d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d)) +ifneq ($(d_files),) + include $(d_files) +endif diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d new file mode 100644 index 00000000000000..4be797e6cbdf6e --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d @@ -0,0 +1 @@ +cmd_Release/cpp_addon.node := ln -f "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node" 2>/dev/null || (rm -rf "Release/cpp_addon.node" && cp -af "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node") diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d new file mode 100644 index 00000000000000..9f4d87550d1f0a --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d @@ -0,0 +1 @@ +cmd_Release/obj.target/cpp_addon.node := g++ -o Release/obj.target/cpp_addon.node -shared -pthread -rdynamic -m64 -Wl,-soname=cpp_addon.node -Wl,--start-group Release/obj.target/cpp_addon/main.o -Wl,--end-group diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d new file mode 100644 index 00000000000000..2955b089117c85 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d @@ -0,0 +1,23 @@ +cmd_Release/obj.target/cpp_addon/main.o := g++ -o Release/obj.target/cpp_addon/main.o ../main.cpp '-DNODE_GYP_MODULE_NAME=cpp_addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/home/matias/.cache/node-gyp/16.9.1/include/node -I/home/matias/.cache/node-gyp/16.9.1/src -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++14 -MMD -MF ./Release/.deps/Release/obj.target/cpp_addon/main.o.d.raw -c +Release/obj.target/cpp_addon/main.o: ../main.cpp \ + /home/matias/.cache/node-gyp/16.9.1/include/node/node.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h \ + /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h +../main.cpp: +/home/matias/.cache/node-gyp/16.9.1/include/node/node.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h: +/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: diff --git a/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node new file mode 100755 index 0000000000000000000000000000000000000000..67c3f500cb518bfb96782ef1aeab0acc72d09ef3 GIT binary patch literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b literal 0 HcmV?d00001 diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node new file mode 100755 index 0000000000000000000000000000000000000000..67c3f500cb518bfb96782ef1aeab0acc72d09ef3 GIT binary patch literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b literal 0 HcmV?d00001 diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o new file mode 100644 index 0000000000000000000000000000000000000000..088f7174574579a7049a29fc9c0372a4205fa7b7 GIT binary patch literal 4368 zcmbtWU2GIp6u#|3sr*(Dh#E|YFUCZYdd{7DwztDWwQ)Ai94$qx=8p zbAPnzwKaNeru8?R)h{e~TlHF-UW@7e$TofMTI;EatDD;6ESLtkHqs_dO>JsFkA~pi zznwUq7*C8PM$_}9%bAqF1l~JydTrINPIT>Si|PV*llJfG{#D(-9ys-X7S8zs&ocE} zXg4%HaqX`vOc~J9)yhMPk6=nSF@{M1e3Ktn8<>|0{>m{x7=! zJ-A8xOB^`A;Aya&fM3%Vb9zs(+-jdbZ{0kVcqK8Bcr{^Q5#9#Jf#*B5OWfklr}g}U z@fU$3t5|e8jyrBK_Y}+HfGNt}l3B2oY`M&!8D=i$*yxW0_U8cVP{xVh36%N?Nq-=9 zD4BerqjPMsYJ1g=ex*<8+S60zBlS&nKbdTg8wk~oPP-XqPNC^u2-=?m!cT4$R~uc82q9n2A-lM##Tqc;HBk0d@Uf& z63%l0>`7=%3}*w0lLCE=MQ0e3_!1rX8{}bKkFkw)os{Rea{v1G3OveFj7gV>aMTO^ zW~rWh?*S`9YZDx~d#3^Zbp!kdz|sF{=u!BYf&Lz}DF54G8c4REsozN0zX&xr=O z-vD21fZu9>FEzm1;AlqW#p>6G;aX=370+^w<%`5PneI1APOe(Cn37I*;h)NklWLca z*AKsnjvXHEo*wA#8m!t`ui)58vsj!ov*%Lwl#?3H7=7brv1)0W#*Cr#k%Nh}ab$2X zqm3G)iGyj)0B>l&FXOod`;4j%TdxhePHD`W8qh|-ygyZOil%32BZspvRC|CBa7Sm$ zmR1n<-Qxpl_o$P0vSv{$mAzSQ8fJP^cELmUeS89!v+u~{Su5-D_3+3PKWY3GVoChL@~q`GoNB6QtB|FVOmV|&(&AX{cq! z_z$JjfF@GP^corr69y)?KT|kkn_kt$dKUmt_rppmo?Fd&j(gC`o6`lyMQgP;Q^;A` z)D+Z$7jgtc?@!V)VYhg7)cY2$s*q-#21d)Z?WeSHv$^>I5&JWiH*A(HY2{!lc71s> z#P0L}dnHqHJ)BW_vh{7!G$V!K{a>)VK@qaTmep=!lTRfZie4~Gq>jfw|n)yU@0 z8B=DV$ZRKPi4$LcAn@Lx8yp@leoNlNuN{!5aS{aQH$x*lfglLtTc8pC9)cixazS_U+n4T4#PMy1Yem7@q99J+G&t_WKM>+$43rN3AFK!0M4}4? zF>I&Bct-Sy$?IWCWwzv*lhAu^(C0~Wt)i*mwZoL0>6uKKtW=odIygYOs;Dp|5+J7Q zRm%b@z)fkGu4~Q;fLj5ZDOsmff=iJpw&PjK(D2wE{?G`Xl{cnbc(TQU|7X_$_E@_W zIm0*(4W)>alFUUFoVs;5bw8I$T`n?Po z-Xr1s{}%Cy4-_smral8`RQy)_msD2T2%ZF z5nmU4jE^M=$FBf}@u^Ora*5-E41)KyETSy+eS8BZ36pteg}scS9_D^1urR$WfJ-3< zw0?pwf)bT~J|chIXR@dI<9foexo_GK(c?L!J;Zsk$H$bYh}T6N=v|@7aQ^5wMBy$j Oi}in8cNi#P`+otuZNl#W literal 0 HcmV?d00001 diff --git a/packages/playground/ssr-deps/node-addon/build/binding.Makefile b/packages/playground/ssr-deps/node-addon/build/binding.Makefile new file mode 100644 index 00000000000000..9521a57df40291 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/binding.Makefile @@ -0,0 +1,6 @@ +# This file is generated by gyp; do not edit. + +export builddir_name ?= ./build/. +.PHONY: all +all: + $(MAKE) cpp_addon diff --git a/packages/playground/ssr-deps/node-addon/build/config.gypi b/packages/playground/ssr-deps/node-addon/build/config.gypi new file mode 100644 index 00000000000000..815e24a35e5c83 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/config.gypi @@ -0,0 +1,351 @@ +# Do not edit. File was generated by node-gyp's "configure" step +{ + "target_defaults": { + "cflags": [], + "default_configuration": "Release", + "defines": [], + "include_dirs": [], + "libraries": [] + }, + "variables": { + "asan": 0, + "coverage": "false", + "dcheck_always_on": 0, + "debug_nghttp2": "false", + "debug_node": "false", + "enable_lto": "false", + "enable_pgo_generate": "false", + "enable_pgo_use": "false", + "error_on_warn": "false", + "force_dynamic_crt": 0, + "gas_version": "2.30", + "host_arch": "x64", + "icu_data_in": "../../deps/icu-tmp/icudt69l.dat", + "icu_endianness": "l", + "icu_gyp_path": "tools/icu/icu-generic.gyp", + "icu_path": "deps/icu-small", + "icu_small": "false", + "icu_ver_major": "69", + "is_debug": 0, + "llvm_version": "0.0", + "napi_build_version": "8", + "node_byteorder": "little", + "node_debug_lib": "false", + "node_enable_d8": "false", + "node_install_npm": "true", + "node_library_files": [ + "lib/diagnostics_channel.js", + "lib/path.js", + "lib/punycode.js", + "lib/tty.js", + "lib/_stream_wrap.js", + "lib/querystring.js", + "lib/_tls_common.js", + "lib/_tls_wrap.js", + "lib/assert.js", + "lib/async_hooks.js", + "lib/child_process.js", + "lib/cluster.js", + "lib/dns.js", + "lib/util.js", + "lib/vm.js", + "lib/worker_threads.js", + "lib/url.js", + "lib/buffer.js", + "lib/wasi.js", + "lib/process.js", + "lib/console.js", + "lib/constants.js", + "lib/events.js", + "lib/fs.js", + "lib/_stream_duplex.js", + "lib/module.js", + "lib/domain.js", + "lib/zlib.js", + "lib/_http_client.js", + "lib/_http_server.js", + "lib/_stream_writable.js", + "lib/http.js", + "lib/https.js", + "lib/inspector.js", + "lib/trace_events.js", + "lib/_http_incoming.js", + "lib/http2.js", + "lib/os.js", + "lib/string_decoder.js", + "lib/_stream_passthrough.js", + "lib/_stream_readable.js", + "lib/_stream_transform.js", + "lib/crypto.js", + "lib/timers.js", + "lib/repl.js", + "lib/_http_agent.js", + "lib/_http_common.js", + "lib/_http_outgoing.js", + "lib/net.js", + "lib/perf_hooks.js", + "lib/readline.js", + "lib/v8.js", + "lib/sys.js", + "lib/tls.js", + "lib/stream.js", + "lib/dgram.js", + "lib/dns/promises.js", + "lib/stream/consumers.js", + "lib/stream/promises.js", + "lib/stream/web.js", + "lib/assert/strict.js", + "lib/internal/async_hooks.js", + "lib/internal/heap_utils.js", + "lib/internal/blob.js", + "lib/internal/freeze_intrinsics.js", + "lib/internal/inspector_async_hook.js", + "lib/internal/linkedlist.js", + "lib/internal/js_stream_socket.js", + "lib/internal/url.js", + "lib/internal/socketaddress.js", + "lib/internal/util.js", + "lib/internal/options.js", + "lib/internal/repl.js", + "lib/internal/child_process.js", + "lib/internal/errors.js", + "lib/internal/event_target.js", + "lib/internal/v8_prof_polyfill.js", + "lib/internal/v8_prof_processor.js", + "lib/internal/validators.js", + "lib/internal/buffer.js", + "lib/internal/encoding.js", + "lib/internal/watchdog.js", + "lib/internal/trace_events_async_hooks.js", + "lib/internal/constants.js", + "lib/internal/abort_controller.js", + "lib/internal/blocklist.js", + "lib/internal/querystring.js", + "lib/internal/net.js", + "lib/internal/cli_table.js", + "lib/internal/fixed_queue.js", + "lib/internal/priority_queue.js", + "lib/internal/tty.js", + "lib/internal/assert.js", + "lib/internal/timers.js", + "lib/internal/socket_list.js", + "lib/internal/error_serdes.js", + "lib/internal/freelist.js", + "lib/internal/dgram.js", + "lib/internal/histogram.js", + "lib/internal/http.js", + "lib/internal/idna.js", + "lib/internal/worker.js", + "lib/internal/dtrace.js", + "lib/internal/stream_base_commons.js", + "lib/internal/bootstrap/environment.js", + "lib/internal/bootstrap/loaders.js", + "lib/internal/bootstrap/pre_execution.js", + "lib/internal/bootstrap/node.js", + "lib/internal/bootstrap/switches/does_not_own_process_state.js", + "lib/internal/bootstrap/switches/is_not_main_thread.js", + "lib/internal/bootstrap/switches/does_own_process_state.js", + "lib/internal/bootstrap/switches/is_main_thread.js", + "lib/internal/debugger/inspect_repl.js", + "lib/internal/debugger/inspect.js", + "lib/internal/debugger/inspect_client.js", + "lib/internal/cluster/shared_handle.js", + "lib/internal/cluster/child.js", + "lib/internal/cluster/primary.js", + "lib/internal/cluster/round_robin_handle.js", + "lib/internal/cluster/utils.js", + "lib/internal/cluster/worker.js", + "lib/internal/crypto/aes.js", + "lib/internal/crypto/certificate.js", + "lib/internal/crypto/cipher.js", + "lib/internal/crypto/diffiehellman.js", + "lib/internal/crypto/hash.js", + "lib/internal/crypto/hashnames.js", + "lib/internal/crypto/hkdf.js", + "lib/internal/crypto/keys.js", + "lib/internal/crypto/mac.js", + "lib/internal/crypto/pbkdf2.js", + "lib/internal/crypto/random.js", + "lib/internal/crypto/scrypt.js", + "lib/internal/crypto/sig.js", + "lib/internal/crypto/util.js", + "lib/internal/crypto/webcrypto.js", + "lib/internal/crypto/x509.js", + "lib/internal/crypto/dsa.js", + "lib/internal/crypto/ec.js", + "lib/internal/crypto/keygen.js", + "lib/internal/crypto/rsa.js", + "lib/internal/dns/promises.js", + "lib/internal/dns/utils.js", + "lib/internal/fs/dir.js", + "lib/internal/fs/read_file_context.js", + "lib/internal/fs/streams.js", + "lib/internal/fs/sync_write_stream.js", + "lib/internal/fs/utils.js", + "lib/internal/fs/watchers.js", + "lib/internal/fs/promises.js", + "lib/internal/fs/rimraf.js", + "lib/internal/fs/cp/cp-sync.js", + "lib/internal/fs/cp/cp.js", + "lib/internal/http2/compat.js", + "lib/internal/http2/util.js", + "lib/internal/http2/core.js", + "lib/internal/modules/package_json_reader.js", + "lib/internal/modules/run_main.js", + "lib/internal/modules/cjs/loader.js", + "lib/internal/modules/cjs/helpers.js", + "lib/internal/modules/esm/loader.js", + "lib/internal/modules/esm/transform_source.js", + "lib/internal/modules/esm/module_job.js", + "lib/internal/modules/esm/module_map.js", + "lib/internal/modules/esm/resolve.js", + "lib/internal/modules/esm/translators.js", + "lib/internal/modules/esm/get_format.js", + "lib/internal/modules/esm/create_dynamic_module.js", + "lib/internal/modules/esm/get_source.js", + "lib/internal/legacy/processbinding.js", + "lib/internal/process/policy.js", + "lib/internal/process/worker_thread_only.js", + "lib/internal/process/esm_loader.js", + "lib/internal/process/execution.js", + "lib/internal/process/per_thread.js", + "lib/internal/process/promises.js", + "lib/internal/process/report.js", + "lib/internal/process/signal.js", + "lib/internal/process/task_queues.js", + "lib/internal/process/warning.js", + "lib/internal/repl/history.js", + "lib/internal/repl/utils.js", + "lib/internal/repl/await.js", + "lib/internal/streams/legacy.js", + "lib/internal/streams/passthrough.js", + "lib/internal/streams/buffer_list.js", + "lib/internal/streams/from.js", + "lib/internal/streams/lazy_transform.js", + "lib/internal/streams/state.js", + "lib/internal/streams/transform.js", + "lib/internal/streams/add-abort-signal.js", + "lib/internal/streams/compose.js", + "lib/internal/streams/destroy.js", + "lib/internal/streams/duplex.js", + "lib/internal/streams/duplexify.js", + "lib/internal/streams/end-of-stream.js", + "lib/internal/streams/pipeline.js", + "lib/internal/streams/readable.js", + "lib/internal/streams/utils.js", + "lib/internal/streams/writable.js", + "lib/internal/test/binding.js", + "lib/internal/test/transfer.js", + "lib/internal/util/comparisons.js", + "lib/internal/util/debuglog.js", + "lib/internal/util/inspect.js", + "lib/internal/util/inspector.js", + "lib/internal/util/iterable_weak_map.js", + "lib/internal/util/types.js", + "lib/internal/main/check_syntax.js", + "lib/internal/main/eval_stdin.js", + "lib/internal/main/prof_process.js", + "lib/internal/main/run_main_module.js", + "lib/internal/main/print_help.js", + "lib/internal/main/repl.js", + "lib/internal/main/inspect.js", + "lib/internal/main/worker_thread.js", + "lib/internal/main/eval_string.js", + "lib/internal/tls/parse-cert-string.js", + "lib/internal/tls/secure-context.js", + "lib/internal/tls/secure-pair.js", + "lib/internal/vm/module.js", + "lib/internal/child_process/serialization.js", + "lib/internal/per_context/domexception.js", + "lib/internal/per_context/messageport.js", + "lib/internal/per_context/primordials.js", + "lib/internal/worker/io.js", + "lib/internal/worker/js_transferable.js", + "lib/internal/assert/calltracker.js", + "lib/internal/assert/assertion_error.js", + "lib/internal/perf/event_loop_delay.js", + "lib/internal/perf/event_loop_utilization.js", + "lib/internal/perf/nodetiming.js", + "lib/internal/perf/observe.js", + "lib/internal/perf/performance.js", + "lib/internal/perf/performance_entry.js", + "lib/internal/perf/timerify.js", + "lib/internal/perf/usertiming.js", + "lib/internal/perf/utils.js", + "lib/internal/webstreams/encoding.js", + "lib/internal/webstreams/queuingstrategies.js", + "lib/internal/webstreams/readablestream.js", + "lib/internal/webstreams/transfer.js", + "lib/internal/webstreams/transformstream.js", + "lib/internal/webstreams/util.js", + "lib/internal/webstreams/writablestream.js", + "lib/internal/source_map/source_map.js", + "lib/internal/source_map/source_map_cache.js", + "lib/internal/source_map/prepare_stack_trace.js", + "lib/internal/console/global.js", + "lib/internal/console/constructor.js", + "lib/internal/readline/utils.js", + "lib/internal/readline/callbacks.js", + "lib/internal/readline/emitKeypressEvents.js", + "lib/internal/policy/manifest.js", + "lib/internal/policy/sri.js", + "lib/fs/promises.js", + "lib/util/types.js", + "lib/path/posix.js", + "lib/path/win32.js", + "lib/timers/promises.js" + ], + "node_module_version": 93, + "node_no_browser_globals": "false", + "node_prefix": "/", + "node_release_urlbase": "https://nodejs.org/download/release/", + "node_section_ordering_info": "", + "node_shared": "false", + "node_shared_brotli": "false", + "node_shared_cares": "false", + "node_shared_http_parser": "false", + "node_shared_libuv": "false", + "node_shared_nghttp2": "false", + "node_shared_nghttp3": "false", + "node_shared_ngtcp2": "false", + "node_shared_openssl": "false", + "node_shared_zlib": "false", + "node_tag": "", + "node_target_type": "executable", + "node_use_bundled_v8": "true", + "node_use_dtrace": "false", + "node_use_etw": "false", + "node_use_node_code_cache": "true", + "node_use_node_snapshot": "true", + "node_use_openssl": "true", + "node_use_v8_platform": "true", + "node_with_ltcg": "false", + "node_without_node_options": "false", + "openssl_fips": "", + "openssl_is_fips": "false", + "openssl_quic": "true", + "ossfuzz": "false", + "shlib_suffix": "so.93", + "target_arch": "x64", + "v8_enable_31bit_smis_on_64bit_arch": 0, + "v8_enable_gdbjit": 0, + "v8_enable_i18n_support": 1, + "v8_enable_inspector": 1, + "v8_enable_lite_mode": 0, + "v8_enable_object_print": 1, + "v8_enable_pointer_compression": 0, + "v8_enable_webassembly": 1, + "v8_no_strict_aliasing": 1, + "v8_optimized_debug": 1, + "v8_promise_internal_field_count": 1, + "v8_random_seed": 0, + "v8_trace_maps": 0, + "v8_use_siphash": 1, + "want_separate_host_toolset": 0, + "nodedir": "/home/matias/.cache/node-gyp/16.9.1", + "standalone_static_library": 1, + "user_agent": "pnpm/6.21.0 npm/? node/v16.9.1 linux x64", + "registry": "https://registry.npmjs.org/", + "node_gyp": "/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/bin/node-gyp.js" + } +} diff --git a/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk b/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk new file mode 100644 index 00000000000000..4a2de286352df8 --- /dev/null +++ b/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk @@ -0,0 +1,159 @@ +# This file is generated by gyp; do not edit. + +TOOLSET := target +TARGET := cpp_addon +DEFS_Debug := \ + '-DNODE_GYP_MODULE_NAME=cpp_addon' \ + '-DUSING_UV_SHARED=1' \ + '-DUSING_V8_SHARED=1' \ + '-DV8_DEPRECATION_WARNINGS=1' \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ + '-D_GLIBCXX_USE_CXX11_ABI=1' \ + '-D_LARGEFILE_SOURCE' \ + '-D_FILE_OFFSET_BITS=64' \ + '-D__STDC_FORMAT_MACROS' \ + '-DOPENSSL_NO_PINSHARED' \ + '-DOPENSSL_THREADS' \ + '-DBUILDING_NODE_EXTENSION' \ + '-DDEBUG' \ + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' + +# Flags passed to all source files. +CFLAGS_Debug := \ + -fPIC \ + -pthread \ + -Wall \ + -Wextra \ + -Wno-unused-parameter \ + -m64 \ + -g \ + -O0 + +# Flags passed to only C files. +CFLAGS_C_Debug := + +# Flags passed to only C++ files. +CFLAGS_CC_Debug := \ + -fno-rtti \ + -fno-exceptions \ + -std=gnu++14 + +INCS_Debug := \ + -I/home/matias/.cache/node-gyp/16.9.1/include/node \ + -I/home/matias/.cache/node-gyp/16.9.1/src \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include + +DEFS_Release := \ + '-DNODE_GYP_MODULE_NAME=cpp_addon' \ + '-DUSING_UV_SHARED=1' \ + '-DUSING_V8_SHARED=1' \ + '-DV8_DEPRECATION_WARNINGS=1' \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ + '-D_GLIBCXX_USE_CXX11_ABI=1' \ + '-D_LARGEFILE_SOURCE' \ + '-D_FILE_OFFSET_BITS=64' \ + '-D__STDC_FORMAT_MACROS' \ + '-DOPENSSL_NO_PINSHARED' \ + '-DOPENSSL_THREADS' \ + '-DBUILDING_NODE_EXTENSION' + +# Flags passed to all source files. +CFLAGS_Release := \ + -fPIC \ + -pthread \ + -Wall \ + -Wextra \ + -Wno-unused-parameter \ + -m64 \ + -O3 \ + -fno-omit-frame-pointer + +# Flags passed to only C files. +CFLAGS_C_Release := + +# Flags passed to only C++ files. +CFLAGS_CC_Release := \ + -fno-rtti \ + -fno-exceptions \ + -std=gnu++14 + +INCS_Release := \ + -I/home/matias/.cache/node-gyp/16.9.1/include/node \ + -I/home/matias/.cache/node-gyp/16.9.1/src \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ + -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include + +OBJS := \ + $(obj).target/$(TARGET)/main.o + +# Add to the list of files we specially track dependencies for. +all_deps += $(OBJS) + +# CFLAGS et al overrides must be target-local. +# See "Target-specific Variable Values" in the GNU Make manual. +$(OBJS): TOOLSET := $(TOOLSET) +$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) +$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) + +# Suffix rules, putting all outputs into $(obj). + +$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) + +# Try building from generated source, too. + +$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) + +$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cpp FORCE_DO_CMD + @$(call do_cmd,cxx,1) + +# End of this set of suffix rules +### Rules for final target. +LDFLAGS_Debug := \ + -pthread \ + -rdynamic \ + -m64 + +LDFLAGS_Release := \ + -pthread \ + -rdynamic \ + -m64 + +LIBS := + +$(obj).target/cpp_addon.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE)) +$(obj).target/cpp_addon.node: LIBS := $(LIBS) +$(obj).target/cpp_addon.node: TOOLSET := $(TOOLSET) +$(obj).target/cpp_addon.node: $(OBJS) FORCE_DO_CMD + $(call do_cmd,solink_module) + +all_deps += $(obj).target/cpp_addon.node +# Add target alias +.PHONY: cpp_addon +cpp_addon: $(builddir)/cpp_addon.node + +# Copy this to the executable output path. +$(builddir)/cpp_addon.node: TOOLSET := $(TOOLSET) +$(builddir)/cpp_addon.node: $(obj).target/cpp_addon.node FORCE_DO_CMD + $(call do_cmd,copy) + +all_deps += $(builddir)/cpp_addon.node +# Short alias for building this executable. +.PHONY: cpp_addon.node +cpp_addon.node: $(obj).target/cpp_addon.node $(builddir)/cpp_addon.node + +# Add executable to "all" target. +.PHONY: all +all: $(builddir)/cpp_addon.node + diff --git a/packages/plugin-vue-jsx/CHANGELOG.md b/packages/plugin-vue-jsx/CHANGELOG.md index 7bd6d06debcac6..6483054fc5e070 100644 --- a/packages/plugin-vue-jsx/CHANGELOG.md +++ b/packages/plugin-vue-jsx/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.3.2](https://github.com/vitejs/vite/compare/plugin-vue-jsx@1.3.1...plugin-vue-jsx@1.3.2) (2021-12-13) + + +### Bug Fixes + +* allow overwriting `define` options in vue & vue-jsx plugins ([#6072](https://github.com/vitejs/vite/issues/6072)) ([5f3f6b7](https://github.com/vitejs/vite/commit/5f3f6b7b406cb3371084057c74814eb36175e5cf)) + + + ## [1.3.1](https://github.com/vitejs/vite/compare/plugin-vue-jsx@1.3.0...plugin-vue-jsx@1.3.1) (2021-12-07) diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 9d0e73583c2e51..76bacceb6ec2d5 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue-jsx", - "version": "1.3.1", + "version": "1.3.2", "license": "MIT", "author": "Evan You", "files": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 572696f0c3bbd9..2af95d41ebc029 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -704,12 +704,6 @@ importers: '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.16.0 hash-sum: 2.0.0 - packages/temp: - specifiers: - css-color-names: ^1.0.1 - devDependencies: - css-color-names: 1.0.1 - packages/vite: specifiers: '@ampproject/remapping': ^1.0.1 From 3e71100162afc564a31ac1e972b33fca4b75c8d6 Mon Sep 17 00:00:00 2001 From: patak-dev Date: Mon, 13 Dec 2021 11:40:16 +0100 Subject: [PATCH 178/258] release: v2.7.2 --- packages/vite/CHANGELOG.md | 11 +++++++++++ packages/vite/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index 382ae98efe085d..d59ef2107df298 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,14 @@ +## [2.7.2](https://github.com/vitejs/vite/compare/v2.7.1...v2.7.2) (2021-12-13) + + +### Bug Fixes + +* **html:** empty script ([#6057](https://github.com/vitejs/vite/issues/6057)) ([1487223](https://github.com/vitejs/vite/commit/1487223f39b7555b1050b660d847eabf4d20249f)) +* **lexGlobPattern:** edge case of glob import ([#6022](https://github.com/vitejs/vite/issues/6022)) ([d4c5cff](https://github.com/vitejs/vite/commit/d4c5cff551ad9fb721243f8abdbf0c78f5b5a7ec)) +* ws types ([#6083](https://github.com/vitejs/vite/issues/6083)) ([1ded1a8](https://github.com/vitejs/vite/commit/1ded1a835bfb64f2c70c8c153e979b7911c9a8c1)) + + + ## [2.7.1](https://github.com/vitejs/vite/compare/v2.7.0...v2.7.1) (2021-12-07) diff --git a/packages/vite/package.json b/packages/vite/package.json index 56df1eedb6e609..0636dbd0bb8192 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.1", + "version": "2.7.2", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", From 16b6a1ebe3f690699cf1e2f4010f902ab26eaa93 Mon Sep 17 00:00:00 2001 From: patak-dev Date: Mon, 13 Dec 2021 11:42:02 +0100 Subject: [PATCH 179/258] release: plugin-react@1.1.2 --- packages/plugin-react/CHANGELOG.md | 9 +++++++++ packages/plugin-react/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md index c3887f6943b521..f0310312556c39 100644 --- a/packages/plugin-react/CHANGELOG.md +++ b/packages/plugin-react/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.1.2](https://github.com/vitejs/vite/compare/plugin-react@1.1.1...plugin-react@1.1.2) (2021-12-13) + + +### Bug Fixes + +* ignore babel config when running restore-jsx ([#6047](https://github.com/vitejs/vite/issues/6047)) ([9c2843c](https://github.com/vitejs/vite/commit/9c2843cf0506844ee32f042a04c22c440434df2a)) + + + ## [1.1.1](https://github.com/vitejs/vite/compare/plugin-react@1.1.0...plugin-react@1.1.1) (2021-12-07) diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index 5e60ed73b10833..360add3a0e6695 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-react", - "version": "1.1.1", + "version": "1.1.2", "license": "MIT", "author": "Evan You", "contributors": [ From ab06081e1d377fa01f4d5fcd417310c9ea961aee Mon Sep 17 00:00:00 2001 From: patak-dev Date: Mon, 13 Dec 2021 11:42:53 +0100 Subject: [PATCH 180/258] release: create-vite@2.7.2 --- packages/create-vite/CHANGELOG.md | 4 ++++ packages/create-vite/package.json | 2 +- packages/create-vite/template-lit-ts/package.json | 2 +- packages/create-vite/template-lit/package.json | 2 +- packages/create-vite/template-preact-ts/package.json | 2 +- packages/create-vite/template-preact/package.json | 2 +- packages/create-vite/template-react-ts/package.json | 2 +- packages/create-vite/template-react/package.json | 2 +- packages/create-vite/template-svelte-ts/package.json | 2 +- packages/create-vite/template-svelte/package.json | 2 +- packages/create-vite/template-vanilla-ts/package.json | 2 +- packages/create-vite/template-vanilla/package.json | 2 +- packages/create-vite/template-vue-ts/package.json | 2 +- packages/create-vite/template-vue/package.json | 2 +- 14 files changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/create-vite/CHANGELOG.md b/packages/create-vite/CHANGELOG.md index 2fabb6b3699f0c..7769233043e03b 100644 --- a/packages/create-vite/CHANGELOG.md +++ b/packages/create-vite/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.7.2](https://github.com/vitejs/vite/compare/create-vite@2.7.1...create-vite@2.7.2) (2021-12-13) + + + ## [2.7.1](https://github.com/vitejs/vite/compare/create-vite@2.7.0...create-vite@2.7.1) (2021-12-12) diff --git a/packages/create-vite/package.json b/packages/create-vite/package.json index 6c505735f90bcd..ab62f2b95229f7 100644 --- a/packages/create-vite/package.json +++ b/packages/create-vite/package.json @@ -1,6 +1,6 @@ { "name": "create-vite", - "version": "2.7.1", + "version": "2.7.2", "license": "MIT", "author": "Evan You", "bin": { diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json index 6ee9ff7bb21359..d12d080cea1cb5 100644 --- a/packages/create-vite/template-lit-ts/package.json +++ b/packages/create-vite/template-lit-ts/package.json @@ -18,7 +18,7 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.7.1", + "vite": "^2.7.2", "typescript": "^4.4.4" } } diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json index 7cc9fd8c5e2598..1081fd506aa25a 100644 --- a/packages/create-vite/template-lit/package.json +++ b/packages/create-vite/template-lit/package.json @@ -16,6 +16,6 @@ "lit": "^2.0.2" }, "devDependencies": { - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json index db136f5be2181d..b567edbda3d67a 100644 --- a/packages/create-vite/template-preact-ts/package.json +++ b/packages/create-vite/template-preact-ts/package.json @@ -12,6 +12,6 @@ "devDependencies": { "@preact/preset-vite": "^2.1.5", "typescript": "^4.4.4", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-preact/package.json b/packages/create-vite/template-preact/package.json index 2dd16f7cd73171..dcfc501e7f2c24 100644 --- a/packages/create-vite/template-preact/package.json +++ b/packages/create-vite/template-preact/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@preact/preset-vite": "^2.1.5", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json index 0800f4ef314907..a589326d901e6a 100644 --- a/packages/create-vite/template-react-ts/package.json +++ b/packages/create-vite/template-react-ts/package.json @@ -15,6 +15,6 @@ "@types/react-dom": "^17.0.10", "@vitejs/plugin-react": "^1.0.7", "typescript": "^4.4.4", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json index d461e794cbb2c5..e9a2984db1960a 100644 --- a/packages/create-vite/template-react/package.json +++ b/packages/create-vite/template-react/package.json @@ -12,6 +12,6 @@ }, "devDependencies": { "@vitejs/plugin-react": "^1.0.7", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json index 23b556b0e63858..61ef1e3187c1bd 100644 --- a/packages/create-vite/template-svelte-ts/package.json +++ b/packages/create-vite/template-svelte-ts/package.json @@ -16,6 +16,6 @@ "svelte-preprocess": "^4.9.8", "tslib": "^2.3.1", "typescript": "^4.4.4", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-svelte/package.json b/packages/create-vite/template-svelte/package.json index b13662d77c4fd0..4a4ac5796dae47 100644 --- a/packages/create-vite/template-svelte/package.json +++ b/packages/create-vite/template-svelte/package.json @@ -10,6 +10,6 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30", "svelte": "^3.44.0", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json index 4f9c527b2861da..fa4fbf59746c84 100644 --- a/packages/create-vite/template-vanilla-ts/package.json +++ b/packages/create-vite/template-vanilla-ts/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "typescript": "^4.4.4", - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-vanilla/package.json b/packages/create-vite/template-vanilla/package.json index 33f927b4d8ee81..e8dc2c73fc5388 100644 --- a/packages/create-vite/template-vanilla/package.json +++ b/packages/create-vite/template-vanilla/package.json @@ -7,6 +7,6 @@ "preview": "vite preview" }, "devDependencies": { - "vite": "^2.7.1" + "vite": "^2.7.2" } } diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json index 8dfaf6aadc4712..74528fb2e15f4e 100644 --- a/packages/create-vite/template-vue-ts/package.json +++ b/packages/create-vite/template-vue-ts/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@vitejs/plugin-vue": "^2.0.0", "typescript": "^4.4.4", - "vite": "^2.7.1", + "vite": "^2.7.2", "vue-tsc": "^0.29.8" } } diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json index e28e07d17a0b94..6d2e335a7ac937 100644 --- a/packages/create-vite/template-vue/package.json +++ b/packages/create-vite/template-vue/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@vitejs/plugin-vue": "^2.0.0", - "vite": "^2.7.1" + "vite": "^2.7.2" } } From 03734417cde10807ab2dd0d71b08c26081aac0b7 Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Mon, 13 Dec 2021 22:47:02 +0800 Subject: [PATCH 181/258] fix(ssr): robust regexp to check cjs content (#6053) --- .../ssr-deps/__tests__/ssr-deps.spec.ts | 21 +++++++++++++++++++ .../define-properties-exports/index.js | 8 +++++++ .../define-properties-exports/package.json | 5 +++++ .../ssr-deps/define-property-exports/index.js | 5 +++++ .../define-property-exports/package.json | 5 +++++ .../only-object-assigned-exports/index.js | 5 +++++ .../only-object-assigned-exports/package.json | 5 +++++ packages/playground/ssr-deps/package.json | 3 +++ packages/playground/ssr-deps/src/app.js | 12 +++++++++++ packages/playground/ssr-deps/vite.config.js | 8 ------- packages/vite/src/node/ssr/ssrExternal.ts | 5 ++++- pnpm-lock.yaml | 15 +++++++++++++ 12 files changed, 88 insertions(+), 9 deletions(-) create mode 100644 packages/playground/ssr-deps/define-properties-exports/index.js create mode 100644 packages/playground/ssr-deps/define-properties-exports/package.json create mode 100644 packages/playground/ssr-deps/define-property-exports/index.js create mode 100644 packages/playground/ssr-deps/define-property-exports/package.json create mode 100644 packages/playground/ssr-deps/only-object-assigned-exports/index.js create mode 100644 packages/playground/ssr-deps/only-object-assigned-exports/package.json delete mode 100644 packages/playground/ssr-deps/vite.config.js diff --git a/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts b/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts index 4922310a8b0ca8..8a201c9eb87455 100644 --- a/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts +++ b/packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts @@ -50,3 +50,24 @@ test('msg from forwarded exports', async () => { 'Hello World!' ) }) + +test('msg from define properties exports', async () => { + await page.goto(url) + expect(await page.textContent('.define-properties-exports-msg')).toMatch( + 'Hello World!' + ) +}) + +test('msg from define property exports', async () => { + await page.goto(url) + expect(await page.textContent('.define-property-exports-msg')).toMatch( + 'Hello World!' + ) +}) + +test('msg from only object assigned exports', async () => { + await page.goto(url) + expect(await page.textContent('.only-object-assigned-exports-msg')).toMatch( + 'Hello World!' + ) +}) diff --git a/packages/playground/ssr-deps/define-properties-exports/index.js b/packages/playground/ssr-deps/define-properties-exports/index.js new file mode 100644 index 00000000000000..5bdd02be906469 --- /dev/null +++ b/packages/playground/ssr-deps/define-properties-exports/index.js @@ -0,0 +1,8 @@ +// prettier-ignore +Object.defineProperties ( exports , { + hello: { + value() { + return 'Hello World!' + } + } +}) diff --git a/packages/playground/ssr-deps/define-properties-exports/package.json b/packages/playground/ssr-deps/define-properties-exports/package.json new file mode 100644 index 00000000000000..7555314741d981 --- /dev/null +++ b/packages/playground/ssr-deps/define-properties-exports/package.json @@ -0,0 +1,5 @@ +{ + "name": "define-properties-exports", + "version": "0.0.0", + "private": true +} diff --git a/packages/playground/ssr-deps/define-property-exports/index.js b/packages/playground/ssr-deps/define-property-exports/index.js new file mode 100644 index 00000000000000..4506dd6200051e --- /dev/null +++ b/packages/playground/ssr-deps/define-property-exports/index.js @@ -0,0 +1,5 @@ +Object.defineProperty(exports, 'hello', { + value() { + return 'Hello World!' + } +}) diff --git a/packages/playground/ssr-deps/define-property-exports/package.json b/packages/playground/ssr-deps/define-property-exports/package.json new file mode 100644 index 00000000000000..02373646db832e --- /dev/null +++ b/packages/playground/ssr-deps/define-property-exports/package.json @@ -0,0 +1,5 @@ +{ + "name": "define-property-exports", + "version": "0.0.0", + "private": true +} diff --git a/packages/playground/ssr-deps/only-object-assigned-exports/index.js b/packages/playground/ssr-deps/only-object-assigned-exports/index.js new file mode 100644 index 00000000000000..b6a4ab368b133d --- /dev/null +++ b/packages/playground/ssr-deps/only-object-assigned-exports/index.js @@ -0,0 +1,5 @@ +Object.assign(exports, { + hello() { + return 'Hello World!' + } +}) diff --git a/packages/playground/ssr-deps/only-object-assigned-exports/package.json b/packages/playground/ssr-deps/only-object-assigned-exports/package.json new file mode 100644 index 00000000000000..b74c5215385df3 --- /dev/null +++ b/packages/playground/ssr-deps/only-object-assigned-exports/package.json @@ -0,0 +1,5 @@ +{ + "name": "only-object-assigned-exports", + "version": "0.0.0", + "private": true +} diff --git a/packages/playground/ssr-deps/package.json b/packages/playground/ssr-deps/package.json index 4ba3c45031731b..a4dfb83e6a0783 100644 --- a/packages/playground/ssr-deps/package.json +++ b/packages/playground/ssr-deps/package.json @@ -10,8 +10,11 @@ }, "dependencies": { "bcrypt": "^5.0.1", + "define-properties-exports": "file:./define-properties-exports", + "define-property-exports": "file:./define-property-exports", "forwarded-export": "file:./forwarded-export", "object-assigned-exports": "file:./object-assigned-exports", + "only-object-assigned-exports": "file:./only-object-assigned-exports", "primitive-export": "file:./primitive-export", "read-file-content": "file:./read-file-content", "ts-transpiled-exports": "file:./ts-transpiled-exports" diff --git a/packages/playground/ssr-deps/src/app.js b/packages/playground/ssr-deps/src/app.js index bbe6ec7f396219..da8883c6a9452b 100644 --- a/packages/playground/ssr-deps/src/app.js +++ b/packages/playground/ssr-deps/src/app.js @@ -5,6 +5,9 @@ import tsDefaultExport, { hello as tsNamedExport } from 'ts-transpiled-exports' import objectAssignedExports from 'object-assigned-exports' import forwardedExport from 'forwarded-export' import bcrypt from 'bcrypt' +import definePropertiesExports from 'define-properties-exports' +import definePropertyExports from 'define-property-exports' +import onlyObjectAssignedExports from 'only-object-assigned-exports' export async function render(url, rootDir) { let html = '' @@ -29,5 +32,14 @@ export async function render(url, rootDir) { const forwardedExportMessage = forwardedExport.hello() html += `\n

message from forwarded-export: ${forwardedExportMessage}

` + const definePropertiesExportsMsg = definePropertiesExports.hello() + html += `\n

message from define-properties-exports: ${definePropertiesExportsMsg}

` + + const definePropertyExportsMsg = definePropertyExports.hello() + html += `\n

message from define-property-exports: ${definePropertyExportsMsg}

` + + const onlyObjectAssignedExportsMessage = onlyObjectAssignedExports.hello() + html += `\n

message from only-object-assigned-exports: ${onlyObjectAssignedExportsMessage}

` + return html + '\n' } diff --git a/packages/playground/ssr-deps/vite.config.js b/packages/playground/ssr-deps/vite.config.js deleted file mode 100644 index 96a2eb87f4cb2d..00000000000000 --- a/packages/playground/ssr-deps/vite.config.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @type {import('vite').UserConfig} - */ -module.exports = { - ssr: { - external: ['object-assigned-exports'] - } -} diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts index 3549d5653dfc95..07cfaa9c238bcf 100644 --- a/packages/vite/src/node/ssr/ssrExternal.ts +++ b/packages/vite/src/node/ssr/ssrExternal.ts @@ -64,6 +64,9 @@ export function resolveSSRExternal( return externals } +const CJS_CONTENT_RE = + /\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(|\bObject\.(defineProperty|defineProperties|assign)\s*\(\s*exports\b/ + // do we need to do this ahead of time or could we do it lazily? function collectExternals( root: string, @@ -157,7 +160,7 @@ function collectExternals( } // check if the entry is cjs const content = fs.readFileSync(esmEntry, 'utf-8') - if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) { + if (CJS_CONTENT_RE.test(content)) { ssrExternals.add(id) continue } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2af95d41ebc029..6c16ab43a73020 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -458,16 +458,22 @@ importers: specifiers: bcrypt: ^5.0.1 cross-env: ^7.0.3 + define-properties-exports: file:./define-properties-exports + define-property-exports: file:./define-property-exports express: ^4.17.1 forwarded-export: file:./forwarded-export object-assigned-exports: file:./object-assigned-exports + only-object-assigned-exports: file:./only-object-assigned-exports primitive-export: file:./primitive-export read-file-content: file:./read-file-content ts-transpiled-exports: file:./ts-transpiled-exports dependencies: bcrypt: 5.0.1 + define-properties-exports: link:define-properties-exports + define-property-exports: link:define-property-exports forwarded-export: link:forwarded-export object-assigned-exports: link:object-assigned-exports + only-object-assigned-exports: link:only-object-assigned-exports primitive-export: link:primitive-export read-file-content: link:read-file-content ts-transpiled-exports: link:ts-transpiled-exports @@ -475,12 +481,21 @@ importers: cross-env: 7.0.3 express: 4.17.1 + packages/playground/ssr-deps/define-properties-exports: + specifiers: {} + + packages/playground/ssr-deps/define-property-exports: + specifiers: {} + packages/playground/ssr-deps/forwarded-export: specifiers: {} packages/playground/ssr-deps/object-assigned-exports: specifiers: {} + packages/playground/ssr-deps/only-object-assigned-exports: + specifiers: {} + packages/playground/ssr-deps/primitive-export: specifiers: {} From 8735294055ce16308a6b8302eba4538f4a2931d0 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Tue, 14 Dec 2021 02:02:50 +0800 Subject: [PATCH 182/258] fix(plugin-react): only detect preamble in hmr context (#6096) --- packages/plugin-react/src/fast-refresh.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/plugin-react/src/fast-refresh.ts b/packages/plugin-react/src/fast-refresh.ts index 76d163e4d665e2..70562bbbdfc5b7 100644 --- a/packages/plugin-react/src/fast-refresh.ts +++ b/packages/plugin-react/src/fast-refresh.ts @@ -35,14 +35,14 @@ import RefreshRuntime from "${runtimePublicPath}"; let prevRefreshReg; let prevRefreshSig; -if (!window.__vite_plugin_react_preamble_installed__) { - throw new Error( - "@vitejs/plugin-react can't detect preamble. Something is wrong. " + - "See https://github.com/vitejs/vite-plugin-react/pull/11#discussion_r430879201" - ); -} - if (import.meta.hot) { + if (!window.__vite_plugin_react_preamble_installed__) { + throw new Error( + "@vitejs/plugin-react can't detect preamble. Something is wrong. " + + "See https://github.com/vitejs/vite-plugin-react/pull/11#discussion_r430879201" + ); + } + prevRefreshReg = window.$RefreshReg$; prevRefreshSig = window.$RefreshSig$; window.$RefreshReg$ = (type, id) => { From 6cdf13ae808a99b7aca6d278bee2ebe6e51d0846 Mon Sep 17 00:00:00 2001 From: Jeff Yang <32727188+ydcjeff@users.noreply.github.com> Date: Tue, 14 Dec 2021 02:04:02 +0630 Subject: [PATCH 183/258] fix: do not overwrite rollupOptions.input in dev (#6025) --- packages/vite/src/node/__tests__/dev.spec.ts | 18 +++++++++++++++++ packages/vite/src/node/build.ts | 21 ++++++++++---------- packages/vite/src/node/config.ts | 6 +++++- 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 packages/vite/src/node/__tests__/dev.spec.ts diff --git a/packages/vite/src/node/__tests__/dev.spec.ts b/packages/vite/src/node/__tests__/dev.spec.ts new file mode 100644 index 00000000000000..3eefd7b4b903c1 --- /dev/null +++ b/packages/vite/src/node/__tests__/dev.spec.ts @@ -0,0 +1,18 @@ +import { resolveConfig } from '..' + +describe('resolveBuildOptions in dev', () => { + test('build.rollupOptions should not have input in lib', async () => { + const config = await resolveConfig( + { + build: { + lib: { + entry: './index.js' + } + } + }, + 'serve' + ) + + expect(config.build.rollupOptions).not.toHaveProperty('input') + }) +}) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index cef74c7ac57f88..8761edf65c66b3 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -236,7 +236,8 @@ export type ResolvedBuildOptions = Required< export function resolveBuildOptions( root: string, - raw?: BuildOptions + raw?: BuildOptions, + isBuild?: boolean ): ResolvedBuildOptions { const resolved: ResolvedBuildOptions = { target: 'modules', @@ -291,14 +292,12 @@ export function resolveBuildOptions( ]) ) : resolve(raw.rollupOptions.input) - } else { - input = resolve( - raw?.lib - ? raw.lib.entry - : typeof raw?.ssr === 'string' - ? raw.ssr - : 'index.html' - ) + } else if (raw?.lib && isBuild) { + input = resolve(raw.lib.entry) + } else if (typeof raw?.ssr === 'string') { + input = resolve(raw.ssr) + } else if (isBuild) { + input = resolve('index.html') } if (!!raw?.ssr && typeof input === 'string' && input.endsWith('.html')) { @@ -308,7 +307,9 @@ export function resolveBuildOptions( ) } - resolved.rollupOptions.input = input + if (input) { + resolved.rollupOptions.input = input + } // handle special build targets if (resolved.target === 'modules') { diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 8ae523c4e7715e..59c5d90ce108d2 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -367,7 +367,11 @@ export async function resolveConfig( // resolve public base url const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger) - const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build) + const resolvedBuildOptions = resolveBuildOptions( + resolvedRoot, + config.build, + command === 'build' + ) // resolve cache directory const pkgPath = lookupFile( From 4bdf5d70b52e4d7dd6436efd30e1046250d3bbfe Mon Sep 17 00:00:00 2001 From: patak-dev Date: Mon, 13 Dec 2021 22:06:09 +0100 Subject: [PATCH 184/258] release: plugin-react@1.1.3 --- packages/plugin-react/CHANGELOG.md | 9 +++++++++ packages/plugin-react/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md index f0310312556c39..cf0df9a2d33b17 100644 --- a/packages/plugin-react/CHANGELOG.md +++ b/packages/plugin-react/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.1.3](https://github.com/vitejs/vite/compare/plugin-react@1.1.2...plugin-react@1.1.3) (2021-12-13) + + +### Bug Fixes + +* **plugin-react:** only detect preamble in hmr context ([#6096](https://github.com/vitejs/vite/issues/6096)) ([8735294](https://github.com/vitejs/vite/commit/8735294055ce16308a6b8302eba4538f4a2931d0)) + + + ## [1.1.2](https://github.com/vitejs/vite/compare/plugin-react@1.1.1...plugin-react@1.1.2) (2021-12-13) diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index 360add3a0e6695..44e44fdc1ed234 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-react", - "version": "1.1.2", + "version": "1.1.3", "license": "MIT", "author": "Evan You", "contributors": [ From 5ec49befad4d7b5e7cc14f14520ba96d5b6f6d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=87=AF?= <46395105+sufuWang@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:34:20 +0800 Subject: [PATCH 185/258] fix(plugin-vue): error.length is zero (#6106) --- packages/plugin-vue/src/utils/descriptorCache.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin-vue/src/utils/descriptorCache.ts b/packages/plugin-vue/src/utils/descriptorCache.ts index ab6d777388c6d4..990f679d0ac08b 100644 --- a/packages/plugin-vue/src/utils/descriptorCache.ts +++ b/packages/plugin-vue/src/utils/descriptorCache.ts @@ -58,7 +58,7 @@ export function getDescriptor( fs.readFileSync(filename, 'utf-8'), options ) - if (errors) { + if (errors.length) { throw errors[0] } return descriptor From a02403869dc6dd9173bb0d9ea028e3372cfa22cc Mon Sep 17 00:00:00 2001 From: patak-dev Date: Tue, 14 Dec 2021 13:53:08 +0100 Subject: [PATCH 186/258] release: plugin-vue@2.0.1 --- packages/plugin-vue/CHANGELOG.md | 9 +++++++++ packages/plugin-vue/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/plugin-vue/CHANGELOG.md b/packages/plugin-vue/CHANGELOG.md index 1fdb317038839d..ed5f600a645818 100644 --- a/packages/plugin-vue/CHANGELOG.md +++ b/packages/plugin-vue/CHANGELOG.md @@ -1,3 +1,12 @@ +## [2.0.1](https://github.com/vitejs/vite/compare/plugin-vue@2.0.0...plugin-vue@2.0.1) (2021-12-14) + + +### Bug Fixes + +* **plugin-vue:** error.length is zero ([#6106](https://github.com/vitejs/vite/issues/6106)) ([5ec49be](https://github.com/vitejs/vite/commit/5ec49befad4d7b5e7cc14f14520ba96d5b6f6d69)) + + + # [2.0.0](https://github.com/vitejs/vite/compare/plugin-vue@1.10.2...plugin-vue@2.0.0) (2021-12-12) diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index 0a07360c48fb5c..a779030008adef 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -1,6 +1,6 @@ { "name": "@vitejs/plugin-vue", - "version": "2.0.0", + "version": "2.0.1", "license": "MIT", "author": "Evan You", "files": [ From 3ceffcca66311f9a7d71612a596b84888c3f843b Mon Sep 17 00:00:00 2001 From: CHOYSEN Date: Wed, 15 Dec 2021 00:04:45 +0800 Subject: [PATCH 187/258] fix: respect new port when change the config file (#6075) --- packages/vite/src/node/server/hmr.ts | 6 +++++- packages/vite/src/node/server/index.ts | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts index aff8e3d096c44b..4c8f26a4a57a16 100644 --- a/packages/vite/src/node/server/hmr.ts +++ b/packages/vite/src/node/server/hmr.ts @@ -61,7 +61,11 @@ export async function handleHMRUpdate( ), { clear: true, timestamp: true } ) - await server.restart() + try { + await server.restart() + } catch (e) { + config.logger.error(chalk.red(e)) + } return } diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index b17180c81d5e64..f5a2f4ca35e9c2 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -720,7 +720,7 @@ export function resolveServerOptions( async function restartServer(server: ViteDevServer) { // @ts-ignore global.__vite_start_time = performance.now() - const { port } = server.config.server + const { port: prevPort, host: prevHost } = server.config.server await server.close() @@ -740,9 +740,19 @@ async function restartServer(server: ViteDevServer) { server[key] = newServer[key] } } - if (!server.config.server.middlewareMode) { + + const { + logger, + server: { port, host, middlewareMode } + } = server.config + if (!middlewareMode) { await server.listen(port, true) + logger.info('server restarted.', { timestamp: true }) + if (port !== prevPort || host !== prevHost) { + logger.info('\n') + server.printUrls() + } } else { - server.config.logger.info('server restarted.', { timestamp: true }) + logger.info('server restarted.', { timestamp: true }) } } From cab55b32de62e0de7d7789e8c2a1f04a8eae3a3f Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 15 Dec 2021 13:55:50 +0800 Subject: [PATCH 188/258] chore: remove deprecated create-app package --- packages/create-app/README.md | 5 ---- packages/create-app/index.js | 43 -------------------------------- packages/create-app/package.json | 33 ------------------------ 3 files changed, 81 deletions(-) delete mode 100644 packages/create-app/README.md delete mode 100755 packages/create-app/index.js delete mode 100644 packages/create-app/package.json diff --git a/packages/create-app/README.md b/packages/create-app/README.md deleted file mode 100644 index edb1dbc6f7ab5b..00000000000000 --- a/packages/create-app/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# @vitejs/create-app - -## DEPRECATED - -Use `npm init vite` instead diff --git a/packages/create-app/index.js b/packages/create-app/index.js deleted file mode 100755 index 602fcdba3d5ab9..00000000000000 --- a/packages/create-app/index.js +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env node -/* eslint-disable node/shebang */ - -const { yellow, green } = require('kolorist') - -const alternativeCommands = { - yarn: 'yarn create vite', - pnpm: 'pnpm create vite', - npm: 'npm init vite', - unknown: 'npm init vite' -} - -function getPackageManager() { - if (!process.env.npm_execpath) { - return 'unknown' - } - - if (process.env.npm_execpath.indexOf('yarn') !== -1) { - return 'yarn' - } - if (process.env.npm_execpath.indexOf('pnpm') !== -1) { - return 'pnpm' - } - if (process.env.npm_execpath.indexOf('npm') !== -1) { - return 'npm' - } - - return 'unknown' -} - -const packageManager = getPackageManager() - -const alternativeCommand = alternativeCommands[packageManager] - -console.warn( - yellow( - `\n@vitejs/create-app is deprecated, use ${green( - alternativeCommand - )} instead\n` - ) -) - -require('create-vite') diff --git a/packages/create-app/package.json b/packages/create-app/package.json deleted file mode 100644 index bd66205c22dcc3..00000000000000 --- a/packages/create-app/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@vitejs/create-app", - "version": "2.5.2", - "license": "MIT", - "author": "Evan You", - "files": [ - "index.js" - ], - "bin": { - "create-app": "index.js", - "cva": "index.js" - }, - "main": "index.js", - "scripts": { - "release": "node ../../scripts/release.cjs --skipBuild" - }, - "engines": { - "node": ">=12.0.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/vitejs/vite.git", - "directory": "packages/create-app" - }, - "bugs": { - "url": "https://github.com/vitejs/vite/issues" - }, - "homepage": "https://github.com/vitejs/vite/tree/main/packages/create-app#readme", - "dependencies": { - "create-vite": "latest", - "kolorist": "^1.5.0" - } -} From 611fa037a72a1179c27794353ffad6ed27e10d1a Mon Sep 17 00:00:00 2001 From: Sam Richard Date: Wed, 15 Dec 2021 06:04:16 -0500 Subject: [PATCH 189/258] fix: Improve post-build asset update check (#6113) --- packages/playground/html/emptyAttr.html | 12 +++++++ packages/playground/html/link.html | 12 +++++++ packages/playground/html/vite.config.js | 3 ++ packages/vite/src/node/plugins/html.ts | 47 +++++++++++++++---------- 4 files changed, 55 insertions(+), 19 deletions(-) create mode 100644 packages/playground/html/emptyAttr.html create mode 100644 packages/playground/html/link.html diff --git a/packages/playground/html/emptyAttr.html b/packages/playground/html/emptyAttr.html new file mode 100644 index 00000000000000..30c647017690dd --- /dev/null +++ b/packages/playground/html/emptyAttr.html @@ -0,0 +1,12 @@ + + + + + + + Empty Attr + + + + + diff --git a/packages/playground/html/link.html b/packages/playground/html/link.html new file mode 100644 index 00000000000000..1ec95eedeab182 --- /dev/null +++ b/packages/playground/html/link.html @@ -0,0 +1,12 @@ + + + + + + + Link to rollup config + + + A Link to a Rollup Import + + diff --git a/packages/playground/html/vite.config.js b/packages/playground/html/vite.config.js index 09fb2fd337e7ee..1703e02cc05366 100644 --- a/packages/playground/html/vite.config.js +++ b/packages/playground/html/vite.config.js @@ -11,6 +11,9 @@ module.exports = { nested: resolve(__dirname, 'nested/index.html'), scriptAsync: resolve(__dirname, 'scriptAsync.html'), scriptMixed: resolve(__dirname, 'scriptMixed.html'), + emptyAttr: resolve(__dirname, 'emptyAttr.html'), + link: resolve(__dirname, 'link.html'), + 'link/target': resolve(__dirname, 'index.html'), zeroJS: resolve(__dirname, 'zeroJS.html'), noHead: resolve(__dirname, 'noHead.html'), noBody: resolve(__dirname, 'noBody.html'), diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts index 119ec49d5afdc0..1ddc494fdb64c0 100644 --- a/packages/vite/src/node/plugins/html.ts +++ b/packages/vite/src/node/plugins/html.ts @@ -299,27 +299,36 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin { } // for each encountered asset url, rewrite original html so that it - // references the post-build location. + // references the post-build location, ignoring empty attributes and + // attributes that directly reference named output. + const namedOutput = Object.keys( + config?.build?.rollupOptions?.input || {} + ) for (const attr of assetUrls) { const value = attr.value! - try { - const url = - attr.name === 'srcset' - ? await processSrcSet(value.content, ({ url }) => - urlToBuiltUrl(url, id, config, this) - ) - : await urlToBuiltUrl(value.content, id, config, this) - - s.overwrite( - value.loc.start.offset, - value.loc.end.offset, - `"${url}"` - ) - } catch (e) { - // #1885 preload may be pointing to urls that do not exist - // locally on disk - if (e.code !== 'ENOENT') { - throw e + const content = value.content + if ( + content !== '' && // Empty attribute + !namedOutput.includes(content) && // Direct reference to named output + !namedOutput.includes(content.replace(/^\//, '')) // Allow for absolute references as named output can't be an absolute path + ) { + try { + const url = + attr.name === 'srcset' + ? await processSrcSet(content, ({ url }) => + urlToBuiltUrl(url, id, config, this) + ) + : await urlToBuiltUrl(content, id, config, this) + + s.overwrite( + value.loc.start.offset, + value.loc.end.offset, + `"${url}"` + ) + } catch (e) { + if (e.code !== 'ENOENT') { + throw e + } } } } From dd79858ab70d2591e1239ddb19e1ce38d9913b4c Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Wed, 15 Dec 2021 05:10:00 -0600 Subject: [PATCH 190/258] refactor: simplify filter callback (#6119) --- packages/vite/src/node/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 8761edf65c66b3..a0be3015059871 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -357,7 +357,7 @@ export function resolveBuildPlugins(config: ResolvedConfig): { dynamicImportVars(options.dynamicImportVarsOptions), assetImportMetaUrlPlugin(config), ...(options.rollupOptions.plugins - ? (options.rollupOptions.plugins.filter((p) => !!p) as Plugin[]) + ? (options.rollupOptions.plugins.filter(Boolean) as Plugin[]) : []) ], post: [ From 717cb08f8611fd1a15cfd614d346185ffe8a61fd Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 15 Dec 2021 11:55:54 -0800 Subject: [PATCH 191/258] fix: improve warning message for malformed packages (#6086) --- packages/vite/src/node/ssr/ssrExternal.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/ssr/ssrExternal.ts b/packages/vite/src/node/ssr/ssrExternal.ts index 07cfaa9c238bcf..b6d98aad5f1565 100644 --- a/packages/vite/src/node/ssr/ssrExternal.ts +++ b/packages/vite/src/node/ssr/ssrExternal.ts @@ -166,7 +166,7 @@ function collectExternals( } logger.warn( - `${id} is incorrectly packaged. Please contact the package author to fix.` + `${id} doesn't appear to be written in CJS, but also doesn't appear to be a valid ES module (i.e. it doesn't have "type": "module" or an .mjs extension for the entry point). Please contact the package author to fix.` ) } } From b9871bbed57c5964b3393e798b0ef2526471d692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Wouts?= Date: Thu, 16 Dec 2021 16:52:39 +1100 Subject: [PATCH 192/258] fix: terminate WebSocket connections before closing WebSocket server (#6115) --- packages/vite/src/node/server/ws.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/vite/src/node/server/ws.ts b/packages/vite/src/node/server/ws.ts index 8e0bbe7058bcb8..598216df700296 100644 --- a/packages/vite/src/node/server/ws.ts +++ b/packages/vite/src/node/server/ws.ts @@ -114,6 +114,9 @@ export function createWebSocketServer( close() { return new Promise((resolve, reject) => { + wss.clients.forEach((client) => { + client.terminate() + }) wss.close((err) => { if (err) { reject(err) From 0be532acd474d9ccfc0593fd0f956e04a1c029ea Mon Sep 17 00:00:00 2001 From: ygj6 <7699524+ygj6@users.noreply.github.com> Date: Thu, 16 Dec 2021 20:23:12 +0800 Subject: [PATCH 193/258] test: correct the confusing test case (#6139) --- packages/playground/worker/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/playground/worker/index.html b/packages/playground/worker/index.html index 1ce429eece42cc..20888835122fac 100644 --- a/packages/playground/worker/index.html +++ b/packages/playground/worker/index.html @@ -59,12 +59,12 @@ sharedWorker.port.start() const tsOutputWorker = new TSOutputWorker() - worker.addEventListener('message', (e) => { + tsOutputWorker.addEventListener('message', (e) => { text('.pong-ts-output', e.data.msg) }) document.querySelector('.ping-ts-output').addEventListener('click', () => { - inlineWorker.postMessage('ping') + tsOutputWorker.postMessage('ping') }) function text(el, text) { From e002f4f4a578ae63156e756abac0487f42b4cdcd Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 16 Dec 2021 20:25:55 +0800 Subject: [PATCH 194/258] fix: pending reload never timeout (#6120) --- .../src/node/server/middlewares/transform.ts | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/packages/vite/src/node/server/middlewares/transform.ts b/packages/vite/src/node/server/middlewares/transform.ts index a68308f391e363..df7f21223a19b9 100644 --- a/packages/vite/src/node/server/middlewares/transform.ts +++ b/packages/vite/src/node/server/middlewares/transform.ts @@ -74,23 +74,29 @@ export function transformMiddleware( !req.url?.startsWith(CLIENT_PUBLIC_PATH) && !req.url?.includes('vite/dist/client') ) { - // missing dep pending reload, hold request until reload happens - server._pendingReload.then(() => - // If the refresh has not happened after timeout, Vite considers - // something unexpected has happened. In this case, Vite - // returns an empty response that will error. - setTimeout(() => { - // Don't do anything if response has already been sent - if (res.writableEnded) return + try { + // missing dep pending reload, hold request until reload happens + await Promise.race([ + server._pendingReload, + // If the refresh has not happened after timeout, Vite considers + // something unexpected has happened. In this case, Vite + // returns an empty response that will error. + new Promise((_, reject) => + setTimeout(reject, NEW_DEPENDENCY_BUILD_TIMEOUT) + ) + ]) + } catch { + // Don't do anything if response has already been sent + if (!res.writableEnded) { // status code request timeout res.statusCode = 408 res.end( `

[vite] Something unexpected happened while optimizing "${req.url}"

` + `

The current page should have reloaded by now

` ) - }, NEW_DEPENDENCY_BUILD_TIMEOUT) - ) - return + } + return + } } let url = decodeURI(removeTimestampQuery(req.url!)).replace( From a08b4c574b32294d925357962d201e314e0f1062 Mon Sep 17 00:00:00 2001 From: patak-dev Date: Thu, 16 Dec 2021 13:44:21 +0100 Subject: [PATCH 195/258] release: v2.7.3 --- packages/vite/CHANGELOG.md | 15 +++++++++++++++ packages/vite/package.json | 2 +- pnpm-lock.yaml | 8 -------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md index d59ef2107df298..9c7e56dee8f847 100644 --- a/packages/vite/CHANGELOG.md +++ b/packages/vite/CHANGELOG.md @@ -1,3 +1,18 @@ +## [2.7.3](https://github.com/vitejs/vite/compare/v2.7.2...v2.7.3) (2021-12-16) + + +### Bug Fixes + +* do not overwrite rollupOptions.input in dev ([#6025](https://github.com/vitejs/vite/issues/6025)) ([6cdf13a](https://github.com/vitejs/vite/commit/6cdf13ae808a99b7aca6d278bee2ebe6e51d0846)) +* Improve post-build asset update check ([#6113](https://github.com/vitejs/vite/issues/6113)) ([611fa03](https://github.com/vitejs/vite/commit/611fa037a72a1179c27794353ffad6ed27e10d1a)) +* improve warning message for malformed packages ([#6086](https://github.com/vitejs/vite/issues/6086)) ([717cb08](https://github.com/vitejs/vite/commit/717cb08f8611fd1a15cfd614d346185ffe8a61fd)) +* pending reload never timeout ([#6120](https://github.com/vitejs/vite/issues/6120)) ([e002f4f](https://github.com/vitejs/vite/commit/e002f4f4a578ae63156e756abac0487f42b4cdcd)) +* respect new port when change the config file ([#6075](https://github.com/vitejs/vite/issues/6075)) ([3ceffcc](https://github.com/vitejs/vite/commit/3ceffcca66311f9a7d71612a596b84888c3f843b)) +* **ssr:** robust regexp to check cjs content ([#6053](https://github.com/vitejs/vite/issues/6053)) ([0373441](https://github.com/vitejs/vite/commit/03734417cde10807ab2dd0d71b08c26081aac0b7)) +* terminate WebSocket connections before closing WebSocket server ([#6115](https://github.com/vitejs/vite/issues/6115)) ([b9871bb](https://github.com/vitejs/vite/commit/b9871bbed57c5964b3393e798b0ef2526471d692)) + + + ## [2.7.2](https://github.com/vitejs/vite/compare/v2.7.1...v2.7.2) (2021-12-13) diff --git a/packages/vite/package.json b/packages/vite/package.json index 0636dbd0bb8192..ed947b04f3a576 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "vite", - "version": "2.7.2", + "version": "2.7.3", "license": "MIT", "author": "Evan You", "description": "Native-ESM powered web dev build tool", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6c16ab43a73020..fb2e71bfdf4b9b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -78,14 +78,6 @@ importers: vitepress: 0.20.1 yorkie: 2.0.0 - packages/create-app: - specifiers: - create-vite: latest - kolorist: ^1.5.0 - dependencies: - create-vite: link:../create-vite - kolorist: 1.5.0 - packages/create-vite: specifiers: kolorist: ^1.5.0 From 5f39c28908ad5441def57cfb2afe341a96c676cb Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 16 Dec 2021 18:52:18 +0000 Subject: [PATCH 196/258] refactor: rename `mergeConfig` parameters (#6144) --- packages/vite/src/node/config.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 59c5d90ce108d2..f7f1c3128e0663 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -666,13 +666,13 @@ function resolveBaseUrl( } function mergeConfigRecursively( - a: Record, - b: Record, + defaults: Record, + overrides: Record, rootPath: string ) { - const merged: Record = { ...a } - for (const key in b) { - const value = b[key] + const merged: Record = { ...defaults } + for (const key in overrides) { + const value = overrides[key] if (value == null) { continue } @@ -710,11 +710,11 @@ function mergeConfigRecursively( } export function mergeConfig( - a: Record, - b: Record, + defaults: Record, + overrides: Record, isRoot = true ): Record { - return mergeConfigRecursively(a, b, isRoot ? '' : '.') + return mergeConfigRecursively(defaults, overrides, isRoot ? '' : '.') } function mergeAlias(a: AliasOptions = [], b: AliasOptions = []): Alias[] { From ce65c567a64fad3be4209cbd1132e62e905fe349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20Ayg=C3=BCn?= Date: Thu, 16 Dec 2021 22:20:39 +0300 Subject: [PATCH 197/258] fix(plugin-react): restore-jsx bug when component name is lowercase (#6110) --- .../plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts | 6 ++++++ packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts index 60e330e4003b03..59d6661bedd11b 100644 --- a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts +++ b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts @@ -108,4 +108,10 @@ describe('babel-restore-jsx', () => { ) ).toMatchInlineSnapshot(`"

{foo ?

: null}

;"`) }) + + it('should handle lowercase component names', () => { + expect(jsx('React.createElement(aaa)')).toMatchInlineSnapshot( + `"React.createElement(aaa);"` + ) + }) }) diff --git a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts index 0ac0a1f831c79a..da08f5327a4eae 100644 --- a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts +++ b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts @@ -76,7 +76,7 @@ export default function ({ types: t }: typeof babel): babel.PluginObj { return null } - const name = getJSXIdentifier(node) + const name = getJSXIdentifier(node, true) if (name != null) { return name } @@ -152,9 +152,9 @@ export default function ({ types: t }: typeof babel): babel.PluginObj { return children } - function getJSXIdentifier(node: any) { + function getJSXIdentifier(node: any, tag = false) { //TODO: JSXNamespacedName - if (t.isIdentifier(node)) { + if (t.isIdentifier(node) && (!tag || node.name.match(/^[A-Z]/))) { return t.jsxIdentifier(node.name) } if (t.isStringLiteral(node)) { From 9c8fb04f936c80971138da81c5757c353cb7396e Mon Sep 17 00:00:00 2001 From: Jeff Yang <32727188+ydcjeff@users.noreply.github.com> Date: Fri, 17 Dec 2021 04:45:30 +0630 Subject: [PATCH 198/258] chore: remove node addon dir (#6107) --- .../ssr-deps/node-addon/build/Makefile | 324 ---------------- .../Release/.deps/Release/cpp_addon.node.d | 1 - .../.deps/Release/obj.target/cpp_addon.node.d | 1 - .../Release/obj.target/cpp_addon/main.o.d | 23 -- .../node-addon/build/Release/cpp_addon.node | Bin 13288 -> 0 bytes .../build/Release/obj.target/cpp_addon.node | Bin 13288 -> 0 bytes .../build/Release/obj.target/cpp_addon/main.o | Bin 4368 -> 0 bytes .../node-addon/build/binding.Makefile | 6 - .../ssr-deps/node-addon/build/config.gypi | 351 ------------------ .../node-addon/build/cpp_addon.target.mk | 159 -------- 10 files changed, 865 deletions(-) delete mode 100644 packages/playground/ssr-deps/node-addon/build/Makefile delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d delete mode 100755 packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node delete mode 100755 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node delete mode 100644 packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o delete mode 100644 packages/playground/ssr-deps/node-addon/build/binding.Makefile delete mode 100644 packages/playground/ssr-deps/node-addon/build/config.gypi delete mode 100644 packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk diff --git a/packages/playground/ssr-deps/node-addon/build/Makefile b/packages/playground/ssr-deps/node-addon/build/Makefile deleted file mode 100644 index 83ce3f09d28c03..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Makefile +++ /dev/null @@ -1,324 +0,0 @@ -# We borrow heavily from the kernel build setup, though we are simpler since -# we don't have Kconfig tweaking settings on us. - -# The implicit make rules have it looking for RCS files, among other things. -# We instead explicitly write all the rules we care about. -# It's even quicker (saves ~200ms) to pass -r on the command line. -MAKEFLAGS=-r - -# The source directory tree. -srcdir := .. -abs_srcdir := $(abspath $(srcdir)) - -# The name of the builddir. -builddir_name ?= . - -# The V=1 flag on command line makes us verbosely print command lines. -ifdef V - quiet= -else - quiet=quiet_ -endif - -# Specify BUILDTYPE=Release on the command line for a release build. -BUILDTYPE ?= Release - -# Directory all our build output goes into. -# Note that this must be two directories beneath src/ for unit tests to pass, -# as they reach into the src/ directory for data with relative paths. -builddir ?= $(builddir_name)/$(BUILDTYPE) -abs_builddir := $(abspath $(builddir)) -depsdir := $(builddir)/.deps - -# Object output directory. -obj := $(builddir)/obj -abs_obj := $(abspath $(obj)) - -# We build up a list of every single one of the targets so we can slurp in the -# generated dependency rule Makefiles in one pass. -all_deps := - - - -CC.target ?= $(CC) -CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS) -CXX.target ?= $(CXX) -CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS) -LINK.target ?= $(LINK) -LDFLAGS.target ?= $(LDFLAGS) -AR.target ?= $(AR) - -# C++ apps need to be linked with g++. -LINK ?= $(CXX.target) - -# TODO(evan): move all cross-compilation logic to gyp-time so we don't need -# to replicate this environment fallback in make as well. -CC.host ?= gcc -CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host) -CXX.host ?= g++ -CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host) -LINK.host ?= $(CXX.host) -LDFLAGS.host ?= $(LDFLAGS_host) -AR.host ?= ar - -# Define a dir function that can handle spaces. -# http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions -# "leading spaces cannot appear in the text of the first argument as written. -# These characters can be put into the argument value by variable substitution." -empty := -space := $(empty) $(empty) - -# http://stackoverflow.com/questions/1189781/using-make-dir-or-notdir-on-a-path-with-spaces -replace_spaces = $(subst $(space),?,$1) -unreplace_spaces = $(subst ?,$(space),$1) -dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1))) - -# Flags to make gcc output dependency info. Note that you need to be -# careful here to use the flags that ccache and distcc can understand. -# We write to a dep file on the side first and then rename at the end -# so we can't end up with a broken dep file. -depfile = $(depsdir)/$(call replace_spaces,$@).d -DEPFLAGS = -MMD -MF $(depfile).raw - -# We have to fixup the deps output in a few ways. -# (1) the file output should mention the proper .o file. -# ccache or distcc lose the path to the target, so we convert a rule of -# the form: -# foobar.o: DEP1 DEP2 -# into -# path/to/foobar.o: DEP1 DEP2 -# (2) we want missing files not to cause us to fail to build. -# We want to rewrite -# foobar.o: DEP1 DEP2 \ -# DEP3 -# to -# DEP1: -# DEP2: -# DEP3: -# so if the files are missing, they're just considered phony rules. -# We have to do some pretty insane escaping to get those backslashes -# and dollar signs past make, the shell, and sed at the same time. -# Doesn't work with spaces, but that's fine: .d files have spaces in -# their names replaced with other characters. -define fixup_dep -# The depfile may not exist if the input file didn't have any #includes. -touch $(depfile).raw -# Fixup path as in (1). -sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) -# Add extra rules as in (2). -# We remove slashes and replace spaces with new lines; -# remove blank lines; -# delete the first line and append a colon to the remaining lines. -sed -e 's|\\||' -e 'y| |\n|' $(depfile).raw |\ - grep -v '^$$' |\ - sed -e 1d -e 's|$$|:|' \ - >> $(depfile) -rm $(depfile).raw -endef - -# Command definitions: -# - cmd_foo is the actual command to run; -# - quiet_cmd_foo is the brief-output summary of the command. - -quiet_cmd_cc = CC($(TOOLSET)) $@ -cmd_cc = $(CC.$(TOOLSET)) -o $@ $< $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c - -quiet_cmd_cxx = CXX($(TOOLSET)) $@ -cmd_cxx = $(CXX.$(TOOLSET)) -o $@ $< $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c - -quiet_cmd_touch = TOUCH $@ -cmd_touch = touch $@ - -quiet_cmd_copy = COPY $@ -# send stderr to /dev/null to ignore messages when linking directories. -cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") - -quiet_cmd_alink = AR($(TOOLSET)) $@ -cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^) - -quiet_cmd_alink_thin = AR($(TOOLSET)) $@ -cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) - -# Due to circular dependencies between libraries :(, we wrap the -# special "figure out circular dependencies" flags around the entire -# input list during linking. -quiet_cmd_link = LINK($(TOOLSET)) $@ -cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group - -# We support two kinds of shared objects (.so): -# 1) shared_library, which is just bundling together many dependent libraries -# into a link line. -# 2) loadable_module, which is generating a module intended for dlopen(). -# -# They differ only slightly: -# In the former case, we want to package all dependent code into the .so. -# In the latter case, we want to package just the API exposed by the -# outermost module. -# This means shared_library uses --whole-archive, while loadable_module doesn't. -# (Note that --whole-archive is incompatible with the --start-group used in -# normal linking.) - -# Other shared-object link notes: -# - Set SONAME to the library filename so our binaries don't reference -# the local, absolute paths used on the link command-line. -quiet_cmd_solink = SOLINK($(TOOLSET)) $@ -cmd_solink = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) - -quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ -cmd_solink_module = $(LINK.$(TOOLSET)) -o $@ -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS) - - -# Define an escape_quotes function to escape single quotes. -# This allows us to handle quotes properly as long as we always use -# use single quotes and escape_quotes. -escape_quotes = $(subst ','\'',$(1)) -# This comment is here just to include a ' to unconfuse syntax highlighting. -# Define an escape_vars function to escape '$' variable syntax. -# This allows us to read/write command lines with shell variables (e.g. -# $LD_LIBRARY_PATH), without triggering make substitution. -escape_vars = $(subst $$,$$$$,$(1)) -# Helper that expands to a shell command to echo a string exactly as it is in -# make. This uses printf instead of echo because printf's behaviour with respect -# to escape sequences is more portable than echo's across different shells -# (e.g., dash, bash). -exact_echo = printf '%s\n' '$(call escape_quotes,$(1))' - -# Helper to compare the command we're about to run against the command -# we logged the last time we ran the command. Produces an empty -# string (false) when the commands match. -# Tricky point: Make has no string-equality test function. -# The kernel uses the following, but it seems like it would have false -# positives, where one string reordered its arguments. -# arg_check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ -# $(filter-out $(cmd_$@), $(cmd_$(1)))) -# We instead substitute each for the empty string into the other, and -# say they're equal if both substitutions produce the empty string. -# .d files contain ? instead of spaces, take that into account. -command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\ - $(subst $(cmd_$(call replace_spaces,$@)),,$(cmd_$(1)))) - -# Helper that is non-empty when a prerequisite changes. -# Normally make does this implicitly, but we force rules to always run -# so we can check their command lines. -# $? -- new prerequisites -# $| -- order-only dependencies -prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?)) - -# Helper that executes all postbuilds until one fails. -define do_postbuilds - @E=0;\ - for p in $(POSTBUILDS); do\ - eval $$p;\ - E=$$?;\ - if [ $$E -ne 0 ]; then\ - break;\ - fi;\ - done;\ - if [ $$E -ne 0 ]; then\ - rm -rf "$@";\ - exit $$E;\ - fi -endef - -# do_cmd: run a command via the above cmd_foo names, if necessary. -# Should always run for a given target to handle command-line changes. -# Second argument, if non-zero, makes it do asm/C/C++ dependency munging. -# Third argument, if non-zero, makes it do POSTBUILDS processing. -# Note: We intentionally do NOT call dirx for depfile, since it contains ? for -# spaces already and dirx strips the ? characters. -define do_cmd -$(if $(or $(command_changed),$(prereq_changed)), - @$(call exact_echo, $($(quiet)cmd_$(1))) - @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))" - $(if $(findstring flock,$(word 1,$(cmd_$1))), - @$(cmd_$(1)) - @echo " $(quiet_cmd_$(1)): Finished", - @$(cmd_$(1)) - ) - @$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile) - @$(if $(2),$(fixup_dep)) - $(if $(and $(3), $(POSTBUILDS)), - $(call do_postbuilds) - ) -) -endef - -# Declare the "all" target first so it is the default, -# even though we don't have the deps yet. -.PHONY: all -all: - -# make looks for ways to re-generate included makefiles, but in our case, we -# don't have a direct way. Explicitly telling make that it has nothing to do -# for them makes it go faster. -%.d: ; - -# Use FORCE_DO_CMD to force a target to run. Should be coupled with -# do_cmd. -.PHONY: FORCE_DO_CMD -FORCE_DO_CMD: - -TOOLSET := target -# Suffix rules, putting all outputs into $(obj). -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.c FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD - @$(call do_cmd,cc,1) - -# Try building from generated source, too. -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD - @$(call do_cmd,cc,1) - -$(obj).$(TOOLSET)/%.o: $(obj)/%.c FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.cc FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD - @$(call do_cmd,cxx,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD - @$(call do_cmd,cc,1) -$(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD - @$(call do_cmd,cc,1) - - -ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ - $(findstring $(join ^,$(prefix)),\ - $(join ^,cpp_addon.target.mk)))),) - include cpp_addon.target.mk -endif - -quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/matias/.cache/node-gyp/16.9.1" "-Dnode_gyp_dir=/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp" "-Dnode_lib_file=/home/matias/.cache/node-gyp/16.9.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/matias/vite/packages/playground/ssr-deps/node-addon" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/matias/vite/packages/playground/ssr-deps/node-addon/build/config.gypi -I/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi -I/home/matias/.cache/node-gyp/16.9.1/include/node/common.gypi "--toplevel-dir=." binding.gyp -Makefile: $(srcdir)/../../../../../.cache/node-gyp/16.9.1/include/node/common.gypi $(srcdir)/../../../../../../../usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi - $(call do_cmd,regen_makefile) - -# "all" is a concatenation of the "all" targets from all the included -# sub-makefiles. This is just here to clarify. -all: - -# Add in dependency-tracking rules. $(all_deps) is the list of every single -# target in our tree. Only consider the ones with .d (dependency) info: -d_files := $(wildcard $(foreach f,$(all_deps),$(depsdir)/$(f).d)) -ifneq ($(d_files),) - include $(d_files) -endif diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d deleted file mode 100644 index 4be797e6cbdf6e..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/cpp_addon.node.d +++ /dev/null @@ -1 +0,0 @@ -cmd_Release/cpp_addon.node := ln -f "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node" 2>/dev/null || (rm -rf "Release/cpp_addon.node" && cp -af "Release/obj.target/cpp_addon.node" "Release/cpp_addon.node") diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d deleted file mode 100644 index 9f4d87550d1f0a..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon.node.d +++ /dev/null @@ -1 +0,0 @@ -cmd_Release/obj.target/cpp_addon.node := g++ -o Release/obj.target/cpp_addon.node -shared -pthread -rdynamic -m64 -Wl,-soname=cpp_addon.node -Wl,--start-group Release/obj.target/cpp_addon/main.o -Wl,--end-group diff --git a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d b/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d deleted file mode 100644 index 2955b089117c85..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/Release/.deps/Release/obj.target/cpp_addon/main.o.d +++ /dev/null @@ -1,23 +0,0 @@ -cmd_Release/obj.target/cpp_addon/main.o := g++ -o Release/obj.target/cpp_addon/main.o ../main.cpp '-DNODE_GYP_MODULE_NAME=cpp_addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DBUILDING_NODE_EXTENSION' -I/home/matias/.cache/node-gyp/16.9.1/include/node -I/home/matias/.cache/node-gyp/16.9.1/src -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++14 -MMD -MF ./Release/.deps/Release/obj.target/cpp_addon/main.o.d.raw -c -Release/obj.target/cpp_addon/main.o: ../main.cpp \ - /home/matias/.cache/node-gyp/16.9.1/include/node/node.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h \ - /home/matias/.cache/node-gyp/16.9.1/include/node/v8.h -../main.cpp: -/home/matias/.cache/node-gyp/16.9.1/include/node/node.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/cppgc/common.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8-internal.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8-version.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8config.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8-platform.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/node_version.h: -/home/matias/.cache/node-gyp/16.9.1/include/node/v8.h: diff --git a/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/cpp_addon.node deleted file mode 100755 index 67c3f500cb518bfb96782ef1aeab0acc72d09ef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon.node deleted file mode 100755 index 67c3f500cb518bfb96782ef1aeab0acc72d09ef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13288 zcmeHOeQX@X6`%7tiAn6(I3Y0!kOhSjC@en5Un!*c?3}X>7suqBkN{z`zFXTz?rx8} zy!*EDS5Iew5p2KN>Pg{Xe(hFl)Chfy0n#2+Jb?i-W4QFQPT7)?t8QI z_V)JfT0m;0N;lE@&HK%JZ{EC}o!yyzc_RkV9%!^6qKru#z&@74Z}D=@0+o2hrZpCRUQp6Q7WL|`u-facka&gY zyci16I!lbz0>$5)Xm``iLXIfPVi|hNj9@*vnzJRe-GUiW(z^}x(9aKAnuOq9(O;#w zG>Lc+6~p0UTMIV4@Y^}KkG=B1HDk4V)=zzP=VNDk*M0lz=B_6)*afyX!;j+s=&a;n zwY}4bT>`%r`1J;U{m%J!Q{VmJn_qlj@ztR>&fI(8vgc;rTmAMg-xW~+Ay>H!c*%t! z+X@}g*qqI;!8pp{YbwaE1IN)vcbTXl|6~RGAkHMW5#Wa_*hyBf^JUN}=l@?S$p5B- z{53GHa&~+b>~w=234ZRf7l5nWAn^U%{yMfGNky&i1J}&zS!;s@*TeX+9OUxrSvALB(P>^*TZ(ujOXOgOp#f^lTHno(gs!WY0q9#*E zfiQJoc()qSQ~FpmZR)Av-F-15p$}^#G2Ln_-=c;mG&G>aqW6Q~9llmYkHw7JjZ`eM z_twF-qup(-{h37Aj2ekPEfyQm!bb)YqsG8sNbT6K#WH#z5CA=t>>nN&(om|Pk4d_F}>L}Gds6zlwv~7K)A~ zG&7UJ$VLJ1Z39ozW-1dlja08bt{sgUDb)70hoTWZFggmc;DH>%uDA7(n{-`#C64=i zFicwvlnSx!qG8*YwVMRHLb^Gq#dU}0pen9<;bMrZvlXO^B^{;*Lq0xOdkTd*U^??z zP;|L=`0UGwv!e^A)viq197qou<~U3?Y{vT`d_)b8A5llOXpAL{h_1$sNG7JMH0xO` zIue%ChTO?iJ))T!sEwr4)~y6kBErJSq^d#$LA%LMF;L&&(AyX zi%A&hv%(+jbBzOU5%>zgoL50|;3AYPnTvu+3Od_U=N;Mg}6#eu_x zwabtLcP{Y<9JqLe17R{AwP~f`GqAYS8qVxgZw<_n~}%R=Vv*;5_t@H z{v_vXkjGHxpXB`C)&h?q&Y$4?pOMGV=BGISC*(1t`6TDxKpv-5{xIiXK^{Y!AL9JW z$YV(JJ)D0Dc?@N~mGeJF9z&RyINt{R=n3F?*{95Gp94h6zI7=7JP3@+jhl}1rp8S> z7=z|KG=tc(*HLWSd5|{y{pPt@h^ zzW^{ykxP{6CS@A@9%{j;z}YnBWj*$+@5_Z>9&@GNv=f@iM=vwzHe zmK%6o$-WZIo(pD|at8r8K5GWRom>OTPY32A%2vzWOouX~pSjb2m;aFeZog{BHcz~ltb!$5OLVca;OXMsKo6w6wRFwgyanP;NOv$1|f-3bW6X25ap z(E_#>P-b;g|LT@qjjQgfn_{cezl^B{*e9~IQU3x0FZH-D$~uWovz z=C+3A{$t+pmC#9G)qeQPt_PXps02RocV#Zu*RWjqy!Wx%nPs0_9z3?9W)3wJyjjtw zXW)lpnz}0@VmqBT$V%H3HQLR3lK0Ks5r@2vj5R-;DsBx6=74 zou}ey0v0^W#X@IpcMG1*?C5(Aoz>BIoJ%b=`+Rq!;OQ)MgW%~r7x%|lXfJ&B!jggf zqHu)HEFY~!)cWR&v{f96(wXBi;UAqfwxAFc0W&5^oTszYZegF!6X>jSJ(ptaggE3R zJSiL`KP910XQ9*|91C#&dxRjIJ#k)$vqizzi}t??-gyQqT=<_7`fl#-^qdIrauL{d zf__ZUPC@$x-7n~NzpQH(EVG_Q*B6^!O*Fjah)76$isKwvUr*A zy4?P17N7;iVaUrG?R*Lc4ECGYx5~<2Y_BiH^39Cam12AiS$oQ+=0 zfG9H`y=)yTH&4B6eaUxqwCCkn6i&<5x20P4-cm8jAoBQ~rw~v2Msx+>9_aT;;ZKiH zybfqNI~{aHUf5Z1UH4iTxTnl~*Z{c1 zZ599N1e~6A&XzkW;3$KCeTC!B9VPvpGd1(W`czc$luUSJtB8?ZtE^D#ItHtEtS$HAv?fKO|sDx z>6+|)*ZnkkEp zQ!Qbbx;&Q1$Rn9(EOJ9M!Z zGEeH0p(>9Vz+w&>lli?TrwpFDBi>NhSe|*D_oiN`NKlEpT#{PJPvuGeE`wT0w)5?e^HTvI|q9{(x?3b(H>eGJ9rcPm~(>n;!2VMHKFC$9hB{Rem z{ftYW_HRUE6j)(^`XzfaE`2)pAxh^VB<~*omxMme6WR|Fy_OUOrTItn387DJy7Ted zUHb0+pLXff{*vggT>2C@g1-k9+>+A#qC7^*(|5;<^oc$Xy12C=eS05;8$Bo_XK@9d z@Si~g&OOqneJ%YzhE69|^ z*?&oo=eAeEsI#UkE$*;b81S4EbA`wsT7U5VAm1$w>u>TJi#|*jPBdbF&VuIx<@C>f O+>(0FDGYVD{=Wc8x$V*b diff --git a/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o b/packages/playground/ssr-deps/node-addon/build/Release/obj.target/cpp_addon/main.o deleted file mode 100644 index 088f7174574579a7049a29fc9c0372a4205fa7b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4368 zcmbtWU2GIp6u#|3sr*(Dh#E|YFUCZYdd{7DwztDWwQ)Ai94$qx=8p zbAPnzwKaNeru8?R)h{e~TlHF-UW@7e$TofMTI;EatDD;6ESLtkHqs_dO>JsFkA~pi zznwUq7*C8PM$_}9%bAqF1l~JydTrINPIT>Si|PV*llJfG{#D(-9ys-X7S8zs&ocE} zXg4%HaqX`vOc~J9)yhMPk6=nSF@{M1e3Ktn8<>|0{>m{x7=! zJ-A8xOB^`A;Aya&fM3%Vb9zs(+-jdbZ{0kVcqK8Bcr{^Q5#9#Jf#*B5OWfklr}g}U z@fU$3t5|e8jyrBK_Y}+HfGNt}l3B2oY`M&!8D=i$*yxW0_U8cVP{xVh36%N?Nq-=9 zD4BerqjPMsYJ1g=ex*<8+S60zBlS&nKbdTg8wk~oPP-XqPNC^u2-=?m!cT4$R~uc82q9n2A-lM##Tqc;HBk0d@Uf& z63%l0>`7=%3}*w0lLCE=MQ0e3_!1rX8{}bKkFkw)os{Rea{v1G3OveFj7gV>aMTO^ zW~rWh?*S`9YZDx~d#3^Zbp!kdz|sF{=u!BYf&Lz}DF54G8c4REsozN0zX&xr=O z-vD21fZu9>FEzm1;AlqW#p>6G;aX=370+^w<%`5PneI1APOe(Cn37I*;h)NklWLca z*AKsnjvXHEo*wA#8m!t`ui)58vsj!ov*%Lwl#?3H7=7brv1)0W#*Cr#k%Nh}ab$2X zqm3G)iGyj)0B>l&FXOod`;4j%TdxhePHD`W8qh|-ygyZOil%32BZspvRC|CBa7Sm$ zmR1n<-Qxpl_o$P0vSv{$mAzSQ8fJP^cELmUeS89!v+u~{Su5-D_3+3PKWY3GVoChL@~q`GoNB6QtB|FVOmV|&(&AX{cq! z_z$JjfF@GP^corr69y)?KT|kkn_kt$dKUmt_rppmo?Fd&j(gC`o6`lyMQgP;Q^;A` z)D+Z$7jgtc?@!V)VYhg7)cY2$s*q-#21d)Z?WeSHv$^>I5&JWiH*A(HY2{!lc71s> z#P0L}dnHqHJ)BW_vh{7!G$V!K{a>)VK@qaTmep=!lTRfZie4~Gq>jfw|n)yU@0 z8B=DV$ZRKPi4$LcAn@Lx8yp@leoNlNuN{!5aS{aQH$x*lfglLtTc8pC9)cixazS_U+n4T4#PMy1Yem7@q99J+G&t_WKM>+$43rN3AFK!0M4}4? zF>I&Bct-Sy$?IWCWwzv*lhAu^(C0~Wt)i*mwZoL0>6uKKtW=odIygYOs;Dp|5+J7Q zRm%b@z)fkGu4~Q;fLj5ZDOsmff=iJpw&PjK(D2wE{?G`Xl{cnbc(TQU|7X_$_E@_W zIm0*(4W)>alFUUFoVs;5bw8I$T`n?Po z-Xr1s{}%Cy4-_smral8`RQy)_msD2T2%ZF z5nmU4jE^M=$FBf}@u^Ora*5-E41)KyETSy+eS8BZ36pteg}scS9_D^1urR$WfJ-3< zw0?pwf)bT~J|chIXR@dI<9foexo_GK(c?L!J;Zsk$H$bYh}T6N=v|@7aQ^5wMBy$j Oi}in8cNi#P`+otuZNl#W diff --git a/packages/playground/ssr-deps/node-addon/build/binding.Makefile b/packages/playground/ssr-deps/node-addon/build/binding.Makefile deleted file mode 100644 index 9521a57df40291..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/binding.Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# This file is generated by gyp; do not edit. - -export builddir_name ?= ./build/. -.PHONY: all -all: - $(MAKE) cpp_addon diff --git a/packages/playground/ssr-deps/node-addon/build/config.gypi b/packages/playground/ssr-deps/node-addon/build/config.gypi deleted file mode 100644 index 815e24a35e5c83..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/config.gypi +++ /dev/null @@ -1,351 +0,0 @@ -# Do not edit. File was generated by node-gyp's "configure" step -{ - "target_defaults": { - "cflags": [], - "default_configuration": "Release", - "defines": [], - "include_dirs": [], - "libraries": [] - }, - "variables": { - "asan": 0, - "coverage": "false", - "dcheck_always_on": 0, - "debug_nghttp2": "false", - "debug_node": "false", - "enable_lto": "false", - "enable_pgo_generate": "false", - "enable_pgo_use": "false", - "error_on_warn": "false", - "force_dynamic_crt": 0, - "gas_version": "2.30", - "host_arch": "x64", - "icu_data_in": "../../deps/icu-tmp/icudt69l.dat", - "icu_endianness": "l", - "icu_gyp_path": "tools/icu/icu-generic.gyp", - "icu_path": "deps/icu-small", - "icu_small": "false", - "icu_ver_major": "69", - "is_debug": 0, - "llvm_version": "0.0", - "napi_build_version": "8", - "node_byteorder": "little", - "node_debug_lib": "false", - "node_enable_d8": "false", - "node_install_npm": "true", - "node_library_files": [ - "lib/diagnostics_channel.js", - "lib/path.js", - "lib/punycode.js", - "lib/tty.js", - "lib/_stream_wrap.js", - "lib/querystring.js", - "lib/_tls_common.js", - "lib/_tls_wrap.js", - "lib/assert.js", - "lib/async_hooks.js", - "lib/child_process.js", - "lib/cluster.js", - "lib/dns.js", - "lib/util.js", - "lib/vm.js", - "lib/worker_threads.js", - "lib/url.js", - "lib/buffer.js", - "lib/wasi.js", - "lib/process.js", - "lib/console.js", - "lib/constants.js", - "lib/events.js", - "lib/fs.js", - "lib/_stream_duplex.js", - "lib/module.js", - "lib/domain.js", - "lib/zlib.js", - "lib/_http_client.js", - "lib/_http_server.js", - "lib/_stream_writable.js", - "lib/http.js", - "lib/https.js", - "lib/inspector.js", - "lib/trace_events.js", - "lib/_http_incoming.js", - "lib/http2.js", - "lib/os.js", - "lib/string_decoder.js", - "lib/_stream_passthrough.js", - "lib/_stream_readable.js", - "lib/_stream_transform.js", - "lib/crypto.js", - "lib/timers.js", - "lib/repl.js", - "lib/_http_agent.js", - "lib/_http_common.js", - "lib/_http_outgoing.js", - "lib/net.js", - "lib/perf_hooks.js", - "lib/readline.js", - "lib/v8.js", - "lib/sys.js", - "lib/tls.js", - "lib/stream.js", - "lib/dgram.js", - "lib/dns/promises.js", - "lib/stream/consumers.js", - "lib/stream/promises.js", - "lib/stream/web.js", - "lib/assert/strict.js", - "lib/internal/async_hooks.js", - "lib/internal/heap_utils.js", - "lib/internal/blob.js", - "lib/internal/freeze_intrinsics.js", - "lib/internal/inspector_async_hook.js", - "lib/internal/linkedlist.js", - "lib/internal/js_stream_socket.js", - "lib/internal/url.js", - "lib/internal/socketaddress.js", - "lib/internal/util.js", - "lib/internal/options.js", - "lib/internal/repl.js", - "lib/internal/child_process.js", - "lib/internal/errors.js", - "lib/internal/event_target.js", - "lib/internal/v8_prof_polyfill.js", - "lib/internal/v8_prof_processor.js", - "lib/internal/validators.js", - "lib/internal/buffer.js", - "lib/internal/encoding.js", - "lib/internal/watchdog.js", - "lib/internal/trace_events_async_hooks.js", - "lib/internal/constants.js", - "lib/internal/abort_controller.js", - "lib/internal/blocklist.js", - "lib/internal/querystring.js", - "lib/internal/net.js", - "lib/internal/cli_table.js", - "lib/internal/fixed_queue.js", - "lib/internal/priority_queue.js", - "lib/internal/tty.js", - "lib/internal/assert.js", - "lib/internal/timers.js", - "lib/internal/socket_list.js", - "lib/internal/error_serdes.js", - "lib/internal/freelist.js", - "lib/internal/dgram.js", - "lib/internal/histogram.js", - "lib/internal/http.js", - "lib/internal/idna.js", - "lib/internal/worker.js", - "lib/internal/dtrace.js", - "lib/internal/stream_base_commons.js", - "lib/internal/bootstrap/environment.js", - "lib/internal/bootstrap/loaders.js", - "lib/internal/bootstrap/pre_execution.js", - "lib/internal/bootstrap/node.js", - "lib/internal/bootstrap/switches/does_not_own_process_state.js", - "lib/internal/bootstrap/switches/is_not_main_thread.js", - "lib/internal/bootstrap/switches/does_own_process_state.js", - "lib/internal/bootstrap/switches/is_main_thread.js", - "lib/internal/debugger/inspect_repl.js", - "lib/internal/debugger/inspect.js", - "lib/internal/debugger/inspect_client.js", - "lib/internal/cluster/shared_handle.js", - "lib/internal/cluster/child.js", - "lib/internal/cluster/primary.js", - "lib/internal/cluster/round_robin_handle.js", - "lib/internal/cluster/utils.js", - "lib/internal/cluster/worker.js", - "lib/internal/crypto/aes.js", - "lib/internal/crypto/certificate.js", - "lib/internal/crypto/cipher.js", - "lib/internal/crypto/diffiehellman.js", - "lib/internal/crypto/hash.js", - "lib/internal/crypto/hashnames.js", - "lib/internal/crypto/hkdf.js", - "lib/internal/crypto/keys.js", - "lib/internal/crypto/mac.js", - "lib/internal/crypto/pbkdf2.js", - "lib/internal/crypto/random.js", - "lib/internal/crypto/scrypt.js", - "lib/internal/crypto/sig.js", - "lib/internal/crypto/util.js", - "lib/internal/crypto/webcrypto.js", - "lib/internal/crypto/x509.js", - "lib/internal/crypto/dsa.js", - "lib/internal/crypto/ec.js", - "lib/internal/crypto/keygen.js", - "lib/internal/crypto/rsa.js", - "lib/internal/dns/promises.js", - "lib/internal/dns/utils.js", - "lib/internal/fs/dir.js", - "lib/internal/fs/read_file_context.js", - "lib/internal/fs/streams.js", - "lib/internal/fs/sync_write_stream.js", - "lib/internal/fs/utils.js", - "lib/internal/fs/watchers.js", - "lib/internal/fs/promises.js", - "lib/internal/fs/rimraf.js", - "lib/internal/fs/cp/cp-sync.js", - "lib/internal/fs/cp/cp.js", - "lib/internal/http2/compat.js", - "lib/internal/http2/util.js", - "lib/internal/http2/core.js", - "lib/internal/modules/package_json_reader.js", - "lib/internal/modules/run_main.js", - "lib/internal/modules/cjs/loader.js", - "lib/internal/modules/cjs/helpers.js", - "lib/internal/modules/esm/loader.js", - "lib/internal/modules/esm/transform_source.js", - "lib/internal/modules/esm/module_job.js", - "lib/internal/modules/esm/module_map.js", - "lib/internal/modules/esm/resolve.js", - "lib/internal/modules/esm/translators.js", - "lib/internal/modules/esm/get_format.js", - "lib/internal/modules/esm/create_dynamic_module.js", - "lib/internal/modules/esm/get_source.js", - "lib/internal/legacy/processbinding.js", - "lib/internal/process/policy.js", - "lib/internal/process/worker_thread_only.js", - "lib/internal/process/esm_loader.js", - "lib/internal/process/execution.js", - "lib/internal/process/per_thread.js", - "lib/internal/process/promises.js", - "lib/internal/process/report.js", - "lib/internal/process/signal.js", - "lib/internal/process/task_queues.js", - "lib/internal/process/warning.js", - "lib/internal/repl/history.js", - "lib/internal/repl/utils.js", - "lib/internal/repl/await.js", - "lib/internal/streams/legacy.js", - "lib/internal/streams/passthrough.js", - "lib/internal/streams/buffer_list.js", - "lib/internal/streams/from.js", - "lib/internal/streams/lazy_transform.js", - "lib/internal/streams/state.js", - "lib/internal/streams/transform.js", - "lib/internal/streams/add-abort-signal.js", - "lib/internal/streams/compose.js", - "lib/internal/streams/destroy.js", - "lib/internal/streams/duplex.js", - "lib/internal/streams/duplexify.js", - "lib/internal/streams/end-of-stream.js", - "lib/internal/streams/pipeline.js", - "lib/internal/streams/readable.js", - "lib/internal/streams/utils.js", - "lib/internal/streams/writable.js", - "lib/internal/test/binding.js", - "lib/internal/test/transfer.js", - "lib/internal/util/comparisons.js", - "lib/internal/util/debuglog.js", - "lib/internal/util/inspect.js", - "lib/internal/util/inspector.js", - "lib/internal/util/iterable_weak_map.js", - "lib/internal/util/types.js", - "lib/internal/main/check_syntax.js", - "lib/internal/main/eval_stdin.js", - "lib/internal/main/prof_process.js", - "lib/internal/main/run_main_module.js", - "lib/internal/main/print_help.js", - "lib/internal/main/repl.js", - "lib/internal/main/inspect.js", - "lib/internal/main/worker_thread.js", - "lib/internal/main/eval_string.js", - "lib/internal/tls/parse-cert-string.js", - "lib/internal/tls/secure-context.js", - "lib/internal/tls/secure-pair.js", - "lib/internal/vm/module.js", - "lib/internal/child_process/serialization.js", - "lib/internal/per_context/domexception.js", - "lib/internal/per_context/messageport.js", - "lib/internal/per_context/primordials.js", - "lib/internal/worker/io.js", - "lib/internal/worker/js_transferable.js", - "lib/internal/assert/calltracker.js", - "lib/internal/assert/assertion_error.js", - "lib/internal/perf/event_loop_delay.js", - "lib/internal/perf/event_loop_utilization.js", - "lib/internal/perf/nodetiming.js", - "lib/internal/perf/observe.js", - "lib/internal/perf/performance.js", - "lib/internal/perf/performance_entry.js", - "lib/internal/perf/timerify.js", - "lib/internal/perf/usertiming.js", - "lib/internal/perf/utils.js", - "lib/internal/webstreams/encoding.js", - "lib/internal/webstreams/queuingstrategies.js", - "lib/internal/webstreams/readablestream.js", - "lib/internal/webstreams/transfer.js", - "lib/internal/webstreams/transformstream.js", - "lib/internal/webstreams/util.js", - "lib/internal/webstreams/writablestream.js", - "lib/internal/source_map/source_map.js", - "lib/internal/source_map/source_map_cache.js", - "lib/internal/source_map/prepare_stack_trace.js", - "lib/internal/console/global.js", - "lib/internal/console/constructor.js", - "lib/internal/readline/utils.js", - "lib/internal/readline/callbacks.js", - "lib/internal/readline/emitKeypressEvents.js", - "lib/internal/policy/manifest.js", - "lib/internal/policy/sri.js", - "lib/fs/promises.js", - "lib/util/types.js", - "lib/path/posix.js", - "lib/path/win32.js", - "lib/timers/promises.js" - ], - "node_module_version": 93, - "node_no_browser_globals": "false", - "node_prefix": "/", - "node_release_urlbase": "https://nodejs.org/download/release/", - "node_section_ordering_info": "", - "node_shared": "false", - "node_shared_brotli": "false", - "node_shared_cares": "false", - "node_shared_http_parser": "false", - "node_shared_libuv": "false", - "node_shared_nghttp2": "false", - "node_shared_nghttp3": "false", - "node_shared_ngtcp2": "false", - "node_shared_openssl": "false", - "node_shared_zlib": "false", - "node_tag": "", - "node_target_type": "executable", - "node_use_bundled_v8": "true", - "node_use_dtrace": "false", - "node_use_etw": "false", - "node_use_node_code_cache": "true", - "node_use_node_snapshot": "true", - "node_use_openssl": "true", - "node_use_v8_platform": "true", - "node_with_ltcg": "false", - "node_without_node_options": "false", - "openssl_fips": "", - "openssl_is_fips": "false", - "openssl_quic": "true", - "ossfuzz": "false", - "shlib_suffix": "so.93", - "target_arch": "x64", - "v8_enable_31bit_smis_on_64bit_arch": 0, - "v8_enable_gdbjit": 0, - "v8_enable_i18n_support": 1, - "v8_enable_inspector": 1, - "v8_enable_lite_mode": 0, - "v8_enable_object_print": 1, - "v8_enable_pointer_compression": 0, - "v8_enable_webassembly": 1, - "v8_no_strict_aliasing": 1, - "v8_optimized_debug": 1, - "v8_promise_internal_field_count": 1, - "v8_random_seed": 0, - "v8_trace_maps": 0, - "v8_use_siphash": 1, - "want_separate_host_toolset": 0, - "nodedir": "/home/matias/.cache/node-gyp/16.9.1", - "standalone_static_library": 1, - "user_agent": "pnpm/6.21.0 npm/? node/v16.9.1 linux x64", - "registry": "https://registry.npmjs.org/", - "node_gyp": "/usr/local/lib/node_modules/pnpm/dist/node_modules/node-gyp/bin/node-gyp.js" - } -} diff --git a/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk b/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk deleted file mode 100644 index 4a2de286352df8..00000000000000 --- a/packages/playground/ssr-deps/node-addon/build/cpp_addon.target.mk +++ /dev/null @@ -1,159 +0,0 @@ -# This file is generated by gyp; do not edit. - -TOOLSET := target -TARGET := cpp_addon -DEFS_Debug := \ - '-DNODE_GYP_MODULE_NAME=cpp_addon' \ - '-DUSING_UV_SHARED=1' \ - '-DUSING_V8_SHARED=1' \ - '-DV8_DEPRECATION_WARNINGS=1' \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ - '-D_GLIBCXX_USE_CXX11_ABI=1' \ - '-D_LARGEFILE_SOURCE' \ - '-D_FILE_OFFSET_BITS=64' \ - '-D__STDC_FORMAT_MACROS' \ - '-DOPENSSL_NO_PINSHARED' \ - '-DOPENSSL_THREADS' \ - '-DBUILDING_NODE_EXTENSION' \ - '-DDEBUG' \ - '-D_DEBUG' \ - '-DV8_ENABLE_CHECKS' - -# Flags passed to all source files. -CFLAGS_Debug := \ - -fPIC \ - -pthread \ - -Wall \ - -Wextra \ - -Wno-unused-parameter \ - -m64 \ - -g \ - -O0 - -# Flags passed to only C files. -CFLAGS_C_Debug := - -# Flags passed to only C++ files. -CFLAGS_CC_Debug := \ - -fno-rtti \ - -fno-exceptions \ - -std=gnu++14 - -INCS_Debug := \ - -I/home/matias/.cache/node-gyp/16.9.1/include/node \ - -I/home/matias/.cache/node-gyp/16.9.1/src \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include - -DEFS_Release := \ - '-DNODE_GYP_MODULE_NAME=cpp_addon' \ - '-DUSING_UV_SHARED=1' \ - '-DUSING_V8_SHARED=1' \ - '-DV8_DEPRECATION_WARNINGS=1' \ - '-DV8_DEPRECATION_WARNINGS' \ - '-DV8_IMMINENT_DEPRECATION_WARNINGS' \ - '-D_GLIBCXX_USE_CXX11_ABI=1' \ - '-D_LARGEFILE_SOURCE' \ - '-D_FILE_OFFSET_BITS=64' \ - '-D__STDC_FORMAT_MACROS' \ - '-DOPENSSL_NO_PINSHARED' \ - '-DOPENSSL_THREADS' \ - '-DBUILDING_NODE_EXTENSION' - -# Flags passed to all source files. -CFLAGS_Release := \ - -fPIC \ - -pthread \ - -Wall \ - -Wextra \ - -Wno-unused-parameter \ - -m64 \ - -O3 \ - -fno-omit-frame-pointer - -# Flags passed to only C files. -CFLAGS_C_Release := - -# Flags passed to only C++ files. -CFLAGS_CC_Release := \ - -fno-rtti \ - -fno-exceptions \ - -std=gnu++14 - -INCS_Release := \ - -I/home/matias/.cache/node-gyp/16.9.1/include/node \ - -I/home/matias/.cache/node-gyp/16.9.1/src \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/config \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/openssl/openssl/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/uv/include \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/zlib \ - -I/home/matias/.cache/node-gyp/16.9.1/deps/v8/include - -OBJS := \ - $(obj).target/$(TARGET)/main.o - -# Add to the list of files we specially track dependencies for. -all_deps += $(OBJS) - -# CFLAGS et al overrides must be target-local. -# See "Target-specific Variable Values" in the GNU Make manual. -$(OBJS): TOOLSET := $(TOOLSET) -$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) -$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) - -# Suffix rules, putting all outputs into $(obj). - -$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) - -# Try building from generated source, too. - -$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) - -$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cpp FORCE_DO_CMD - @$(call do_cmd,cxx,1) - -# End of this set of suffix rules -### Rules for final target. -LDFLAGS_Debug := \ - -pthread \ - -rdynamic \ - -m64 - -LDFLAGS_Release := \ - -pthread \ - -rdynamic \ - -m64 - -LIBS := - -$(obj).target/cpp_addon.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE)) -$(obj).target/cpp_addon.node: LIBS := $(LIBS) -$(obj).target/cpp_addon.node: TOOLSET := $(TOOLSET) -$(obj).target/cpp_addon.node: $(OBJS) FORCE_DO_CMD - $(call do_cmd,solink_module) - -all_deps += $(obj).target/cpp_addon.node -# Add target alias -.PHONY: cpp_addon -cpp_addon: $(builddir)/cpp_addon.node - -# Copy this to the executable output path. -$(builddir)/cpp_addon.node: TOOLSET := $(TOOLSET) -$(builddir)/cpp_addon.node: $(obj).target/cpp_addon.node FORCE_DO_CMD - $(call do_cmd,copy) - -all_deps += $(builddir)/cpp_addon.node -# Short alias for building this executable. -.PHONY: cpp_addon.node -cpp_addon.node: $(obj).target/cpp_addon.node $(builddir)/cpp_addon.node - -# Add executable to "all" target. -.PHONY: all -all: $(builddir)/cpp_addon.node - From 39c252e97d0bb001cbcdb519cb1e15171ff2908c Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Thu, 16 Dec 2021 23:52:45 -0600 Subject: [PATCH 199/258] chore: delete extra blank line (#6152) --- packages/vite/src/node/server/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index f5a2f4ca35e9c2..b186285ffeff0b 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -749,7 +749,7 @@ async function restartServer(server: ViteDevServer) { await server.listen(port, true) logger.info('server restarted.', { timestamp: true }) if (port !== prevPort || host !== prevHost) { - logger.info('\n') + logger.info('') server.printUrls() } } else { From e19ba6a98d85586d1f54e6b0eed11dcf72e6c651 Mon Sep 17 00:00:00 2001 From: Jeff Yang <32727188+ydcjeff@users.noreply.github.com> Date: Fri, 17 Dec 2021 15:08:02 +0630 Subject: [PATCH 200/258] ci: cancel same in-progress workflow (#6127) --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e946cf9b4fda1..64166e7158caf3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,10 @@ on: pull_request: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.sha }} + cancel-in-progress: true + jobs: build: runs-on: ${{ matrix.os }} From aab303f7bd333307c77363259f97a310762c4848 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 12:26:20 +0100 Subject: [PATCH 201/258] chore(deps): update all non-major dependencies (#5879) --- package.json | 28 +- packages/plugin-legacy/package.json | 4 +- packages/plugin-react/package.json | 12 +- packages/plugin-vue-jsx/package.json | 4 +- packages/plugin-vue/package.json | 6 +- packages/vite/package.json | 20 +- pnpm-lock.yaml | 1646 +++++++++++++------------- 7 files changed, 879 insertions(+), 841 deletions(-) diff --git a/package.json b/package.json index 1343fc1cbd7052..dcb61a6713fb40 100644 --- a/package.json +++ b/package.json @@ -24,39 +24,39 @@ "ci-docs": "run-s build-vite build-plugin-vue build-docs" }, "devDependencies": { - "@microsoft/api-extractor": "^7.18.19", + "@microsoft/api-extractor": "^7.19.2", "@types/fs-extra": "^9.0.13", "@types/jest": "^27.0.3", - "@types/node": "^16.11.9", + "@types/node": "^16.11.14", "@types/semver": "^7.3.9", - "@typescript-eslint/eslint-plugin": "^5.4.0", - "@typescript-eslint/parser": "^5.4.0", + "@typescript-eslint/eslint-plugin": "^5.7.0", + "@typescript-eslint/parser": "^5.7.0", "chalk": "^4.1.2", "conventional-changelog-cli": "^2.1.1", "cross-env": "^7.0.3", "esbuild": "^0.13.12", - "eslint": "^8.3.0", - "eslint-define-config": "^1.1.4", + "eslint": "^8.4.1", + "eslint-define-config": "^1.2.0", "eslint-plugin-node": "^11.1.0", "execa": "^5.1.1", "fs-extra": "^10.0.0", - "jest": "^27.3.1", - "lint-staged": "^12.1.1", + "jest": "^27.4.5", + "lint-staged": "^12.1.2", "minimist": "^1.2.5", "node-fetch": "^2.6.6", "npm-run-all": "^4.1.5", - "playwright-chromium": "^1.16.3", - "prettier": "2.4.1", + "playwright-chromium": "^1.17.1", + "prettier": "2.5.1", "prompts": "^2.4.2", "rimraf": "^3.0.2", "rollup": "^2.59.0", "semver": "^7.3.5", - "sirv": "^1.0.18", - "ts-jest": "^27.0.7", + "sirv": "^1.0.19", + "ts-jest": "^27.1.2", "ts-node": "^10.4.0", "typescript": "~4.4.4", "vite": "workspace:*", - "vitepress": "^0.20.1", + "vitepress": "^0.20.9", "yorkie": "^2.0.0" }, "gitHooks": { @@ -74,7 +74,7 @@ "eslint --ext .ts" ] }, - "packageManager": "pnpm@6.23.0", + "packageManager": "pnpm@6.24.1", "pnpm": { "overrides": { "vite": "workspace:*", diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json index 2c08940d5f335d..cd2ecc6a5858a9 100644 --- a/packages/plugin-legacy/package.json +++ b/packages/plugin-legacy/package.json @@ -26,8 +26,8 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme", "dependencies": { - "@babel/standalone": "^7.16.4", - "core-js": "^3.19.1", + "@babel/standalone": "^7.16.6", + "core-js": "^3.20.0", "magic-string": "^0.25.7", "regenerator-runtime": "^0.13.9", "systemjs": "^6.11.0" diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index 44e44fdc1ed234..a58d08f6b6834a 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -33,12 +33,12 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme", "dependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-transform-react-jsx": "^7.16.0", - "@babel/plugin-transform-react-jsx-development": "^7.16.0", - "@babel/plugin-transform-react-jsx-self": "^7.16.0", - "@babel/plugin-transform-react-jsx-source": "^7.16.0", - "@rollup/pluginutils": "^4.1.1", + "@babel/core": "^7.16.5", + "@babel/plugin-transform-react-jsx": "^7.16.5", + "@babel/plugin-transform-react-jsx-development": "^7.16.5", + "@babel/plugin-transform-react-jsx-self": "^7.16.5", + "@babel/plugin-transform-react-jsx-source": "^7.16.5", + "@rollup/pluginutils": "^4.1.2", "react-refresh": "^0.11.0", "resolve": "^1.20.0" } diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 76bacceb6ec2d5..40ef71dac734ea 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -26,10 +26,10 @@ }, "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue-jsx#readme", "dependencies": { - "@babel/core": "^7.16.0", + "@babel/core": "^7.16.5", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-transform-typescript": "^7.16.1", - "@rollup/pluginutils": "^4.1.1", + "@rollup/pluginutils": "^4.1.2", "@vue/babel-plugin-jsx": "^1.1.1", "hash-sum": "^2.0.0" } diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index a779030008adef..a3721f40f960b5 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -35,13 +35,13 @@ "vue": "^3.2.25" }, "devDependencies": { - "@rollup/pluginutils": "^4.1.1", + "@rollup/pluginutils": "^4.1.2", "@types/hash-sum": "^1.0.0", - "debug": "^4.3.2", + "debug": "^4.3.3", "hash-sum": "^2.0.0", "rollup": "^2.59.0", "slash": "^4.0.0", "source-map": "^0.6.1", - "vue": "^3.2.25" + "vue": "^3.2.26" } } diff --git a/packages/vite/package.json b/packages/vite/package.json index ed947b04f3a576..46b3036da6e022 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -45,7 +45,7 @@ "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!", "dependencies": { "esbuild": "^0.13.12", - "postcss": "^8.3.11", + "postcss": "^8.4.5", "resolve": "^1.20.0", "rollup": "^2.59.0" }, @@ -53,16 +53,16 @@ "fsevents": "~2.3.2" }, "devDependencies": { - "@ampproject/remapping": "^1.0.1", - "@babel/parser": "^7.16.4", + "@ampproject/remapping": "^1.0.2", + "@babel/parser": "^7.16.6", "@babel/types": "^7.16.0", "@rollup/plugin-alias": "^3.1.8", "@rollup/plugin-commonjs": "^21.0.1", "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "13.0.6", + "@rollup/plugin-node-resolve": "13.1.1", "@rollup/plugin-typescript": "^8.3.0", - "@rollup/pluginutils": "^4.1.1", + "@rollup/pluginutils": "^4.1.2", "@types/convert-source-map": "^1.5.2", "@types/debug": "^4.1.7", "@types/estree": "^0.0.50", @@ -70,12 +70,12 @@ "@types/less": "^3.0.3", "@types/micromatch": "^4.0.2", "@types/mime": "^2.0.3", - "@types/node": "^16.11.9", + "@types/node": "^16.11.14", "@types/resolve": "^1.20.1", - "@types/sass": "~1.43.0", + "@types/sass": "~1.43.1", "@types/stylus": "^0.48.36", "@types/ws": "^8.2.2", - "@vue/compiler-dom": "^3.2.22", + "@vue/compiler-dom": "^3.2.26", "acorn": "^8.6.0", "acorn-class-fields": "^1.0.0", "acorn-static-class-features": "^1.0.0", @@ -87,7 +87,7 @@ "connect-history-api-fallback": "^1.6.0", "convert-source-map": "^1.8.0", "cors": "^2.8.5", - "debug": "^4.3.2", + "debug": "^4.3.3", "dotenv": "^10.0.0", "dotenv-expand": "^5.1.0", "es-module-lexer": "^0.9.3", @@ -109,7 +109,7 @@ "resolve.exports": "^1.1.0", "rollup-plugin-license": "^2.6.0", "selfsigned": "^1.10.11", - "sirv": "^1.0.18", + "sirv": "^1.0.19", "source-map": "^0.6.1", "source-map-support": "^0.5.21", "strip-ansi": "^6.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fb2e71bfdf4b9b..0a476f1e90e12d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,74 +8,74 @@ importers: .: specifiers: - '@microsoft/api-extractor': ^7.18.19 + '@microsoft/api-extractor': ^7.19.2 '@types/fs-extra': ^9.0.13 '@types/jest': ^27.0.3 - '@types/node': ^16.11.9 + '@types/node': ^16.11.14 '@types/semver': ^7.3.9 - '@typescript-eslint/eslint-plugin': ^5.4.0 - '@typescript-eslint/parser': ^5.4.0 + '@typescript-eslint/eslint-plugin': ^5.7.0 + '@typescript-eslint/parser': ^5.7.0 chalk: ^4.1.2 conventional-changelog-cli: ^2.1.1 cross-env: ^7.0.3 esbuild: ^0.13.12 - eslint: ^8.3.0 - eslint-define-config: ^1.1.4 + eslint: ^8.4.1 + eslint-define-config: ^1.2.0 eslint-plugin-node: ^11.1.0 execa: ^5.1.1 fs-extra: ^10.0.0 - jest: ^27.3.1 - lint-staged: ^12.1.1 + jest: ^27.4.5 + lint-staged: ^12.1.2 minimist: ^1.2.5 node-fetch: ^2.6.6 npm-run-all: ^4.1.5 - playwright-chromium: ^1.16.3 - prettier: 2.4.1 + playwright-chromium: ^1.17.1 + prettier: 2.5.1 prompts: ^2.4.2 rimraf: ^3.0.2 rollup: ^2.59.0 semver: ^7.3.5 - sirv: ^1.0.18 - ts-jest: ^27.0.7 + sirv: ^1.0.19 + ts-jest: ^27.1.2 ts-node: ^10.4.0 typescript: ~4.4.4 vite: workspace:* - vitepress: ^0.20.1 + vitepress: ^0.20.9 yorkie: ^2.0.0 devDependencies: - '@microsoft/api-extractor': 7.18.19 + '@microsoft/api-extractor': 7.19.2 '@types/fs-extra': 9.0.13 '@types/jest': 27.0.3 - '@types/node': 16.11.9 + '@types/node': 16.11.14 '@types/semver': 7.3.9 - '@typescript-eslint/eslint-plugin': 5.4.0_8fbd82ef37e23da98dfca9805cf945cd - '@typescript-eslint/parser': 5.4.0_eslint@8.3.0+typescript@4.4.4 + '@typescript-eslint/eslint-plugin': 5.7.0_d7a0d6b59468b4d2ea38f782f4f112e3 + '@typescript-eslint/parser': 5.7.0_eslint@8.4.1+typescript@4.4.4 chalk: 4.1.2 conventional-changelog-cli: 2.1.1 cross-env: 7.0.3 esbuild: 0.13.12 - eslint: 8.3.0 - eslint-define-config: 1.1.4 - eslint-plugin-node: 11.1.0_eslint@8.3.0 + eslint: 8.4.1 + eslint-define-config: 1.2.0 + eslint-plugin-node: 11.1.0_eslint@8.4.1 execa: 5.1.1 fs-extra: 10.0.0 - jest: 27.3.1_ts-node@10.4.0 - lint-staged: 12.1.1 + jest: 27.4.5_ts-node@10.4.0 + lint-staged: 12.1.2 minimist: 1.2.5 node-fetch: 2.6.6 npm-run-all: 4.1.5 - playwright-chromium: 1.16.3 - prettier: 2.4.1 + playwright-chromium: 1.17.1 + prettier: 2.5.1 prompts: 2.4.2 rimraf: 3.0.2 rollup: 2.59.0 semver: 7.3.5 - sirv: 1.0.18 - ts-jest: 27.0.7_b626c82449d36ccae0aa7169b15092e6 - ts-node: 10.4.0_7dd5cf9af763e621261d5cc88a052be2 + sirv: 1.0.19 + ts-jest: 27.1.2_52ee6014196323fc54772ef1ffde0dac + ts-node: 10.4.0_08095b3038b55682110c004d6a64072d typescript: 4.4.4 vite: link:packages/vite - vitepress: 0.20.1 + vitepress: 0.20.9 yorkie: 2.0.0 packages/create-vite: @@ -643,86 +643,86 @@ importers: packages/plugin-legacy: specifiers: - '@babel/standalone': ^7.16.4 - core-js: ^3.19.1 + '@babel/standalone': ^7.16.6 + core-js: ^3.20.0 magic-string: ^0.25.7 regenerator-runtime: ^0.13.9 systemjs: ^6.11.0 dependencies: - '@babel/standalone': 7.16.4 - core-js: 3.19.1 + '@babel/standalone': 7.16.6 + core-js: 3.20.0 magic-string: 0.25.7 regenerator-runtime: 0.13.9 systemjs: 6.11.0 packages/plugin-react: specifiers: - '@babel/core': ^7.16.0 - '@babel/plugin-transform-react-jsx': ^7.16.0 - '@babel/plugin-transform-react-jsx-development': ^7.16.0 - '@babel/plugin-transform-react-jsx-self': ^7.16.0 - '@babel/plugin-transform-react-jsx-source': ^7.16.0 - '@rollup/pluginutils': ^4.1.1 + '@babel/core': ^7.16.5 + '@babel/plugin-transform-react-jsx': ^7.16.5 + '@babel/plugin-transform-react-jsx-development': ^7.16.5 + '@babel/plugin-transform-react-jsx-self': ^7.16.5 + '@babel/plugin-transform-react-jsx-source': ^7.16.5 + '@rollup/pluginutils': ^4.1.2 react-refresh: ^0.11.0 resolve: ^1.20.0 dependencies: - '@babel/core': 7.16.0 - '@babel/plugin-transform-react-jsx': 7.16.0_@babel+core@7.16.0 - '@babel/plugin-transform-react-jsx-development': 7.16.0_@babel+core@7.16.0 - '@babel/plugin-transform-react-jsx-self': 7.16.0_@babel+core@7.16.0 - '@babel/plugin-transform-react-jsx-source': 7.16.0_@babel+core@7.16.0 - '@rollup/pluginutils': 4.1.1 + '@babel/core': 7.16.5 + '@babel/plugin-transform-react-jsx': 7.16.5_@babel+core@7.16.5 + '@babel/plugin-transform-react-jsx-development': 7.16.5_@babel+core@7.16.5 + '@babel/plugin-transform-react-jsx-self': 7.16.5_@babel+core@7.16.5 + '@babel/plugin-transform-react-jsx-source': 7.16.5_@babel+core@7.16.5 + '@rollup/pluginutils': 4.1.2 react-refresh: 0.11.0 resolve: 1.20.0 packages/plugin-vue: specifiers: - '@rollup/pluginutils': ^4.1.1 + '@rollup/pluginutils': ^4.1.2 '@types/hash-sum': ^1.0.0 - debug: ^4.3.2 + debug: ^4.3.3 hash-sum: ^2.0.0 rollup: ^2.59.0 slash: ^4.0.0 source-map: ^0.6.1 - vue: ^3.2.25 + vue: ^3.2.26 devDependencies: - '@rollup/pluginutils': 4.1.1 + '@rollup/pluginutils': 4.1.2 '@types/hash-sum': 1.0.0 - debug: 4.3.2 + debug: 4.3.3 hash-sum: 2.0.0 rollup: 2.59.0 slash: 4.0.0 source-map: 0.6.1 - vue: 3.2.25 + vue: 3.2.26 packages/plugin-vue-jsx: specifiers: - '@babel/core': ^7.16.0 + '@babel/core': ^7.16.5 '@babel/plugin-syntax-import-meta': ^7.10.4 '@babel/plugin-transform-typescript': ^7.16.1 - '@rollup/pluginutils': ^4.1.1 + '@rollup/pluginutils': ^4.1.2 '@vue/babel-plugin-jsx': ^1.1.1 hash-sum: ^2.0.0 dependencies: - '@babel/core': 7.16.0 - '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.16.0 - '@babel/plugin-transform-typescript': 7.16.1_@babel+core@7.16.0 - '@rollup/pluginutils': 4.1.1 - '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.16.0 + '@babel/core': 7.16.5 + '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.16.5 + '@babel/plugin-transform-typescript': 7.16.1_@babel+core@7.16.5 + '@rollup/pluginutils': 4.1.2 + '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.16.5 hash-sum: 2.0.0 packages/vite: specifiers: - '@ampproject/remapping': ^1.0.1 - '@babel/parser': ^7.16.4 + '@ampproject/remapping': ^1.0.2 + '@babel/parser': ^7.16.6 '@babel/types': ^7.16.0 '@rollup/plugin-alias': ^3.1.8 '@rollup/plugin-commonjs': ^21.0.1 '@rollup/plugin-dynamic-import-vars': ^1.4.1 '@rollup/plugin-json': ^4.1.0 - '@rollup/plugin-node-resolve': 13.0.6 + '@rollup/plugin-node-resolve': 13.1.1 '@rollup/plugin-typescript': ^8.3.0 - '@rollup/pluginutils': ^4.1.1 + '@rollup/pluginutils': ^4.1.2 '@types/convert-source-map': ^1.5.2 '@types/debug': ^4.1.7 '@types/estree': ^0.0.50 @@ -730,12 +730,12 @@ importers: '@types/less': ^3.0.3 '@types/micromatch': ^4.0.2 '@types/mime': ^2.0.3 - '@types/node': ^16.11.9 + '@types/node': ^16.11.14 '@types/resolve': ^1.20.1 - '@types/sass': ~1.43.0 + '@types/sass': ~1.43.1 '@types/stylus': ^0.48.36 '@types/ws': ^8.2.2 - '@vue/compiler-dom': ^3.2.22 + '@vue/compiler-dom': ^3.2.26 acorn: ^8.6.0 acorn-class-fields: ^1.0.0 acorn-static-class-features: ^1.0.0 @@ -747,7 +747,7 @@ importers: connect-history-api-fallback: ^1.6.0 convert-source-map: ^1.8.0 cors: ^2.8.5 - debug: ^4.3.2 + debug: ^4.3.3 dotenv: ^10.0.0 dotenv-expand: ^5.1.0 es-module-lexer: ^0.9.3 @@ -765,7 +765,7 @@ importers: okie: ^1.0.1 open: ^8.4.0 periscopic: ^2.0.3 - postcss: ^8.3.11 + postcss: ^8.4.5 postcss-import: ^14.0.2 postcss-load-config: ^3.1.0 postcss-modules: ^4.2.2 @@ -774,7 +774,7 @@ importers: rollup: ^2.59.0 rollup-plugin-license: ^2.6.0 selfsigned: ^1.10.11 - sirv: ^1.0.18 + sirv: ^1.0.19 source-map: ^0.6.1 source-map-support: ^0.5.21 strip-ansi: ^6.0.1 @@ -785,22 +785,22 @@ importers: ws: ^8.3.0 dependencies: esbuild: 0.13.12 - postcss: 8.3.11 + postcss: 8.4.5 resolve: 1.20.0 rollup: 2.59.0 optionalDependencies: fsevents: 2.3.2 devDependencies: - '@ampproject/remapping': 1.0.1 - '@babel/parser': 7.16.4 + '@ampproject/remapping': 1.0.2 + '@babel/parser': 7.16.6 '@babel/types': 7.16.0 '@rollup/plugin-alias': 3.1.8_rollup@2.59.0 '@rollup/plugin-commonjs': 21.0.1_rollup@2.59.0 '@rollup/plugin-dynamic-import-vars': 1.4.1_rollup@2.59.0 '@rollup/plugin-json': 4.1.0_rollup@2.59.0 - '@rollup/plugin-node-resolve': 13.0.6_rollup@2.59.0 + '@rollup/plugin-node-resolve': 13.1.1_rollup@2.59.0 '@rollup/plugin-typescript': 8.3.0_80f1acc233e4df93aa4e78959e046afc - '@rollup/pluginutils': 4.1.1 + '@rollup/pluginutils': 4.1.2 '@types/convert-source-map': 1.5.2 '@types/debug': 4.1.7 '@types/estree': 0.0.50 @@ -808,12 +808,12 @@ importers: '@types/less': 3.0.3 '@types/micromatch': 4.0.2 '@types/mime': 2.0.3 - '@types/node': 16.11.9 + '@types/node': 16.11.14 '@types/resolve': 1.20.1 - '@types/sass': 1.43.0 + '@types/sass': 1.43.1 '@types/stylus': 0.48.36 '@types/ws': 8.2.2 - '@vue/compiler-dom': 3.2.22 + '@vue/compiler-dom': 3.2.26 acorn: 8.6.0 acorn-class-fields: 1.0.0_acorn@8.6.0 acorn-static-class-features: 1.0.0_acorn@8.6.0 @@ -825,7 +825,7 @@ importers: connect-history-api-fallback: 1.6.0 convert-source-map: 1.8.0 cors: 2.8.5 - debug: 4.3.2 + debug: 4.3.3 dotenv: 10.0.0 dotenv-expand: 5.1.0 es-module-lexer: 0.9.3 @@ -833,7 +833,7 @@ importers: etag: 1.8.1 execa: 5.1.1 fast-glob: 3.2.7 - http-proxy: 1.18.1_debug@4.3.2 + http-proxy: 1.18.1_debug@4.3.3 launch-editor-middleware: 2.2.1 magic-string: 0.25.7 micromatch: 4.0.4 @@ -841,13 +841,13 @@ importers: okie: 1.0.1 open: 8.4.0 periscopic: 2.0.3 - postcss-import: 14.0.2_postcss@8.3.11 + postcss-import: 14.0.2_postcss@8.4.5 postcss-load-config: 3.1.0_ts-node@10.4.0 - postcss-modules: 4.2.2_postcss@8.3.11 + postcss-modules: 4.2.2_postcss@8.4.5 resolve.exports: 1.1.0 rollup-plugin-license: 2.6.0_rollup@2.59.0 selfsigned: 1.10.11 - sirv: 1.0.18 + sirv: 1.0.19 source-map: 0.6.1 source-map-support: 0.5.21 strip-ansi: 6.0.1 @@ -859,6 +859,26 @@ importers: packages: + /@algolia/autocomplete-core/1.5.0: + resolution: {integrity: sha512-E7+VJwcvwMM8vPeaVn7fNUgix8WHV8A1WUeHDi2KHemCaaGc8lvUnP3QnvhMxiDhTe7OpMEv4o2TBUMyDgThaw==} + dependencies: + '@algolia/autocomplete-shared': 1.5.0 + dev: true + + /@algolia/autocomplete-preset-algolia/1.5.0_algoliasearch@4.11.0: + resolution: {integrity: sha512-iiFxKERGHkvkiupmrFJbvESpP/zv5jSgH714XRiP5LDvUHaYOo4GLAwZCFf2ef/L5tdtPBARvekn6k1Xf33gjA==} + peerDependencies: + '@algolia/client-search': ^4.9.1 + algoliasearch: ^4.9.1 + dependencies: + '@algolia/autocomplete-shared': 1.5.0 + algoliasearch: 4.11.0 + dev: true + + /@algolia/autocomplete-shared/1.5.0: + resolution: {integrity: sha512-bRSkqHHHSwZYbFY3w9hgMyQRm86Wz27bRaGCbNldLfbk0zUjApmE4ajx+ZCVSLqxvcUEjMqZFJzDsder12eKsg==} + dev: true + /@algolia/cache-browser-local-storage/4.11.0: resolution: {integrity: sha512-4sr9vHIG1fVA9dONagdzhsI/6M5mjs/qOe2xUP0yBmwsTsuwiZq3+Xu6D3dsxsuFetcJgC6ydQoCW8b7fDJHYQ==} dependencies: @@ -949,8 +969,8 @@ packages: '@algolia/requester-common': 4.11.0 dev: true - /@ampproject/remapping/1.0.1: - resolution: {integrity: sha512-Ta9bMA3EtUHDaZJXqUoT5cn/EecwOp+SXpKJqxDbDuMbLvEMu6YTyDDuvTWeStODfdmXyfMo7LymQyPkN3BicA==} + /@ampproject/remapping/1.0.2: + resolution: {integrity: sha512-SncaVxs+E3EdoA9xJgHfWPxZfowAgeIsd71VpqCKP6KNKm6s7zSqqvUc70UpKUFsrV3dAmy6qxHoIj5NG+3DiA==} engines: {node: '>=6.0.0'} dependencies: '@jridgewell/resolve-uri': 1.0.0 @@ -967,21 +987,21 @@ packages: resolution: {integrity: sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==} engines: {node: '>=6.9.0'} - /@babel/core/7.16.0: - resolution: {integrity: sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==} + /@babel/core/7.16.5: + resolution: {integrity: sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.16.0 - '@babel/generator': 7.16.0 - '@babel/helper-compilation-targets': 7.16.0_@babel+core@7.16.0 - '@babel/helper-module-transforms': 7.16.0 - '@babel/helpers': 7.16.0 - '@babel/parser': 7.16.2 + '@babel/generator': 7.16.5 + '@babel/helper-compilation-targets': 7.16.3_@babel+core@7.16.5 + '@babel/helper-module-transforms': 7.16.5 + '@babel/helpers': 7.16.5 + '@babel/parser': 7.16.6 '@babel/template': 7.16.0 - '@babel/traverse': 7.16.0 + '@babel/traverse': 7.16.5 '@babel/types': 7.16.0 convert-source-map: 1.8.0 - debug: 4.3.2 + debug: 4.3.3 gensync: 1.0.0-beta.2 json5: 2.2.0 semver: 6.3.0 @@ -996,6 +1016,15 @@ packages: '@babel/types': 7.16.0 jsesc: 2.5.2 source-map: 0.5.7 + dev: false + + /@babel/generator/7.16.5: + resolution: {integrity: sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + jsesc: 2.5.2 + source-map: 0.5.7 /@babel/helper-annotate-as-pure/7.16.0: resolution: {integrity: sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==} @@ -1004,25 +1033,25 @@ packages: '@babel/types': 7.16.0 dev: false - /@babel/helper-compilation-targets/7.16.0_@babel+core@7.16.0: - resolution: {integrity: sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==} + /@babel/helper-compilation-targets/7.16.3_@babel+core@7.16.5: + resolution: {integrity: sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: '@babel/compat-data': 7.16.0 - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@babel/helper-validator-option': 7.14.5 browserslist: 4.17.6 semver: 6.3.0 - /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.16.0: + /@babel/helper-create-class-features-plugin/7.16.0_@babel+core@7.16.5: resolution: {integrity: sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@babel/helper-annotate-as-pure': 7.16.0 '@babel/helper-function-name': 7.16.0 '@babel/helper-member-expression-to-functions': 7.16.0 @@ -1033,6 +1062,12 @@ packages: - supports-color dev: false + /@babel/helper-environment-visitor/7.16.5: + resolution: {integrity: sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.16.0 + /@babel/helper-function-name/7.16.0: resolution: {integrity: sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==} engines: {node: '>=6.9.0'} @@ -1058,6 +1093,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.16.0 + dev: false /@babel/helper-module-imports/7.16.0: resolution: {integrity: sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==} @@ -1065,17 +1101,17 @@ packages: dependencies: '@babel/types': 7.16.0 - /@babel/helper-module-transforms/7.16.0: - resolution: {integrity: sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==} + /@babel/helper-module-transforms/7.16.5: + resolution: {integrity: sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==} engines: {node: '>=6.9.0'} dependencies: + '@babel/helper-environment-visitor': 7.16.5 '@babel/helper-module-imports': 7.16.0 - '@babel/helper-replace-supers': 7.16.0 '@babel/helper-simple-access': 7.16.0 '@babel/helper-split-export-declaration': 7.16.0 '@babel/helper-validator-identifier': 7.15.7 '@babel/template': 7.16.0 - '@babel/traverse': 7.16.0 + '@babel/traverse': 7.16.5 '@babel/types': 7.16.0 transitivePeerDependencies: - supports-color @@ -1085,11 +1121,16 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.16.0 + dev: false /@babel/helper-plugin-utils/7.14.5: resolution: {integrity: sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==} engines: {node: '>=6.9.0'} + /@babel/helper-plugin-utils/7.16.5: + resolution: {integrity: sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ==} + engines: {node: '>=6.9.0'} + /@babel/helper-replace-supers/7.16.0: resolution: {integrity: sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==} engines: {node: '>=6.9.0'} @@ -1100,6 +1141,7 @@ packages: '@babel/types': 7.16.0 transitivePeerDependencies: - supports-color + dev: false /@babel/helper-simple-access/7.16.0: resolution: {integrity: sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==} @@ -1121,12 +1163,12 @@ packages: resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==} engines: {node: '>=6.9.0'} - /@babel/helpers/7.16.0: - resolution: {integrity: sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==} + /@babel/helpers/7.16.5: + resolution: {integrity: sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.16.0 - '@babel/traverse': 7.16.0 + '@babel/traverse': 7.16.5 '@babel/types': 7.16.0 transitivePeerDependencies: - supports-color @@ -1149,6 +1191,11 @@ packages: engines: {node: '>=6.0.0'} hasBin: true + /@babel/parser/7.16.6: + resolution: {integrity: sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==} + engines: {node: '>=6.0.0'} + hasBin: true + /@babel/plugin-proposal-pipeline-operator/7.16.0: resolution: {integrity: sha512-y9WbLfaPDDkShmU89N1spx54ELht7rXE2jWDzCgc23OmTwliEK9NSoR8KZdtjr1mR3QfG7D6mcDHmI4M0bhMQA==} engines: {node: '>=6.9.0'} @@ -1159,48 +1206,48 @@ packages: '@babel/plugin-syntax-pipeline-operator': 7.16.0 dev: true - /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.0: + /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.16.5: resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.16.0: + /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.16.5: resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.16.0: + /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.16.5: resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.16.0: + /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.16.5: resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@babel/helper-plugin-utils': 7.14.5 - /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.0: + /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.16.5: resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true /@babel/plugin-syntax-jsx/7.16.0: @@ -1212,68 +1259,78 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-jsx/7.16.0_@babel+core@7.16.0: + /@babel/plugin-syntax-jsx/7.16.0_@babel+core@7.16.5: resolution: {integrity: sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@babel/helper-plugin-utils': 7.14.5 dev: false - /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.0: + /@babel/plugin-syntax-jsx/7.16.5_@babel+core@7.16.5: + resolution: {integrity: sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 + dev: false + + /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.16.5: resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.0: + /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.16.5: resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.0: + /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.16.5: resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.0: + /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.16.5: resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.0: + /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.16.5: resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.0: + /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.16.5: resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true /@babel/plugin-syntax-pipeline-operator/7.16.0: @@ -1285,79 +1342,79 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.16.0: + /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.16.5: resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: true - /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.0: + /@babel/plugin-syntax-typescript/7.16.0_@babel+core@7.16.5: resolution: {integrity: sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@babel/helper-plugin-utils': 7.14.5 - /@babel/plugin-transform-react-jsx-development/7.16.0_@babel+core@7.16.0: - resolution: {integrity: sha512-qq65iSqBRq0Hr3wq57YG2AmW0H6wgTnIzpffTphrUWUgLCOK+zf1f7G0vuOiXrp7dU1qq+fQBoqZ3wCDAkhFzw==} + /@babel/plugin-transform-react-jsx-development/7.16.5_@babel+core@7.16.5: + resolution: {integrity: sha512-uQSLacMZSGLCxOw20dzo1dmLlKkd+DsayoV54q3MHXhbqgPzoiGerZQgNPl/Ro8/OcXV2ugfnkx+rxdS0sN5Uw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/plugin-transform-react-jsx': 7.16.0_@babel+core@7.16.0 + '@babel/core': 7.16.5 + '@babel/plugin-transform-react-jsx': 7.16.5_@babel+core@7.16.5 dev: false - /@babel/plugin-transform-react-jsx-self/7.16.0_@babel+core@7.16.0: - resolution: {integrity: sha512-97yCFY+2GvniqOThOSjPor8xUoDiQ0STVWAQMl3pjhJoFVe5DuXDLZCRSZxu9clx+oRCbTiXGgKEG/Yoyo6Y+w==} + /@babel/plugin-transform-react-jsx-self/7.16.5_@babel+core@7.16.5: + resolution: {integrity: sha512-fvwq+jir1Vn4f5oBS0H/J/gD5CneTD53MHs+NMjlHcha4Sq35fwxI5RtmJGEBXO+M93f/eeD9cAhRPhmLyJiVw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: false - /@babel/plugin-transform-react-jsx-source/7.16.0_@babel+core@7.16.0: - resolution: {integrity: sha512-8yvbGGrHOeb/oyPc9tzNoe9/lmIjz3HLa9Nc5dMGDyNpGjfFrk8D2KdEq9NRkftZzeoQEW6yPQ29TMZtrLiUUA==} + /@babel/plugin-transform-react-jsx-source/7.16.5_@babel+core@7.16.5: + resolution: {integrity: sha512-/eP+nZywJntGLjSPjksAnM9/ELIs3RbiEuTu2/zAOzwwBcfiu+m/iptEq1lERUUtSXubYSHVnVHMr13GR+TwPw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 + '@babel/core': 7.16.5 + '@babel/helper-plugin-utils': 7.16.5 dev: false - /@babel/plugin-transform-react-jsx/7.16.0_@babel+core@7.16.0: - resolution: {integrity: sha512-rqDgIbukZ44pqq7NIRPGPGNklshPkvlmvqjdx3OZcGPk4zGIenYkxDTvl3LsSL8gqcc3ZzGmXPE6hR/u/voNOw==} + /@babel/plugin-transform-react-jsx/7.16.5_@babel+core@7.16.5: + resolution: {integrity: sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@babel/helper-annotate-as-pure': 7.16.0 '@babel/helper-module-imports': 7.16.0 - '@babel/helper-plugin-utils': 7.14.5 - '@babel/plugin-syntax-jsx': 7.16.0_@babel+core@7.16.0 + '@babel/helper-plugin-utils': 7.16.5 + '@babel/plugin-syntax-jsx': 7.16.5_@babel+core@7.16.5 '@babel/types': 7.16.0 dev: false - /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.0: + /@babel/plugin-transform-typescript/7.16.1_@babel+core@7.16.5: resolution: {integrity: sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.16.0 - '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.0 + '@babel/core': 7.16.5 + '@babel/helper-create-class-features-plugin': 7.16.0_@babel+core@7.16.5 '@babel/helper-plugin-utils': 7.14.5 - '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0 + '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.5 transitivePeerDependencies: - supports-color dev: false @@ -1368,8 +1425,8 @@ packages: dependencies: regenerator-runtime: 0.13.9 - /@babel/standalone/7.16.4: - resolution: {integrity: sha512-FDRLwjeQfPm5jaHNuB+vwNyGCp24Ah3kEsbLzKmh0eSru+QCr4DmjgbRPoz71AwXLVtXU+l/i7MlVlIj5XO7Gw==} + /@babel/standalone/7.16.6: + resolution: {integrity: sha512-wjildVe951w1IPEPN4G76j+y5JFZfJN9gdyP8o9zd61qbiVEecAgORKskK1D/7VrJZrZS+nxDbhj2akEFU2RJw==} engines: {node: '>=6.9.0'} dev: false @@ -1396,6 +1453,24 @@ packages: globals: 11.12.0 transitivePeerDependencies: - supports-color + dev: false + + /@babel/traverse/7.16.5: + resolution: {integrity: sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.16.0 + '@babel/generator': 7.16.5 + '@babel/helper-environment-visitor': 7.16.5 + '@babel/helper-function-name': 7.16.0 + '@babel/helper-hoist-variables': 7.16.0 + '@babel/helper-split-export-declaration': 7.16.0 + '@babel/parser': 7.16.6 + '@babel/types': 7.16.0 + debug: 4.3.3 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color /@babel/types/7.16.0: resolution: {integrity: sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==} @@ -1424,30 +1499,35 @@ packages: '@cspotcode/source-map-consumer': 0.8.0 dev: true - /@docsearch/css/1.0.0-alpha.28: - resolution: {integrity: sha512-1AhRzVdAkrWwhaxTX6/R7SnFHz8yLz1W8I/AldlTrfbNvZs9INk1FZiEFTJdgHaP68nhgQNWSGlQiDiI3y2RYg==} + /@docsearch/css/3.0.0-alpha.42: + resolution: {integrity: sha512-AGwI2AXUacYhVOHmYnsXoYDJKO6Ued2W+QO80GERbMLhC7GH5tfvtW5REs/s7jSdcU3vzFoxT8iPDBCh/PkrlQ==} dev: true - /@docsearch/js/1.0.0-alpha.28: - resolution: {integrity: sha512-2g7aPhBy7FoEyeZW2G3LYHWVa8CFvqyozEz8PXt3hyywdFcmEIqmoCRwn8kboVftrOKCjtPcuLCewsaBoB3uiw==} + /@docsearch/js/3.0.0-alpha.42: + resolution: {integrity: sha512-8rxxsvFKS5GzDX2MYMETeib4EOwAkoxVUHFP5R4tSENXojhuCEy3np+k3Q0c9WPT+MUmWLxKJab5jyl0jmaeBQ==} dependencies: - '@docsearch/react': 1.0.0-alpha.28 + '@docsearch/react': 3.0.0-alpha.42 preact: 10.5.15 transitivePeerDependencies: + - '@algolia/client-search' + - '@types/react' - react - react-dom dev: true - /@docsearch/react/1.0.0-alpha.28: - resolution: {integrity: sha512-XjJOnCBXn+UZmtuDmgzlVIHnnvh6yHVwG4aFq8AXN6xJEIX3f180FvGaowFWAxgdtHplJxFGux0Xx4piHqBzIw==} + /@docsearch/react/3.0.0-alpha.42: + resolution: {integrity: sha512-1aOslZJDxwUUcm2QRNmlEePUgL8P5fOAeFdOLDMctHQkV2iTja9/rKVbkP8FZbIUnZxuuCCn8ErLrjD/oXWOag==} peerDependencies: - react: ^16.8.0 - react-dom: ^16.8.0 + '@types/react': '>= 16.8.0 < 18.0.0' + react: '>= 16.8.0 < 18.0.0' + react-dom: '>= 16.8.0 < 18.0.0' dependencies: - '@docsearch/css': 1.0.0-alpha.28 - '@francoischalifour/autocomplete-core': 1.0.0-alpha.28 - '@francoischalifour/autocomplete-preset-algolia': 1.0.0-alpha.28 + '@algolia/autocomplete-core': 1.5.0 + '@algolia/autocomplete-preset-algolia': 1.5.0_algoliasearch@4.11.0 + '@docsearch/css': 3.0.0-alpha.42 algoliasearch: 4.11.0 + transitivePeerDependencies: + - '@algolia/client-search' dev: true /@emotion/babel-plugin/11.3.0: @@ -1530,13 +1610,13 @@ packages: resolution: {integrity: sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==} dev: false - /@eslint/eslintrc/1.0.4: - resolution: {integrity: sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==} + /@eslint/eslintrc/1.0.5: + resolution: {integrity: sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.2 - espree: 9.1.0 + debug: 4.3.3 + espree: 9.2.0 globals: 13.12.0 ignore: 4.0.6 import-fresh: 3.3.0 @@ -1547,20 +1627,12 @@ packages: - supports-color dev: true - /@francoischalifour/autocomplete-core/1.0.0-alpha.28: - resolution: {integrity: sha512-rL9x+72btViw+9icfBKUJjZj87FgjFrD2esuTUqtj4RAX3s4AuVZiN8XEsfjQBSc6qJk31cxlvqZHC/BIyYXgg==} - dev: true - - /@francoischalifour/autocomplete-preset-algolia/1.0.0-alpha.28: - resolution: {integrity: sha512-bprfNmYt1opFUFEtD2XfY/kEsm13bzHQgU80uMjhuK0DJ914IjolT1GytpkdM6tJ4MBvyiJPP+bTtWO+BZ7c7w==} - dev: true - - /@humanwhocodes/config-array/0.6.0: - resolution: {integrity: sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==} + /@humanwhocodes/config-array/0.9.2: + resolution: {integrity: sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==} engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 - debug: 4.3.2 + debug: 4.3.3 minimatch: 3.0.4 transitivePeerDependencies: - supports-color @@ -1595,20 +1667,20 @@ packages: engines: {node: '>=8'} dev: true - /@jest/console/27.3.1: - resolution: {integrity: sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw==} + /@jest/console/27.4.2: + resolution: {integrity: sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 chalk: 4.1.2 - jest-message-util: 27.3.1 - jest-util: 27.3.1 + jest-message-util: 27.4.2 + jest-util: 27.4.2 slash: 3.0.0 dev: true - /@jest/core/27.3.1_ts-node@10.4.0: - resolution: {integrity: sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg==} + /@jest/core/27.4.5_ts-node@10.4.0: + resolution: {integrity: sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1616,30 +1688,30 @@ packages: node-notifier: optional: true dependencies: - '@jest/console': 27.3.1 - '@jest/reporters': 27.3.1 - '@jest/test-result': 27.3.1 - '@jest/transform': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@jest/console': 27.4.2 + '@jest/reporters': 27.4.5 + '@jest/test-result': 27.4.2 + '@jest/transform': 27.4.5 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 exit: 0.1.2 graceful-fs: 4.2.8 - jest-changed-files: 27.3.0 - jest-config: 27.3.1_ts-node@10.4.0 - jest-haste-map: 27.3.1 - jest-message-util: 27.3.1 - jest-regex-util: 27.0.6 - jest-resolve: 27.3.1 - jest-resolve-dependencies: 27.3.1 - jest-runner: 27.3.1 - jest-runtime: 27.3.1 - jest-snapshot: 27.3.1 - jest-util: 27.3.1 - jest-validate: 27.3.1 - jest-watcher: 27.3.1 + jest-changed-files: 27.4.2 + jest-config: 27.4.5_ts-node@10.4.0 + jest-haste-map: 27.4.5 + jest-message-util: 27.4.2 + jest-regex-util: 27.4.0 + jest-resolve: 27.4.5 + jest-resolve-dependencies: 27.4.5 + jest-runner: 27.4.5 + jest-runtime: 27.4.5 + jest-snapshot: 27.4.5 + jest-util: 27.4.2 + jest-validate: 27.4.2 + jest-watcher: 27.4.2 micromatch: 4.0.4 rimraf: 3.0.2 slash: 3.0.0 @@ -1652,61 +1724,39 @@ packages: - utf-8-validate dev: true - /@jest/environment/27.3.1: - resolution: {integrity: sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/fake-timers': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 - jest-mock: 27.3.0 - dev: true - - /@jest/environment/27.4.2: - resolution: {integrity: sha512-uSljKxh/rGlHlmhyeG4ZoVK9hOec+EPBkwTHkHKQ2EqDu5K+MaG9uJZ8o1CbRsSdZqSuhXvJCYhBWsORPPg6qw==} + /@jest/environment/27.4.4: + resolution: {integrity: sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/fake-timers': 27.4.2 '@jest/types': 27.4.2 - '@types/node': 16.11.9 + '@types/node': 16.11.14 jest-mock: 27.4.2 dev: true - /@jest/fake-timers/27.3.1: - resolution: {integrity: sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/types': 27.2.5 - '@sinonjs/fake-timers': 8.1.0 - '@types/node': 16.11.9 - jest-message-util: 27.3.1 - jest-mock: 27.3.0 - jest-util: 27.3.1 - dev: true - /@jest/fake-timers/27.4.2: resolution: {integrity: sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.4.2 '@sinonjs/fake-timers': 8.1.0 - '@types/node': 16.11.9 + '@types/node': 16.11.14 jest-message-util: 27.4.2 jest-mock: 27.4.2 jest-util: 27.4.2 dev: true - /@jest/globals/27.3.1: - resolution: {integrity: sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg==} + /@jest/globals/27.4.4: + resolution: {integrity: sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.3.1 - '@jest/types': 27.2.5 - expect: 27.3.1 + '@jest/environment': 27.4.4 + '@jest/types': 27.4.2 + expect: 27.4.2 dev: true - /@jest/reporters/27.3.1: - resolution: {integrity: sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w==} + /@jest/reporters/27.4.5: + resolution: {integrity: sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -1715,11 +1765,11 @@ packages: optional: true dependencies: '@bcoe/v8-coverage': 0.2.3 - '@jest/console': 27.3.1 - '@jest/test-result': 27.3.1 - '@jest/transform': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@jest/console': 27.4.2 + '@jest/test-result': 27.4.2 + '@jest/transform': 27.4.5 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -1730,10 +1780,10 @@ packages: istanbul-lib-report: 3.0.0 istanbul-lib-source-maps: 4.0.1 istanbul-reports: 3.0.5 - jest-haste-map: 27.3.1 - jest-resolve: 27.3.1 - jest-util: 27.3.1 - jest-worker: 27.3.1 + jest-haste-map: 27.4.5 + jest-resolve: 27.4.5 + jest-util: 27.4.2 + jest-worker: 27.4.5 slash: 3.0.0 source-map: 0.6.1 string-length: 4.0.2 @@ -1743,8 +1793,8 @@ packages: - supports-color dev: true - /@jest/source-map/27.0.6: - resolution: {integrity: sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==} + /@jest/source-map/27.4.0: + resolution: {integrity: sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: callsites: 3.1.0 @@ -1752,42 +1802,42 @@ packages: source-map: 0.6.1 dev: true - /@jest/test-result/27.3.1: - resolution: {integrity: sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg==} + /@jest/test-result/27.4.2: + resolution: {integrity: sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/console': 27.3.1 - '@jest/types': 27.2.5 + '@jest/console': 27.4.2 + '@jest/types': 27.4.2 '@types/istanbul-lib-coverage': 2.0.3 collect-v8-coverage: 1.0.1 dev: true - /@jest/test-sequencer/27.3.1: - resolution: {integrity: sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA==} + /@jest/test-sequencer/27.4.5: + resolution: {integrity: sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/test-result': 27.3.1 + '@jest/test-result': 27.4.2 graceful-fs: 4.2.8 - jest-haste-map: 27.3.1 - jest-runtime: 27.3.1 + jest-haste-map: 27.4.5 + jest-runtime: 27.4.5 transitivePeerDependencies: - supports-color dev: true - /@jest/transform/27.3.1: - resolution: {integrity: sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ==} + /@jest/transform/27.4.5: + resolution: {integrity: sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.16.0 - '@jest/types': 27.2.5 + '@babel/core': 7.16.5 + '@jest/types': 27.4.2 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 1.8.0 fast-json-stable-stringify: 2.1.0 graceful-fs: 4.2.8 - jest-haste-map: 27.3.1 - jest-regex-util: 27.0.6 - jest-util: 27.3.1 + jest-haste-map: 27.4.5 + jest-regex-util: 27.4.0 + jest-util: 27.4.2 micromatch: 4.0.4 pirates: 4.0.1 slash: 3.0.0 @@ -1797,24 +1847,13 @@ packages: - supports-color dev: true - /@jest/types/27.2.5: - resolution: {integrity: sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@types/istanbul-lib-coverage': 2.0.3 - '@types/istanbul-reports': 3.0.1 - '@types/node': 16.11.9 - '@types/yargs': 16.0.4 - chalk: 4.1.2 - dev: true - /@jest/types/27.4.2: resolution: {integrity: sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@types/istanbul-lib-coverage': 2.0.3 '@types/istanbul-reports': 3.0.1 - '@types/node': 16.11.9 + '@types/node': 16.11.14 '@types/yargs': 16.0.4 chalk: 4.1.2 dev: true @@ -1841,30 +1880,30 @@ packages: - supports-color dev: false - /@microsoft/api-extractor-model/7.13.16: - resolution: {integrity: sha512-ttdxVXsTWL5dd26W1YNLe3LgDsE0EE273aZlcLe58W0opymBybCYU1Mn+OHQM8BuErrdvdN8LdpWAAbkiOEN/Q==} + /@microsoft/api-extractor-model/7.15.1: + resolution: {integrity: sha512-DWfS1o3oMY0mzdO3OuQbD/9vzn80jwM6tFd7XbiYnkpxwhD83LMGXz7NZWwSh+IaA+9w3LF4w62fT31Qq+dAMw==} dependencies: '@microsoft/tsdoc': 0.13.2 '@microsoft/tsdoc-config': 0.15.2 - '@rushstack/node-core-library': 3.43.2 + '@rushstack/node-core-library': 3.44.2 dev: true - /@microsoft/api-extractor/7.18.19: - resolution: {integrity: sha512-aY+/XR7PtQXtnqNPFRs3/+iVRlQJpo6uLTjO2g7PqmnMywl3GBU3bCgAlV/khZtAQbIs6Le57XxmSE6rOqbcfg==} + /@microsoft/api-extractor/7.19.2: + resolution: {integrity: sha512-LxSa9lwp7eYtM4i5y/1n79QpotPKlmpCrVQbkb0LAHE1sCRHpZDTb6p3cMJthDhYPMjAYKOLfq639GwtZrg23Q==} hasBin: true dependencies: - '@microsoft/api-extractor-model': 7.13.16 + '@microsoft/api-extractor-model': 7.15.1 '@microsoft/tsdoc': 0.13.2 '@microsoft/tsdoc-config': 0.15.2 - '@rushstack/node-core-library': 3.43.2 - '@rushstack/rig-package': 0.3.5 - '@rushstack/ts-command-line': 4.10.4 + '@rushstack/node-core-library': 3.44.2 + '@rushstack/rig-package': 0.3.6 + '@rushstack/ts-command-line': 4.10.5 colors: 1.2.5 lodash: 4.17.21 resolve: 1.17.0 semver: 7.3.5 source-map: 0.6.1 - typescript: 4.4.4 + typescript: 4.5.4 dev: true /@microsoft/tsdoc-config/0.15.2: @@ -1987,8 +2026,8 @@ packages: rollup: 2.59.0 dev: true - /@rollup/plugin-node-resolve/13.0.6_rollup@2.59.0: - resolution: {integrity: sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA==} + /@rollup/plugin-node-resolve/13.1.1_rollup@2.59.0: + resolution: {integrity: sha512-6QKtRevXLrmEig9UiMYt2fSvee9TyltGRfw+qSs6xjUnxwjOzTOqy+/Lpxsgjb8mJn1EQNbCDAvt89O4uzL5kw==} engines: {node: '>= 10.0.0'} peerDependencies: rollup: ^2.42.0 @@ -2029,15 +2068,15 @@ packages: rollup: 2.59.0 dev: true - /@rollup/pluginutils/4.1.1: - resolution: {integrity: sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ==} + /@rollup/pluginutils/4.1.2: + resolution: {integrity: sha512-ROn4qvkxP9SyPeHaf7uQC/GPFY6L/OWy9+bd9AwcjOAWQwxRscoEyAUD8qCY5o5iL4jqQwoLk2kaTKJPb/HwzQ==} engines: {node: '>= 8.0.0'} dependencies: estree-walker: 2.0.2 picomatch: 2.3.0 - /@rushstack/node-core-library/3.43.2: - resolution: {integrity: sha512-b7AEhSf6CvZgvuDcWMFDeKx2mQSn9AVnMQVyxNxFeHCtLz3gJicqCOlw2GOXM8HKh6PInLdil/NVCDcstwSrIw==} + /@rushstack/node-core-library/3.44.2: + resolution: {integrity: sha512-lQ8Ct267UKkNSJSDxpBWn7SyyITWQ9l3Xqww0V+YY0rMt02r9eiGvwwPaU1ugJW7IMVo6r/HXvgbmpOSPyzGyg==} dependencies: '@types/node': 12.20.24 colors: 1.2.5 @@ -2047,18 +2086,18 @@ packages: resolve: 1.17.0 semver: 7.3.5 timsort: 0.3.0 - z-schema: 3.18.4 + z-schema: 5.0.2 dev: true - /@rushstack/rig-package/0.3.5: - resolution: {integrity: sha512-CvqWw+E81U5lRBN/lUj7Ngr/XQa/PPb2jAS5QcLP7WL+IMUl+3+Cc2qYrsDoB4zke81kz+usWGmBQpBzGMLmAA==} + /@rushstack/rig-package/0.3.6: + resolution: {integrity: sha512-H/uFsAT6cD4JCYrlQXYMZg+wPVECByFoJLGqfGRiTwSS5ngQw9QxnFV2mPG2LrxFUsMjLQ2lsrYr523700XzfA==} dependencies: resolve: 1.17.0 strip-json-comments: 3.1.1 dev: true - /@rushstack/ts-command-line/4.10.4: - resolution: {integrity: sha512-4T5ao4UgDb6LmiRj4GumvG3VT/p6RSMgl7TN7S58ifaAGN2GeTNBajFCDdJs9QQP0d/4tA5p0SFzT7Ps5Byirg==} + /@rushstack/ts-command-line/4.10.5: + resolution: {integrity: sha512-5fVlTDbKsJ5WyT6L7NrnOlLG3uoITKxoqTPP2j0QZEi95kPbVT4+VPZaXXDJtkrao9qrIyig8pLK9WABY1bb3w==} dependencies: '@types/argparse': 1.0.38 argparse: 1.0.10 @@ -2110,7 +2149,7 @@ packages: /@types/babel__core/7.1.16: resolution: {integrity: sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==} dependencies: - '@babel/parser': 7.16.2 + '@babel/parser': 7.16.6 '@babel/types': 7.16.0 '@types/babel__generator': 7.6.3 '@types/babel__template': 7.4.1 @@ -2126,7 +2165,7 @@ packages: /@types/babel__template/7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.16.2 + '@babel/parser': 7.16.6 '@babel/types': 7.16.0 dev: true @@ -2161,19 +2200,19 @@ packages: /@types/etag/1.8.1: resolution: {integrity: sha512-bsKkeSqN7HYyYntFRAmzcwx/dKW4Wa+KVMTInANlI72PWLQmOpZu96j0OqHZGArW4VQwCmJPteQlXaUDeOB0WQ==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/graceful-fs/4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/hash-sum/1.0.0: @@ -2237,8 +2276,8 @@ packages: resolution: {integrity: sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==} dev: true - /@types/node/16.11.9: - resolution: {integrity: sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==} + /@types/node/16.11.14: + resolution: {integrity: sha512-mK6BKLpL0bG6v2CxHbm0ed6RcZrAtTHBTd/ZpnlVPVa3HkumsqLE4BC4u6TQ8D7pnrRbOU0am6epuALs+Ncnzw==} dev: true /@types/normalize-package-data/2.4.1: @@ -2255,17 +2294,17 @@ packages: /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/resolve/1.20.1: resolution: {integrity: sha512-Ku5+GPFa12S3W26Uwtw+xyrtIpaZsGYHH6zxNbZlstmlvMYSZRzOwzwsXbxlVUbHyUucctSyuFtu6bNxwYomIw==} dev: true - /@types/sass/1.43.0: - resolution: {integrity: sha512-DPSXNJ1rYLo88GyF9tuB4bsYGfpKI1a4+wOQmc+LI1SUoocm9QLRSpz0GxxuyjmJsYFIQo/dDlRSSpIXngff+w==} + /@types/sass/1.43.1: + resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/semver/7.3.9: @@ -2283,13 +2322,13 @@ packages: /@types/stylus/0.48.36: resolution: {integrity: sha512-7klEq45BUE8ZJWkYWy1E442DcCs0wi0FkFY1Tjr6EJ7edL77t9w/QmOwlkFumBMqHlatDBtrA2xgfRrGqkUkzg==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/ws/8.2.2: resolution: {integrity: sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true /@types/yargs-parser/20.2.1: @@ -2306,12 +2345,12 @@ packages: resolution: {integrity: sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==} requiresBuild: true dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true optional: true - /@typescript-eslint/eslint-plugin/5.4.0_8fbd82ef37e23da98dfca9805cf945cd: - resolution: {integrity: sha512-9/yPSBlwzsetCsGEn9j24D8vGQgJkOTr4oMLas/w886ZtzKIs1iyoqFrwsX2fqYEeUwsdBpC21gcjRGo57u0eg==} + /@typescript-eslint/eslint-plugin/5.7.0_d7a0d6b59468b4d2ea38f782f4f112e3: + resolution: {integrity: sha512-8RTGBpNn5a9M628wBPrCbJ+v3YTEOE2qeZb7TDkGKTDXSj36KGRg92SpFFaR/0S3rSXQxM0Og/kV9EyadsYSBg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -2321,11 +2360,11 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 5.4.0_eslint@8.3.0+typescript@4.4.4 - '@typescript-eslint/parser': 5.4.0_eslint@8.3.0+typescript@4.4.4 - '@typescript-eslint/scope-manager': 5.4.0 - debug: 4.3.2 - eslint: 8.3.0 + '@typescript-eslint/experimental-utils': 5.7.0_eslint@8.4.1+typescript@4.4.4 + '@typescript-eslint/parser': 5.7.0_eslint@8.4.1+typescript@4.4.4 + '@typescript-eslint/scope-manager': 5.7.0 + debug: 4.3.3 + eslint: 8.4.1 functional-red-black-tree: 1.0.1 ignore: 5.1.9 regexpp: 3.2.0 @@ -2336,26 +2375,26 @@ packages: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.4.0_eslint@8.3.0+typescript@4.4.4: - resolution: {integrity: sha512-Nz2JDIQUdmIGd6p33A+naQmwfkU5KVTLb/5lTk+tLVTDacZKoGQisj8UCxk7onJcrgjIvr8xWqkYI+DbI3TfXg==} + /@typescript-eslint/experimental-utils/5.7.0_eslint@8.4.1+typescript@4.4.4: + resolution: {integrity: sha512-u57eZ5FbEpzN5kSjmVrSesovWslH2ZyNPnaXQMXWgH57d5+EVHEt76W75vVuI9qKZ5BMDKNfRN+pxcPEjQjb2A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' dependencies: '@types/json-schema': 7.0.9 - '@typescript-eslint/scope-manager': 5.4.0 - '@typescript-eslint/types': 5.4.0 - '@typescript-eslint/typescript-estree': 5.4.0_typescript@4.4.4 - eslint: 8.3.0 + '@typescript-eslint/scope-manager': 5.7.0 + '@typescript-eslint/types': 5.7.0 + '@typescript-eslint/typescript-estree': 5.7.0_typescript@4.4.4 + eslint: 8.4.1 eslint-scope: 5.1.1 - eslint-utils: 3.0.0_eslint@8.3.0 + eslint-utils: 3.0.0_eslint@8.4.1 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/parser/5.4.0_eslint@8.3.0+typescript@4.4.4: - resolution: {integrity: sha512-JoB41EmxiYpaEsRwpZEYAJ9XQURPFer8hpkIW9GiaspVLX8oqbqNM8P4EP8HOZg96yaALiLEVWllA2E8vwsIKw==} + /@typescript-eslint/parser/5.7.0_eslint@8.4.1+typescript@4.4.4: + resolution: {integrity: sha512-m/gWCCcS4jXw6vkrPQ1BjZ1vomP01PArgzvauBqzsoZ3urLbsRChexB8/YV8z9HwE3qlJM35FxfKZ1nfP/4x8g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -2364,31 +2403,31 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.4.0 - '@typescript-eslint/types': 5.4.0 - '@typescript-eslint/typescript-estree': 5.4.0_typescript@4.4.4 - debug: 4.3.2 - eslint: 8.3.0 + '@typescript-eslint/scope-manager': 5.7.0 + '@typescript-eslint/types': 5.7.0 + '@typescript-eslint/typescript-estree': 5.7.0_typescript@4.4.4 + debug: 4.3.3 + eslint: 8.4.1 typescript: 4.4.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager/5.4.0: - resolution: {integrity: sha512-pRxFjYwoi8R+n+sibjgF9iUiAELU9ihPBtHzocyW8v8D8G8KeQvXTsW7+CBYIyTYsmhtNk50QPGLE3vrvhM5KA==} + /@typescript-eslint/scope-manager/5.7.0: + resolution: {integrity: sha512-7mxR520DGq5F7sSSgM0HSSMJ+TFUymOeFRMfUfGFAVBv8BR+Jv1vHgAouYUvWRZeszVBJlLcc9fDdktxb5kmxA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.4.0 - '@typescript-eslint/visitor-keys': 5.4.0 + '@typescript-eslint/types': 5.7.0 + '@typescript-eslint/visitor-keys': 5.7.0 dev: true - /@typescript-eslint/types/5.4.0: - resolution: {integrity: sha512-GjXNpmn+n1LvnttarX+sPD6+S7giO+9LxDIGlRl4wK3a7qMWALOHYuVSZpPTfEIklYjaWuMtfKdeByx0AcaThA==} + /@typescript-eslint/types/5.7.0: + resolution: {integrity: sha512-5AeYIF5p2kAneIpnLFve8g50VyAjq7udM7ApZZ9JYjdPjkz0LvODfuSHIDUVnIuUoxafoWzpFyU7Sqbxgi79mA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.4.0_typescript@4.4.4: - resolution: {integrity: sha512-nhlNoBdhKuwiLMx6GrybPT3SFILm5Gij2YBdPEPFlYNFAXUJWX6QRgvi/lwVoadaQEFsizohs6aFRMqsXI2ewA==} + /@typescript-eslint/typescript-estree/5.7.0_typescript@4.4.4: + resolution: {integrity: sha512-aO1Ql+izMrTnPj5aFFlEJkpD4jRqC4Gwhygu2oHK2wfVQpmOPbyDSveJ+r/NQo+PWV43M6uEAeLVbTi09dFLhg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -2396,9 +2435,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.4.0 - '@typescript-eslint/visitor-keys': 5.4.0 - debug: 4.3.2 + '@typescript-eslint/types': 5.7.0 + '@typescript-eslint/visitor-keys': 5.7.0 + debug: 4.3.3 globby: 11.0.4 is-glob: 4.0.3 semver: 7.3.5 @@ -2408,11 +2447,11 @@ packages: - supports-color dev: true - /@typescript-eslint/visitor-keys/5.4.0: - resolution: {integrity: sha512-PVbax7MeE7tdLfW5SA0fs8NGVVr+buMPrcj+CWYWPXsZCH8qZ1THufDzbXm1xrZ2b2PA1iENJ0sRq5fuUtvsJg==} + /@typescript-eslint/visitor-keys/5.7.0: + resolution: {integrity: sha512-hdohahZ4lTFcglZSJ3DGdzxQHBSxsLVqHzkiOmKi7xVAWC4y2c1bIMKmPJSrA4aOEoRUPOKQ87Y/taC7yVHpFg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.4.0 + '@typescript-eslint/types': 5.7.0 eslint-visitor-keys: 3.1.0 dev: true @@ -2420,11 +2459,11 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: false - /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.16.0: + /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.16.5: resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: '@babel/helper-module-imports': 7.16.0 - '@babel/plugin-syntax-jsx': 7.16.0_@babel+core@7.16.0 + '@babel/plugin-syntax-jsx': 7.16.0_@babel+core@7.16.5 '@babel/template': 7.16.0 '@babel/traverse': 7.16.0 '@babel/types': 7.16.0 @@ -2437,24 +2476,6 @@ packages: - supports-color dev: false - /@vue/compiler-core/3.2.21: - resolution: {integrity: sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==} - dependencies: - '@babel/parser': 7.16.2 - '@vue/shared': 3.2.21 - estree-walker: 2.0.2 - source-map: 0.6.1 - dev: true - - /@vue/compiler-core/3.2.22: - resolution: {integrity: sha512-uAkovrVeTcjzpiM4ECmVaMrv/bjdgAaLzvjcGqQPBEyUrcqsCgccT9fHJ/+hWVGhyMahmBwLqcn4guULNx7sdw==} - dependencies: - '@babel/parser': 7.16.2 - '@vue/shared': 3.2.22 - estree-walker: 2.0.2 - source-map: 0.6.1 - dev: true - /@vue/compiler-core/3.2.25: resolution: {integrity: sha512-FlffKezIqztTCTyG0klkYRwhdyL6b1PTTCIerPb4p2R9qQaczccTX5g9ysi9w6tpLQ48a1WiXnFDJhWD7XoqwA==} dependencies: @@ -2463,18 +2484,13 @@ packages: estree-walker: 2.0.2 source-map: 0.6.1 - /@vue/compiler-dom/3.2.21: - resolution: {integrity: sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA==} + /@vue/compiler-core/3.2.26: + resolution: {integrity: sha512-N5XNBobZbaASdzY9Lga2D9Lul5vdCIOXvUMd6ThcN8zgqQhPKfCV+wfAJNNJKQkSHudnYRO2gEB+lp0iN3g2Tw==} dependencies: - '@vue/compiler-core': 3.2.21 - '@vue/shared': 3.2.21 - dev: true - - /@vue/compiler-dom/3.2.22: - resolution: {integrity: sha512-VZdsw/VuO1ODs8K7NQwnMQzKITDkIFlYYC03SVnunuf6eNRxBPEonSyqbWNoo6qNaHAEBTG6VVcZC5xC9bAx1g==} - dependencies: - '@vue/compiler-core': 3.2.22 - '@vue/shared': 3.2.22 + '@babel/parser': 7.16.6 + '@vue/shared': 3.2.26 + estree-walker: 2.0.2 + source-map: 0.6.1 dev: true /@vue/compiler-dom/3.2.25: @@ -2483,19 +2499,11 @@ packages: '@vue/compiler-core': 3.2.25 '@vue/shared': 3.2.25 - /@vue/compiler-sfc/3.2.21: - resolution: {integrity: sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ==} + /@vue/compiler-dom/3.2.26: + resolution: {integrity: sha512-smBfaOW6mQDxcT3p9TKT6mE22vjxjJL50GFVJiI0chXYGU/xzC05QRGrW3HHVuJrmLTLx5zBhsZ2dIATERbarg==} dependencies: - '@babel/parser': 7.16.2 - '@vue/compiler-core': 3.2.21 - '@vue/compiler-dom': 3.2.21 - '@vue/compiler-ssr': 3.2.21 - '@vue/ref-transform': 3.2.21 - '@vue/shared': 3.2.21 - estree-walker: 2.0.2 - magic-string: 0.25.7 - postcss: 8.3.11 - source-map: 0.6.1 + '@vue/compiler-core': 3.2.26 + '@vue/shared': 3.2.26 dev: true /@vue/compiler-sfc/3.2.25: @@ -2512,11 +2520,19 @@ packages: postcss: 8.3.11 source-map: 0.6.1 - /@vue/compiler-ssr/3.2.21: - resolution: {integrity: sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g==} + /@vue/compiler-sfc/3.2.26: + resolution: {integrity: sha512-ePpnfktV90UcLdsDQUh2JdiTuhV0Skv2iYXxfNMOK/F3Q+2BO0AulcVcfoksOpTJGmhhfosWfMyEaEf0UaWpIw==} dependencies: - '@vue/compiler-dom': 3.2.21 - '@vue/shared': 3.2.21 + '@babel/parser': 7.16.6 + '@vue/compiler-core': 3.2.26 + '@vue/compiler-dom': 3.2.26 + '@vue/compiler-ssr': 3.2.26 + '@vue/reactivity-transform': 3.2.26 + '@vue/shared': 3.2.26 + estree-walker: 2.0.2 + magic-string: 0.25.7 + postcss: 8.3.11 + source-map: 0.6.1 dev: true /@vue/compiler-ssr/3.2.25: @@ -2525,6 +2541,13 @@ packages: '@vue/compiler-dom': 3.2.25 '@vue/shared': 3.2.25 + /@vue/compiler-ssr/3.2.26: + resolution: {integrity: sha512-2mywLX0ODc4Zn8qBoA2PDCsLEZfpUGZcyoFRLSOjyGGK6wDy2/5kyDOWtf0S0UvtoyVq95OTSGIALjZ4k2q/ag==} + dependencies: + '@vue/compiler-dom': 3.2.26 + '@vue/shared': 3.2.26 + dev: true + /@vue/devtools-api/6.0.0-beta.20: resolution: {integrity: sha512-21u2jFOk8jbAneeGpDwZQ0W66RJa0IBDUyVl6SgKnn2cRFjLWzKj+ukXjpLhYr1KASyCe5E5U4jXwChVo0YUAw==} dev: false @@ -2538,10 +2561,14 @@ packages: estree-walker: 2.0.2 magic-string: 0.25.7 - /@vue/reactivity/3.2.21: - resolution: {integrity: sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==} + /@vue/reactivity-transform/3.2.26: + resolution: {integrity: sha512-XKMyuCmzNA7nvFlYhdKwD78rcnmPb7q46uoR00zkX6yZrUmcCQ5OikiwUEVbvNhL5hBJuvbSO95jB5zkUon+eQ==} dependencies: - '@vue/shared': 3.2.21 + '@babel/parser': 7.16.6 + '@vue/compiler-core': 3.2.26 + '@vue/shared': 3.2.26 + estree-walker: 2.0.2 + magic-string: 0.25.7 dev: true /@vue/reactivity/3.2.25: @@ -2549,21 +2576,10 @@ packages: dependencies: '@vue/shared': 3.2.25 - /@vue/ref-transform/3.2.21: - resolution: {integrity: sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ==} + /@vue/reactivity/3.2.26: + resolution: {integrity: sha512-h38bxCZLW6oFJVDlCcAiUKFnXI8xP8d+eO0pcDxx+7dQfSPje2AO6M9S9QO6MrxQB7fGP0DH0dYQ8ksf6hrXKQ==} dependencies: - '@babel/parser': 7.16.2 - '@vue/compiler-core': 3.2.21 - '@vue/shared': 3.2.21 - estree-walker: 2.0.2 - magic-string: 0.25.7 - dev: true - - /@vue/runtime-core/3.2.21: - resolution: {integrity: sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==} - dependencies: - '@vue/reactivity': 3.2.21 - '@vue/shared': 3.2.21 + '@vue/shared': 3.2.26 dev: true /@vue/runtime-core/3.2.25: @@ -2572,12 +2588,11 @@ packages: '@vue/reactivity': 3.2.25 '@vue/shared': 3.2.25 - /@vue/runtime-dom/3.2.21: - resolution: {integrity: sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==} + /@vue/runtime-core/3.2.26: + resolution: {integrity: sha512-BcYi7qZ9Nn+CJDJrHQ6Zsmxei2hDW0L6AB4vPvUQGBm2fZyC0GXd/4nVbyA2ubmuhctD5RbYY8L+5GUJszv9mQ==} dependencies: - '@vue/runtime-core': 3.2.21 - '@vue/shared': 3.2.21 - csstype: 2.6.18 + '@vue/reactivity': 3.2.26 + '@vue/shared': 3.2.26 dev: true /@vue/runtime-dom/3.2.25: @@ -2587,14 +2602,12 @@ packages: '@vue/shared': 3.2.25 csstype: 2.6.18 - /@vue/server-renderer/3.2.21_vue@3.2.21: - resolution: {integrity: sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg==} - peerDependencies: - vue: 3.2.21 + /@vue/runtime-dom/3.2.26: + resolution: {integrity: sha512-dY56UIiZI+gjc4e8JQBwAifljyexfVCkIAu/WX8snh8vSOt/gMSEGwPRcl2UpYpBYeyExV8WCbgvwWRNt9cHhQ==} dependencies: - '@vue/compiler-ssr': 3.2.21 - '@vue/shared': 3.2.21 - vue: 3.2.21 + '@vue/runtime-core': 3.2.26 + '@vue/shared': 3.2.26 + csstype: 2.6.18 dev: true /@vue/server-renderer/3.2.25_vue@3.2.25: @@ -2606,17 +2619,23 @@ packages: '@vue/shared': 3.2.25 vue: 3.2.25 - /@vue/shared/3.2.21: - resolution: {integrity: sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA==} - dev: true - - /@vue/shared/3.2.22: - resolution: {integrity: sha512-qWVav014mpjEtbWbEgl0q9pEyrrIySKum8UVYjwhC6njrKzknLZPvfuYdQyVbApsqr94tf/3dP4pCuZmmjdCWQ==} + /@vue/server-renderer/3.2.26_vue@3.2.26: + resolution: {integrity: sha512-Jp5SggDUvvUYSBIvYEhy76t4nr1vapY/FIFloWmQzn7UxqaHrrBpbxrqPcTrSgGrcaglj0VBp22BKJNre4aA1w==} + peerDependencies: + vue: 3.2.26 + dependencies: + '@vue/compiler-ssr': 3.2.26 + '@vue/shared': 3.2.26 + vue: 3.2.26 dev: true /@vue/shared/3.2.25: resolution: {integrity: sha512-DkHJFV2gw9WBRmUCa21eyG0WvlF0l1QFOgTkWj29O4mt2Tv3BSE5PQOKhUruZIym4bBYCqx9ZGtoD1WohDprow==} + /@vue/shared/3.2.26: + resolution: {integrity: sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==} + dev: true + /@wessberg/stringutil/1.0.19: resolution: {integrity: sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg==} engines: {node: '>=8.0.0'} @@ -2928,18 +2947,18 @@ packages: - debug dev: false - /babel-jest/27.3.1_@babel+core@7.16.0: - resolution: {integrity: sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ==} + /babel-jest/27.4.5_@babel+core@7.16.5: + resolution: {integrity: sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: - '@babel/core': 7.16.0 - '@jest/transform': 27.3.1 - '@jest/types': 27.2.5 + '@babel/core': 7.16.5 + '@jest/transform': 27.4.5 + '@jest/types': 27.4.2 '@types/babel__core': 7.1.16 babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 27.2.0_@babel+core@7.16.0 + babel-preset-jest: 27.4.0_@babel+core@7.16.5 chalk: 4.1.2 graceful-fs: 4.2.8 slash: 3.0.0 @@ -2951,7 +2970,7 @@ packages: resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} engines: {node: '>=8'} dependencies: - '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-plugin-utils': 7.16.5 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 5.1.0 @@ -2960,8 +2979,8 @@ packages: - supports-color dev: true - /babel-plugin-jest-hoist/27.2.0: - resolution: {integrity: sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==} + /babel-plugin-jest-hoist/27.4.0: + resolution: {integrity: sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@babel/template': 7.16.0 @@ -2978,35 +2997,35 @@ packages: resolve: 1.20.0 dev: true - /babel-preset-current-node-syntax/1.0.1_@babel+core@7.16.0: + /babel-preset-current-node-syntax/1.0.1_@babel+core@7.16.5: resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.16.0 - '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.0 - '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.16.0 - '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.16.0 - '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.16.0 - '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.0 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.0 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.0 - '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.0 - '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.0 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.0 - '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.0 - '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.0 - dev: true - - /babel-preset-jest/27.2.0_@babel+core@7.16.0: - resolution: {integrity: sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==} + '@babel/core': 7.16.5 + '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.16.5 + '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.16.5 + '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.16.5 + '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.16.5 + '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.16.5 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.16.5 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.16.5 + '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.16.5 + '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.16.5 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.16.5 + '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.16.5 + '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.16.5 + dev: true + + /babel-preset-jest/27.4.0_@babel+core@7.16.5: + resolution: {integrity: sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.16.0 - babel-plugin-jest-hoist: 27.2.0 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.16.0 + '@babel/core': 7.16.5 + babel-plugin-jest-hoist: 27.4.0 + babel-preset-current-node-syntax: 1.0.1_@babel+core@7.16.5 dev: true /babel-walk/3.0.0-canary-5: @@ -3649,8 +3668,8 @@ packages: is-what: 3.14.1 dev: true - /core-js/3.19.1: - resolution: {integrity: sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==} + /core-js/3.20.0: + resolution: {integrity: sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==} requiresBuild: true dev: false @@ -3836,8 +3855,19 @@ packages: dependencies: ms: 2.1.2 - /debug/4.3.2_supports-color@9.0.2: - resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==} + /debug/4.3.3: + resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + + /debug/4.3.3_supports-color@9.0.2: + resolution: {integrity: sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -3959,8 +3989,8 @@ packages: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} dev: false - /diff-sequences/27.0.6: - resolution: {integrity: sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==} + /diff-sequences/27.4.0: + resolution: {integrity: sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dev: true @@ -4319,30 +4349,30 @@ packages: source-map: 0.6.1 dev: true - /eslint-define-config/1.1.4: - resolution: {integrity: sha512-B1o0OTL32lPXwjjCpe+HtowrHqAlldInkU9PWVs+BsSi3E1GgjGIsiEz0g/1jHpBjP8zZMWh+DmdaB7gdLjUKQ==} + /eslint-define-config/1.2.0: + resolution: {integrity: sha512-EQ8d9F9LmJVRfkZW9WgSa5VBAVZialrLZKy0k1062zlhM8KFUyFoAC8xRI+mdp5m81FNMPnpKZfyq0AfJDyNTg==} engines: {node: '>= 16.9.0', npm: '>= 7.0.0', pnpm: '>= 6.17.0'} dev: true - /eslint-plugin-es/3.0.1_eslint@8.3.0: + /eslint-plugin-es/3.0.1_eslint@8.4.1: resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=4.19.1' dependencies: - eslint: 8.3.0 + eslint: 8.4.1 eslint-utils: 2.1.0 regexpp: 3.2.0 dev: true - /eslint-plugin-node/11.1.0_eslint@8.3.0: + /eslint-plugin-node/11.1.0_eslint@8.4.1: resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=5.16.0' dependencies: - eslint: 8.3.0 - eslint-plugin-es: 3.0.1_eslint@8.3.0 + eslint: 8.4.1 + eslint-plugin-es: 3.0.1_eslint@8.4.1 eslint-utils: 2.1.0 ignore: 5.1.9 minimatch: 3.0.4 @@ -4373,13 +4403,13 @@ packages: eslint-visitor-keys: 1.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.3.0: + /eslint-utils/3.0.0_eslint@8.4.1: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.3.0 + eslint: 8.4.1 eslint-visitor-keys: 2.1.0 dev: true @@ -4398,24 +4428,24 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.3.0: - resolution: {integrity: sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==} + /eslint/8.4.1: + resolution: {integrity: sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint/eslintrc': 1.0.4 - '@humanwhocodes/config-array': 0.6.0 + '@eslint/eslintrc': 1.0.5 + '@humanwhocodes/config-array': 0.9.2 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.2 + debug: 4.3.3 doctrine: 3.0.0 enquirer: 2.3.6 escape-string-regexp: 4.0.0 eslint-scope: 7.1.0 - eslint-utils: 3.0.0_eslint@8.3.0 + eslint-utils: 3.0.0_eslint@8.4.1 eslint-visitor-keys: 3.1.0 - espree: 9.1.0 + espree: 9.2.0 esquery: 1.4.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -4445,8 +4475,8 @@ packages: - supports-color dev: true - /espree/9.1.0: - resolution: {integrity: sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==} + /espree/9.2.0: + resolution: {integrity: sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: acorn: 8.6.0 @@ -4543,16 +4573,16 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /expect/27.3.1: - resolution: {integrity: sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==} + /expect/27.4.2: + resolution: {integrity: sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 ansi-styles: 5.2.0 - jest-get-type: 27.3.1 - jest-matcher-utils: 27.3.1 - jest-message-util: 27.3.1 - jest-regex-util: 27.0.6 + jest-get-type: 27.4.0 + jest-matcher-utils: 27.4.2 + jest-message-util: 27.4.2 + jest-regex-util: 27.4.0 dev: true /express/4.17.1: @@ -4602,7 +4632,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: 4.3.2 + debug: 4.3.3 get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -5112,12 +5142,12 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.2 + debug: 4.3.3 transitivePeerDependencies: - supports-color dev: true - /http-proxy/1.18.1_debug@4.3.2: + /http-proxy/1.18.1_debug@4.3.3: resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} engines: {node: '>=8.0.0'} dependencies: @@ -5153,13 +5183,13 @@ packages: resolution: {integrity: sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=} dev: true - /icss-utils/5.1.0_postcss@8.3.11: + /icss-utils/5.1.0_postcss@8.4.5: resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.3.11 + postcss: 8.4.5 dev: true /ignore/4.0.6: @@ -5505,7 +5535,7 @@ packages: resolution: {integrity: sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.16.0 + '@babel/core': 7.16.5 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.0 @@ -5517,8 +5547,8 @@ packages: resolution: {integrity: sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.16.0 - '@babel/parser': 7.16.2 + '@babel/core': 7.16.5 + '@babel/parser': 7.16.6 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.0 @@ -5539,7 +5569,7 @@ packages: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: - debug: 4.3.2 + debug: 4.3.3 istanbul-lib-coverage: 3.2.0 source-map: 0.6.1 transitivePeerDependencies: @@ -5554,35 +5584,35 @@ packages: istanbul-lib-report: 3.0.0 dev: true - /jest-changed-files/27.3.0: - resolution: {integrity: sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg==} + /jest-changed-files/27.4.2: + resolution: {integrity: sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 execa: 5.1.1 throat: 6.0.1 dev: true - /jest-circus/27.3.1: - resolution: {integrity: sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw==} + /jest-circus/27.4.5: + resolution: {integrity: sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.3.1 - '@jest/test-result': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@jest/environment': 27.4.4 + '@jest/test-result': 27.4.2 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 - expect: 27.3.1 + expect: 27.4.2 is-generator-fn: 2.1.0 - jest-each: 27.3.1 - jest-matcher-utils: 27.3.1 - jest-message-util: 27.3.1 - jest-runtime: 27.3.1 - jest-snapshot: 27.3.1 - jest-util: 27.3.1 - pretty-format: 27.3.1 + jest-each: 27.4.2 + jest-matcher-utils: 27.4.2 + jest-message-util: 27.4.2 + jest-runtime: 27.4.5 + jest-snapshot: 27.4.5 + jest-util: 27.4.2 + pretty-format: 27.4.2 slash: 3.0.0 stack-utils: 2.0.5 throat: 6.0.1 @@ -5590,8 +5620,8 @@ packages: - supports-color dev: true - /jest-cli/27.3.1_ts-node@10.4.0: - resolution: {integrity: sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q==} + /jest-cli/27.4.5_ts-node@10.4.0: + resolution: {integrity: sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: @@ -5600,16 +5630,16 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.3.1_ts-node@10.4.0 - '@jest/test-result': 27.3.1 - '@jest/types': 27.2.5 + '@jest/core': 27.4.5_ts-node@10.4.0 + '@jest/test-result': 27.4.2 + '@jest/types': 27.4.2 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.8 import-local: 3.0.3 - jest-config: 27.3.1_ts-node@10.4.0 - jest-util: 27.3.1 - jest-validate: 27.3.1 + jest-config: 27.4.5_ts-node@10.4.0 + jest-util: 27.4.2 + jest-validate: 27.4.2 prompts: 2.4.2 yargs: 16.2.0 transitivePeerDependencies: @@ -5620,8 +5650,8 @@ packages: - utf-8-validate dev: true - /jest-config/27.3.1_ts-node@10.4.0: - resolution: {integrity: sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg==} + /jest-config/27.4.5_ts-node@10.4.0: + resolution: {integrity: sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: ts-node: '>=9.0.0' @@ -5629,28 +5659,29 @@ packages: ts-node: optional: true dependencies: - '@babel/core': 7.16.0 - '@jest/test-sequencer': 27.3.1 - '@jest/types': 27.2.5 - babel-jest: 27.3.1_@babel+core@7.16.0 + '@babel/core': 7.16.5 + '@jest/test-sequencer': 27.4.5 + '@jest/types': 27.4.2 + babel-jest: 27.4.5_@babel+core@7.16.5 chalk: 4.1.2 ci-info: 3.2.0 deepmerge: 4.2.2 glob: 7.2.0 graceful-fs: 4.2.8 - jest-circus: 27.3.1 - jest-environment-jsdom: 27.3.1 - jest-environment-node: 27.4.2 - jest-get-type: 27.3.1 - jest-jasmine2: 27.3.1 - jest-regex-util: 27.0.6 - jest-resolve: 27.3.1 - jest-runner: 27.3.1 - jest-util: 27.3.1 - jest-validate: 27.3.1 + jest-circus: 27.4.5 + jest-environment-jsdom: 27.4.4 + jest-environment-node: 27.4.4 + jest-get-type: 27.4.0 + jest-jasmine2: 27.4.5 + jest-regex-util: 27.4.0 + jest-resolve: 27.4.5 + jest-runner: 27.4.5 + jest-util: 27.4.2 + jest-validate: 27.4.2 micromatch: 4.0.4 - pretty-format: 27.3.1 - ts-node: 10.4.0_7dd5cf9af763e621261d5cc88a052be2 + pretty-format: 27.4.2 + slash: 3.0.0 + ts-node: 10.4.0_08095b3038b55682110c004d6a64072d transitivePeerDependencies: - bufferutil - canvas @@ -5663,39 +5694,49 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: chalk: 4.1.2 - diff-sequences: 27.0.6 - jest-get-type: 27.3.1 - pretty-format: 27.3.1 + diff-sequences: 27.4.0 + jest-get-type: 27.4.0 + pretty-format: 27.4.2 + dev: true + + /jest-diff/27.4.2: + resolution: {integrity: sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + dependencies: + chalk: 4.1.2 + diff-sequences: 27.4.0 + jest-get-type: 27.4.0 + pretty-format: 27.4.2 dev: true - /jest-docblock/27.0.6: - resolution: {integrity: sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==} + /jest-docblock/27.4.0: + resolution: {integrity: sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: detect-newline: 3.1.0 dev: true - /jest-each/27.3.1: - resolution: {integrity: sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ==} + /jest-each/27.4.2: + resolution: {integrity: sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 chalk: 4.1.2 - jest-get-type: 27.3.1 - jest-util: 27.3.1 - pretty-format: 27.3.1 + jest-get-type: 27.4.0 + jest-util: 27.4.2 + pretty-format: 27.4.2 dev: true - /jest-environment-jsdom/27.3.1: - resolution: {integrity: sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg==} + /jest-environment-jsdom/27.4.4: + resolution: {integrity: sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.3.1 - '@jest/fake-timers': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 - jest-mock: 27.3.0 - jest-util: 27.3.1 + '@jest/environment': 27.4.4 + '@jest/fake-timers': 27.4.2 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 + jest-mock: 27.4.2 + jest-util: 27.4.2 jsdom: 16.7.0 transitivePeerDependencies: - bufferutil @@ -5704,100 +5745,85 @@ packages: - utf-8-validate dev: true - /jest-environment-node/27.4.2: - resolution: {integrity: sha512-nzTZ5nJ+FabuZPH2YVci7SZIHpvtNRHPt8+vipLkCnAgXGjVzHm7XJWdnNqXbAkExIgiKeVEkVMNZOZE/LeiIg==} + /jest-environment-node/27.4.4: + resolution: {integrity: sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/environment': 27.4.2 + '@jest/environment': 27.4.4 '@jest/fake-timers': 27.4.2 '@jest/types': 27.4.2 - '@types/node': 16.11.9 + '@types/node': 16.11.14 jest-mock: 27.4.2 jest-util: 27.4.2 dev: true - /jest-get-type/27.3.1: - resolution: {integrity: sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==} + /jest-get-type/27.4.0: + resolution: {integrity: sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dev: true - /jest-haste-map/27.3.1: - resolution: {integrity: sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg==} + /jest-haste-map/27.4.5: + resolution: {integrity: sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 '@types/graceful-fs': 4.1.5 - '@types/node': 16.11.9 + '@types/node': 16.11.14 anymatch: 3.1.2 fb-watchman: 2.0.1 graceful-fs: 4.2.8 - jest-regex-util: 27.0.6 - jest-serializer: 27.0.6 - jest-util: 27.3.1 - jest-worker: 27.3.1 + jest-regex-util: 27.4.0 + jest-serializer: 27.4.0 + jest-util: 27.4.2 + jest-worker: 27.4.5 micromatch: 4.0.4 walker: 1.0.8 optionalDependencies: fsevents: 2.3.2 dev: true - /jest-jasmine2/27.3.1: - resolution: {integrity: sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg==} + /jest-jasmine2/27.4.5: + resolution: {integrity: sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/traverse': 7.16.0 - '@jest/environment': 27.3.1 - '@jest/source-map': 27.0.6 - '@jest/test-result': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@babel/traverse': 7.16.5 + '@jest/environment': 27.4.4 + '@jest/source-map': 27.4.0 + '@jest/test-result': 27.4.2 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 chalk: 4.1.2 co: 4.6.0 - expect: 27.3.1 + expect: 27.4.2 is-generator-fn: 2.1.0 - jest-each: 27.3.1 - jest-matcher-utils: 27.3.1 - jest-message-util: 27.3.1 - jest-runtime: 27.3.1 - jest-snapshot: 27.3.1 - jest-util: 27.3.1 - pretty-format: 27.3.1 + jest-each: 27.4.2 + jest-matcher-utils: 27.4.2 + jest-message-util: 27.4.2 + jest-runtime: 27.4.5 + jest-snapshot: 27.4.5 + jest-util: 27.4.2 + pretty-format: 27.4.2 throat: 6.0.1 transitivePeerDependencies: - supports-color dev: true - /jest-leak-detector/27.3.1: - resolution: {integrity: sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - jest-get-type: 27.3.1 - pretty-format: 27.3.1 - dev: true - - /jest-matcher-utils/27.3.1: - resolution: {integrity: sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==} + /jest-leak-detector/27.4.2: + resolution: {integrity: sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - chalk: 4.1.2 - jest-diff: 27.3.1 - jest-get-type: 27.3.1 - pretty-format: 27.3.1 + jest-get-type: 27.4.0 + pretty-format: 27.4.2 dev: true - /jest-message-util/27.3.1: - resolution: {integrity: sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==} + /jest-matcher-utils/27.4.2: + resolution: {integrity: sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/code-frame': 7.16.0 - '@jest/types': 27.2.5 - '@types/stack-utils': 2.0.1 chalk: 4.1.2 - graceful-fs: 4.2.8 - micromatch: 4.0.4 - pretty-format: 27.3.1 - slash: 3.0.0 - stack-utils: 2.0.5 + jest-diff: 27.4.2 + jest-get-type: 27.4.0 + pretty-format: 27.4.2 dev: true /jest-message-util/27.4.2: @@ -5815,23 +5841,15 @@ packages: stack-utils: 2.0.5 dev: true - /jest-mock/27.3.0: - resolution: {integrity: sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/types': 27.2.5 - '@types/node': 16.11.9 - dev: true - /jest-mock/27.4.2: resolution: {integrity: sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.4.2 - '@types/node': 16.11.9 + '@types/node': 16.11.14 dev: true - /jest-pnp-resolver/1.2.2_jest-resolve@27.3.1: + /jest-pnp-resolver/1.2.2_jest-resolve@27.4.5: resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==} engines: {node: '>=6'} peerDependencies: @@ -5840,66 +5858,66 @@ packages: jest-resolve: optional: true dependencies: - jest-resolve: 27.3.1 + jest-resolve: 27.4.5 dev: true - /jest-regex-util/27.0.6: - resolution: {integrity: sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==} + /jest-regex-util/27.4.0: + resolution: {integrity: sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dev: true - /jest-resolve-dependencies/27.3.1: - resolution: {integrity: sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A==} + /jest-resolve-dependencies/27.4.5: + resolution: {integrity: sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 - jest-regex-util: 27.0.6 - jest-snapshot: 27.3.1 + '@jest/types': 27.4.2 + jest-regex-util: 27.4.0 + jest-snapshot: 27.4.5 transitivePeerDependencies: - supports-color dev: true - /jest-resolve/27.3.1: - resolution: {integrity: sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw==} + /jest-resolve/27.4.5: + resolution: {integrity: sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 chalk: 4.1.2 graceful-fs: 4.2.8 - jest-haste-map: 27.3.1 - jest-pnp-resolver: 1.2.2_jest-resolve@27.3.1 - jest-util: 27.3.1 - jest-validate: 27.3.1 + jest-haste-map: 27.4.5 + jest-pnp-resolver: 1.2.2_jest-resolve@27.4.5 + jest-util: 27.4.2 + jest-validate: 27.4.2 resolve: 1.20.0 resolve.exports: 1.1.0 slash: 3.0.0 dev: true - /jest-runner/27.3.1: - resolution: {integrity: sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww==} + /jest-runner/27.4.5: + resolution: {integrity: sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/console': 27.3.1 - '@jest/environment': 27.3.1 - '@jest/test-result': 27.3.1 - '@jest/transform': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@jest/console': 27.4.2 + '@jest/environment': 27.4.4 + '@jest/test-result': 27.4.2 + '@jest/transform': 27.4.5 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 chalk: 4.1.2 emittery: 0.8.1 exit: 0.1.2 graceful-fs: 4.2.8 - jest-docblock: 27.0.6 - jest-environment-jsdom: 27.3.1 - jest-environment-node: 27.4.2 - jest-haste-map: 27.3.1 - jest-leak-detector: 27.3.1 - jest-message-util: 27.3.1 - jest-resolve: 27.3.1 - jest-runtime: 27.3.1 - jest-util: 27.3.1 - jest-worker: 27.3.1 - source-map-support: 0.5.20 + jest-docblock: 27.4.0 + jest-environment-jsdom: 27.4.4 + jest-environment-node: 27.4.4 + jest-haste-map: 27.4.5 + jest-leak-detector: 27.4.2 + jest-message-util: 27.4.2 + jest-resolve: 27.4.5 + jest-runtime: 27.4.5 + jest-util: 27.4.2 + jest-worker: 27.4.5 + source-map-support: 0.5.21 throat: 6.0.1 transitivePeerDependencies: - bufferutil @@ -5908,17 +5926,17 @@ packages: - utf-8-validate dev: true - /jest-runtime/27.3.1: - resolution: {integrity: sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg==} + /jest-runtime/27.4.5: + resolution: {integrity: sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/console': 27.3.1 - '@jest/environment': 27.3.1 - '@jest/globals': 27.3.1 - '@jest/source-map': 27.0.6 - '@jest/test-result': 27.3.1 - '@jest/transform': 27.3.1 - '@jest/types': 27.2.5 + '@jest/console': 27.4.2 + '@jest/environment': 27.4.4 + '@jest/globals': 27.4.4 + '@jest/source-map': 27.4.0 + '@jest/test-result': 27.4.2 + '@jest/transform': 27.4.5 + '@jest/types': 27.4.2 '@types/yargs': 16.0.4 chalk: 4.1.2 cjs-module-lexer: 1.2.2 @@ -5927,14 +5945,14 @@ packages: exit: 0.1.2 glob: 7.2.0 graceful-fs: 4.2.8 - jest-haste-map: 27.3.1 - jest-message-util: 27.3.1 - jest-mock: 27.3.0 - jest-regex-util: 27.0.6 - jest-resolve: 27.3.1 - jest-snapshot: 27.3.1 - jest-util: 27.3.1 - jest-validate: 27.3.1 + jest-haste-map: 27.4.5 + jest-message-util: 27.4.2 + jest-mock: 27.4.2 + jest-regex-util: 27.4.0 + jest-resolve: 27.4.5 + jest-snapshot: 27.4.5 + jest-util: 27.4.2 + jest-validate: 27.4.2 slash: 3.0.0 strip-bom: 4.0.0 yargs: 16.2.0 @@ -5942,106 +5960,94 @@ packages: - supports-color dev: true - /jest-serializer/27.0.6: - resolution: {integrity: sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==} + /jest-serializer/27.4.0: + resolution: {integrity: sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 graceful-fs: 4.2.8 dev: true - /jest-snapshot/27.3.1: - resolution: {integrity: sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg==} + /jest-snapshot/27.4.5: + resolution: {integrity: sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.16.0 - '@babel/generator': 7.16.0 - '@babel/parser': 7.16.2 - '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.0 - '@babel/traverse': 7.16.0 + '@babel/core': 7.16.5 + '@babel/generator': 7.16.5 + '@babel/parser': 7.16.6 + '@babel/plugin-syntax-typescript': 7.16.0_@babel+core@7.16.5 + '@babel/traverse': 7.16.5 '@babel/types': 7.16.0 - '@jest/transform': 27.3.1 - '@jest/types': 27.2.5 + '@jest/transform': 27.4.5 + '@jest/types': 27.4.2 '@types/babel__traverse': 7.14.2 '@types/prettier': 2.4.1 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.16.0 + babel-preset-current-node-syntax: 1.0.1_@babel+core@7.16.5 chalk: 4.1.2 - expect: 27.3.1 + expect: 27.4.2 graceful-fs: 4.2.8 - jest-diff: 27.3.1 - jest-get-type: 27.3.1 - jest-haste-map: 27.3.1 - jest-matcher-utils: 27.3.1 - jest-message-util: 27.3.1 - jest-resolve: 27.3.1 - jest-util: 27.3.1 + jest-diff: 27.4.2 + jest-get-type: 27.4.0 + jest-haste-map: 27.4.5 + jest-matcher-utils: 27.4.2 + jest-message-util: 27.4.2 + jest-resolve: 27.4.5 + jest-util: 27.4.2 natural-compare: 1.4.0 - pretty-format: 27.3.1 + pretty-format: 27.4.2 semver: 7.3.5 transitivePeerDependencies: - supports-color dev: true - /jest-util/27.3.1: - resolution: {integrity: sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@jest/types': 27.2.5 - '@types/node': 16.11.9 - chalk: 4.1.2 - ci-info: 3.2.0 - graceful-fs: 4.2.8 - picomatch: 2.3.0 - dev: true - /jest-util/27.4.2: resolution: {integrity: sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.4.2 - '@types/node': 16.11.9 + '@types/node': 16.11.14 chalk: 4.1.2 ci-info: 3.2.0 graceful-fs: 4.2.8 picomatch: 2.3.0 dev: true - /jest-validate/27.3.1: - resolution: {integrity: sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q==} + /jest-validate/27.4.2: + resolution: {integrity: sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 camelcase: 6.2.0 chalk: 4.1.2 - jest-get-type: 27.3.1 + jest-get-type: 27.4.0 leven: 3.1.0 - pretty-format: 27.3.1 + pretty-format: 27.4.2 dev: true - /jest-watcher/27.3.1: - resolution: {integrity: sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA==} + /jest-watcher/27.4.2: + resolution: {integrity: sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/test-result': 27.3.1 - '@jest/types': 27.2.5 - '@types/node': 16.11.9 + '@jest/test-result': 27.4.2 + '@jest/types': 27.4.2 + '@types/node': 16.11.14 ansi-escapes: 4.3.2 chalk: 4.1.2 - jest-util: 27.3.1 + jest-util: 27.4.2 string-length: 4.0.2 dev: true - /jest-worker/27.3.1: - resolution: {integrity: sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==} + /jest-worker/27.4.5: + resolution: {integrity: sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 16.11.9 + '@types/node': 16.11.14 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true - /jest/27.3.1_ts-node@10.4.0: - resolution: {integrity: sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng==} + /jest/27.4.5_ts-node@10.4.0: + resolution: {integrity: sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: @@ -6050,9 +6056,9 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.3.1_ts-node@10.4.0 + '@jest/core': 27.4.5_ts-node@10.4.0 import-local: 3.0.3 - jest-cli: 27.3.1_ts-node@10.4.0 + jest-cli: 27.4.5_ts-node@10.4.0 transitivePeerDependencies: - bufferutil - canvas @@ -6273,15 +6279,15 @@ packages: /lines-and-columns/1.1.6: resolution: {integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=} - /lint-staged/12.1.1: - resolution: {integrity: sha512-zOmteWgJwTfZXcj6vXSnjeDDI/fvkKI2KOqRdc84ZFc2ZMDKXEeiTITtaskE3HiNrHraFmYVBpnMSZHngLoogA==} + /lint-staged/12.1.2: + resolution: {integrity: sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true dependencies: cli-truncate: 3.1.0 colorette: 2.0.16 commander: 8.3.0 - debug: 4.3.2_supports-color@9.0.2 + debug: 4.3.3_supports-color@9.0.2 enquirer: 2.3.6 execa: 5.1.1 lilconfig: 2.0.4 @@ -6667,6 +6673,11 @@ packages: resolution: {integrity: sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==} dev: true + /mrmime/1.0.0: + resolution: {integrity: sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==} + engines: {node: '>=10'} + dev: true + /ms/2.0.0: resolution: {integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=} dev: true @@ -7155,26 +7166,26 @@ packages: find-up: 4.1.0 dev: true - /playwright-chromium/1.16.3: - resolution: {integrity: sha512-wXKjf9UYB2WtzC3C+3CCn9bNO6svRGY+F1vjm2UMxW/9wjyclLFkbcV3P6EztGQ0Ngrov9BQwvtmpjIZuKk8dQ==} + /playwright-chromium/1.17.1: + resolution: {integrity: sha512-EnCtsP/QTWWoQV/cFYpt2wgKwcOdoa2iHBlBaldHB8gobtynMKwk96rzldaRS4YimFibIzREFkWCNMrrb3LRMQ==} engines: {node: '>=12'} hasBin: true requiresBuild: true dependencies: - playwright-core: 1.16.3 + playwright-core: 1.17.1 transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate dev: true - /playwright-core/1.16.3: - resolution: {integrity: sha512-16hF27IvQheJee+DbhC941AUZLjbJgfZFWi9YPS4LKEk/lKFhZI+9TiFD0sboYqb9eaEWvul47uR5xxTVbE4iw==} + /playwright-core/1.17.1: + resolution: {integrity: sha512-C3c8RpPiC3qr15fRDN6dx6WnUkPLFmST37gms2aoHPDRvp7EaGDPMMZPpqIm/QWB5J40xDrQCD4YYHz2nBTojQ==} engines: {node: '>=12'} hasBin: true dependencies: commander: 8.3.0 - debug: 4.3.2 + debug: 4.3.3 extract-zip: 2.0.1 https-proxy-agent: 5.0.0 jpeg-js: 0.4.3 @@ -7200,13 +7211,13 @@ packages: engines: {node: '>=10.13.0'} dev: true - /postcss-import/14.0.2_postcss@8.3.11: + /postcss-import/14.0.2_postcss@8.4.5: resolution: {integrity: sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==} engines: {node: '>=10.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.3.11 + postcss: 8.4.5 postcss-value-parser: 4.1.0 read-cache: 1.0.0 resolve: 1.20.0 @@ -7231,51 +7242,51 @@ packages: dependencies: import-cwd: 3.0.0 lilconfig: 2.0.4 - ts-node: 10.4.0_7dd5cf9af763e621261d5cc88a052be2 + ts-node: 10.4.0_08095b3038b55682110c004d6a64072d yaml: 1.10.2 - /postcss-modules-extract-imports/3.0.0_postcss@8.3.11: + /postcss-modules-extract-imports/3.0.0_postcss@8.4.5: resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.3.11 + postcss: 8.4.5 dev: true - /postcss-modules-local-by-default/4.0.0_postcss@8.3.11: + /postcss-modules-local-by-default/4.0.0_postcss@8.4.5: resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0_postcss@8.3.11 - postcss: 8.3.11 + icss-utils: 5.1.0_postcss@8.4.5 + postcss: 8.4.5 postcss-selector-parser: 6.0.6 postcss-value-parser: 4.1.0 dev: true - /postcss-modules-scope/3.0.0_postcss@8.3.11: + /postcss-modules-scope/3.0.0_postcss@8.4.5: resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.3.11 + postcss: 8.4.5 postcss-selector-parser: 6.0.6 dev: true - /postcss-modules-values/4.0.0_postcss@8.3.11: + /postcss-modules-values/4.0.0_postcss@8.4.5: resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0_postcss@8.3.11 - postcss: 8.3.11 + icss-utils: 5.1.0_postcss@8.4.5 + postcss: 8.4.5 dev: true - /postcss-modules/4.2.2_postcss@8.3.11: + /postcss-modules/4.2.2_postcss@8.4.5: resolution: {integrity: sha512-/H08MGEmaalv/OU8j6bUKi/kZr2kqGF6huAW8m9UAgOLWtpFdhA14+gPBoymtqyv+D4MLsmqaF2zvIegdCxJXg==} peerDependencies: postcss: ^8.0.0 @@ -7283,11 +7294,11 @@ packages: generic-names: 2.0.1 icss-replace-symbols: 1.1.0 lodash.camelcase: 4.3.0 - postcss: 8.3.11 - postcss-modules-extract-imports: 3.0.0_postcss@8.3.11 - postcss-modules-local-by-default: 4.0.0_postcss@8.3.11 - postcss-modules-scope: 3.0.0_postcss@8.3.11 - postcss-modules-values: 4.0.0_postcss@8.3.11 + postcss: 8.4.5 + postcss-modules-extract-imports: 3.0.0_postcss@8.4.5 + postcss-modules-local-by-default: 4.0.0_postcss@8.4.5 + postcss-modules-scope: 3.0.0_postcss@8.4.5 + postcss-modules-values: 4.0.0_postcss@8.4.5 string-hash: 1.1.3 dev: true @@ -7321,6 +7332,15 @@ packages: picocolors: 1.0.0 source-map-js: 0.6.2 + /postcss/8.4.5: + resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.1.30 + picocolors: 1.0.0 + source-map-js: 1.0.1 + dev: false + /preact/10.5.15: resolution: {integrity: sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==} dev: true @@ -7335,8 +7355,8 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier/2.4.1: - resolution: {integrity: sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==} + /prettier/2.5.1: + resolution: {integrity: sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==} engines: {node: '>=10.13.0'} hasBin: true dev: true @@ -7345,7 +7365,7 @@ packages: resolution: {integrity: sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@jest/types': 27.2.5 + '@jest/types': 27.4.2 ansi-regex: 5.0.1 ansi-styles: 5.2.0 react-is: 17.0.2 @@ -8056,12 +8076,12 @@ packages: is-arrayish: 0.3.2 dev: false - /sirv/1.0.18: - resolution: {integrity: sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA==} + /sirv/1.0.19: + resolution: {integrity: sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==} engines: {node: '>= 10'} dependencies: '@polka/url': 1.0.0-next.21 - mime: 2.6.0 + mrmime: 1.0.0 totalist: 1.1.0 dev: true @@ -8114,7 +8134,7 @@ packages: engines: {node: '>= 10'} dependencies: agent-base: 6.0.2 - debug: 4.3.2 + debug: 4.3.3 socks: 2.6.1 transitivePeerDependencies: - supports-color @@ -8132,6 +8152,11 @@ packages: resolution: {integrity: sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==} engines: {node: '>=0.10.0'} + /source-map-js/1.0.1: + resolution: {integrity: sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==} + engines: {node: '>=0.10.0'} + dev: false + /source-map-resolve/0.6.0: resolution: {integrity: sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==} dependencies: @@ -8697,14 +8722,15 @@ packages: utf8-byte-length: 1.0.4 dev: true - /ts-jest/27.0.7_b626c82449d36ccae0aa7169b15092e6: - resolution: {integrity: sha512-O41shibMqzdafpuP+CkrOL7ykbmLh+FqQrXEmV9CydQ5JBk0Sj0uAEF5TNNe94fZWKm3yYvWa/IbyV4Yg1zK2Q==} + /ts-jest/27.1.2_52ee6014196323fc54772ef1ffde0dac: + resolution: {integrity: sha512-eSOiJOWq6Hhs6Khzk5wKC5sgWIXgXqOCiIl1+3lfnearu58Hj4QpE5tUhQcA3xtZrELbcvAGCsd6HB8OsaVaTA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: '@babel/core': '>=7.0.0-beta.0 <8' '@types/jest': ^27.0.0 babel-jest: '>=27.0.0 <28' + esbuild: ~0.14.0 jest: ^27.0.0 typescript: '>=3.8 <5.0' peerDependenciesMeta: @@ -8714,12 +8740,15 @@ packages: optional: true babel-jest: optional: true + esbuild: + optional: true dependencies: '@types/jest': 27.0.3 bs-logger: 0.2.6 + esbuild: 0.13.12 fast-json-stable-stringify: 2.1.0 - jest: 27.3.1_ts-node@10.4.0 - jest-util: 27.3.1 + jest: 27.4.5_ts-node@10.4.0 + jest-util: 27.4.2 json5: 2.2.0 lodash.memoize: 4.1.2 make-error: 1.3.6 @@ -8728,7 +8757,7 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-node/10.4.0_7dd5cf9af763e621261d5cc88a052be2: + /ts-node/10.4.0_08095b3038b55682110c004d6a64072d: resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==} hasBin: true peerDependencies: @@ -8747,7 +8776,7 @@ packages: '@tsconfig/node12': 1.0.9 '@tsconfig/node14': 1.0.1 '@tsconfig/node16': 1.0.2 - '@types/node': 16.11.9 + '@types/node': 16.11.14 acorn: 8.5.0 acorn-walk: 8.2.0 arg: 4.1.3 @@ -8865,6 +8894,12 @@ packages: hasBin: true dev: true + /typescript/4.5.4: + resolution: {integrity: sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==} + engines: {node: '>=4.2.0'} + hasBin: true + dev: true + /typeson-registry/1.0.0-alpha.39: resolution: {integrity: sha512-NeGDEquhw+yfwNhguLPcZ9Oj0fzbADiX4R0WxvoY8nGhy98IbzQy1sezjoEFWOywOboj/DWehI+/aUlRVrJnnw==} engines: {node: '>=10.0.0'} @@ -8958,8 +8993,8 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /validator/8.2.0: - resolution: {integrity: sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==} + /validator/13.7.0: + resolution: {integrity: sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==} engines: {node: '>= 0.10'} dev: true @@ -8972,18 +9007,20 @@ packages: engines: {node: '>= 0.8'} dev: true - /vitepress/0.20.1: - resolution: {integrity: sha512-2SOlvRv0bvPrQ3RPtp7Fh/G1MKidrsgAgYz18OvV+nIJb9iiYo0GUVHKN3OYswMh+vH78NyTeA1Q5v4YJ/H9LQ==} + /vitepress/0.20.9: + resolution: {integrity: sha512-2Rd6NMS5sTVl+3HDM9EzIMi3JOTNz1DjylvbYEWjxPyCmL3OH0lEez7O4FAijCkS5+i3VcwygxisadonMhtYkw==} engines: {node: '>=12.0.0'} hasBin: true dependencies: - '@docsearch/css': 1.0.0-alpha.28 - '@docsearch/js': 1.0.0-alpha.28 + '@docsearch/css': 3.0.0-alpha.42 + '@docsearch/js': 3.0.0-alpha.42 '@vitejs/plugin-vue': link:packages/plugin-vue prismjs: 1.25.0 vite: link:packages/vite - vue: 3.2.21 + vue: 3.2.26 transitivePeerDependencies: + - '@algolia/client-search' + - '@types/react' - react - react-dom dev: true @@ -9002,16 +9039,6 @@ packages: vue: 3.2.25 dev: false - /vue/3.2.21: - resolution: {integrity: sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg==} - dependencies: - '@vue/compiler-dom': 3.2.21 - '@vue/compiler-sfc': 3.2.21 - '@vue/runtime-dom': 3.2.21 - '@vue/server-renderer': 3.2.21_vue@3.2.21 - '@vue/shared': 3.2.21 - dev: true - /vue/3.2.25: resolution: {integrity: sha512-jU3t7fyQDHoCWCqhmRrnSmYZvHC35tOJTP704di7HGfq5EcFA1cU/1ZPjUV1eCxJev65Khjyfni+vk9oa+eTtw==} dependencies: @@ -9021,6 +9048,16 @@ packages: '@vue/server-renderer': 3.2.25_vue@3.2.25 '@vue/shared': 3.2.25 + /vue/3.2.26: + resolution: {integrity: sha512-KD4lULmskL5cCsEkfhERVRIOEDrfEL9CwAsLYpzptOGjaGFNWo3BQ9g8MAb7RaIO71rmVOziZ/uEN/rHwcUIhg==} + dependencies: + '@vue/compiler-dom': 3.2.26 + '@vue/compiler-sfc': 3.2.26 + '@vue/runtime-dom': 3.2.26 + '@vue/server-renderer': 3.2.26_vue@3.2.26 + '@vue/shared': 3.2.26 + dev: true + /vuex/4.0.2_vue@3.2.25: resolution: {integrity: sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==} peerDependencies: @@ -9292,13 +9329,14 @@ packages: stack-trace: 0.0.10 dev: true - /z-schema/3.18.4: - resolution: {integrity: sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==} + /z-schema/5.0.2: + resolution: {integrity: sha512-40TH47ukMHq5HrzkeVE40Ad7eIDKaRV2b+Qpi2prLc9X9eFJFzV7tMe5aH12e6avaSS/u5l653EQOv+J9PirPw==} + engines: {node: '>=8.0.0'} hasBin: true dependencies: lodash.get: 4.4.2 lodash.isequal: 4.5.0 - validator: 8.2.0 + validator: 13.7.0 optionalDependencies: commander: 2.20.3 dev: true From 15b6f1ba82731c16b19e00ca3b28b1a898caa4d4 Mon Sep 17 00:00:00 2001 From: Shinigami Date: Sat, 18 Dec 2021 13:06:39 +0100 Subject: [PATCH 202/258] chore: convert scripts to TS (#6160) --- CONTRIBUTING.md | 2 +- package.json | 3 +- packages/create-vite/package.json | 2 +- .../{updateVersions.js => updateVersions.ts} | 19 +-- packages/playground/alias/package.json | 2 +- .../playground/optimize-deps/package.json | 2 +- .../optimize-missing-deps/package.json | 2 +- packages/playground/ssr-deps/package.json | 2 +- packages/plugin-legacy/package.json | 2 +- packages/plugin-react/package.json | 2 +- packages/plugin-vue-jsx/package.json | 2 +- packages/plugin-vue/package.json | 2 +- packages/vite/LICENSE.md | 52 ++++++-- packages/vite/package.json | 4 +- packages/vite/scripts/patchTypes.cjs | 70 ----------- packages/vite/scripts/patchTypes.ts | 66 +++++++++++ pnpm-lock.yaml | 8 ++ .../{patchFileDeps.cjs => patchFileDeps.ts} | 21 ++-- scripts/{release.cjs => release.ts} | 112 ++++++------------ scripts/{verifyCommit.cjs => verifyCommit.ts} | 8 +- 20 files changed, 194 insertions(+), 189 deletions(-) rename packages/create-vite/{updateVersions.js => updateVersions.ts} (50%) delete mode 100644 packages/vite/scripts/patchTypes.cjs create mode 100644 packages/vite/scripts/patchTypes.ts rename scripts/{patchFileDeps.cjs => patchFileDeps.ts} (61%) rename scripts/{release.cjs => release.ts} (67%) rename scripts/{verifyCommit.cjs => verifyCommit.ts} (83%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fe17b0f3befe36..191eb468a38814 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -100,7 +100,7 @@ To work around this, playground packages that uses the `file:` protocol should a ```jsonc "scripts": { //... - "postinstall": "node ../../../scripts/patchFileDeps.cjs" + "postinstall": "ts-node ../../../scripts/patchFileDeps.ts" } ``` diff --git a/package.json b/package.json index dcb61a6713fb40..c4d6a04d96a1c1 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@types/fs-extra": "^9.0.13", "@types/jest": "^27.0.3", "@types/node": "^16.11.14", + "@types/prompts": "^2.0.14", "@types/semver": "^7.3.9", "@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/parser": "^5.7.0", @@ -61,7 +62,7 @@ }, "gitHooks": { "pre-commit": "lint-staged --concurrent false", - "commit-msg": "node scripts/verifyCommit.cjs" + "commit-msg": "ts-node scripts/verifyCommit.ts" }, "lint-staged": { "*": [ diff --git a/packages/create-vite/package.json b/packages/create-vite/package.json index ab62f2b95229f7..bb340a75b5773a 100644 --- a/packages/create-vite/package.json +++ b/packages/create-vite/package.json @@ -14,7 +14,7 @@ "main": "index.js", "scripts": { "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . --lerna-package create-vite", - "release": "node updateVersions && node ../../scripts/release.cjs --skipBuild" + "release": "ts-node updateVersions && ts-node ../../scripts/release.ts --skipBuild" }, "engines": { "node": ">=12.0.0" diff --git a/packages/create-vite/updateVersions.js b/packages/create-vite/updateVersions.ts similarity index 50% rename from packages/create-vite/updateVersions.js rename to packages/create-vite/updateVersions.ts index 6ec2985854c64a..7125fce9119f07 100644 --- a/packages/create-vite/updateVersions.js +++ b/packages/create-vite/updateVersions.ts @@ -1,22 +1,23 @@ -const fs = require('fs') -const path = require('path') +import { readdirSync, writeFileSync } from 'fs' +import { join } from 'path' + const latestVersion = require('../vite/package.json').version const isLatestPreRelease = /beta|alpha|rc/.test(latestVersion) ;(async () => { - const templates = fs - .readdirSync(__dirname) - .filter((d) => d.startsWith('template-')) - for (const t of templates) { - const pkgPath = path.join(__dirname, t, `package.json`) + const templates = readdirSync(__dirname).filter((dir) => + dir.startsWith('template-') + ) + for (const template of templates) { + const pkgPath = join(__dirname, template, `package.json`) const pkg = require(pkgPath) if (!isLatestPreRelease) { pkg.devDependencies.vite = `^` + latestVersion } - if (t.startsWith('template-vue')) { + if (template.startsWith('template-vue')) { pkg.devDependencies['@vitejs/plugin-vue'] = `^` + require('../plugin-vue/package.json').version } - fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n') + writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n') } })() diff --git a/packages/playground/alias/package.json b/packages/playground/alias/package.json index 6d17bbe99eac6d..853a3efaf2bd93 100644 --- a/packages/playground/alias/package.json +++ b/packages/playground/alias/package.json @@ -7,7 +7,7 @@ "build": "vite build", "debug": "node --inspect-brk ../../vite/bin/vite", "preview": "vite preview", - "postinstall": "node ../../../scripts/patchFileDeps.cjs" + "postinstall": "ts-node ../../../scripts/patchFileDeps.ts" }, "dependencies": { "aliased-module": "file:./dir/module", diff --git a/packages/playground/optimize-deps/package.json b/packages/playground/optimize-deps/package.json index ca3bbd8e5b7c1f..0606343e0dce3c 100644 --- a/packages/playground/optimize-deps/package.json +++ b/packages/playground/optimize-deps/package.json @@ -7,7 +7,7 @@ "build": "vite build", "debug": "node --inspect-brk ../../vite/bin/vite", "preview": "vite preview", - "postinstall": "node ../../../scripts/patchFileDeps.cjs" + "postinstall": "ts-node ../../../scripts/patchFileDeps.ts" }, "dependencies": { "axios": "^0.24.0", diff --git a/packages/playground/optimize-missing-deps/package.json b/packages/playground/optimize-missing-deps/package.json index 74e17dd60704a6..431cf3b33c3847 100644 --- a/packages/playground/optimize-missing-deps/package.json +++ b/packages/playground/optimize-missing-deps/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "scripts": { "dev": "node server", - "postinstall": "node ../../../scripts/patchFileDeps.cjs" + "postinstall": "ts-node ../../../scripts/patchFileDeps.ts" }, "dependencies": { "missing-dep": "file:./missing-dep", diff --git a/packages/playground/ssr-deps/package.json b/packages/playground/ssr-deps/package.json index a4dfb83e6a0783..fac7c150b49924 100644 --- a/packages/playground/ssr-deps/package.json +++ b/packages/playground/ssr-deps/package.json @@ -6,7 +6,7 @@ "dev": "node server", "serve": "cross-env NODE_ENV=production node server", "debug": "node --inspect-brk server", - "postinstall": "node ../../../scripts/patchFileDeps.cjs" + "postinstall": "ts-node ../../../scripts/patchFileDeps.ts" }, "dependencies": { "bcrypt": "^5.0.1", diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json index cd2ecc6a5858a9..e0556f1ddaf59c 100644 --- a/packages/plugin-legacy/package.json +++ b/packages/plugin-legacy/package.json @@ -11,7 +11,7 @@ "types": "index.d.ts", "scripts": { "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . --lerna-package plugin-legacy", - "release": "node ../../scripts/release.cjs --skipBuild" + "release": "ts-node ../../scripts/release.ts --skipBuild" }, "engines": { "node": ">=12.0.0" diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index a58d08f6b6834a..f95a158155c400 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -18,7 +18,7 @@ "build-bundle": "esbuild src/index.ts --bundle --platform=node --target=node12 --external:@babel/* --external:@rollup/* --external:resolve --external:react-refresh/* --outfile=dist/index.js", "build-types": "tsc -p . --emitDeclarationOnly --outDir temp && api-extractor run && rimraf temp", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . --lerna-package plugin-react", - "release": "node ../../scripts/release.cjs" + "release": "ts-node ../../scripts/release.ts" }, "engines": { "node": ">=12.0.0" diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index 40ef71dac734ea..b55f44b7e1228e 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -11,7 +11,7 @@ "types": "index.d.ts", "scripts": { "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . --lerna-package plugin-vue-jsx", - "release": "node ../../scripts/release.cjs --skipBuild" + "release": "ts-node ../../scripts/release.ts --skipBuild" }, "engines": { "node": ">=12.0.0" diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index a3721f40f960b5..8e76dc4c1ec2fd 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -16,7 +16,7 @@ "build-bundle": "esbuild src/index.ts --bundle --platform=node --target=node12 --external:@vue/compiler-sfc --external:vue/compiler-sfc --external:vite --outfile=dist/index.js", "build-types": "tsc -p . --emitDeclarationOnly --outDir temp && api-extractor run && rimraf temp", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . --lerna-package plugin-vue", - "release": "node ../../scripts/release.cjs" + "release": "ts-node ../../scripts/release.ts" }, "engines": { "node": ">=12.0.0" diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md index a77f5adb62043b..8541f3d92fc23b 100644 --- a/packages/vite/LICENSE.md +++ b/packages/vite/LICENSE.md @@ -1288,26 +1288,27 @@ Repository: https://github.com/mathiasbynens/cssesc.git ## debug License: MIT -By: TJ Holowaychuk, Nathan Rajlich, Andrew Rhyne, Josh Junon -Repository: git://github.com/visionmedia/debug.git +By: Josh Junon, TJ Holowaychuk, Nathan Rajlich, Andrew Rhyne +Repository: git://github.com/debug-js/debug.git > (The MIT License) > -> Copyright (c) 2014 TJ Holowaychuk +> Copyright (c) 2014-2017 TJ Holowaychuk +> Copyright (c) 2018-2021 Josh Junon > -> Permission 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, +> Permission 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: > -> The above copyright notice and this permission notice shall be included in all copies or substantial +> The above copyright notice and this permission notice shall be included in all copies or substantial > portions of the Software. > -> THE 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 +> THE 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. --------------------------------------- @@ -2887,6 +2888,35 @@ Repository: git://github.com/isaacs/minimatch.git --------------------------------------- +## mrmime +License: MIT +By: Luke Edwards +Repository: lukeed/mrmime + +> The MIT License (MIT) +> +> Copyright (c) Luke Edwards (https://lukeed.com) +> +> Permission 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: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE 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. + +--------------------------------------- + ## ms License: MIT Repository: zeit/ms diff --git a/packages/vite/package.json b/packages/vite/package.json index 46b3036da6e022..9351957e6c7f87 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -35,12 +35,12 @@ "build-types": "run-s build-temp-types patch-types roll-types", "build-temp-types": "tsc --emitDeclarationOnly --outDir temp/node -p src/node", "ci-build": "rimraf dist && run-s build-bundle build-types", - "patch-types": "node scripts/patchTypes.cjs", + "patch-types": "ts-node scripts/patchTypes.ts", "roll-types": "api-extractor run && rimraf temp", "lint": "eslint --ext .ts src/**", "format": "prettier --write --parser typescript \"src/**/*.ts\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path .", - "release": "node ../../scripts/release.cjs" + "release": "ts-node ../../scripts/release.ts" }, "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!", "dependencies": { diff --git a/packages/vite/scripts/patchTypes.cjs b/packages/vite/scripts/patchTypes.cjs deleted file mode 100644 index 8be75c47f8d2cb..00000000000000 --- a/packages/vite/scripts/patchTypes.cjs +++ /dev/null @@ -1,70 +0,0 @@ -// @ts-check -const fs = require('fs') -const path = require('path') -const chalk = require('chalk') -const { parse } = require('@babel/parser') -const MagicString = require('magic-string').default -const tempDir = path.resolve(__dirname, '../temp/node') -const typesDir = path.resolve(__dirname, '../types') - -// walk through the temp dts dir, find all import/export of types/* -// and rewrite them into relative imports - so that api-extractor actually -// includes them in the rolled-up final d.ts file. -walkDir(tempDir) -console.log(chalk.green.bold(`patched types/* imports`)) - -function slash(p) { - return p.replace(/\\/g, '/') -} - -/** - * @param {string} dir - */ -function walkDir(dir) { - const files = fs.readdirSync(dir) - for (const file of files) { - const resolved = path.resolve(dir, file) - const isDir = fs.statSync(resolved).isDirectory() - if (isDir) { - walkDir(resolved) - } else { - rewriteFile(resolved) - } - } -} - -/** - * @param {string} file - */ -function rewriteFile(file) { - const content = fs.readFileSync(file, 'utf-8') - const str = new MagicString(content) - let ast - try { - ast = parse(content, { - sourceType: 'module', - plugins: ['typescript', 'classProperties'] - }) - } catch (e) { - console.log(chalk.red(`failed to parse ${file}`)) - throw e - } - for (const statement of ast.program.body) { - if ( - (statement.type === 'ImportDeclaration' || - statement.type === 'ExportNamedDeclaration' || - statement.type === 'ExportAllDeclaration') && - statement.source && - statement.source.value.startsWith('types/') - ) { - const source = statement.source - const absoluteTypePath = path.resolve(typesDir, source.value.slice(6)) - const relativeTypePath = slash( - path.relative(path.dirname(file), absoluteTypePath) - ) - // @ts-ignore - str.overwrite(source.start, source.end, JSON.stringify(relativeTypePath)) - } - } - fs.writeFileSync(file, str.toString()) -} diff --git a/packages/vite/scripts/patchTypes.ts b/packages/vite/scripts/patchTypes.ts new file mode 100644 index 00000000000000..b54cf0389f88b2 --- /dev/null +++ b/packages/vite/scripts/patchTypes.ts @@ -0,0 +1,66 @@ +import type { ParseResult } from '@babel/parser' +import { parse } from '@babel/parser' +import type { File } from '@babel/types' +import chalk from 'chalk' +import { readdirSync, readFileSync, statSync, writeFileSync } from 'fs' +import MagicString from 'magic-string' +import { dirname, relative, resolve } from 'path' + +const tempDir = resolve(__dirname, '../temp/node') +const typesDir = resolve(__dirname, '../types') + +// walk through the temp dts dir, find all import/export of types/* +// and rewrite them into relative imports - so that api-extractor actually +// includes them in the rolled-up final d.ts file. +walkDir(tempDir) +console.log(chalk.green.bold(`patched types/* imports`)) + +function slash(p: string): string { + return p.replace(/\\/g, '/') +} + +function walkDir(dir: string): void { + const files = readdirSync(dir) + for (const file of files) { + const resolved = resolve(dir, file) + const isDir = statSync(resolved).isDirectory() + if (isDir) { + walkDir(resolved) + } else { + rewriteFile(resolved) + } + } +} + +function rewriteFile(file: string): void { + const content = readFileSync(file, 'utf-8') + const str = new MagicString(content) + let ast: ParseResult + try { + ast = parse(content, { + sourceType: 'module', + plugins: ['typescript', 'classProperties'] + }) + } catch (e) { + console.log(chalk.red(`failed to parse ${file}`)) + throw e + } + for (const statement of ast.program.body) { + if ( + (statement.type === 'ImportDeclaration' || + statement.type === 'ExportNamedDeclaration' || + statement.type === 'ExportAllDeclaration') && + statement.source?.value.startsWith('types/') + ) { + const source = statement.source + const absoluteTypePath = resolve(typesDir, source.value.slice(6)) + const relativeTypePath = slash(relative(dirname(file), absoluteTypePath)) + str.overwrite( + source.start!, + source.end!, + JSON.stringify(relativeTypePath) + ) + } + } + writeFileSync(file, str.toString()) +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a476f1e90e12d..0905c721570719 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,7 @@ importers: '@types/fs-extra': ^9.0.13 '@types/jest': ^27.0.3 '@types/node': ^16.11.14 + '@types/prompts': ^2.0.14 '@types/semver': ^7.3.9 '@typescript-eslint/eslint-plugin': ^5.7.0 '@typescript-eslint/parser': ^5.7.0 @@ -47,6 +48,7 @@ importers: '@types/fs-extra': 9.0.13 '@types/jest': 27.0.3 '@types/node': 16.11.14 + '@types/prompts': 2.0.14 '@types/semver': 7.3.9 '@typescript-eslint/eslint-plugin': 5.7.0_d7a0d6b59468b4d2ea38f782f4f112e3 '@typescript-eslint/parser': 5.7.0_eslint@8.4.1+typescript@4.4.4 @@ -2291,6 +2293,12 @@ packages: resolution: {integrity: sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==} dev: true + /@types/prompts/2.0.14: + resolution: {integrity: sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==} + dependencies: + '@types/node': 16.11.14 + dev: true + /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: diff --git a/scripts/patchFileDeps.cjs b/scripts/patchFileDeps.ts similarity index 61% rename from scripts/patchFileDeps.cjs rename to scripts/patchFileDeps.ts index dbb42caadd38f4..0e90bbe8adece2 100644 --- a/scripts/patchFileDeps.cjs +++ b/scripts/patchFileDeps.ts @@ -3,19 +3,20 @@ // This script is called from postinstall hooks in playground packages that // uses the file: protocol, and copies the file: deps into node_modules. -const fs = require('fs-extra') -const path = require('path') +import { copySync, removeSync } from 'fs-extra' +import { join, resolve } from 'path' + const root = process.cwd() -const pkg = require(path.join(root, 'package.json')) +const pkg = require(join(root, 'package.json')) -let hasPatched -for (const [key, val] of Object.entries(pkg.dependencies)) { +let hasPatched: boolean = false +for (const [key, val] of Object.entries(pkg.dependencies)) { if (val.startsWith('file:')) { hasPatched = true - const src = path.resolve(root, val.slice('file:'.length)) - const dest = path.resolve(root, 'node_modules', key) - fs.removeSync(dest) - fs.copySync(src, dest, { + const src = resolve(root, val.slice('file:'.length)) + const dest = resolve(root, 'node_modules', key) + removeSync(dest) + copySync(src, dest, { dereference: true }) console.log(`patched ${val}`) @@ -26,5 +27,5 @@ if (hasPatched) { // remove node_modules/.ignored as pnpm will think our patched files are // installed by another package manager and move them into this directory. // On further installs it will error out if this directory is not empty. - fs.removeSync(path.resolve(root, 'node_modules', '.ignored')) + removeSync(resolve(root, 'node_modules', '.ignored')) } diff --git a/scripts/release.cjs b/scripts/release.ts similarity index 67% rename from scripts/release.cjs rename to scripts/release.ts index d7f258bc70d140..37cd2d9cb26ecc 100644 --- a/scripts/release.cjs +++ b/scripts/release.ts @@ -1,37 +1,26 @@ -// @ts-check - /** * modified from https://github.com/vuejs/vue-next/blob/master/scripts/release.js */ -const execa = require('execa') -const path = require('path') -const fs = require('fs') +import chalk from 'chalk' +import type { ExecaChildProcess, Options as ExecaOptions } from 'execa' +import execa from 'execa' +import { readFileSync, writeFileSync } from 'fs' +import path from 'path' +import prompts from 'prompts' +import type { ReleaseType } from 'semver' +import semver from 'semver' + const args = require('minimist')(process.argv.slice(2)) -const semver = require('semver') -const chalk = require('chalk') -const prompts = require('prompts') const pkgDir = process.cwd() const pkgPath = path.resolve(pkgDir, 'package.json') -/** - * @type {{ name: string, version: string }} - */ -const pkg = require(pkgPath) +const pkg: { name: string; version: string } = require(pkgPath) const pkgName = pkg.name.replace(/^@vitejs\//, '') const currentVersion = pkg.version -/** - * @type {boolean} - */ -const isDryRun = args.dry -/** - * @type {boolean} - */ -const skipBuild = args.skipBuild +const isDryRun: boolean = args.dry +const skipBuild: boolean = args.skipBuild -/** - * @type {import('semver').ReleaseType[]} - */ -const versionIncrements = [ +const versionIncrements: ReleaseType[] = [ 'patch', 'minor', 'major', @@ -41,43 +30,33 @@ const versionIncrements = [ 'prerelease' ] -/** - * @param {import('semver').ReleaseType} i - */ -const inc = (i) => semver.inc(currentVersion, i, 'beta') +const inc: (i: ReleaseType) => string = (i) => + semver.inc(currentVersion, i, 'beta') -/** - * @param {string} bin - * @param {string[]} args - * @param {object} opts - */ -const run = (bin, args, opts = {}) => +type RunFn = ( + bin: string, + args: string[], + opts?: ExecaOptions +) => ExecaChildProcess + +const run: RunFn = (bin, args, opts = {}) => execa(bin, args, { stdio: 'inherit', ...opts }) -/** - * @param {string} bin - * @param {string[]} args - * @param {object} opts - */ -const dryRun = (bin, args, opts = {}) => +type DryRunFn = (bin: string, args: string[], opts?: any) => void + +const dryRun: DryRunFn = (bin, args, opts: any) => console.log(chalk.blue(`[dryrun] ${bin} ${args.join(' ')}`), opts) const runIfNotDry = isDryRun ? dryRun : run -/** - * @param {string} msg - */ -const step = (msg) => console.log(chalk.cyan(msg)) +const step: (msg: string) => void = (msg) => console.log(chalk.cyan(msg)) -async function main() { - let targetVersion = args._[0] +async function main(): Promise { + let targetVersion: string | undefined = args._[0] if (!targetVersion) { // no explicit version, offer suggestions - /** - * @type {{ release: string }} - */ - const { release } = await prompts({ + const { release }: { release: string } = await prompts({ type: 'select', name: 'release', message: 'Select release type', @@ -88,10 +67,7 @@ async function main() { }) if (release === 'custom') { - /** - * @type {{ version: string }} - */ - const res = await prompts({ + const res: { version: string } = await prompts({ type: 'text', name: 'version', message: 'Input custom version', @@ -111,10 +87,7 @@ async function main() { pkgName === 'vite' ? `v${targetVersion}` : `${pkgName}@${targetVersion}` if (targetVersion.includes('beta') && !args.tag) { - /** - * @type {{ tagBeta: boolean }} - */ - const { tagBeta } = await prompts({ + const { tagBeta }: { tagBeta: boolean } = await prompts({ type: 'confirm', name: 'tagBeta', message: `Publish under dist-tag "beta"?` @@ -123,10 +96,7 @@ async function main() { if (tagBeta) args.tag = 'beta' } - /** - * @type {{ yes: boolean }} - */ - const { yes } = await prompts({ + const { yes }: { yes: boolean } = await prompts({ type: 'confirm', name: 'yes', message: `Releasing ${tag}. Confirm?` @@ -173,20 +143,16 @@ async function main() { console.log() } -/** - * @param {string} version - */ -function updateVersion(version) { - const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')) +function updateVersion(version: string): void { + const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8')) pkg.version = version - fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n') + writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n') } -/** - * @param {string} version - * @param {Function} runIfNotDry - */ -async function publishPackage(version, runIfNotDry) { +async function publishPackage( + version: string, + runIfNotDry: RunFn | DryRunFn +): Promise { const publicArgs = [ 'publish', '--no-git-tag-version', diff --git a/scripts/verifyCommit.cjs b/scripts/verifyCommit.ts similarity index 83% rename from scripts/verifyCommit.cjs rename to scripts/verifyCommit.ts index fbbff40796a8d7..437e723c85d17b 100644 --- a/scripts/verifyCommit.cjs +++ b/scripts/verifyCommit.ts @@ -1,8 +1,10 @@ // Invoked on the commit-msg git hook by yorkie. -const chalk = require('chalk') -const msgPath = process.env.GIT_PARAMS -const msg = require('fs').readFileSync(msgPath, 'utf-8').trim() +import chalk from 'chalk' +import { readFileSync } from 'fs' + +const msgPath = process.env.GIT_PARAMS! +const msg = readFileSync(msgPath, 'utf-8').trim() const releaseRE = /^v\d/ const commitRE = From 2762a0e7f0a599ced2c25c9d2baf06ec99ad8cfb Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Sat, 18 Dec 2021 21:12:38 +0800 Subject: [PATCH 203/258] fix(ssr): ssrTransfrom function argument destructure (#6171) --- .../node/ssr/__tests__/ssrTransform.spec.ts | 25 +++++++++++++++++++ packages/vite/src/node/ssr/ssrTransform.ts | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts index f63c9f5036767f..cdce4cc4f629f8 100644 --- a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts +++ b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts @@ -381,3 +381,28 @@ test('Empty array pattern', async () => { (await ssrTransform(`const [, LHS, RHS] = inMatch;`, null, null)).code ).toMatchInlineSnapshot(`"const [, LHS, RHS] = inMatch;"`) }) + +test('function argument destructure', async () => { + expect( + ( + await ssrTransform( + ` +import { foo, bar } from 'foo' +const a = ({ _ = foo() }) => {} +function b({ _ = bar() }) {} +function c({ _ = bar() + foo() }) {} +`, + null, + null + ) + ).code + ).toMatchInlineSnapshot(` + " + const __vite_ssr_import_0__ = await __vite_ssr_import__(\\"foo\\"); + + const a = ({ _ = __vite_ssr_import_0__.foo() }) => {} + function b({ _ = __vite_ssr_import_0__.bar() }) {} + function c({ _ = __vite_ssr_import_0__.bar() + __vite_ssr_import_0__.foo() }) {} + " + `) +}) diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts index 394906816453f9..5721d06a487987 100644 --- a/packages/vite/src/node/ssr/ssrTransform.ts +++ b/packages/vite/src/node/ssr/ssrTransform.ts @@ -324,7 +324,8 @@ function walk( (parent?.type === 'AssignmentPattern' && parent?.right === child) || (parent?.type === 'TemplateLiteral' && - parent?.expressions.includes(child)) + parent?.expressions.includes(child)) || + (parent?.type === 'CallExpression' && parent?.callee === child) ) { return } From 10e8f857d320cfbb2f0375dac03911484cbc0b33 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Sun, 19 Dec 2021 16:26:40 +0800 Subject: [PATCH 204/258] docs: update node version note (#6177) --- docs/guide/index.md | 2 +- package.json | 2 +- packages/create-vite/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/guide/index.md b/docs/guide/index.md index d87f039f4d4561..a38140ed54c58d 100644 --- a/docs/guide/index.md +++ b/docs/guide/index.md @@ -38,7 +38,7 @@ The supported template presets are: ## Scaffolding Your First Vite Project ::: tip Compatibility Note -Vite requires [Node.js](https://nodejs.org/en/) version >=12.0.0. +Vite requires [Node.js](https://nodejs.org/en/) version >=12.2.0. However, some templates require a higher Node.js version to work, please upgrade if your package manager warns about it. ::: With NPM: diff --git a/package.json b/package.json index c4d6a04d96a1c1..2d1c4d81712298 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vite-monorepo", "private": true, "engines": { - "node": ">=12.0.0" + "node": ">=12.2.0" }, "scripts": { "preinstall": "npx only-allow pnpm", diff --git a/packages/create-vite/README.md b/packages/create-vite/README.md index df50bb2996981f..5e17ee0541f845 100644 --- a/packages/create-vite/README.md +++ b/packages/create-vite/README.md @@ -3,7 +3,7 @@ ## Scaffolding Your First Vite Project > **Compatibility Note:** -> Vite requires [Node.js](https://nodejs.org/en/) version >=12.0.0. +> Vite requires [Node.js](https://nodejs.org/en/) version >=12.2.0. However, some templates require a higher Node.js version to work, please upgrade if your package manager warns about it. With NPM: From 71868579058512b51991718655e089a78b99d39c Mon Sep 17 00:00:00 2001 From: Shinigami Date: Sun, 19 Dec 2021 12:35:25 +0100 Subject: [PATCH 205/258] chore: prefer type imports (#5835) --- .eslintrc.cjs | 6 ++- packages/create-vite/__tests__/cli.spec.ts | 3 +- .../create-vite/template-vue-ts/src/env.d.ts | 2 +- .../playground/react-emotion/vite.config.ts | 3 +- packages/playground/react/vite.config.ts | 3 +- packages/playground/shims.d.ts | 2 +- packages/playground/testUtils.ts | 2 +- .../tsconfig-json/nested-with-extends/main.ts | 1 + .../playground/tsconfig-json/nested/main.ts | 1 + packages/playground/tsconfig-json/src/main.ts | 1 + packages/playground/vue/CustomBlockPlugin.ts | 2 +- .../worker/__tests__/worker.spec.ts | 2 +- packages/plugin-legacy/index.d.ts | 2 +- .../jsx-runtime/babel-import-to-require.ts | 5 +- .../src/jsx-runtime/babel-restore-jsx.ts | 2 +- .../src/jsx-runtime/restore-jsx.ts | 3 +- packages/plugin-vue-jsx/index.d.ts | 6 +-- packages/plugin-vue/src/compiler.ts | 2 +- packages/plugin-vue/src/handleHotUpdate.ts | 6 +-- packages/plugin-vue/src/index.ts | 6 +-- packages/plugin-vue/src/main.ts | 9 ++-- packages/plugin-vue/src/script.ts | 4 +- packages/plugin-vue/src/style.ts | 6 +-- packages/plugin-vue/src/template.ts | 6 +-- .../plugin-vue/src/utils/descriptorCache.ts | 4 +- packages/plugin-vue/src/utils/error.ts | 4 +- packages/vite/src/client/client.ts | 4 +- packages/vite/src/client/overlay.ts | 2 +- .../vite/src/node/__tests__/config.spec.ts | 11 ++-- packages/vite/src/node/build.ts | 18 ++++--- packages/vite/src/node/cli.ts | 7 +-- packages/vite/src/node/config.ts | 49 +++++++---------- packages/vite/src/node/http.ts | 10 ++-- packages/vite/src/node/importGlob.ts | 2 +- packages/vite/src/node/logger.ts | 11 ++-- .../src/node/optimizer/esbuildDepPlugin.ts | 6 +-- packages/vite/src/node/optimizer/index.ts | 5 +- .../src/node/optimizer/registerMissing.ts | 2 +- packages/vite/src/node/optimizer/scan.ts | 11 ++-- packages/vite/src/node/packages.ts | 4 +- packages/vite/src/node/plugin.ts | 14 ++--- packages/vite/src/node/plugins/asset.ts | 6 +-- .../src/node/plugins/assetImportMetaUrl.ts | 4 +- .../vite/src/node/plugins/clientInjections.ts | 4 +- packages/vite/src/node/plugins/css.ts | 12 ++--- packages/vite/src/node/plugins/dataUri.ts | 2 +- packages/vite/src/node/plugins/define.ts | 6 +-- packages/vite/src/node/plugins/esbuild.ts | 15 +++--- packages/vite/src/node/plugins/html.ts | 12 ++--- .../vite/src/node/plugins/importAnalysis.ts | 9 ++-- .../src/node/plugins/importAnalysisBuild.ts | 9 ++-- packages/vite/src/node/plugins/index.ts | 4 +- packages/vite/src/node/plugins/json.ts | 2 +- .../vite/src/node/plugins/loadFallback.ts | 2 +- packages/vite/src/node/plugins/manifest.ts | 6 +-- .../src/node/plugins/modulePreloadPolyfill.ts | 4 +- packages/vite/src/node/plugins/preAlias.ts | 4 +- packages/vite/src/node/plugins/reporter.ts | 4 +- packages/vite/src/node/plugins/resolve.ts | 14 ++--- .../vite/src/node/plugins/ssrRequireHook.ts | 4 +- packages/vite/src/node/plugins/terser.ts | 6 +-- packages/vite/src/node/plugins/wasm.ts | 4 +- packages/vite/src/node/plugins/worker.ts | 6 +-- packages/vite/src/node/preview.ts | 17 +++--- .../server/__tests__/pluginContainer.spec.ts | 8 +-- packages/vite/src/node/server/hmr.ts | 10 ++-- packages/vite/src/node/server/index.ts | 53 +++++++++---------- .../vite/src/node/server/middlewares/base.ts | 4 +- .../vite/src/node/server/middlewares/error.ts | 8 +-- .../src/node/server/middlewares/indexHtml.ts | 9 ++-- .../vite/src/node/server/middlewares/proxy.ts | 8 +-- .../node/server/middlewares/spaFallback.ts | 2 +- .../src/node/server/middlewares/static.ts | 10 ++-- .../vite/src/node/server/middlewares/time.ts | 2 +- .../src/node/server/middlewares/transform.ts | 4 +- packages/vite/src/node/server/moduleGraph.ts | 4 +- packages/vite/src/node/server/openBrowser.ts | 2 +- .../vite/src/node/server/pluginContainer.ts | 12 ++--- packages/vite/src/node/server/send.ts | 4 +- packages/vite/src/node/server/sourcemap.ts | 2 +- .../vite/src/node/server/transformRequest.ts | 4 +- packages/vite/src/node/server/ws.ts | 20 +++---- packages/vite/src/node/ssr/ssrExternal.ts | 5 +- .../vite/src/node/ssr/ssrManifestPlugin.ts | 4 +- packages/vite/src/node/ssr/ssrModuleLoader.ts | 5 +- packages/vite/src/node/ssr/ssrStacktrace.ts | 5 +- packages/vite/src/node/ssr/ssrTransform.ts | 8 +-- packages/vite/src/node/utils.ts | 4 +- packages/vite/types/alias.d.ts | 2 +- packages/vite/types/chokidar.d.ts | 4 +- packages/vite/types/http-proxy.d.ts | 8 +-- packages/vite/types/importMeta.d.ts | 27 +++++----- packages/vite/types/shims.d.ts | 10 ++-- packages/vite/types/ws.d.ts | 12 ++--- scripts/jestPerTestSetup.ts | 9 ++-- 95 files changed, 337 insertions(+), 337 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 578e00417db95b..48a0bd7773b0d7 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -89,7 +89,11 @@ module.exports = defineConfig({ '@typescript-eslint/no-inferrable-types': 'off', '@typescript-eslint/no-non-null-assertion': 'off', // maybe we should turn this on in a new PR '@typescript-eslint/no-unused-vars': 'off', // maybe we should turn this on in a new PR - '@typescript-eslint/no-var-requires': 'off' + '@typescript-eslint/no-var-requires': 'off', + '@typescript-eslint/consistent-type-imports': [ + 'error', + { prefer: 'type-imports' } + ] }, overrides: [ { diff --git a/packages/create-vite/__tests__/cli.spec.ts b/packages/create-vite/__tests__/cli.spec.ts index 307ce36a5a2b35..c52998172149e6 100644 --- a/packages/create-vite/__tests__/cli.spec.ts +++ b/packages/create-vite/__tests__/cli.spec.ts @@ -1,5 +1,6 @@ /* eslint-disable node/no-extraneous-import */ -import { commandSync, ExecaSyncReturnValue, SyncOptions } from 'execa' +import type { ExecaSyncReturnValue, SyncOptions } from 'execa' +import { commandSync } from 'execa' import { mkdirpSync, readdirSync, remove, writeFileSync } from 'fs-extra' import { join } from 'path' diff --git a/packages/create-vite/template-vue-ts/src/env.d.ts b/packages/create-vite/template-vue-ts/src/env.d.ts index d27eb5a311f66a..aafef9509dd5c4 100644 --- a/packages/create-vite/template-vue-ts/src/env.d.ts +++ b/packages/create-vite/template-vue-ts/src/env.d.ts @@ -1,7 +1,7 @@ /// declare module '*.vue' { - import { DefineComponent } from 'vue' + import type { DefineComponent } from 'vue' // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types const component: DefineComponent<{}, {}, any> export default component diff --git a/packages/playground/react-emotion/vite.config.ts b/packages/playground/react-emotion/vite.config.ts index 5b60bc7e26d145..9364c8f616c2f5 100644 --- a/packages/playground/react-emotion/vite.config.ts +++ b/packages/playground/react-emotion/vite.config.ts @@ -1,6 +1,7 @@ import react from '@vitejs/plugin-react' +import type { UserConfig } from 'vite' -const config: import('vite').UserConfig = { +const config: UserConfig = { plugins: [ react({ jsxImportSource: '@emotion/react', diff --git a/packages/playground/react/vite.config.ts b/packages/playground/react/vite.config.ts index e8780031511dac..c6955a131d375f 100644 --- a/packages/playground/react/vite.config.ts +++ b/packages/playground/react/vite.config.ts @@ -1,6 +1,7 @@ import react from '@vitejs/plugin-react' +import type { UserConfig } from 'vite' -const config: import('vite').UserConfig = { +const config: UserConfig = { plugins: [react()], build: { // to make tests faster diff --git a/packages/playground/shims.d.ts b/packages/playground/shims.d.ts index 99ed8eb232b14f..ced8fb1ad585ae 100644 --- a/packages/playground/shims.d.ts +++ b/packages/playground/shims.d.ts @@ -4,7 +4,7 @@ declare module 'css-color-names' { } declare module '*.vue' { - import { ComponentOptions } from 'vue' + import type { ComponentOptions } from 'vue' const component: ComponentOptions export default component } diff --git a/packages/playground/testUtils.ts b/packages/playground/testUtils.ts index 2be13b1aee8cc4..3c6cba769b3ffe 100644 --- a/packages/playground/testUtils.ts +++ b/packages/playground/testUtils.ts @@ -5,7 +5,7 @@ import fs from 'fs' import path from 'path' import colors from 'css-color-names' -import { ElementHandle } from 'playwright-chromium' +import type { ElementHandle } from 'playwright-chromium' import type { Manifest } from 'vite' export function slash(p: string): string { diff --git a/packages/playground/tsconfig-json/nested-with-extends/main.ts b/packages/playground/tsconfig-json/nested-with-extends/main.ts index 557f496c4fe1dc..497708b4f4d226 100644 --- a/packages/playground/tsconfig-json/nested-with-extends/main.ts +++ b/packages/playground/tsconfig-json/nested-with-extends/main.ts @@ -1,4 +1,5 @@ // @ts-nocheck +// eslint-disable-next-line @typescript-eslint/consistent-type-imports import { NestedWithExtendsTypeOnlyClass } from './not-used-type' class NestedWithExtendsBase { diff --git a/packages/playground/tsconfig-json/nested/main.ts b/packages/playground/tsconfig-json/nested/main.ts index c3c23c44ef59f8..306efd0b1a87d9 100644 --- a/packages/playground/tsconfig-json/nested/main.ts +++ b/packages/playground/tsconfig-json/nested/main.ts @@ -1,4 +1,5 @@ // @ts-nocheck +// eslint-disable-next-line @typescript-eslint/consistent-type-imports import { NestedTypeOnlyClass } from './not-used-type' class NestedBase { diff --git a/packages/playground/tsconfig-json/src/main.ts b/packages/playground/tsconfig-json/src/main.ts index 05f1d1a02796ae..6ae1fe03b7d023 100644 --- a/packages/playground/tsconfig-json/src/main.ts +++ b/packages/playground/tsconfig-json/src/main.ts @@ -2,6 +2,7 @@ import '../nested/main' import '../nested-with-extends/main' +// eslint-disable-next-line @typescript-eslint/consistent-type-imports import { MainTypeOnlyClass } from './not-used-type' class MainBase { diff --git a/packages/playground/vue/CustomBlockPlugin.ts b/packages/playground/vue/CustomBlockPlugin.ts index b434bbc24cf324..4f5def023902bc 100644 --- a/packages/playground/vue/CustomBlockPlugin.ts +++ b/packages/playground/vue/CustomBlockPlugin.ts @@ -1,4 +1,4 @@ -import { Plugin } from 'vite' +import type { Plugin } from 'vite' export const vueI18nPlugin: Plugin = { name: 'vue-i18n', diff --git a/packages/playground/worker/__tests__/worker.spec.ts b/packages/playground/worker/__tests__/worker.spec.ts index 46b136edd66d2a..b84ea39fef5d0a 100644 --- a/packages/playground/worker/__tests__/worker.spec.ts +++ b/packages/playground/worker/__tests__/worker.spec.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { untilUpdated, isBuild, testDir } from '../../testUtils' -import { Page } from 'playwright-chromium' +import type { Page } from 'playwright-chromium' test('normal', async () => { await page.click('.ping') diff --git a/packages/plugin-legacy/index.d.ts b/packages/plugin-legacy/index.d.ts index 612e6cacda9702..8f340f11cba074 100644 --- a/packages/plugin-legacy/index.d.ts +++ b/packages/plugin-legacy/index.d.ts @@ -1,4 +1,4 @@ -import { Plugin } from 'vite' +import type { Plugin } from 'vite' export interface Options { /** diff --git a/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts b/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts index 936d88b0c8472b..dc7129862fd976 100644 --- a/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts +++ b/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts @@ -1,3 +1,4 @@ +import type * as babelCore from '@babel/core' import type { types as t, Visitor } from '@babel/core' /** @@ -9,9 +10,7 @@ import type { types as t, Visitor } from '@babel/core' * * var _jsx = require("react/jsx-runtime").jsx */ -export function babelImportToRequire({ - types: t -}: typeof import('@babel/core')): { +export function babelImportToRequire({ types: t }: typeof babelCore): { visitor: Visitor } { return { diff --git a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts index da08f5327a4eae..669a0aeeced207 100644 --- a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts +++ b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.ts @@ -2,7 +2,7 @@ * https://github.com/flying-sheep/babel-plugin-transform-react-createelement-to-jsx * @license GNU General Public License v3.0 */ -import * as babel from '@babel/core' +import type * as babel from '@babel/core' /** * Visitor factory for babel, converting React.createElement(...) to ... diff --git a/packages/plugin-react/src/jsx-runtime/restore-jsx.ts b/packages/plugin-react/src/jsx-runtime/restore-jsx.ts index 095f7c586e43a1..5cc7042a32c55e 100644 --- a/packages/plugin-react/src/jsx-runtime/restore-jsx.ts +++ b/packages/plugin-react/src/jsx-runtime/restore-jsx.ts @@ -1,3 +1,4 @@ +import type * as babelCore from '@babel/core' import type { PluginItem, types as t } from '@babel/core' type RestoredJSX = [result: t.File | null | undefined, isCommonJS: boolean] @@ -8,7 +9,7 @@ const jsxNotFound: RestoredJSX = [null, false] /** Restore JSX from `React.createElement` calls */ export async function restoreJSX( - babel: typeof import('@babel/core'), + babel: typeof babelCore, code: string, filename: string ): Promise { diff --git a/packages/plugin-vue-jsx/index.d.ts b/packages/plugin-vue-jsx/index.d.ts index 2cac80ba56632e..a702c09baa8417 100644 --- a/packages/plugin-vue-jsx/index.d.ts +++ b/packages/plugin-vue-jsx/index.d.ts @@ -1,6 +1,6 @@ -import { Plugin } from 'vite' -import { VueJSXPluginOptions } from '@vue/babel-plugin-jsx' -import { FilterPattern } from '@rollup/pluginutils' +import type { Plugin } from 'vite' +import type { VueJSXPluginOptions } from '@vue/babel-plugin-jsx' +import type { FilterPattern } from '@rollup/pluginutils' declare interface FilterOptions { include?: FilterPattern diff --git a/packages/plugin-vue/src/compiler.ts b/packages/plugin-vue/src/compiler.ts index 59350659b9a31e..0fb4eef7d2677a 100644 --- a/packages/plugin-vue/src/compiler.ts +++ b/packages/plugin-vue/src/compiler.ts @@ -5,7 +5,7 @@ declare module 'vue/compiler-sfc' { } } -import * as _compiler from 'vue/compiler-sfc' +import type * as _compiler from 'vue/compiler-sfc' export function resolveCompiler(root: string): typeof _compiler { // resolve from project root first, then fallback to peer dep (if any) diff --git a/packages/plugin-vue/src/handleHotUpdate.ts b/packages/plugin-vue/src/handleHotUpdate.ts index d93e647a1498bf..2bce3950563367 100644 --- a/packages/plugin-vue/src/handleHotUpdate.ts +++ b/packages/plugin-vue/src/handleHotUpdate.ts @@ -1,13 +1,13 @@ import _debug from 'debug' -import { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc' +import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc' import { createDescriptor, getDescriptor, setPrevDescriptor } from './utils/descriptorCache' import { getResolvedScript, setResolvedScript } from './script' -import { ModuleNode, HmrContext } from 'vite' -import { ResolvedOptions } from '.' +import type { ModuleNode, HmrContext } from 'vite' +import type { ResolvedOptions } from '.' const debug = _debug('vite:hmr') diff --git a/packages/plugin-vue/src/index.ts b/packages/plugin-vue/src/index.ts index 51ac057232aef0..f12dbd5b4cc0ef 100644 --- a/packages/plugin-vue/src/index.ts +++ b/packages/plugin-vue/src/index.ts @@ -1,13 +1,13 @@ import fs from 'fs' -import { Plugin, ViteDevServer } from 'vite' +import type { Plugin, ViteDevServer } from 'vite' import { createFilter } from '@rollup/pluginutils' -import { +import type { SFCBlock, SFCScriptCompileOptions, SFCStyleCompileOptions, SFCTemplateCompileOptions } from 'vue/compiler-sfc' -import * as _compiler from 'vue/compiler-sfc' +import type * as _compiler from 'vue/compiler-sfc' import { resolveCompiler } from './compiler' import { parseVueRequest } from './utils/query' import { getDescriptor, getSrcDescriptor } from './utils/descriptorCache' diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts index 11dad79cc61733..29c5cffa4cfa81 100644 --- a/packages/plugin-vue/src/main.ts +++ b/packages/plugin-vue/src/main.ts @@ -1,18 +1,19 @@ import qs from 'querystring' import path from 'path' -import { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc' -import { ResolvedOptions } from '.' +import type { SFCBlock, SFCDescriptor } from 'vue/compiler-sfc' +import type { ResolvedOptions } from '.' import { createDescriptor, getPrevDescriptor, setSrcDescriptor } from './utils/descriptorCache' -import { PluginContext, SourceMap, TransformPluginContext } from 'rollup' +import type { PluginContext, SourceMap, TransformPluginContext } from 'rollup' import { normalizePath } from '@rollup/pluginutils' import { resolveScript, isUseInlineTemplate } from './script' import { transformTemplateInMain } from './template' import { isOnlyTemplateChanged, isEqualBlock } from './handleHotUpdate' -import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map' +import type { RawSourceMap } from 'source-map' +import { SourceMapConsumer, SourceMapGenerator } from 'source-map' import { createRollupError } from './utils/error' import { transformWithEsbuild } from 'vite' import { EXPORT_HELPER_ID } from './helper' diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts index 241eca21eefea1..93610dcf7f6a36 100644 --- a/packages/plugin-vue/src/script.ts +++ b/packages/plugin-vue/src/script.ts @@ -1,5 +1,5 @@ -import { SFCDescriptor, SFCScriptBlock } from 'vue/compiler-sfc' -import { ResolvedOptions } from '.' +import type { SFCDescriptor, SFCScriptBlock } from 'vue/compiler-sfc' +import type { ResolvedOptions } from '.' import { resolveTemplateCompilerOptions } from './template' // ssr and non ssr builds would output different script content diff --git a/packages/plugin-vue/src/style.ts b/packages/plugin-vue/src/style.ts index c27e16591f1de9..ad9d981412f52d 100644 --- a/packages/plugin-vue/src/style.ts +++ b/packages/plugin-vue/src/style.ts @@ -1,6 +1,6 @@ -import { SFCDescriptor } from 'vue/compiler-sfc' -import { TransformPluginContext } from 'rollup' -import { ResolvedOptions } from '.' +import type { SFCDescriptor } from 'vue/compiler-sfc' +import type { TransformPluginContext } from 'rollup' +import type { ResolvedOptions } from '.' // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types export async function transformStyle( diff --git a/packages/plugin-vue/src/template.ts b/packages/plugin-vue/src/template.ts index 9ee386b1c90d69..72e9588967556e 100644 --- a/packages/plugin-vue/src/template.ts +++ b/packages/plugin-vue/src/template.ts @@ -1,13 +1,13 @@ import path from 'path' import slash from 'slash' -import { +import type { SFCDescriptor, SFCTemplateCompileOptions, SFCTemplateCompileResults, CompilerOptions } from 'vue/compiler-sfc' -import { PluginContext, TransformPluginContext } from 'rollup' -import { ResolvedOptions } from '.' +import type { PluginContext, TransformPluginContext } from 'rollup' +import type { ResolvedOptions } from '.' import { getResolvedScript } from './script' import { createRollupError } from './utils/error' diff --git a/packages/plugin-vue/src/utils/descriptorCache.ts b/packages/plugin-vue/src/utils/descriptorCache.ts index 990f679d0ac08b..c0b77e72d3e613 100644 --- a/packages/plugin-vue/src/utils/descriptorCache.ts +++ b/packages/plugin-vue/src/utils/descriptorCache.ts @@ -2,8 +2,8 @@ import fs from 'fs' import path from 'path' import slash from 'slash' import hash from 'hash-sum' -import { CompilerError, SFCDescriptor } from 'vue/compiler-sfc' -import { ResolvedOptions, VueQuery } from '..' +import type { CompilerError, SFCDescriptor } from 'vue/compiler-sfc' +import type { ResolvedOptions, VueQuery } from '..' // compiler-sfc should be exported so it can be re-used export interface SFCParseResult { diff --git a/packages/plugin-vue/src/utils/error.ts b/packages/plugin-vue/src/utils/error.ts index 1f3e48d7c7ed44..50999910fabb7b 100644 --- a/packages/plugin-vue/src/utils/error.ts +++ b/packages/plugin-vue/src/utils/error.ts @@ -1,5 +1,5 @@ -import { CompilerError } from 'vue/compiler-sfc' -import { RollupError } from 'rollup' +import type { CompilerError } from 'vue/compiler-sfc' +import type { RollupError } from 'rollup' export function createRollupError( id: string, diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts index 188d6f1a5eb01b..c801b716d0318c 100644 --- a/packages/vite/src/client/client.ts +++ b/packages/vite/src/client/client.ts @@ -1,4 +1,4 @@ -import { +import type { ErrorPayload, FullReloadPayload, HMRPayload, @@ -6,7 +6,7 @@ import { Update, UpdatePayload } from 'types/hmrPayload' -import { CustomEventName } from 'types/customEvent' +import type { CustomEventName } from 'types/customEvent' import { ErrorOverlay, overlayId } from './overlay' // eslint-disable-next-line node/no-missing-import import '@vite/env' diff --git a/packages/vite/src/client/overlay.ts b/packages/vite/src/client/overlay.ts index 536b9df167a83f..150c570fbc8aaf 100644 --- a/packages/vite/src/client/overlay.ts +++ b/packages/vite/src/client/overlay.ts @@ -1,4 +1,4 @@ -import { ErrorPayload } from 'types/hmrPayload' +import type { ErrorPayload } from 'types/hmrPayload' const template = /*html*/ ` +
+ inline style +
+
use style class
+ +

base64

+ +

+ inline style +

+

use style class

+ +

@import

+ +