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

Topics/regroup non static files #6346

Merged
merged 18 commits into from
Jul 17, 2018
Merged

Topics/regroup non static files #6346

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4803d61
First try at cleaning up build output
brotzky Jul 4, 2018
e1b8be9
Adding flag to build, ordering pathPrefix correctly, and cleaned up s…
brotzky Jul 4, 2018
77371b9
Removing the deletion of files as referenced by m-allanson and pieh
brotzky Jul 4, 2018
59cf18a
Adding support for styles grouping
brotzky Jul 4, 2018
366bd97
renaming output directories to js and css
brotzky Jul 6, 2018
972fb6b
First try at cleaning up build output
brotzky Jul 4, 2018
4042ae1
Adding flag to build, ordering pathPrefix correctly, and cleaned up s…
brotzky Jul 4, 2018
695cb68
Removing the deletion of files as referenced by m-allanson and pieh
brotzky Jul 4, 2018
699e5ca
Adding support for styles grouping
brotzky Jul 4, 2018
eed6616
renaming output directories to js and css
brotzky Jul 6, 2018
d8a8377
Merge branch 'topics/regroup-non-static-files' of github.com:narative…
brotzky Jul 6, 2018
87f0ada
Removing config flag
brotzky Jul 8, 2018
cd834ab
Removing config flag logic from styles
brotzky Jul 8, 2018
414ce25
Merge branch 'master' into topics/regroup-non-static-files
brotzky Jul 12, 2018
41f80b6
Removing 'text/css' from CSS Link
brotzky Jul 12, 2018
ef334d2
Merge branch 'topics/regroup-non-static-files' of github.com:narative…
brotzky Jul 12, 2018
6f1e987
Woops, adding back the CSS as I was testing locally and commited the …
brotzky Jul 12, 2018
f1ad758
Adding '../' to the relative static route similar to CSS
brotzky Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/gatsby/src/utils/webpack-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,13 @@ module.exports = async ({
stage: Stage,
program: any,
}): Promise<WebpackUtilsOptions> => {
const assetRelativeRoot = `static/`
/**
* the leading `../` for assetRelativeRoot is required to ensure
* the static files extracted by webpack are not part of the
* "build-javascript" output path of `/js`. The same technique is
* used for CSS
*/
const assetRelativeRoot = `../static/`
Copy link
Contributor Author

@brotzky brotzky Jul 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

@m-allanson This had to be treated the same way as the ../css/ case because of how there's only a build-javascript stage. #6346 (comment)

Here are all the build stages:

type Stage = "develop" | "develop-html" | "build-javascript" | "build-html"

I think in the future it could be a good idea to add discrete build stages for CSS (although CSS in JS makes this a question mark?) and static assets instead of relying on this current workaround.

Here's an example of the output folder of your example repository with this commit

screen shot 2018-07-12 at 7 00 45 pm

const vendorRegex = /(node_modules|bower_components)/
const supportedBrowsers = program.browserlist

Expand Down