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

Re-converge Apollo and Meteor themes. #51

Merged
merged 42 commits into from
Feb 14, 2018
Merged

Re-converge Apollo and Meteor themes. #51

merged 42 commits into from
Feb 14, 2018

Conversation

abernix
Copy link
Contributor

@abernix abernix commented Feb 13, 2018 •
edited
Loading

We've had the apollo and master branches going in two similar, though ever-so-slightly different directions for going on a couple years now. As incremental changes have continued on each branch, the maintenance has become quite difficult and most of the themes are on a different commit of the apollo branch (and some on small trunks off of that). Great improvements to the theme are often not propagated out the breadth of doc sites, sometimes causing browsing inconsistencies on split properties.

This PR combines all apollo changes back into the master branch, allowing the operation of two different sites by simply providing a different _config.yml. This was a bit tricky due as many changes were made without considering their effects to other flavors of the theme, and many changes had to be restructured to allow toggle-ability via _config.yml. While there is still room to improve on this re-structuring, I seem to have it providing a consistent experience with the tips of both branches.

This is all thanks to hexo's recently-added support of cascading config files, which also allow us to hoist the more-global configuration variables (such as social_links, permalink, logo, apis, etc.) into site-level configurations, which can be independently updated via (new) apollo-hexo-config and meteor-hexo-config npm packages.

Futhermore, when combined with the updates in this PR, those new npm-based theme configurations, allow this theme to become a npm package, rather than a Git-submodule, and allowing tools such as @renovate-bot (which is configured on many of our repositories) to automatically update the themes (i.e. npms) where they are used through the use of PRs. With proper configuration, those PRs can be automatically merged, though even without that configuration the automatic PR-ing of those repositories, and easy npm update-ability, is already a great improvement over the current process (where the commit is often not bumped when a theme change is made).

Lastly, this PR implements a test theme which is automatically deployed to Netlify in both Apollo and Meteor flavors, in order to validate the changes being committed in a more generic sense. Once confirmed that they look okay, the new npm can be published and the downstream projects will receive automatic PRs at the next scheduled interval (usually within a couple hours).

Edit: that test theme now lives in another repo (https://github.com/meteor/theme-example)

tmeasday and others added 30 commits April 7, 2017 20:28
@tmeasday @abernix
Fix issue with relative image paths
656ec53 
Cherry picked from 29ec5bb.
@tmeasday @abernix
Allow the site to modify the logo
ef57814 
Cherry-picked from 22fe839.
@abernix
Add Apollo logos to converged branch.
909d938 
diff --git a/source/images/logo-apollo-space-left.svg b/source/images/logo-apollo-space-left.svg
new file mode 100644
index 0000000..bd0ad9f
--- /dev/null
+++ b/source/images/logo-apollo-space-left.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="807.682px" height="331.561px" viewBox="0 0 807.682 331.561" enable-background="new 0 0 807.682 331.561"
+	 xml:space="preserve">
+<g id="Layer_1_1_">
+</g>
+<g id="logo_apollo_white">
+	<g>
+		<polygon fill="#333333" points="130.863,114.38 106.552,114.38 71.451,205.477 93.44,205.477 99.177,190.045 132.343,190.045
+			126.339,172.971 104.5,172.971 118.706,133.773 143.976,205.477 165.964,205.477 		"/>
+		<path fill="#333333" d="M500.165,205.477V114.38h19.528v74.024h38.517v17.072H500.165z"/>
+		<path fill="#333333" d="M612.729,205.477V114.38h19.531v74.024h38.516v17.072H612.729z"/>
+		<path fill="#333333" d="M391.998,130.705c16.152,0,29.293,13.14,29.293,29.292c0,16.151-13.141,29.292-29.293,29.292
+			c-16.151,0-29.292-13.141-29.292-29.292C362.706,143.842,375.847,130.705,391.998,130.705 M391.998,112.88
+			c-26.022,0-47.118,21.096-47.118,47.117c0,26.023,21.096,47.12,47.118,47.12s47.12-21.097,47.12-47.12
+			C439.118,133.974,418.021,112.88,391.998,112.88L391.998,112.88z"/>
+		<path fill="#333333" d="M760.561,130.705c16.154,0,29.295,13.14,29.295,29.292c0,16.151-13.141,29.292-29.295,29.292
+			c-16.152,0-29.291-13.141-29.291-29.292C731.27,143.842,744.409,130.705,760.561,130.705 M760.561,112.88
+			c-26.021,0-47.119,21.096-47.119,47.117c0,26.023,21.101,47.12,47.119,47.12c26.023,0,47.121-21.097,47.121-47.12
+			C807.682,133.974,786.585,112.88,760.561,112.88L760.561,112.88z"/>
+		<path fill="#333333" d="M265.263,114.38h-23.082h-3.312h-16.084v91.099h19.396v-31.353h23.082
+			c16.189,0,29.314-13.685,29.314-29.874C294.577,128.061,281.452,114.38,265.263,114.38z M265.263,156.298h-23.082v-24.089h23.082
+			c6.336,0,11.486,5.711,11.486,12.045C276.749,150.589,271.599,156.298,265.263,156.298z"/>
+		<g>
+			<path fill="#333333" d="M206.038,233.124c-1.688,0-3.178,0.836-4.088,2.118c0,0-4.375,4.991-6.732,7.354
+				c-9.979,9.979-21.6,17.812-34.533,23.281c-13.387,5.663-27.611,8.534-42.281,8.534c-14.672,0-28.896-2.871-42.281-8.534
+				c-12.936-5.472-24.555-13.305-34.532-23.281c-9.979-9.981-17.813-21.602-23.285-34.534c-5.66-13.39-8.533-27.613-8.533-42.282
+				s2.873-28.895,8.533-42.281c5.472-12.936,13.306-24.554,23.285-34.533s21.598-17.812,34.532-23.285
+				c13.386-5.661,27.609-8.532,42.281-8.532c14.67,0,28.896,2.871,42.281,8.532c9.422,3.986,18.141,9.23,26.041,15.641
+				c-0.422,1.243-0.658,2.576-0.658,3.963c0,6.77,5.488,12.258,12.256,12.258c6.771,0,12.258-5.488,12.258-12.258
+				c0-6.771-5.487-12.257-12.258-12.257c-1.68,0-3.283,0.339-4.742,0.953c-20.467-16.782-46.645-26.858-75.178-26.858
+				c-65.535,0-118.66,53.125-118.66,118.66s53.125,118.661,118.66,118.661c36.658,0,69.42-16.636,91.185-42.758
+				c0.905-0.907,1.469-2.16,1.469-3.543C211.056,235.367,208.812,233.124,206.038,233.124z"/>
+		</g>
+	</g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/source/images/logo-apollo-space.svg b/source/images/logo-apollo-space.svg
new file mode 100644
index 0000000..a168fc1
--- /dev/null
+++ b/source/images/logo-apollo-space.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="972.627px" height="331.561px" viewBox="0 0 972.627 331.561" enable-background="new 0 0 972.627 331.561"
+	 xml:space="preserve">
+<symbol  id="logo_apollo_space" viewBox="-486.326 -165.78 972.652 331.561">
+	<g>
+		<polygon fill="#333333" points="-284.735,51.4 -309.046,51.4 -344.147,-39.697 -322.157,-39.697 -316.421,-24.266
+			-283.255,-24.266 -289.259,-7.191 -311.095,-7.191 -296.89,32.006 -271.622,-39.697 -249.634,-39.697 		"/>
+		<path fill="#333333" d="M84.567-39.697V51.4h19.531v-74.025h38.514v-17.072H84.567z"/>
+		<path fill="#333333" d="M197.132-39.697V51.4h19.531v-74.025h38.516v-17.072H197.132z"/>
+		<path fill="#333333" d="M-23.599,35.074c16.152,0,29.293-13.139,29.293-29.292c0-16.151-13.141-29.292-29.293-29.292
+			S-52.89-10.369-52.89,5.782C-52.89,21.936-39.751,35.074-23.599,35.074 M-23.599,52.901c-26.023,0-47.119-21.096-47.119-47.119
+			s21.096-47.12,47.119-47.12s47.119,21.097,47.119,47.12S2.425,52.901-23.599,52.901L-23.599,52.901z"/>
+		<path fill="#333333" d="M344.964,35.074c16.154,0,29.295-13.139,29.295-29.292c0-16.151-13.141-29.292-29.295-29.292
+			c-16.152,0-29.291,13.141-29.291,29.292C315.673,21.936,328.812,35.074,344.964,35.074 M344.964,52.901
+			c-26.021,0-47.119-21.096-47.119-47.119s21.098-47.12,47.119-47.12c26.023,0,47.121,21.097,47.121,47.12
+			S370.987,52.901,344.964,52.901L344.964,52.901z"/>
+		<path fill="#333333" d="M-150.335,51.4h-23.082h-3.311h-16.084v-91.098h19.395v31.35h23.082c16.191,0,29.316,13.685,29.316,29.874
+			C-121.019,37.718-134.144,51.4-150.335,51.4z M-150.335,9.481h-23.082v24.091h23.082c6.336,0,11.488-5.711,11.488-12.046
+			S-143.999,9.481-150.335,9.481z"/>
+		<g>
+			<path fill="#333333" d="M-209.558-67.345c-1.688,0-3.178-0.836-4.088-2.118c0,0-4.375-4.991-6.734-7.353
+				c-9.979-9.979-21.598-17.812-34.533-23.284c-13.387-5.663-27.611-8.534-42.281-8.534c-14.672,0-28.896,2.871-42.281,8.534
+				c-12.936,5.472-24.555,13.305-34.533,23.284c-9.98,9.981-17.814,21.599-23.285,34.534c-5.661,13.387-8.533,27.613-8.533,42.282
+				s2.872,28.895,8.533,42.282c5.471,12.935,13.305,24.553,23.285,34.532c9.979,9.98,21.598,17.813,34.533,23.285
+				c13.385,5.663,27.609,8.534,42.281,8.534c14.67,0,28.895-2.871,42.281-8.534c9.422-3.985,18.141-9.23,26.041-15.639
+				c-0.422-1.243-0.658-2.576-0.658-3.963c0-6.769,5.488-12.257,12.256-12.257c6.77,0,12.258,5.488,12.258,12.257
+				c0,6.77-5.488,12.257-12.258,12.257c-1.68,0-3.283-0.339-4.742-0.953c-20.467,16.782-46.645,26.858-75.178,26.858
+				c-65.535,0-118.661-53.125-118.661-118.66s53.126-118.661,118.661-118.661c36.658,0,69.42,16.636,91.184,42.758
+				c0.906,0.907,1.469,2.16,1.469,3.543C-204.542-69.588-206.786-67.345-209.558-67.345z"/>
+		</g>
+	</g>
+	<polygon fill="none" points="486.325,-165.78 -486.326,-165.78 -486.326,165.78 486.325,165.78 	"/>
+</symbol>
+<g id="Layer_1">
+</g>
+<g id="Layer_2">
+
+		<use xlink:href="#logo_apollo_space"  width="972.652" height="331.561" x="-486.326" y="-165.78" transform="matrix(1 0 0 -1 486.3135 165.7803)" overflow="visible"/>
+</g>
+</svg>
diff --git a/source/images/logo-apollo-subbrands-developers-space.svg b/source/images/logo-apollo-subbrands-developers-space.svg
new file mode 100644
index 0000000..b1bbe7f
--- /dev/null
+++ b/source/images/logo-apollo-subbrands-developers-space.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="78.688px" height="13.622px" viewBox="0 0 78.688 13.622" enable-background="new 0 0 78.688 13.622" xml:space="preserve">
+<g>
+	<path fill="#333333" d="M0,10.676V0h3.648c3.33,0,5.475,2.321,5.475,5.347c0,3.041-2.146,5.329-5.475,5.329H0z M7.747,5.347
+		c0-2.306-1.457-4.162-4.099-4.162H1.329v8.308h2.32C6.243,9.491,7.747,7.635,7.747,5.347z"/>
+	<path fill="#333333" d="M10.704,6.803c0-2.241,1.601-4.05,3.81-4.05c2.337,0,3.713,1.824,3.713,4.146v0.303h-6.243
+		c0.097,1.457,1.104,2.673,2.77,2.673c0.896,0,1.776-0.352,2.4-0.992l0.576,0.785c-0.785,0.769-1.825,1.199-3.072,1.199
+		C12.353,10.868,10.704,9.22,10.704,6.803z M14.498,3.745c-1.649,0-2.465,1.393-2.529,2.562h5.074
+		C17.026,5.17,16.258,3.745,14.498,3.745z"/>
+	<path fill="#333333" d="M22.225,10.676l-3.217-7.73h1.312l2.562,6.34l2.577-6.34h1.296l-3.217,7.73H22.225z"/>
+	<path fill="#333333" d="M27.552,6.803c0-2.241,1.601-4.05,3.81-4.05c2.338,0,3.714,1.824,3.714,4.146v0.303h-6.243
+		c0.096,1.457,1.104,2.673,2.769,2.673c0.896,0,1.777-0.352,2.401-0.992l0.576,0.785c-0.785,0.769-1.825,1.199-3.073,1.199
+		C29.2,10.868,27.552,9.22,27.552,6.803z M31.345,3.745c-1.649,0-2.465,1.393-2.529,2.562h5.074
+		C33.874,5.17,33.106,3.745,31.345,3.745z"/>
+	<path fill="#333333" d="M37.008,10.676V0h1.2v10.676H37.008z"/>
+	<path fill="#333333" d="M40.159,6.803c0-2.241,1.473-4.05,3.824-4.05c2.354,0,3.826,1.809,3.826,4.05
+		c0,2.24-1.473,4.064-3.826,4.064C41.632,10.868,40.159,9.043,40.159,6.803z M46.545,6.803c0-1.569-0.912-2.978-2.562-2.978
+		c-1.647,0-2.561,1.408-2.561,2.978c0,1.585,0.913,2.992,2.561,2.992C45.633,9.795,46.545,8.388,46.545,6.803z"/>
+	<path fill="#333333" d="M50.96,9.508v4.113h-1.201V2.945h1.201v1.152c0.561-0.784,1.52-1.345,2.608-1.345
+		c2.032,0,3.441,1.537,3.441,4.05c0,2.498-1.409,4.066-3.441,4.066C52.513,10.868,51.6,10.356,50.96,9.508z M55.745,6.803
+		c0-1.713-0.929-2.978-2.48-2.978c-0.944,0-1.889,0.561-2.305,1.232v3.49c0.416,0.672,1.359,1.248,2.305,1.248
+		C54.817,9.795,55.745,8.516,55.745,6.803z"/>
+	<path fill="#333333" d="M58.463,6.803c0-2.241,1.601-4.05,3.81-4.05c2.337,0,3.713,1.824,3.713,4.146v0.303h-6.241
+		c0.096,1.457,1.104,2.673,2.77,2.673c0.896,0,1.776-0.352,2.4-0.992l0.576,0.785c-0.784,0.769-1.824,1.199-3.072,1.199
+		C60.111,10.868,58.463,9.22,58.463,6.803z M62.257,3.745c-1.649,0-2.465,1.393-2.529,2.562h5.074
+		C64.785,5.17,64.017,3.745,62.257,3.745z"/>
+	<path fill="#333333" d="M67.919,10.676V2.945h1.2v1.232c0.624-0.8,1.521-1.409,2.576-1.409V4c-0.145-0.016-0.287-0.031-0.465-0.031
+		c-0.752,0-1.76,0.607-2.111,1.232v5.475H67.919L67.919,10.676z"/>
+	<path fill="#333333" d="M72.542,9.651l0.607-0.863c0.514,0.592,1.489,1.104,2.545,1.104c1.186,0,1.842-0.562,1.842-1.328
+		c0-1.873-4.785-0.722-4.785-3.586c0-1.217,1.022-2.225,2.865-2.225c1.327,0,2.256,0.496,2.864,1.121L77.92,4.706
+		c-0.465-0.561-1.297-0.977-2.305-0.977c-1.058,0-1.714,0.528-1.714,1.217c0,1.68,4.785,0.576,4.785,3.586
+		c0,1.297-1.041,2.336-3.024,2.336C74.383,10.868,73.327,10.467,72.542,9.651z"/>
+</g>
+</svg>
@abernix
Global Apollo Config.
a3684e2
@abernix
Global Meteor Config.
0bed5a6
@abernix
Links in headers
3a7d73c
@abernix
Make lines have fixed height
6aab5ef
@abernix
Add support for Google Tag Manager, configurable with "config.apis.gtm".
ecb7750 
Aims to address meteor/meteor#8683 at the request of @rezpezz.
@abernix
Add new deployments to the known deployments.
cf28573
@calebmer @abernix
escape sidebar nested link html content
c7810dd
@abernix
Allow specifying sidebar title separately
5196b4a
@abernix
Add Slack button
f90f316
@abernix
Add basic table styling
cfe63b5
@abernix
Don't mess up code
0d58d46
@abernix
Treat all links equally
2b5dc3b
@abernix
Fix nav
5ce2442
@abernix
Fail gracefully if adjacent link doesn't exist.
83921ad 
In order to allow more flexibility in the arrangement of the
sidebar_categories, this change will allow the adjacent link to not be
present.
@abernix
Tidy up the sidebar categories creation function.
af433e9 
This also changes the linking method to highlight (the current page)
based on the matching of the paths, not the matching of the title name,
which seems like a cleaner way to do it.  There's no indiciation of
whether this technique was problematic in the past, so here goes!

# Conflicts:
#	layout/partials/sidebar.ejs
@abernix
Reconverge the two themes again.
d5553d6 
Hopefully for the last time!
@abernix
Fix invalid HTML due to double-quotes.
1de6d38
@abernix
Merge branch 'abernix/reconverge-again' into meteor-beta
50b9e37
@abernix
alpha version
e1c8a0d
@abernix
logos
4e6eb1d
@abernix
Merge branch 'abernix/reconverge-again' into meteor-beta
7ff04cd
@abernix
Fix favicons.
b4610e0
@abernix
Split the logos into separate files.
b95ed30 
Unfortunately, there's no way to have these assets stored separately, so
they will need to be referred to by name.
@abernix
Have 'escapeHtml' also escape quotes, not just <, >, &.
ab7ea76
@abernix
Merge branch 'abernix/reconverge-again' into meteor-beta
d8d52ec
@abernix
Bump to 1.0.1-alpha.3.
4068e26
@abernix
Return search CSS to its previous state and subclass with Apollo colors.
e531d2a
abernix added a commit to apollographql/apollo-client that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
2e19819 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
abernix added a commit to apollographql/apollo-ios that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
ec2d581 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
abernix added a commit to apollographql/apollo-link that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
023ed89 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
abernix added a commit to apollographql/apollo-server that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
b6973c3 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
abernix added a commit to apollographql/community that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
64b52fb 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
abernix added a commit to ardatan/graphql-tools that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
32a47cb 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
abernix added a commit to apollographql/subscriptions-transport-ws that referenced this pull request Mar 12, 2018
@abernix
docs: Use theme from npm, rather than submodule, using chexo.
0475bc9 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
This was referenced Mar 12, 2018
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
abernix added a commit to apollographql/apollo-server that referenced this pull request Mar 12, 2018
@abernix
[docs] Use package-based Hexo theme, rather than a Git submodule. (#869)
fbdcac1 
* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Remove _config.yml options now covered by global theme config.

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add missing `meteor-theme-hexo` package.

This was apparently missed, only on this repository (???) in my automated
commits, probably due to my own error.
evans pushed a commit to apollographql/apollo-link that referenced this pull request Mar 13, 2018
@abernix @evans
docs: Use theme from npm, rather than submodule, using chexo.
1ec750d 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
sav007 pushed a commit to apollographql/apollo-kotlin that referenced this pull request Mar 13, 2018
@abernix @sav007
[docs] Use package-based Hexo theme, rather than a Git submodule. (#852)
9e9749a 
* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Remove _config.yml options now covered by global theme config.

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Upgrade Hexo to 3.6.0.

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add Renovate configuration.

While some repositories which host Hexo docs alongside other code may not have
Renovate setup, it's anticipated that they will in the future, at the very
least for the docs portions of the respective repositories.

By having this `renovate` section in the `package.json` for the Hexo docs, we
can ensure that they will receive the proper treatment and minimize the amount
of manual work necessary on those repositories.

Additionally, this ensures that there is a single point of upstream Apollo-docs
Renovate configuration through the use of the
[`renovate-config-apollo-docs`](https://npm.im/renovate-config-apollo-docs)
package, which inherits further from
[`renovate-config-mdg-docs`](https://npm.im/renovate-config-mdg-docs).

Repositories which already have Renovate setup should benefit automatically
from this new docs-specific configuration.
freiksenet pushed a commit to ardatan/graphql-tools that referenced this pull request Mar 13, 2018
@abernix @freiksenet
[docs] Use package-based Hexo theme, rather than a Git submodule. (#675)
bd3df4c 
* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Remove _config.yml options now covered by global theme config.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Upgrade Hexo to 3.6.0.

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add Renovate configuration.

While some repositories which host Hexo docs alongside other code may not have
Renovate setup, it's anticipated that they will in the future, at the very
least for the docs portions of the respective repositories.

By having this `renovate` section in the `package.json` for the Hexo docs, we
can ensure that they will receive the proper treatment and minimize the amount
of manual work necessary on those repositories.

Additionally, this ensures that there is a single point of upstream Apollo-docs
Renovate configuration through the use of the
[`renovate-config-apollo-docs`](https://npm.im/renovate-config-apollo-docs)
package, which inherits further from
[`renovate-config-mdg-docs`](https://npm.im/renovate-config-mdg-docs).

Repositories which already have Renovate setup should benefit automatically
from this new docs-specific configuration.
evans pushed a commit to apollographql/apollo that referenced this pull request Mar 13, 2018
@abernix @evans
docs: Use theme from npm, rather than submodule, using chexo.
88d914d 
The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).
@abernix abernix mentioned this pull request Mar 15, 2018
Closed
abernix added a commit to apollographql/apollo-client that referenced this pull request Mar 15, 2018
@abernix
[docs] Use package-based Hexo theme, rather than a Git submodule. (#3148
a4548b0 
)

* docs: Make `scripts` consistent across "docs" repos.

For example, the `test` and `start` commands.

* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Fix top-level `hexo` versions in docs `package.json`s.

This is just metadata used by Hexo, but it's meant to be updated and committed.

* docs: Remove _config.yml options now covered by global theme config.

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Upgrade Hexo to 3.6.0.

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add Renovate configuration.

While some repositories which host Hexo docs alongside other code may not have
Renovate setup, it's anticipated that they will in the future, at the very
least for the docs portions of the respective repositories.

By having this `renovate` section in the `package.json` for the Hexo docs, we
can ensure that they will receive the proper treatment and minimize the amount
of manual work necessary on those repositories.

Additionally, this ensures that there is a single point of upstream Apollo-docs
Renovate configuration through the use of the
[`renovate-config-apollo-docs`](https://npm.im/renovate-config-apollo-docs)
package, which inherits further from
[`renovate-config-mdg-docs`](https://npm.im/renovate-config-mdg-docs).

Repositories which already have Renovate setup should benefit automatically
from this new docs-specific configuration.
abernix added a commit to apollographql/subscriptions-transport-ws that referenced this pull request Mar 16, 2018
@abernix
[docs] Use package-based Hexo theme, rather than a Git submodule. (#370)
698e546 
* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Remove _config.yml options now covered by global theme config.

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Upgrade Hexo to 3.6.0.

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add Renovate configuration.

While some repositories which host Hexo docs alongside other code may not have
Renovate setup, it's anticipated that they will in the future, at the very
least for the docs portions of the respective repositories.

By having this `renovate` section in the `package.json` for the Hexo docs, we
can ensure that they will receive the proper treatment and minimize the amount
of manual work necessary on those repositories.

Additionally, this ensures that there is a single point of upstream Apollo-docs
Renovate configuration through the use of the
[`renovate-config-apollo-docs`](https://npm.im/renovate-config-apollo-docs)
package, which inherits further from
[`renovate-config-mdg-docs`](https://npm.im/renovate-config-mdg-docs).

Repositories which already have Renovate setup should benefit automatically
from this new docs-specific configuration.
abernix added a commit to kamilkisiela/apollo-angular that referenced this pull request Mar 16, 2018
@abernix
[docs] Use package-based Hexo theme, rather than a Git submodule. (#500)
6aa39e9 
* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Remove _config.yml options now covered by global theme config.

* docs: Add `db.json` to docs `.gitignore`.

This file is an artifact of docs generation which need not be committed.

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Upgrade Hexo to 3.6.0.

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add Renovate configuration.

While some repositories which host Hexo docs alongside other code may not have
Renovate setup, it's anticipated that they will in the future, at the very
least for the docs portions of the respective repositories.

By having this `renovate` section in the `package.json` for the Hexo docs, we
can ensure that they will receive the proper treatment and minimize the amount
of manual work necessary on those repositories.

Additionally, this ensures that there is a single point of upstream Apollo-docs
Renovate configuration through the use of the
[`renovate-config-apollo-docs`](https://npm.im/renovate-config-apollo-docs)
package, which inherits further from
[`renovate-config-mdg-docs`](https://npm.im/renovate-config-mdg-docs).

Repositories which already have Renovate setup should benefit automatically
from this new docs-specific configuration.
abernix added a commit to apollographql/apollo-ios that referenced this pull request Mar 16, 2018
@abernix
[docs] Use package-based Hexo theme, rather than a Git submodule. (#224)
3009bfe 
* docs: Use `devDependencies` instead of `dependencies`.

It's safe to mark all dependencies of this theme as 'dev' dependencies, as
none of them are needed to be installed in a production setting.

This was done automatically, so in some cases, this merges existing
`devDependencies`, and may also have added a missing `nodemon` `devDependency`
in cases where it was missing.  In other cases, this commit may not have
made such a change.

* docs: Remove _config.yml options now covered by global theme config.

* docs: Add `_multiconfig.yml`, a build artifact, to docs `.gitignore`.

* docs: Use theme from npm, rather than submodule, using `chexo`.

The theme which the docs in this repository are based on
([`hexo-theme-meteor`](https://github.com/meteor/hexo-theme-meteor)) has been
published to npm.

Additionally, most of the configuration which was once present in this
repository's `_config.yml` file, has been moved into an Apollo-centric theme
configuration npm,
[`apollo-hexo-config`](https://www.npmjs.com/package/apollo-hexo-config) (and
similarly, [GitHub](https://github.com/apollographql/apollo-hexo-config)).

The theme bundled in this npm is a converged version of the two `apollo`
and `master` branches on the `hexo-theme-meteor` repository, which is a result
of the work undertaken in meteor/meteor-theme-hexo#51.

Lastly, this makes use of a new `chexo` npm which acts as a wrapper for `hexo`
but permits the use of an inherited configuration from npm, rather than a
statically defined CLI file parameter (previously with `--config a,b`).

* docs: Upgrade Hexo to 3.6.0.

* docs: Upgrade Hexo generator/tag/server dependencies.

* docs: Add Renovate configuration.

While some repositories which host Hexo docs alongside other code may not have
Renovate setup, it's anticipated that they will in the future, at the very
least for the docs portions of the respective repositories.

By having this `renovate` section in the `package.json` for the Hexo docs, we
can ensure that they will receive the proper treatment and minimize the amount
of manual work necessary on those repositories.

Additionally, this ensures that there is a single point of upstream Apollo-docs
Renovate configuration through the use of the
[`renovate-config-apollo-docs`](https://npm.im/renovate-config-apollo-docs)
package, which inherits further from
[`renovate-config-mdg-docs`](https://npm.im/renovate-config-mdg-docs).

Repositories which already have Renovate setup should benefit automatically
from this new docs-specific configuration.
abernix added a commit that referenced this pull request Mar 21, 2018
@abernix
Introduce theme-specific CSS bundles.
3f58cce 
This introduces two separate CSS bundles, which are created automatically by
Hexo, share almost 100% of their code, and are able to be selected by
individual doc deployments by use of the `css_bundle` variable.  At a higher
level, that variable will be automatically set through the
`apollo-hexo-config`[0] and `meteor-hexo-config`[1] config packages, so no
changes by the individual deployments will be necessary.

This builds on the work done in the Apollo/Meteor theme merge[2], and
eliminates a local `./assets/theme-colors.less` which was still present in
each Apollo docs deployment.

In additional to being a maintenance burden in the event that we wanted to
change that file, it was also the source of problems with link colors
exhibited in the test theme used on the Netlify previews on this
`hexo-theme-meteor` repository.

This eliminates the need for that file (though keeps it there in case the need
arises for a _deployment-specific_ color override.

[0] https://github.com/apollographql/apollo-hexo-config
[1] https://github.com/meteor/meteor-hexo-config
[2] #51

cc @stubailo tl;dr fyi, red link colors fixed. was unnoticed bug-ish. 🎉.
This was referenced Mar 21, 2018
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@abernix @tmeasday @calebmer