-
Notifications
You must be signed in to change notification settings - Fork 8
AI config logging enhancements #1711
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| import { App } from "./App"; | ||
| import { IFileSystem, FS_TOKEN } from "../types/FileSystem"; | ||
| import { ProjectConfig } from "./ProjectConfig"; | ||
| import { Util } from "./Util"; | ||
|
|
||
| type Framework = "angular" | "react" | "webcomponents" | "blazor" | "jquery"; | ||
|
|
||
| /** | ||
| * Attempt to detect project framework by first checking for local cli-config, | ||
| * then falling back to package.json analysis of `detectFrameworkFromPackageJson()`. | ||
| * then falling back to .csproj / package.json analysis. | ||
| * Logs the detection source when a framework is found. | ||
| * @returns The detected framework Id or `null` if no framework could be detected. | ||
| */ | ||
| export function detectFramework(): Framework | null { | ||
| let framework: Framework | null = null; | ||
| try { | ||
| // try project config first: | ||
| if (ProjectConfig.hasLocalConfig()) { | ||
| framework = ProjectConfig.getConfig().project?.framework?.toLowerCase() as Framework ?? null; | ||
| } | ||
|
damyanpetev marked this conversation as resolved.
|
||
|
|
@@ -54,13 +55,16 @@ export function detectFrameworkFromPackageJson(): Exclude<Framework, "jquery"> | | |
| ]); | ||
|
|
||
| if (deps.has("@angular/core")) { | ||
| Util.log("Detected Angular project (from package.json)"); | ||
| return "angular"; | ||
| } | ||
| if (deps.has("react")) { | ||
| Util.log("Detected React project (from package.json)"); | ||
| return "react"; | ||
| } | ||
|
|
||
| // for now assume webcomponents as default fallback | ||
| Util.log("Assuming Web Components (no Angular/React deps found in package.json)"); | ||
| return "webcomponents"; | ||
|
Comment on lines
66
to
68
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated the log message to |
||
| } | ||
|
|
||
|
|
@@ -135,6 +139,10 @@ export function detectBlazorFromCsproj(): boolean { | |
| } | ||
| } | ||
|
|
||
| return csprojFiles.some(csproj => isBlazorProject(fs, csproj)); | ||
| const detected = csprojFiles.some(csproj => isBlazorProject(fs, csproj)); | ||
| if (detected) { | ||
| Util.log("Detected Blazor project (from .csproj)"); | ||
| } | ||
| return detected; | ||
| } | ||
| //#endregion Blazor detection | ||
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.