Skip to content
New issue

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

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

Already on GitHub? # to your account

feat: Make include_file overrule include_ext, fixes: #350, base_on: #358 #416

Merged

Conversation

zhb127
Copy link
Contributor

@zhb127 zhb127 commented Apr 21, 2023

Fixes: #350

Base on: #358

I don't know, why marked #358 PR as draft?

Just fix code by #358 PR author's comments. then create new PR.

@silverwind
Copy link
Contributor

silverwind commented Apr 21, 2023

Please add "Fixes: #350" to your comment.

@zhb127 zhb127 changed the title feat: Make include_file overrule include_ext feat: Make include_file overrule include_ext, fixes: #350, base_on: #358 Apr 21, 2023
@zhb127
Copy link
Contributor Author

zhb127 commented Apr 21, 2023

Please add "Fixes: #350" to your comment.

OK

@silverwind
Copy link
Contributor

Bump, would love to see this merged.

@nmfzone
Copy link

nmfzone commented Sep 12, 2023

Just to notify, I personally want to see this merged

@xiantang xiantang self-requested a review October 20, 2023 04:07
@park-jemin
Copy link

Bump - would love to see this merged as well, seems it's been hanging for a while

@zhb127 zhb127 force-pushed the feat/make_include_file_overrule_include_ext branch from 88b8e9c to 957cbd9 Compare February 2, 2024 03:10
@silverwind
Copy link
Contributor

silverwind commented Feb 2, 2024

You should also include this change to actually test the changed functionality:

https://github.com/cosmtrek/air/pull/358/files#diff-c484509c25b7c8e4df331c9aefcbb49e43881a9a57c201a4491a4b7b61a72acb

@zhb127
Copy link
Contributor Author

zhb127 commented Feb 2, 2024

You should also include this change to actually test the changed functionality:

https://github.com/cosmtrek/air/pull/358/files#diff-c484509c25b7c8e4df331c9aefcbb49e43881a9a57c201a4491a4b7b61a72acb

thx, The test code has been added.

@cosmtrek cosmtrek merged commit c75a2f5 into air-verse:master Sep 22, 2024
1 check passed
jesses-code-adventures pushed a commit to jesses-code-adventures/air that referenced this pull request Sep 25, 2024
…ase_on: air-verse#358 (air-verse#416)

* feat: Make include_file overrule include_ext

* feat: Make include_file overrule include_ext unittest
wafer-bw added a commit to searchspring/air that referenced this pull request Jan 31, 2025
* chore: bump go to 1.23 (air-verse#650)

* docs: update banner (air-verse#651)

* fix proxy retry loop (air-verse#635)

This addresses two bugs:
1) The loop could exit with an error condition present and fail to
   inform the user.
2) On Windows 11, syscall.ECONNREFUSED is not returned. Instead we
   receive net.OpError with a message similar to:

"unable to reach app: Get "http://localhost:7000/": dial tcp [::1]:7000: connectex: No connection could be made because the target machine actively refused it."

The Fix:
Since the retry loop is short; just 1 second maximum, we retry until no
error happens. If an error does occur, we inform the user.

* Use web page address when making request to reload proxy (air-verse#625)

* Use web page address when making request to reload proxy

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>

* Create event source with just a path because browser can handle address on its own.

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>

---------

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>

* fix the stop_on_error is false configuration does not work (air-verse#555)

* fix color output (air-verse#551)

* Set the Via header in proxy requests to origin and in client responses (air-verse#629)

* Set the Via header in proxy requests to origin and in client responses

* Remove pseudonym and use host only

* feat: Make include_file overrule include_ext, fixes: air-verse#350, base_on: air-verse#358 (air-verse#416)

* feat: Make include_file overrule include_ext

* feat: Make include_file overrule include_ext unittest

* fix: broken code (air-verse#652)

* feat: silent flag in .air.toml, suppressing all air prints (air-verse#641)

* feat: silent flag in .air.toml, suppressing all air prints

useful if the app being watched has structured outputs that are being
piped into subsequent program/s.

* update: add silent to air_example.toml

* FIX: Support working directories containing whitespace (air-verse#646)

* encapsulate paths with quotes to escape spaces

* encapsulate paths with quotes to escape spaces

* preprocess error in test

* Revert "FIX: Support working directories containing whitespace (air-verse#646)" (air-verse#665)

This reverts commit df13da5.

* refactor: remove unnecessary var copy in for (air-verse#682)

* docs: fix badge link in README-zh_cn.md (air-verse#681)

* refactor: simplify test asserts; enable testifylint (air-verse#680)

* Update unclear .profile changes in README.md (air-verse#684)

* Fix: typo in air_example.toml (air-verse#706)

* Implement kill delay on Windows (air-verse#552)

* fix color output

* Implement kill delay on Windows

* Revert the change on master

* Remove extra newline

* Handle absolute paths in config (air-verse#318)

* remove a data race by compiling the exclude regexes in the preprocess phase (air-verse#677)

the regex compilation was done lazily on first access but did not properly synchronize
for being accessed by multiple watcher goroutines

between the option of adding a mutex for something that (should) only ever happen
once and removing the potential for a race, this seems like the better choice

* catch and report start cmd failure rather than panicing (air-verse#676)

* do not report the process as running if it failed to start

* change the return values on error to match what the other platforms produce

* chore: fix test case TestRegexes

* air -h will be document of air

* Update README for air help command

* fix: default config override (air-verse#719)

* Avoid duplicating cors header. (air-verse#727)

* fix: typos (air-verse#728)

* wait for killfunc completion when shutting down current app (air-verse#670)

* wait for killfunc completion when shutting down current app

---------

Co-authored-by: jingdi.zhu <jingdi.zhu@bytedance.com>

* Feature: Show build errors when using proxy (air-verse#725)

* proxy: stream reload and error messages

* proxy: Console log on build failure

* proxy: show build errors in a modal

---------

Co-authored-by: xiantang <zhujingdi1998@gmail.com>

* Add exiter to test os.Exit case (air-verse#729)

authored-by: jingdi.zhu <jingdi.zhu@bytedance.com>

* Fix: using powershell instead of cmd /C (air-verse#708)

---------

Signed-off-by: Alexandra Fishova <yopoyka@yopoyka.com>
Co-authored-by: Rick Yu <m@c6k.app>
Co-authored-by: Greg Dietsche <greg@gregd.org>
Co-authored-by: Alexandra Fishova <yopoyka@yopoyka.com>
Co-authored-by: dengdajun <78243198+pyjcode@users.noreply.github.com>
Co-authored-by: 8LWXpg <105704427+8LWXpg@users.noreply.github.com>
Co-authored-by: dedalusj <dedalusj@gmail.com>
Co-authored-by: zhb127 <1224680008@qq.com>
Co-authored-by: ~ jesse ~ <113159758+jesses-code-adventures@users.noreply.github.com>
Co-authored-by: osteensco <86266589+osteensco@users.noreply.github.com>
Co-authored-by: Oleksandr Redko <oleksandr.red+github@gmail.com>
Co-authored-by: Gourav Kolhatkar <gstar1525@gmail.com>
Co-authored-by: Olivia Bahr <ob.bahr@gmail.com>
Co-authored-by: ZipFile <lin.aaa.lin@gmail.com>
Co-authored-by: Isak Styf <isak@styfsoftware.se>
Co-authored-by: xiantang <zhujingdi1998@gmail.com>
Co-authored-by: Nemanja Milićević <the.nemanja.milicevic@gmail.com>
Co-authored-by: Brandon Bloom <brandon.d.bloom@gmail.com>
Co-authored-by: Nathan Baulch <nathan.baulch@gmail.com>
Co-authored-by: jingdi.zhu <jingdi.zhu@bytedance.com>
Co-authored-by: Polo123456789 <57022222+Polo123456789@users.noreply.github.com>
Co-authored-by: Po <73031052+n1vk@users.noreply.github.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

include_file should overrule include_ext
6 participants