Skip to content

Fix asconfig merge order #1406

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jul 24, 2020
Merged

Fix asconfig merge order #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b89af45
Fix asconfig merge order
dcodeIO Jul 22, 2020
b0e15ce
revert rename?
dcodeIO Jul 22, 2020
8c8e08f
fixes
dcodeIO Jul 23, 2020
7008203
improve showConfig
dcodeIO Jul 23, 2020
d10df1b
Merge branch 'master' into issue-1404
dcodeIO Jul 24, 2020
25e9ffa
make node resolution give us relative paths
dcodeIO Jul 24, 2020
9dd78b7
revert to absolute node module paths
dcodeIO Jul 24, 2020
79403bd
functional changes from #1408
dcodeIO Jul 24, 2020
8821f7f
Update cli/asc.js
dcodeIO Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/asc.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export interface MemoryStream extends OutputStream {
}

/** Compiler options. */
interface CompilerOptions {
export interface CompilerOptions {
/** Prints just the compiler's version and exits. */
version?: boolean;
/** Prints the help message and exits. */
Expand Down Expand Up @@ -146,7 +146,7 @@ interface CompilerOptions {
}

/** Compiler API options. */
interface APIOptions {
export interface APIOptions {
/** Standard output stream to use. */
stdout?: OutputStream;
/** Standard error stream to use. */
Expand Down
Loading