Skip to content

fix(build): Adjust pointers to bazel-built directory #1793

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 2 commits into from
Nov 8, 2022

Conversation

atscott
Copy link
Collaborator

@atscott atscott commented Oct 28, 2022

Prior commits have migrated this project to have its outputs built by bazel. As a result the pointers to the dist folder need to be updated to bazel-bin.

@atscott atscott added the target: patch This PR is targeted for the next patch release label Oct 28, 2022
@atscott atscott requested a review from dylhunn October 28, 2022 16:46
@@ -6,7 +6,8 @@
"rootDir": "src",
"rootDirs": [
".",
"../dist"
"../dist",
"../bazel-bin"
Copy link
Contributor

Choose a reason for hiding this comment

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

for editor support I'm guessing? or is this load bearing for debugging as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'll revert this. I was seeing an error in my editor that was saying something along the lines of ...dist/common/resolver wasn't built from source ...common/resolver.ts. Which could make sense because we don't actually build anything with tsc and put it in the dist folder.

@@ -490,7 +490,7 @@ function getServerOptions(ctx: vscode.ExtensionContext, debug: boolean): lsp.Nod
// Node module for the language server
const args = constructArgs(ctx, viewEngine, vscode.workspace.isTrusted);
const prodBundle = ctx.asAbsolutePath('server');
const devBundle = ctx.asAbsolutePath(path.join('dist', 'server', 'src', 'server.js'));
const devBundle = ctx.asAbsolutePath(path.join('bazel-bin', 'server', 'src', 'server.js'));
Copy link
Contributor

Choose a reason for hiding this comment

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

this one is surprising? needed for debugging or for some other reason?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is when running the extension how locally. We don't copy anything from bazel-bin to dist so this is definitely necessary.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@gregmagolan
Copy link
Contributor

LGTM

@atscott atscott added action: merge Ready to merge target: minor This PR is targeted for the next minor release and removed target: patch This PR is targeted for the next patch release labels Nov 8, 2022
Prior commits have migrated this project to have its outputs built by bazel. As a result
the pointers to the dist folder need to be updated to bazel-bin.
@atscott atscott merged commit b18c39c into angular:main Nov 8, 2022
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Dec 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge Ready to merge target: minor This PR is targeted for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants