-
Notifications
You must be signed in to change notification settings - Fork 28
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
1.41pre #420
Open
Wolfr
wants to merge
42
commits into
develop
Choose a base branch
from
1.41pre
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will make it possible to cleanly separate Bedrock's templates from the user project templates.
This calls the Gulpfile main task, 'build'.
This allows to run `bedrock build` from a directory that contains content/ but not core/.
The goal is to allow to do something like npm install git+https://github.com/thusc/bedrock.git#cli and have a working Bedrock program.
This supposes that the current directory doesn't have a core Bedrock install, but instead used a standalone Bedrock program.
This is supposed to contribute to #391.
This one is equivalent to `npm start` in a regular Bedrock install.
This commit changes where Bedrock development server is looking for templates. Instead of using the local core/ directoy, it directs Bedrock to its own core/ directory. In addition, to allow styleguide templates to live in the local project, this commit adds an underscore prefix to the _styleguide/ directory. (The underscore is used to make sure those .pug files are not part of the main content processed by the static build.)
…tree) + Adjust in URLs
# Conflicts: # core/paths.js # core/templates/styleguide/doc.pug
This pull request is being automatically deployed with Vercel (learn more). 🔍 Inspect: https://vercel.com/monocompany/bedrock/42XAy7Wx7MtHT9wLgXdA4271znQU [Deployment for eb4fb6a failed] |
# Conflicts: # package-lock.json
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the PR to track 1.41, which removes
core
from projects using Bedrock. This achieves a better separation of concerns as noted in @thusc 's comment here.The first idea behind this was formulated in #320 . Through work in multiple branches we finally got to this result.
With a core-less Bedrock,
bedrock
becomes an npm dependency of a project. Your project repo will look a lot simpler - example at https://github.com/thusc/bedrock/tree/bedrock-init/As a user you can:
You can still use the pagetree in scenario 2 but it will make less sense. It is advisable to disable the page tree in this scenario.
To enable scenario 2 (I.e. the strategy used for https://design.smart.coop/ ) you would set
overrideStyleguideTemplates
totrue
inbedrock.config.js
.You would then supply your own templates in
/content/templates/_styleguide/
that override Bedrock's default templates.