diff --git a/.gitignore b/.gitignore index 5dfb980..278eeb4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,8 @@ _site .jekyll-metadata .bundle vendor +repos/wasm-bindgen +repos/book +repos/wasm-pack +_site +_build.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..46bfd2e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: rust + +before_install: + - curl -L https://github.com/rust-lang-nursery/mdBook/releases/download/v0.2.1/mdbook-v0.2.1-x86_64-unknown-linux-musl.tar.gz | tar xzf - + - export PATH=$PATH:`pwd` + - bundler install + +script: + - ./ci/build.sh + +deploy: + provider: script + script: curl -LsSf https://git.io/fhJ8n | rustc - && (cd _site && ../rust_out) + skip_cleanup: true + on: + branch: master diff --git a/_config.yml b/_config.yml index b97d1d5..a65bb08 100644 --- a/_config.yml +++ b/_config.yml @@ -33,6 +33,7 @@ plugins: exclude: - template.md - vendor/bundle/ + - repos # - Gemfile # - Gemfile.lock # - node_modules diff --git a/_includes/header.html b/_includes/header.html index ddca3b8..7b2bffc 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -22,7 +22,8 @@
- 📚 Learn + 📚 Learn + 📖 Blog 👯 Get Involved {%- for path in page_paths -%} {%- assign my_page = site.pages | where: "path", path | first -%} diff --git a/_layouts/default.html b/_layouts/default.html index bf6def4..5105d2a 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -8,9 +8,13 @@ {%- include header.html -%}
+ {%- if layout.unwrapped -%} + {{ content }} + {%- else -%}
{{ content }}
+ {%- endif -%}
{%- include footer.html -%} @@ -19,4 +23,4 @@ - \ No newline at end of file + diff --git a/_layouts/home.html b/_layouts/home.html index 2702001..61b72c1 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,71 +1,51 @@ --- +layout: default +unwrapped: true --- - - - - - {%- include head.html -%} - - - - {%- include header.html -%} - -
-
- {%- if page.title -%} -

{{ page.title }}

+{%- if page.title -%} +

{{ page.title }}

+{%- endif -%} + +
+
+ +

Learn Rust and WebAssembly

+

+ Read the Rust and WebAssembly documentation to + learn how to design, develop, test, debug, profile, and publish Rust and + WebAssembly libraries and applications. +

+

Get Involved

+

+ Join the Rust and WebAssembly domain working group! Help us craft the future of Rust and WebAssembly. +

+
+
+ +
+ {{ content }} + + {%- if site.posts.size > 0 -%} +
+

{{ page.list_title | default: "Blog Posts" }}

+
    + {%- for post in site.posts -%} +
  • + {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} + {{ post.date | date: date_format }} +

    + + {{ post.title | escape }} + +

    + {%- if site.show_excerpts -%} + {{ post.excerpt }} {%- endif -%} - -
    -
    - -

    Learn Rust and WebAssembly

    -

    - Read the Rust and WebAssembly book to - learn how to design, develop, test, debug, profile, and publish Rust and - WebAssembly libraries and applications. -

    -

    Get Involved

    -

    - Join the Rust and WebAssembly domain working group! Help us craft the future of Rust and WebAssembly. -

    -
    -
    - - {{ content }} - -
    - {%- if site.posts.size > 0 -%} -
    -

    {{ page.list_title | default: "Blog Posts" }}

    -
      - {%- for post in site.posts -%} -
    • - {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - {{ post.date | date: date_format }} -

      - - {{ post.title | escape }} - -

      - {%- if site.show_excerpts -%} - {{ post.excerpt }} - {%- endif -%} -
      • - {%- endfor -%} -
    - -

    subscribe via RSS

    -
    - {%- endif -%} -
    -
-
- - {%- include footer.html -%} - - {%- include analytics.html -%} - - - - + + {%- endfor -%} + + +

subscribe via RSS

+ + {%- endif -%} +
diff --git a/assets/extra.css b/assets/extra.css index 797302f..ea7a879 100644 --- a/assets/extra.css +++ b/assets/extra.css @@ -23,3 +23,23 @@ section { clear: both; } + +#installer { + text-align: center; +} + +#installer .button { + background-color: #6556EC; + border-color: #6556EC; + height: 20%; + font-size: 1.8rem; + padding: 1.8rem; + color: #fff; + font-weight: 600; + line-height: 38px; + border-radius: 4px; + display: inline-block; +} +#installer .button:hover { + text-decoration: none; +} diff --git a/ci/build.sh b/ci/build.sh new file mode 100755 index 0000000..225ca92 --- /dev/null +++ b/ci/build.sh @@ -0,0 +1,38 @@ +#!/bin/sh +set -ex + +mkdir -p repos + +if [ ! -d repos/wasm-bindgen ]; then + git clone https://github.com/rustwasm/wasm-bindgen repos/wasm-bindgen +fi +if [ ! -d repos/wasm-pack ]; then + git clone https://github.com/rustwasm/wasm-pack repos/wasm-pack +fi +if [ ! -d repos/book ]; then + git clone https://github.com/rustwasm/book repos/book +fi + +wasm_bindgen_tag=$(cd repos/wasm-bindgen && git describe --abbrev=0 --tags) +wasm_pack_tag=$(cd repos/wasm-pack && git describe --abbrev=0 --tags) + +(cd repos/wasm-bindgen && git reset --hard $wasm_bindgen_tag) +(cd repos/wasm-pack && git reset --hard $wasm_pack_tag) + +wasm_pack_publish_date=$(date -d "@$(cd repos/wasm-pack && git show -s --format=%at)" "+%b %e") + +echo "wasm-pack-tag: $wasm_pack_tag" >> _build.yml +echo "wasm-pack-publish-date: $wasm_pack_publish_date" >> _build.yml + +bundler exec jekyll build --config _config.yml,_build.yml + +mkdir -p _site/docs +mdbook build repos/wasm-bindgen/guide +mv repos/wasm-bindgen/guide/book _site/docs/wasm-bindgen + +mdbook build repos/wasm-pack/docs +mv repos/wasm-pack/docs/book _site/docs/wasm-pack + +mdbook build repos/book +mv repos/book/book _site/docs/book + diff --git a/docs.md b/docs.md new file mode 100644 index 0000000..19f83cc --- /dev/null +++ b/docs.md @@ -0,0 +1,3 @@ +* [The rustwasm book](docs/book) +* [The wasm-bindgen book](docs/wasm-bindgen) +* [The wasm-pack book](docs/wasm-pack) diff --git a/index.md b/index.md index 1eb5d67..3014d92 100644 --- a/index.md +++ b/index.md @@ -4,3 +4,12 @@ # See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults layout: home --- + +
+ ✨ Install wasm-pack 0.6.0 ✨ +

{{ site.wasm-pack-publish-date }} | + + Release Notes + +

+