FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix asconfig merge order by dcodeIO · Pull Request #1406 · AssemblyScript/assemblyscript · GitHub

/ assemblyscript Public

Fix asconfig merge order - #1406

Merged
dcodeIO merged 9 commits into
masterfrom
issue-1404
Jul 24, 2020
ConversationCommits (9)ChecksFiles changed
Merged

Fix asconfig merge order#1406
dcodeIO merged 9 commits into
masterfrom
issue-1404

Conversation

dcodeIO commented Jul 22, 2020

Copy link
Copy Markdown
Member

Fixes the merge order part of #1404 by updating to the originally intended order

  1. CLI arguments (without defaults)
  2. ASConfig target
  3. ASConfig options
  4. Repeat 2. and 3. while ASConfig extends
  5. Add defaults

while moving the defaults for target and config to asc itself because we need these early. Previously, the initial invocation of parse missed to omit populating defaults, and #1404 also seems to populate these too early.

  • I've read the contributing guidelines

dcodeIO commented Jul 22, 2020

Copy link
Copy Markdown
Member Author

Hmm, this is failing in apparently unrelated packages tests now, specifically b.

willemneal commented Jul 22, 2020

Copy link
Copy Markdown
Contributor

I had the same issue when I tried to delay the adding defaults to args, now opt. Is the plan to merge this first and then mine? Why not just edit mine directly? You can push to my branch.

dcodeIO commented Jul 22, 2020

Copy link
Copy Markdown
Member Author

Really just trying to dig into merge order in separation here, as that's what I'm primarily concerned about. Wasn't expecting unrelated breakage, though, so if you'd like to incorporate the merge order (this PR has the correct one now) into your PR, feel free to do so.

willemneal mentioned this pull request Jul 22, 2020
Closed
willemneal reviewed Jul 22, 2020
View reviewed changes
Comment thread cli/asc.js Outdated
willemneal reviewed Jul 22, 2020
View reviewed changes
Comment thread cli/asc.js Outdated
willemneal reviewed Jul 23, 2020
View reviewed changes
Comment thread cli/asc.js Outdated
seenAsconfig.add(filePath);
asconfig = getAsconfig(fileName, asconfigDir, readFile);
}
asconfigPath = optionsUtil.resolvePath(asconfig.extends, asconfigDir);

willemneal Jul 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Nice! I was going to mention that we should allow for node_resolution here like ts does.

willemneal commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

#1408 Adds tests to this PR.

dcodeIO mentioned this pull request Jul 24, 2020
Closed
MaxGraey reviewed Jul 24, 2020
View reviewed changes
Comment thread cli/asc.js Outdated

dcodeIO commented Jul 24, 2020

Copy link
Copy Markdown
Member Author

Merging to get this fixed, but can't merge #1408 on top of it because it includes #1411 for some reason (probably a mistake). Suggesting to rebase #1408 cleanly on top of master afterwards.

dcodeIO merged commit df40407 into master Jul 24, 2020

github-actions Bot commented Jul 25, 2020

Copy link
Copy Markdown

🎉 This PR is included in version 0.14.4 🎉

The release is available on:

Your semantic-release bot 📦🚀

dcodeIO deleted the issue-1404 branch June 1, 2021 15:21
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

MaxGraey MaxGraey left review comments
+1 more reviewer
willemneal willemneal left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL