Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vite-node): fix esm false-detection inside comment #6506

Merged
merged 3 commits into from
Sep 17, 2024

Conversation

hi-ogawa
Copy link
Contributor

@hi-ogawa hi-ogawa commented Sep 14, 2024

Description

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

  • It's really useful if your PR references an issue where it is discussed ahead of time. If the feature is substantial or introduces breaking changes without a discussion, PR might be closed.
  • Ideally, include a test that fails without this PR but passes with it.
  • Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Tests

  • Run the tests with pnpm test:ci.

Documentation

  • If you introduce new functionality, document it. You can run documentation with pnpm run docs command.

Changesets

  • Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.

Copy link

netlify bot commented Sep 14, 2024

Deploy Preview for vitest-dev ready!

Built without sensitive environment variables

Name Link
🔨 Latest commit 3fcfff1
🔍 Latest deploy log https://app.netlify.com/sites/vitest-dev/deploys/66e55ae4cb3353000861fcb4
😎 Deploy Preview https://deploy-preview-6506--vitest-dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@hi-ogawa hi-ogawa marked this pull request as ready for review September 14, 2024 09:53
@hi-ogawa hi-ogawa changed the title fix(vite-node): fix external due to esm false-detection inside comment fix(vite-node): fix esm false-detection inside comment Sep 15, 2024
Comment on lines +14 to +16
// https://stackoverflow.com/a/15123777
const COMMENT_RE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would https://github.com/antfu/strip-literal be better here? It should be able to cover all kinds of edge cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that would be an option, but that's essentially running js-token based lexer, so if we go with something more sophisticated, it would be probably more direct (and also faster?) to use es-module-lexer's esm detection https://github.com/guybedford/es-module-lexer?tab=readme-ov-file#esm-detection

My impression is that over-stripping the code is mostly fine, so this regex should probably suffice for our usage.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This regex looks good enough for the reproduction's case. Also fast enough: https://regexr.com/85v1c

@AriPerkkio AriPerkkio merged commit 91f8599 into vitest-dev:main Sep 17, 2024
15 of 16 checks passed
@hi-ogawa hi-ogawa deleted the fix-esm-syntax-detect-comment branch September 17, 2024 05:46
renovate bot added a commit to mmkal/eslint-plugin-mmkal that referenced this pull request Oct 2, 2024
##### [v2.1.2](https://github.com/vitest-dev/vitest/releases/tag/v2.1.2)

#####    🐞 Bug Fixes

-   Move `Vitest.setServer` to post `configureServer` hook to enable import analysis for workspace config loading  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6584 [<samp>(e7f35)</samp>](vitest-dev/vitest@e7f35214)
-   **benchmark**:
    -   Clear `BenchmarkResult.samples` array to reduce memory usage  -  by [@hi-ogawa](https://github.com/hi-ogawa) and [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#6541 [<samp>(a6407)</samp>](vitest-dev/vitest@a6407afc)
-   **browser**:
    -   Fix dynamic import inside worker  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6569 [<samp>(ea2d4)</samp>](vitest-dev/vitest@ea2d429b)
    -   Fix browser mock factory event race condition  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6530 [<samp>(f131f)</samp>](vitest-dev/vitest@f131f93b)
    -   Serve ui assets as static  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6564 [<samp>(adcda)</samp>](vitest-dev/vitest@adcdaee8)
    -   Update solidjs testing library lib  -  by [@CamilleTeruel](https://github.com/CamilleTeruel) in vitest-dev/vitest#6548 [<samp>(91442)</samp>](vitest-dev/vitest@91442dfc)
    -   Use `data:` protocol on preview provider file upload  -  by [@userquin](https://github.com/userquin) in vitest-dev/vitest#6501 [<samp>(e9821)</samp>](vitest-dev/vitest@e9821f70)
    -   Fix base for client script  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6510 [<samp>(f9528)</samp>](vitest-dev/vitest@f952874e)
    -   Throw an error if "@vitest/browser/context" is imported outside of the browser mode  -  by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#6570 [<samp>(383f1)</samp>](vitest-dev/vitest@383f1791)
-   **coverage**:
    -   Remove empty coverage folder on test failure too  -  by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#6547 [<samp>(1371c)</samp>](vitest-dev/vitest@1371ca6a)
    -   Include `*.astro` by default  -  by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#6565 [<samp>(f8ff7)</samp>](vitest-dev/vitest@f8ff76a9)
    -   `cleanOnRerun: false` to invalidate previous results  -  by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#6592 [<samp>(88bde)</samp>](vitest-dev/vitest@88bde99c)
-   **expect**:
    -   Fix `toBeDefined` with `expect.poll`  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6562 [<samp>(f7da6)</samp>](vitest-dev/vitest@f7da6199)
-   **runner**:
    -   Mark tests as skipped when `beforeAll` failed  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6524 [<samp>(fb797)</samp>](vitest-dev/vitest@fb79792d)
    -   Support fixture parsing of lowered async syntax  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6531 [<samp>(b553c)</samp>](vitest-dev/vitest@b553c7d6)
    -   Fix fixture parsing of lowered async syntax for non arrow functions  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6575 [<samp>(3de00)</samp>](vitest-dev/vitest@3de00ab6)
    -   Guard test hook callback  -  by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#6604 [<samp>(14971)</samp>](vitest-dev/vitest@1497134e)
    -   Run `onTestFinished` and `onTestFailed` during `retry` and `repeats`  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6609 [<samp>(c5e29)</samp>](vitest-dev/vitest@c5e29098)
-   **ui**:
    -   List tests on ui when `--standalone`  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6577 [<samp>(d0bf8)</samp>](vitest-dev/vitest@d0bf89d3)
-   **vite-node**:
    -   Fix esm false-detection inside comment  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6506 [<samp>(91f85)</samp>](vitest-dev/vitest@91f85997)
-   **vitest**:
    -   Install dependencies with the same version when prompted  -  by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#6611 [<samp>(ed8b7)</samp>](vitest-dev/vitest@ed8b7c08)
    -   Make env.SSR consistent between different pools  -  by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#6616 [<samp>(8a8d3)</samp>](vitest-dev/vitest@8a8d3f03)
    -   Don't start a websocket server if api is disabled  -  by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#6617 [<samp>(82140)</samp>](vitest-dev/vitest@821400b8)
-   **workspace**:
    -   Fix glob pattern detection  -  by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#6502 [<samp>(7727c)</samp>](vitest-dev/vitest@7727ca87)
    -   Ignore DS_Store by default  -  by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#6571 [<samp>(d2a86)</samp>](vitest-dev/vitest@d2a86ff5)

#####     [View changes on GitHub](vitest-dev/vitest@v2.1.1...v2.1.2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vitest loads same module twice from dependencies
2 participants