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

build(aio): align stackblitz files with Angular CLI V6 #23521

Closed
wants to merge 1 commit into from
Closed

build(aio): align stackblitz files with Angular CLI V6 #23521

wants to merge 1 commit into from

Conversation

brandonroberts
Copy link
Contributor

@brandonroberts brandonroberts commented Apr 24, 2018 •
edited

The .angular-cli.json file was still being copied into the stackblitz examples

Closes #23437

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

@mary-poppins
Copy link

You can preview abd88d9 at https://pr23521-abd88d9.ngbuilds.io/.

gkalpak
gkalpak approved these changes Apr 24, 2018
View reviewed changes
Copy link
Member

@gkalpak gkalpak left a comment

Choose a reason for hiding this comment

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

Unrelated to this PR, but I noticed the universal and testing examples still use the old cli + layout. Is there a reason or is it temporary? If the intention is to eventually upgrade them too, can you please create an issue, @brandonroberts?

aio/tools/stackblitz-builder/builder.js
@@ -252,7 +252,7 @@ class StackblitzBuilder {
}

var defaultIncludes = ['**/*.ts', '**/*.js', '**/*.css', '**/*.html', '**/*.md', '**/*.json', '**/*.png'];
var boilerplateIncludes = ['src/environments/*.*', '.angular-cli.json', 'src/polyfills.ts'];
var boilerplateIncludes = ['src/environments/*.*', 'angular.json', 'src/polyfills.ts'];
Copy link
Member

Choose a reason for hiding this comment

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

But why does the file exist in the first place? Shouldn't it be removed?

Copy link
Contributor

Choose a reason for hiding this comment

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

does stackblitz use this file for anything?

Copy link
Member

Choose a reason for hiding this comment

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

AFAICT, it only uses it to include it in the exported zip.
(BTW, I just realized the zips exported by StackBlitz are broken (e.g. wrong layout) for both old and new projects.)

@gkalpak gkalpak added action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews area: build & ci Related the build and CI infrastructure of the project comp: aio target: patch This PR is targeted for the next patch release labels Apr 24, 2018
@brandonroberts
Copy link
Contributor Author

@gkalpak the intention is to upgrade those also. They require changes to the associated guides also and the initial PR was to upgrade the standard examples that didn't require any custom configuration. I'll add an issue for updating the remaining ones. Once those are updated, then we can safely remove the .angular-cli.json from the shared example files.

@gkalpak
Copy link
Member

gkalpak commented Apr 24, 2018

They require changes to the associated guides also and the initial PR was to upgrade the standard examples that didn't require any custom configuration.

👍

Once those are updated, then we can safely remove the .angular-cli.json from the shared example files.

If it is only universal and testing, then do we still need the boilerplate/cli/.angular-cli.json (given that universal and testing use their own boilerplate .angular-cli.json)?

@brandonroberts
Copy link
Contributor Author

@gkalpak I don't think so. I'll remove it as part of this PR and any leftover references.

@mary-poppins
Copy link

You can preview 6651690 at https://pr23521-6651690.ngbuilds.io/.

@brandonroberts brandonroberts force-pushed the examples-stackblitz branch 2 times, most recently from 34d68a7 to 76872bd Compare April 30, 2018 13:20
@mary-poppins
Copy link

You can preview 76872bd at https://pr23521-76872bd.ngbuilds.io/.

@brandonroberts
build(aio): align stackblitz files with Angular CLI V6
010dd79 
Also cleans up legacy references to `.angular-cli.json`
@brandonroberts brandonroberts mentioned this pull request May 2, 2018
Closed
3 tasks
@gkalpak
Copy link
Member

gkalpak commented May 2, 2018

Why didn't Travis pick this up? 😒

@brandonroberts
Copy link
Contributor Author

@gkalpak this one is ready for another review

@gkalpak
Copy link
Member

gkalpak commented May 2, 2018

Did you make any more changes other than removing boilerplate/cli/.angular-cli.json?

(BTW, once a PR has been reviewed (and especially if you aren't making significant changes), it helps not amend the original commit, but add a fixup commit instead 💥)

@gkalpak gkalpak closed this May 2, 2018
@gkalpak gkalpak reopened this May 2, 2018
@mary-poppins
Copy link

You can preview 010dd79 at https://pr23521-010dd79.ngbuilds.io/.

@brandonroberts
Copy link
Contributor Author

brandonroberts commented May 2, 2018 •
edited

@gkalpak gotcha. I did not make anymore changes besides removing references to .angular-cli.json. The testing and universal changes are in another PR

@gkalpak gkalpak added action: merge The PR is ready for merge by the caretaker and removed action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews labels May 2, 2018
@IgorMinar IgorMinar closed this in fd9d188 May 2, 2018
IgorMinar pushed a commit that referenced this pull request May 2, 2018
@brandonroberts @IgorMinar
build(aio): align stackblitz files with Angular CLI V6 (#23521)
22eb8e2 
Also cleans up legacy references to `.angular-cli.json`

PR Close #23521
@brandonroberts brandonroberts mentioned this pull request May 4, 2018
Closed
@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

@IgorMinar IgorMinar IgorMinar left review comments

@gkalpak gkalpak gkalpak approved these changes

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker area: build & ci Related the build and CI infrastructure of the project cla: yes target: patch This PR is targeted for the next patch release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

build(aio): ensure stackblitz examples look like cli@6
6 participants
@brandonroberts @mary-poppins @gkalpak @IgorMinar @googlebot @jenniferfell