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

[docs] Update devdocs dependencies #1957

Merged
merged 5 commits into from
Nov 6, 2019
Merged

[docs] Update devdocs dependencies #1957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c251d60
Update node package and ruby gem dependencies
jcalcaben Oct 25, 2019
e2abc7c
Remove {{site.baseurl}} prefix before link tags
jcalcaben Oct 25, 2019
bd8082a
Merge remote-tracking branch 'origin/develop' into jimothy/update-dev…
jcalcaben Oct 31, 2019
95796ce
Update lock file
jcalcaben Nov 4, 2019
a5f3bb3
Merge branch 'develop' into jimothy/update-devdocs-dependencies
supernova-at Nov 5, 2019
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
52 changes: 27 additions & 25 deletions pwa-devdocs/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
GIT
remote: https://github.com/magento-devdocs/devdocs-theme.git
revision: 7ed3a8b1051e6f03527ba0ee833d78f6fe3d3302
revision: 5e99a84dd5692d3ee4c1985b9f48824eeede8cfd
specs:
devdocs (2)
devdocs (5)
jekyll (>= 3.3)

GEM
remote: https://rubygems.org/
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
concurrent-ruby (1.1.5)
em-websocket (0.5.1)
Expand All @@ -19,46 +19,48 @@ GEM
ffi (1.11.1)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
jekyll (3.8.6)
jekyll (4.0.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
i18n (>= 0.9.5, < 2)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (~> 3.0)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
terminal-table (~> 1.8)
jekyll-sass-converter (2.0.1)
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (1.17.0)
kramdown (2.1.0)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
listen (3.2.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
public_suffix (4.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.6.0)
ruby_dep (1.5.0)
rouge (3.12.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.2.1)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.6.0)

PLATFORMS
ruby
Expand Down
8 changes: 4 additions & 4 deletions pwa-devdocs/_drafts/project-setup/create-configuration-files/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ It will not retain broad permissions on your system.

Now that you have created your project configuration files, you can create a [simple peregrine app].

[previous topic]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/link-project/index.md %}
[previous topic]: {% link pwa-buildpack/project-setup/link-project/index.md %}
[JSX]: https://facebook.github.io/jsx/
[Introducing JSX]: https://reactjs.org/docs/introducing-jsx.html
[webpack.config.js]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-configuration-files/webpack-config-example/index.md %}
[Peregrine]: {{ site.baseurl }}{% link peregrine/index.md %}
[simple peregrine app]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-simple-peregrine-app/index.md %}
[webpack.config.js]: {% link pwa-buildpack/project-setup/create-configuration-files/webpack-config-example/index.md %}
[Peregrine]: {% link peregrine/index.md %}
[simple peregrine app]: {% link pwa-buildpack/project-setup/create-simple-peregrine-app/index.md %}
[Babel]: https://babeljs.io/
[`syntax-jsx`]: https://babeljs.io/docs/plugins/syntax-jsx
[`transform-react-jsx`]: https://babeljs.io/docs/plugins/transform-react-jsx
Expand Down
2 changes: 1 addition & 1 deletion ...drafts/project-setup/create-configuration-files/webpack-config-example/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ module.exports = async function(env) {
}
```

[Create configuration files]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
[Create configuration files]: {% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
8 changes: 4 additions & 4 deletions pwa-devdocs/_drafts/project-setup/create-simple-peregrine-app/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ npm start

If you experience problems with the project setup, see [Troubleshooting].

[previous topic]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
[Peregrine]: {{ site.baseurl }}{% link peregrine/index.md %}
[Project setup tutorial]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/index.md %}
[Troubleshooting]: {{ site.baseurl }}{% link pwa-buildpack/troubleshooting/index.md %}
[previous topic]: {% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
[Peregrine]: {% link peregrine/index.md %}
[Project setup tutorial]: {% link pwa-buildpack/project-setup/index.md %}
[Troubleshooting]: {% link pwa-buildpack/troubleshooting/index.md %}
4 changes: 2 additions & 2 deletions pwa-devdocs/_drafts/project-setup/create-theme-files/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ Now that you have the basic directory structure for your theme project, you need

[Magento Themes]: http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/themes/theme-create.html
[Magento Marketplace]: https://marketplace.magento.com/
[install project dependencies]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/install-dependencies/index.md %}
[Project setup tutorial]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/index.md %}
[install project dependencies]: {% link pwa-buildpack/project-setup/install-dependencies/index.md %}
[Project setup tutorial]: {% link pwa-buildpack/project-setup/index.md %}
[PWA base theme]: https://github.com/magento-research/theme-frontend-pwa
14 changes: 7 additions & 7 deletions pwa-devdocs/_drafts/project-setup/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ Begin this tutorial by [creating the initial theme files].
[NPM]: https://www.npmjs.com/
[NodeJS 8.x LTS]: https://nodejs.org/en/

[Create the initial theme files]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-theme-files/index.md %}
[creating the initial theme files]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-theme-files/index.md %}
[Install project dependencies]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/install-dependencies/index.md %}
[Create a simple peregrine app]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-simple-peregrine-app/index.md %}
[Create configuration files]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
[Link project to the Magento backend]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/link-project/index.md %}
[Troubleshooting]: {{ site.baseurl }}{% link pwa-buildpack/troubleshooting/index.md %}
[Create the initial theme files]: {% link pwa-buildpack/project-setup/create-theme-files/index.md %}
[creating the initial theme files]: {% link pwa-buildpack/project-setup/create-theme-files/index.md %}
[Install project dependencies]: {% link pwa-buildpack/project-setup/install-dependencies/index.md %}
[Create a simple peregrine app]: {% link pwa-buildpack/project-setup/create-simple-peregrine-app/index.md %}
[Create configuration files]: {% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
[Link project to the Magento backend]: {% link pwa-buildpack/project-setup/link-project/index.md %}
[Troubleshooting]: {% link pwa-buildpack/troubleshooting/index.md %}
8 changes: 4 additions & 4 deletions pwa-devdocs/_drafts/project-setup/install-dependencies/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ Dependency versions in your `package.json` file may differ from the ones listed

In the next topic, you will [link your project to the Magento backend].

[previous topic]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-theme-files/index.md %}
[peregrine]: {{ site.baseurl }}{% link peregrine/index.md %}
[pwa-buildpack]: {{ site.baseurl }}{% link pwa-buildpack/index.md %}
[previous topic]: {% link pwa-buildpack/project-setup/create-theme-files/index.md %}
[peregrine]: {% link peregrine/index.md %}
[pwa-buildpack]: {% link pwa-buildpack/index.md %}
[Webpack]: https://webpack.js.org/
[link your project to the Magento backend]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/link-project/index.md %}
[link your project to the Magento backend]: {% link pwa-buildpack/project-setup/link-project/index.md %}
[Babel]: https://babeljs.io/
[React]: http://reactjs.org/
4 changes: 2 additions & 2 deletions pwa-devdocs/_drafts/project-setup/link-project/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ To install the theme, select **Configuration** in the **Content** tab and set yo
The next step is to [create the configuration files].


[previous topic]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/install-dependencies/index.md %}
[create the configuration files]: {{ site.baseurl }}{% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
[previous topic]: {% link pwa-buildpack/project-setup/install-dependencies/index.md %}
[create the configuration files]: {% link pwa-buildpack/project-setup/create-configuration-files/index.md %}
2 changes: 1 addition & 1 deletion pwa-devdocs/_drafts/venia-pwa-concept/component/account-details/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title: Account details component
| Account details | ![Account details]{:width="300px"} |
{:style="table-layout:auto"}

[Account details]: {{site.baseurl}}{% link venia-pwa-concept/images/account-details.png %}
[Account details]: {% link venia-pwa-concept/images/account-details.png %}

<!-- TODO: add this section, right now the page is available in read only mode. -->
## Interactions
Loading