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.

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

[PWA] rename components and move app specific code to /src #1490

Merged
merged 7 commits into from
Aug 23, 2017
Merged

[PWA] rename components and move app specific code to /src #1490

merged 7 commits into from
Aug 23, 2017

Conversation

pierreneter
Copy link
Member

Related to #1400
Finished the first two lines in this checklist.

@skipjack
Copy link
Collaborator

skipjack commented Aug 6, 2017

@pierreneter thanks so much for tackling this! This will take a significant amount of testing/review to be sure everything is working properly. I will start testing this out as soon as I have time.

Once we've approved the changes, we can resolve the conflicts and get this merged.

cc @bebraw @hulkish

@skipjack
Copy link
Collaborator

Ok started testing this out locally...

The npm run build script runs fine, however when running npm run lint I get a bunch of these errors from the lint:links method:

should respond with HTTP status 200
404 https://github.com/webpack/webpack.js.org/edit/master/src/content/support/index.md at build/support/index.html:19:31179 <a class="page-links__link" href="https://github.com/webpack/webpack.js.org/edit/master/src/content/support/index.md">...</a>

which seems to be caused by links picking up the .md extension when they shouldn't. I'll keep testing more and see if I can dig anything else up.

@pierreneter
Copy link
Member Author

@skipjack This error occurred because I have moved the content and in src folder.

https://github.com/webpack/webpack.js.org/edit/master/src/content/support/index.md //after merged
https://github.com/webpack/webpack.js.org/edit/master/content/support/index.md //now

We should move it inwards or not?
I want to take the next steps but still waiting for this PR to be merged.
If these two steps are not necessary then we should discuss whether to merge it or not to avoid large file conflicts.

@skipjack
Copy link
Collaborator

skipjack commented Aug 20, 2017

@pierreneter ah you're totally right, the edit link failures are to be expected.

We should move it inwards or not?

No it's fine as is, this is to be expected in scenarios like this.

I want to take the next steps but still waiting for this PR to be merged.
If these two steps are not necessary then we should discuss whether to merge it or not to avoid large file conflicts.

Can you carefully resolve all the conflicts? From there I'll do one more round of testing and make it a priority to get this merged.

@pierreneter
Copy link
Member Author

all done @skipjack

Copy link
Collaborator

@skipjack skipjack left a comment

Choose a reason for hiding this comment

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

Ok tested and everything seems to be working great. Added a few minor comments but nothing that necessarily has to be changed before merging. I am seeing a few warnings from npm run lint:social but they don't seem to be related to your changes.

@@ -6,7 +6,7 @@ language: node_js
node_js:
- "6"
script:
- bash ./scripts/deploy.sh
- bash ./src/scripts/deploy.sh
Copy link
Collaborator

Choose a reason for hiding this comment

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

We may want to keep the /scripts directory as is seeing as it's not part of the actual site code. @bebraw what do you think?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok I'm going to leave this for now but may revert this change in a follow up PR. It's nothing major but I think it's good to separate build process related scripts from actual the actual javascript that runs the site (though the line is somewhat blurry for static site generators).

import Link from '../link/link';
import Container from '../container/container';
import Link from '../Link/Link';
import Container from '../Container/Container';
Copy link
Collaborator

Choose a reason for hiding this comment

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

Now that each file is named similarly just with a different extension, is there a potential for conflict here? Seeing as the site works, I'm guessing webpack tries .jsx files before .scss but isn't it somewhat ambiguous to which module this import goes? I do see that you did update all the styling imports to hit the .scss file directly. If this is common practice then I'm fine with it, just curious.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok still interested in thoughts on this ambiguity but as far as I can tell this isn't causing any issues.

@skipjack
Copy link
Collaborator

Aside from the lint:social errors and edit link errors everything seems to run perfectly. I'd like to give @bebraw another day or two to review before merging but I'll hold off on merging other PRs until we hear from him so you don't need to keep rebasing.

These files are now placed in the same location under
the `/src` directory.
It seems most of our content actually wasn't picked
up by alex prior to the recent changes. This commit
fixes/ignores some new warnings that cropped up.
@skipjack
Copy link
Collaborator

@pierreneter did a final review, pushed some fixes, and will merge shortly.

@skipjack skipjack merged commit fd37f67 into webpack:master Aug 23, 2017
@hulkish hulkish mentioned this pull request Aug 23, 2017
13 tasks
@pierreneter
Copy link
Member Author

@skipjack thanks!

@skipjack
Copy link
Collaborator

skipjack commented Aug 23, 2017

@pierreneter no problem had to fix one thing in #1538 but aside from that everything seems 👍 (at least no "the site blew up" issues popped up so far 😆 ).

Thanks again for your work on this, you may want to sync up with @hulkish in #1400 to discuss next steps. Note that I did check the first two items there off and added references to these PRs. It seems the other items there won't be as big overhauls but please feel free to ping me if I can help in anyway. I'm finding the PWA items, performance improvements, and lighthouse testing all very interesting.

skipjack added a commit that referenced this pull request Aug 29, 2017
These files are generated by the `npm run fetch` script and were
somehow messed up by #1490 (I think).
@skipjack skipjack mentioned this pull request Aug 29, 2017
skipjack added a commit that referenced this pull request Aug 29, 2017
These files are generated by the `npm run fetch` script and were
somehow messed up by #1490 (I think). Followed these instructions
to ensure they were fully removed and ignored:

https://stackoverflow.com/questions/11451535/gitignore-is-not-working

Resolves #1554
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants