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

feat: rename templated imports to avoid collisions #421

Merged
merged 1 commit into from
May 10, 2022

Conversation

ladydascalie
Copy link
Contributor

@ladydascalie ladydascalie commented Apr 14, 2022

Addresses #286

This PR renames most imports in the template to minimise the risk of collisions.
Some imports (like context) may need to remain pure, for generated wrapFuncs to function properly (unless this also merits changing).

@natefinch
Copy link
Member

This looks really good. I've been meaning to do this for a long time. Thanks for the work.

I think it's fine without changing context for now.

@ladydascalie
Copy link
Contributor Author

Amazing. Just let me know if there's anything else you would like added / changed, and I'll be happy to help!

Copy link
Member

@natefinch natefinch left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks!

@natefinch natefinch merged commit 40d421b into magefile:master May 10, 2022
@ladydascalie ladydascalie deleted the feature/rename-imports branch May 12, 2022 09:12
andrii-zakurenyi referenced this pull request in DelineaXPM/ansible-core-collection Oct 13, 2022
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/magefile/mage](https://github.com/magefile/mage) |
require | minor | `v1.13.0` -> `v1.14.0` |

---

### Release Notes

<details>
<summary>magefile/mage</summary>

### [`v1.14.0`](https://github.com/magefile/mage/releases/tag/v1.14.0)

[Compare
Source](https://github.com/magefile/mage/compare/v1.13.0...v1.14.0)

#### What's Changed

- give props to netlify on the main page by
[@&#8203;natefinch](https://github.com/natefinch) in
[https://github.com/magefile/mage/pull/410](https://github.com/magefile/mage/pull/410)
- Update site to build with newer hugo by
[@&#8203;perrito666](https://github.com/perrito666) in
[https://github.com/magefile/mage/pull/411](https://github.com/magefile/mage/pull/411)
- bring docs for use of directives up to date by
[@&#8203;efd6](https://github.com/efd6) in
[https://github.com/magefile/mage/pull/407](https://github.com/magefile/mage/pull/407)
- add blog post about v1.13 by
[@&#8203;natefinch](https://github.com/natefinch) in
[https://github.com/magefile/mage/pull/412](https://github.com/magefile/mage/pull/412)
- fix author links by
[@&#8203;natefinch](https://github.com/natefinch) in
[https://github.com/magefile/mage/pull/413](https://github.com/magefile/mage/pull/413)
- Add variadic support to mg.F by
[@&#8203;perj](https://github.com/perj) in
[https://github.com/magefile/mage/pull/402](https://github.com/magefile/mage/pull/402)
- feat: rename templated imports to avoid collisions by
[@&#8203;ladydascalie](https://github.com/ladydascalie) in
[https://github.com/magefile/mage/pull/421](https://github.com/magefile/mage/pull/421)
- Website: fixing typos by
[@&#8203;deining](https://github.com/deining) in
[https://github.com/magefile/mage/pull/429](https://github.com/magefile/mage/pull/429)
- refactor(listGoFiles): remove go list dependency by
[@&#8203;jaredallard](https://github.com/jaredallard) in
[https://github.com/magefile/mage/pull/440](https://github.com/magefile/mage/pull/440)
- doc: add MacPorts install info by
[@&#8203;herbygillot](https://github.com/herbygillot) in
[https://github.com/magefile/mage/pull/419](https://github.com/magefile/mage/pull/419)

#### New Contributors

- [@&#8203;efd6](https://github.com/efd6) made their first
contribution in
[https://github.com/magefile/mage/pull/407](https://github.com/magefile/mage/pull/407)
- [@&#8203;perj](https://github.com/perj) made their first
contribution in
[https://github.com/magefile/mage/pull/402](https://github.com/magefile/mage/pull/402)
- [@&#8203;ladydascalie](https://github.com/ladydascalie) made their
first contribution in
[https://github.com/magefile/mage/pull/421](https://github.com/magefile/mage/pull/421)
- [@&#8203;deining](https://github.com/deining) made their first
contribution in
[https://github.com/magefile/mage/pull/429](https://github.com/magefile/mage/pull/429)
- [@&#8203;jaredallard](https://github.com/jaredallard) made their
first contribution in
[https://github.com/magefile/mage/pull/440](https://github.com/magefile/mage/pull/440)
- [@&#8203;herbygillot](https://github.com/herbygillot) made their
first contribution in
[https://github.com/magefile/mage/pull/419](https://github.com/magefile/mage/pull/419)

**Full Changelog**:
magefile/mage@v1.13.0...v1.14.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click
this checkbox.

Co-authored-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
scottames referenced this pull request in scottames/cmder Apr 22, 2023
….0 (#6)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/magefile/mage](https://github.com/magefile/mage) |
require | minor | `v1.11.0` -> `v1.14.0` |

---

### Release Notes

<details>
<summary>magefile/mage</summary>

###
[`v1.14.0`](https://github.com/magefile/mage/releases/tag/v1.14.0): -
Faster Than Ever

[Compare
Source](https://github.com/magefile/mage/compare/v1.13.0...v1.14.0)

#### What's Changed

- give props to netlify on the main page by
[@&#8203;natefinch](https://github.com/natefinch) in
[https://github.com/magefile/mage/pull/410](https://github.com/magefile/mage/pull/410)
- Update site to build with newer hugo by
[@&#8203;perrito666](https://github.com/perrito666) in
[https://github.com/magefile/mage/pull/411](https://github.com/magefile/mage/pull/411)
- bring docs for use of directives up to date by
[@&#8203;efd6](https://github.com/efd6) in
[https://github.com/magefile/mage/pull/407](https://github.com/magefile/mage/pull/407)
- add blog post about v1.13 by
[@&#8203;natefinch](https://github.com/natefinch) in
[https://github.com/magefile/mage/pull/412](https://github.com/magefile/mage/pull/412)
- fix author links by
[@&#8203;natefinch](https://github.com/natefinch) in
[https://github.com/magefile/mage/pull/413](https://github.com/magefile/mage/pull/413)
- Add variadic support to mg.F by
[@&#8203;perj](https://github.com/perj) in
[https://github.com/magefile/mage/pull/402](https://github.com/magefile/mage/pull/402)
- feat: rename templated imports to avoid collisions by
[@&#8203;ladydascalie](https://github.com/ladydascalie) in
[https://github.com/magefile/mage/pull/421](https://github.com/magefile/mage/pull/421)
- Website: fixing typos by
[@&#8203;deining](https://github.com/deining) in
[https://github.com/magefile/mage/pull/429](https://github.com/magefile/mage/pull/429)
- refactor(listGoFiles): remove go list dependency by
[@&#8203;jaredallard](https://github.com/jaredallard) in
[https://github.com/magefile/mage/pull/440](https://github.com/magefile/mage/pull/440)
- doc: add MacPorts install info by
[@&#8203;herbygillot](https://github.com/herbygillot) in
[https://github.com/magefile/mage/pull/419](https://github.com/magefile/mage/pull/419)

#### New Contributors

- [@&#8203;efd6](https://github.com/efd6) made their first
contribution in
[https://github.com/magefile/mage/pull/407](https://github.com/magefile/mage/pull/407)
- [@&#8203;perj](https://github.com/perj) made their first
contribution in
[https://github.com/magefile/mage/pull/402](https://github.com/magefile/mage/pull/402)
- [@&#8203;ladydascalie](https://github.com/ladydascalie) made their
first contribution in
[https://github.com/magefile/mage/pull/421](https://github.com/magefile/mage/pull/421)
- [@&#8203;deining](https://github.com/deining) made their first
contribution in
[https://github.com/magefile/mage/pull/429](https://github.com/magefile/mage/pull/429)
- [@&#8203;jaredallard](https://github.com/jaredallard) made their
first contribution in
[https://github.com/magefile/mage/pull/440](https://github.com/magefile/mage/pull/440)
- [@&#8203;herbygillot](https://github.com/herbygillot) made their
first contribution in
[https://github.com/magefile/mage/pull/419](https://github.com/magefile/mage/pull/419)

**Full Changelog**:
magefile/mage@v1.13.0...v1.14.0

###
[`v1.13.0`](https://github.com/magefile/mage/releases/tag/v1.13.0): -
Magefiles Directory and more!

[Compare
Source](https://github.com/magefile/mage/compare/v1.12.1...v1.13.0)

#### What's Changed

- feat: allow mage:import alias to be defined for multiple imports by
[@&#8203;viktorvoltaire](https://github.com/viktorvoltaire) in
[https://github.com/magefile/mage/pull/398](https://github.com/magefile/mage/pull/398)
- chore: wrap log.Println in cmd with verbose check by
[@&#8203;viktorvoltaire](https://github.com/viktorvoltaire) in
[https://github.com/magefile/mage/pull/399](https://github.com/magefile/mage/pull/399)
- Detect deps that have already been invoked by
[@&#8203;carolynvs](https://github.com/carolynvs) in
[https://github.com/magefile/mage/pull/346](https://github.com/magefile/mage/pull/346)
- Replace godoc.org URLs by
[@&#8203;JamieEdge](https://github.com/JamieEdge) in
[https://github.com/magefile/mage/pull/342](https://github.com/magefile/mage/pull/342)
- Add magefiles directory support by
[@&#8203;perrito666](https://github.com/perrito666) in
[https://github.com/magefile/mage/pull/405](https://github.com/magefile/mage/pull/405)

#### New Contributors

- [@&#8203;viktorvoltaire](https://github.com/viktorvoltaire) made
their first contribution in
[https://github.com/magefile/mage/pull/398](https://github.com/magefile/mage/pull/398)
- [@&#8203;carolynvs](https://github.com/carolynvs) made their first
contribution in
[https://github.com/magefile/mage/pull/346](https://github.com/magefile/mage/pull/346)
- [@&#8203;JamieEdge](https://github.com/JamieEdge) made their first
contribution in
[https://github.com/magefile/mage/pull/342](https://github.com/magefile/mage/pull/342)
- [@&#8203;perrito666](https://github.com/perrito666) made their first
contribution in
[https://github.com/magefile/mage/pull/405](https://github.com/magefile/mage/pull/405)

**Full Changelog**:
magefile/mage@v1.12.1...v1.13.0

###
[`v1.12.1`](https://github.com/magefile/mage/releases/tag/v1.12.1): -
Second Verse, Same as the First

[Compare
Source](https://github.com/magefile/mage/compare/v1.12.0...v1.12.1)

This is a copy of v1.12.0 ... nothing has changed. However, there was an
initial v1.12.0 that was created accidentally, and then deleted, and
it's causing some go proxies to complain. So hopefully this will fix
that.

#### Changelog

- [`2f1ec40`](https://github.com/magefile/mage/commit/2f1ec40) ci:
migrate from travis to github action
([#&#8203;391](https://github.com/magefile/mage/issues/391))
- [`fe9f942`](https://github.com/magefile/mage/commit/fe9f942)
evidently goreleaseer has changed in the last 4 years :)
([#&#8203;394](https://github.com/magefile/mage/issues/394))
- [`fd5011e`](https://github.com/magefile/mage/commit/fd5011e) Fix the
rollback mechanism for tags during a release
([#&#8203;392](https://github.com/magefile/mage/issues/392))
- [`404c119`](https://github.com/magefile/mage/commit/404c119)
sh.run(): quoted strings before join
([#&#8203;306](https://github.com/magefile/mage/issues/306))
- [`0c5affe`](https://github.com/magefile/mage/commit/0c5affe) Add
asdf installation instructions to docs
([#&#8203;383](https://github.com/magefile/mage/issues/383))
- [`e84bbc1`](https://github.com/magefile/mage/commit/e84bbc1)
[#&#8203;288](https://github.com/magefile/mage/issues/288) add brew
and scoop install to docs
([#&#8203;376](https://github.com/magefile/mage/issues/376))
- [`80953f7`](https://github.com/magefile/mage/commit/80953f7)
[#&#8203;378](https://github.com/magefile/mage/issues/378) bump
travisci go16
([#&#8203;379](https://github.com/magefile/mage/issues/379))
- [`dd94424`](https://github.com/magefile/mage/commit/dd94424) Create
issue templates
([#&#8203;374](https://github.com/magefile/mage/issues/374))
- [`d9e2e41`](https://github.com/magefile/mage/commit/d9e2e41) fix:
deterministic compiled mainfile
([#&#8203;348](https://github.com/magefile/mage/issues/348))
- [`4cf3cfc`](https://github.com/magefile/mage/commit/4cf3cfc) make -h
work with imported targets
([#&#8203;335](https://github.com/magefile/mage/issues/335))
- [`de7ca6c`](https://github.com/magefile/mage/commit/de7ca6c) fix
test for go 1.16
([#&#8203;330](https://github.com/magefile/mage/issues/330))

###
[`v1.12.0`](https://github.com/magefile/mage/releases/tag/v1.12.0): -
Small Fixes

[Compare
Source](https://github.com/magefile/mage/compare/v1.11.0...v1.12.0)

This is our first release in a while, and nothing major is added, but
some small fixes have gone out, like making the mainfile deterministic
and making sure we can use -h with imported targets.

#### Changelog

- [`2f1ec40`](https://github.com/magefile/mage/commit/2f1ec40) ci:
migrate from travis to github action
([#&#8203;391](https://github.com/magefile/mage/issues/391))
- [`fe9f942`](https://github.com/magefile/mage/commit/fe9f942)
evidently goreleaseer has changed in the last 4 years :)
([#&#8203;394](https://github.com/magefile/mage/issues/394))
- [`fd5011e`](https://github.com/magefile/mage/commit/fd5011e) Fix the
rollback mechanism for tags during a release
([#&#8203;392](https://github.com/magefile/mage/issues/392))
- [`404c119`](https://github.com/magefile/mage/commit/404c119)
sh.run(): quoted strings before join
([#&#8203;306](https://github.com/magefile/mage/issues/306))
- [`0c5affe`](https://github.com/magefile/mage/commit/0c5affe) Add
asdf installation instructions to docs
([#&#8203;383](https://github.com/magefile/mage/issues/383))
- [`e84bbc1`](https://github.com/magefile/mage/commit/e84bbc1)
[#&#8203;288](https://github.com/magefile/mage/issues/288) add brew
and scoop install to docs
([#&#8203;376](https://github.com/magefile/mage/issues/376))
- [`80953f7`](https://github.com/magefile/mage/commit/80953f7)
[#&#8203;378](https://github.com/magefile/mage/issues/378) bump
travisci go16
([#&#8203;379](https://github.com/magefile/mage/issues/379))
- [`dd94424`](https://github.com/magefile/mage/commit/dd94424) Create
issue templates
([#&#8203;374](https://github.com/magefile/mage/issues/374))
- [`d9e2e41`](https://github.com/magefile/mage/commit/d9e2e41) fix:
deterministic compiled mainfile
([#&#8203;348](https://github.com/magefile/mage/issues/348))
- [`4cf3cfc`](https://github.com/magefile/mage/commit/4cf3cfc) make -h
work with imported targets
([#&#8203;335](https://github.com/magefile/mage/issues/335))
- [`de7ca6c`](https://github.com/magefile/mage/commit/de7ca6c) fix
test for go 1.16
([#&#8203;330](https://github.com/magefile/mage/issues/330))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://app.renovatebot.com/dashboard#github/scottames/cmder).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS41Ny4wIiwidXBkYXRlZEluVmVyIjoiMzUuNTcuMCJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

2 participants