Skip to content

Commit

Permalink
Merge branch 'master' into contribute-2
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronang authored Apr 5, 2017
2 parents b4b4df4 + 3f25dbc commit 8bb7851
Show file tree
Hide file tree
Showing 32 changed files with 310 additions and 71 deletions.
34 changes: 17 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ GEM
execjs (2.7.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.17)
ffi (1.9.18)
forwardable-extended (2.6.0)
gemoji (3.0.0)
github-pages (119)
github-pages (127)
activesupport (= 4.2.7)
github-pages-health-check (= 1.3.0)
jekyll (= 3.3.1)
github-pages-health-check (= 1.3.3)
jekyll (= 3.4.1)
jekyll-avatar (= 0.4.2)
jekyll-coffeescript (= 1.0.1)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.8.0)
jekyll-feed (= 0.9.1)
jekyll-gist (= 1.4.0)
jekyll-github-metadata (= 2.3.1)
jekyll-mentions (= 1.2.0)
jekyll-optional-front-matter (= 0.1.2)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.0.4)
jekyll-redirect-from (= 0.12.1)
jekyll-relative-links (= 0.2.1)
jekyll-relative-links (= 0.3.0)
jekyll-sass-converter (= 1.5.0)
jekyll-seo-tag (= 2.1.0)
jekyll-sitemap (= 0.12.0)
jekyll-sitemap (= 1.0.0)
jekyll-swiss (= 0.4.0)
jekyll-theme-architect (= 0.0.3)
jekyll-theme-cayman (= 0.0.3)
Expand All @@ -58,15 +58,15 @@ GEM
jekyll-theme-time-machine (= 0.0.3)
jekyll-titles-from-headings (= 0.1.4)
jemoji (= 0.8.0)
kramdown (= 1.11.1)
kramdown (= 1.13.2)
liquid (= 3.0.6)
listen (= 3.0.6)
mercenary (~> 0.3)
minima (= 2.0.0)
nokogiri (= 1.6.8.1)
rouge (= 1.11.1)
terminal-table (~> 1.4)
github-pages-health-check (1.3.0)
github-pages-health-check (1.3.3)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
Expand All @@ -84,8 +84,8 @@ GEM
parallel (~> 1.3)
typhoeus (~> 0.7)
yell (~> 2.0)
i18n (0.8.0)
jekyll (3.3.1)
i18n (0.8.1)
jekyll (3.4.1)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
Expand All @@ -102,7 +102,7 @@ GEM
coffee-script (~> 2.2)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.8.0)
jekyll-feed (0.9.1)
jekyll (~> 3.3)
jekyll-gist (1.4.0)
octokit (~> 4.2)
Expand All @@ -120,13 +120,13 @@ GEM
jekyll (~> 3.0)
jekyll-redirect-from (0.12.1)
jekyll (~> 3.3)
jekyll-relative-links (0.2.1)
jekyll-relative-links (0.3.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-seo-tag (2.1.0)
jekyll (~> 3.3)
jekyll-sitemap (0.12.0)
jekyll-sitemap (1.0.0)
jekyll (~> 3.3)
jekyll-swiss (0.4.0)
jekyll-theme-architect (0.0.3)
Expand Down Expand Up @@ -165,7 +165,7 @@ GEM
html-pipeline (~> 2.2)
jekyll (>= 3.0)
json (1.8.6)
kramdown (1.11.1)
kramdown (1.13.2)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
Expand Down Expand Up @@ -196,7 +196,7 @@ GEM
faraday (~> 0.8, < 1.0)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
thread_safe (0.3.6)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
Expand All @@ -213,4 +213,4 @@ DEPENDENCIES
rake

BUNDLED WITH
1.14.3
1.14.5
30 changes: 30 additions & 0 deletions _data/users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -538,3 +538,33 @@
- name: Hooroo
url: https://hooroo.com/
logo: hooroo.svg
- name: The New York Times
url: https://nytimes.com/
logo: nytimes.svg
- name: Wave
url: https://waveapps.com
logo: wave.svg
- name: Shelf.io
url: https://shelf.io/
logo: shelfio.svg
- name: Nau Studio
url: https://naustud.io
logo: naustudio.svg
- name: Triip
url: https://triip.me
logo: triip.svg
- name: Overblog
url: https://over-blog.com
logo: overblog.svg
- name: EXANTE
url: https://exante.eu
logo: exante.svg
- name: Insider.pro
url: https://insider.pro
logo: insider.svg
- name: JustWatch
url: https://www.justwatch.com
logo: justwatch.svg
- name: HIJUP
url: https://www.hijup.com
logo: hijup.svg
10 changes: 10 additions & 0 deletions _includes/guy.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="personal-appeal">
<div class="container">
<a href="https://opencollective.com/babel">
<img src="/images/appeal_blank.png" />
<span id="fieri_quote">We're on Open Collective!</span>
</a>
</div>
</div>
<script src='/scripts/textFit.js' type="text/javascript"></script>
<script src='/scripts/flavortown.flavors.js' type="text/javascript"></script>
3 changes: 3 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
{% endfor %}
</ul>
<ul class="nav navbar-nav navbar-right nav-social">
<li>
<a href="https://opencollective.com/babel">Donate</a>
</li>
<li>
<a href="https://discuss.babeljs.io">Forum</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion _includes/tools/fly/install.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
```sh
npm install -D fly-babel babel-preset-latest
npm install -D fly-babel babel-preset-env
```
2 changes: 1 addition & 1 deletion _includes/tools/fly/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
export function* text () {
yield this
.source("src/**/*.js")
.babel({ presets: ["latest"] })
.babel({ presets: ["env"] })
.target("dist/")
}
```
Expand Down
2 changes: 1 addition & 1 deletion _includes/tools/nodemon/install.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
```sh
npm install babel-cli babel-preset-latest --save-dev
npm install babel-cli babel-preset-env --save-dev
```
4 changes: 4 additions & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

{% include header.html %}

<!-- {% if page.permalink != '/repl/' %} -->
<!-- {% include guy.html %} -->
<!-- {% endif %} -->

{{ content }}

{% include footer.html %}
Expand Down
10 changes: 10 additions & 0 deletions _posts/2017-03-01-upgrade-to-babel-7-for-tool-authors.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ This had to be used earlier to prevent a breaking change with our exports.

If you import a Babel package in a library you may need to use `.default` when using `require` rather than `import`.

## `babel-core`

The publicly exposed but undocumented `Pipeline` class has been removed. Best to use the transformation methods exposed from `babel-core` directly [babel/babel#5376](https://github.com/babel/babel/pull/5376).

The `babel.util.*` helper methods have been removed, and `util.EXTENSIONS` has been moved to `babel.DEFAULT_EXTENSIONS` [babel/babel#5487](https://github.com/babel/babel/pull/5487).

Calls to `babel.transform` or any other transform function may return `null` if the file matched an `ignore` pattern or failed to match an `only` pattern [babel/babel#5487](https://github.com/babel/babel/pull/5487).

The `opts.basename` option exposed on `state.file.opts` has been removed. If you need it, best to build it from `opts.filename` yourself [babel/babel#5467](https://github.com/babel/babel/pull/5467).

## Babylon

> AST changes ![high](https://img.shields.io/badge/risk%20of%20breakage%3F-high-red.svg)
Expand Down
47 changes: 41 additions & 6 deletions _posts/2017-03-01-upgrade-to-babel-7.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ custom_js_with_timestamps:
- docs.js
---

Refer users to this document when upgrading to Babel 7.
Refer users to this document when upgrading to Babel 7 (currently alpha).

Because not every breaking change will affect every project, we've sorted the sections by the likelihood of a change breaking tests when upgrading.

Expand All @@ -22,7 +22,42 @@ Because not every breaking change will affect every project, we've sorted the se
We highly encourage you to use a newer version of Node.js (LTS v4, LTS v6) since the previous versions are not maintained.
See [nodejs/LTS](https://github.com/nodejs/LTS) for more information.

> This just means Babel *itself* won't run on older versions of Node. It can still *output* code that runs on old Node.
> This just means Babel *itself* won't run on older versions of Node. It can still *output* code that runs on old Node.

## Option parsing

Babel's config options are stricter than in Babel 6. Where a comma-separated list for presets, e.g. `presets: 'es2015,es2016'` technically worked before, it will now fail and need to be changed to an array [#5463](https://github.com/babel/babel/pull/5463). This does not apply to the CLI, where `--presets es2015,es2016` will certainly still work.


## Resolving string-based config values

In Babel 6, values passed to Babel directly (not from a config file), were resolved relative to the files being compiled, which led to lots of confusion. In Babel 7, values are resolved consistently either relative to the config file that loaded them, or relative to the working directory.

For `presets` and `plugins` values, this change means that the CLI will behave nicely in cases such as

```bash
babel --presets es2015 ../file.js
```

Assuming your `node_modules` folder is in `.`, in Babel 6 this would fail because the preset could not be found.

This change also affects `only` and `ignore` which will be expanded on next.


## Path-based `only` and `ignore` patterns

In Babel 6, `only` and `ignore` were treated as a general matching string, rather than a filepath glob. This meant that for instance `*.foo.js` would match `./**/*.foo.js`, which was confusing and surprising to most users.

In Babel 7, these are now treated as path-based glob patterns which can either be relative or absolute paths. This means that if you were using these patterns, you'll probably need to at least add a `**/` prefix to them now to ensure that your patterns match deeply into directories.

`only` and `ignore` patterns _do_ still also work for directories, so you could also use `only: './tests'` to only compile files in your `tests` directory, with no need to use `**/*.js` to match all nested files.


## Babel's CLI commands

The `--copy-files` argument for the `babel` command, which tells Babel to copy all files in a directory that Babel doesn't know how to handle, will also now copy files that failed an `only`/`ignore` check, where before it would silently skip all ignored files.


## babel-preset-stage-3

Expand Down Expand Up @@ -93,7 +128,7 @@ After:

See [/docs/plugins/preset-env/](/docs/plugins/preset-env/) for more information.

## Spec Compliancy
## Spec Compliancy

> A trailing comma cannot come after a RestElement in objects [#290](https://github.com/babel/babylon/pull/290) ![medium](https://img.shields.io/badge/risk%20of%20breakage%3F-medium-yellow.svg)
Expand All @@ -115,9 +150,9 @@ var { ...y } = { a: 1};

## babel-preset-stage-1/babel-preset-stage-2 (decorators)

> [legacy-decorators](https://github.com/loganfsmyth/babel-plugin-transform-decorators-legacy) has been moved into the [transform-decorators](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-decorators) package [#5225](https://github.com/babel/babel/pull/5225) ![medium](https://img.shields.io/badge/risk%20of%20breakage%3F-medium-yellow.svg)
> The [transform-decorators-legacy plugin](https://github.com/loganfsmyth/babel-plugin-transform-decorators-legacy) has been moved and merged into the [transform-decorators](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-decorators) package ([#5290](https://github.com/babel/babel/pull/5290)).
Currently, we don't have a Stage 2 transform for decorators. Instead of making it error, we are adding legacy-decorators as part of the Stage 1 preset by merging it into the transform-decorators plugin.
Currently, the transform-decorators plugin does little more than display an unsupported error. While we work to update decorator support, we've decided to replace it with the legacy decorator plugin and include it in the Stage 1 preset.

## babel-core

Expand Down Expand Up @@ -211,7 +246,7 @@ This option was only available through `babel-generator` explicitly until v6.18.

> Dropping the `flowUsesCommas` option [#5123](https://github.com/babel/babel/pull/5123) ![none](https://img.shields.io/badge/risk%20of%20breakage%3F-none-brightgreen.svg)
Currently there are 2 supported syntaxes (`,` and `;`) in Flow Object Types.
Currently there are 2 supported syntaxes (`,` and `;`) in Flow Object Types.

This change just makes babel-generator output `,` instead of `;`.

Expand Down
3 changes: 3 additions & 0 deletions _sass/components/_featurette.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
margin-bottom: 32px;
min-height: 90px;
}
h3 {
font-size: 22px;
}
}

h2 {
Expand Down
34 changes: 34 additions & 0 deletions _sass/components/_guy.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.personal-appeal {
background: #000;

.container {
position: relative;
}
#fieri_quote {
position: absolute;
white-space: pre-wrap;
top: 35%;
left: 5.15%;
color: #eee;
height: 30%;
width: 63%;
font-size: 26px; // What you see is what you get with me. There's no show.
&.animating {
animation: 1s ease-in-out fade;
}
}
@keyframes fade {
0% {
opacity: 1;
}
50% {
opacity: 0;
}
100% {
opacity: 1;
}
}
img {
width: 100%;
}
}
Loading

0 comments on commit 8bb7851

Please sign in to comment.