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.

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

Jump to bottom

docs(aio): Upgrade server-side rendering example to Angular V6 #23649

Closed
wants to merge 1 commit into from
Closed

docs(aio): Upgrade server-side rendering example to Angular V6 #23649

wants to merge 1 commit into from

Conversation

brandonroberts
Copy link
Contributor

@brandonroberts brandonroberts commented May 2, 2018 •
edited

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[x] angular.io application / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

Once #23521 lands, I'll rebase this branch

@brandonroberts brandonroberts changed the title feat(aio): Upgrade server-side rendering example to Angular V6 docs(aio): Upgrade server-side rendering example to Angular V6 May 2, 2018
@mary-poppins
Copy link

You can preview 169fd04 at https://pr23649-169fd04.ngbuilds.io/.

@mary-poppins
Copy link

You can preview df5ebbc at https://pr23649-df5ebbc.ngbuilds.io/.

@jenniferfell jenniferfell requested a review from vikerman May 2, 2018 17:47
@jenniferfell
Copy link
Contributor

@vikerman Hi. Igor asked me to reach out to you for review and approval on this. Hoping to merge today. It's a change to universal examples to bring them current for v6. Thanks!

@jenniferfell jenniferfell added this to the v6-candidates milestone May 2, 2018
@vikerman
Copy link
Contributor

vikerman commented May 2, 2018

Looking into this now...

vikerman
vikerman reviewed May 2, 2018
View reviewed changes
aio/content/examples/universal/server.ts
@@ -51,7 +51,7 @@ app.get('*.*', express.static(join(DIST_FOLDER, 'browser')));
// #docregion navigation-request
// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render(join(DIST_FOLDER, 'browser', 'index.html'), { req });
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we no longer looking for the index.html as part of the DIST_FOLDER?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The change was based off the universal-starter upgrade to V6. Did fix the change from index.html to index

@mary-poppins
Copy link

You can preview d3a9a46 at https://pr23649-d3a9a46.ngbuilds.io/.

vikerman
vikerman approved these changes May 2, 2018
View reviewed changes
Copy link
Contributor

@vikerman vikerman left a comment

Choose a reason for hiding this comment

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

Approving. Please ensure sample works with the changes.

@jenniferfell jenniferfell added target: major This PR is targeted for the next major release merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note labels May 2, 2018
@IgorMinar IgorMinar added the action: merge The PR is ready for merge by the caretaker label May 2, 2018
@ngbot
Copy link

ngbot bot commented May 2, 2018

I see that you just added the PR action: merge label, but the following checks are still failing:
    failure missing required status "code-review/pullapprove"
    pending status "ci/circleci: lint" is pending
    pending status "ci/circleci: build-packages-dist" is pending
    pending status "ci/circleci: test" is pending
    pending status "continuous-integration/travis-ci/pr" is pending
    pending 1 pending code review

If you want your PR to be merged, it has to pass all the CI checks.

If you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help.

@mary-poppins
Copy link

You can preview 7bf224e at https://pr23649-7bf224e.ngbuilds.io/.

@IgorMinar IgorMinar closed this in 2cf6244 May 2, 2018
@brandonroberts brandonroberts mentioned this pull request May 3, 2018
Closed
IgorMinar pushed a commit that referenced this pull request May 3, 2018
@brandonroberts @IgorMinar
docs(aio): Upgrade server-side rendering example to Angular V6 (#23649)
9027818 
PR Close #23649
@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 Sep 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vikerman vikerman vikerman approved these changes

@gkalpak gkalpak Awaiting requested review from gkalpak

Assignees

@IgorMinar IgorMinar

Labels
action: merge The PR is ready for merge by the caretaker cla: yes merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note target: major This PR is targeted for the next major release
Projects
No open projects
docs
  
Awaiting triage
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@brandonroberts @mary-poppins @jenniferfell @vikerman @IgorMinar @googlebot