Skip to content

Commit

Permalink
Merge branch 'master' into recast-babylon7
Browse files Browse the repository at this point in the history
  • Loading branch information
fkling authored Mar 13, 2018
2 parents 8513337 + 1ed1ef1 commit 19c8f6c
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ node.
[tslint]: https://palantir.github.io/tslint/
[uglify-js]: https://github.com/mishoo/UglifyJS2
[webidl]: https://github.com/darobin/webidl2.js
[remark]: https://github.com/wooorm/remark
[remark]: https://github.com/remarkjs/remark
[regexp-tree]: https://github.com/DmitrySoshnikov/regexp-tree
[php-parser]: https://github.com/glayzzle/php-parser
[glimmer]: https://github.com/glimmerjs/glimmer-vm
Expand Down
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"eslint4": "file:packages/eslint4",
"espree": "^3.1.0",
"esprima": "^4.0.0",
"flow-parser": "^0.59.0",
"flow-parser": "^0.63.0",
"font-awesome": "^4.5.0",
"glsl-parser": "^2.0.0",
"glsl-tokenizer": "^2.1.2",
Expand Down Expand Up @@ -104,7 +104,7 @@
"redux-batched-actions": "^0.2.0",
"redux-saga": "^0.15.3",
"regexp-tree": "^0.0.65",
"remark": "^8.0.0",
"remark": "^9.0.0",
"reselect": "^3.0.1",
"scalameta-parsers": "^2.0.0-RC3",
"shift-parser": "^5.0.2",
Expand Down
1 change: 1 addition & 0 deletions website/src/parsers/js/babylon7.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const availablePlugins = [
'typescript',
'bigInt',
'optionalCatchBinding',
'pipelineOperator',
];

const ID = 'babylon7';
Expand Down
2 changes: 1 addition & 1 deletion website/src/parsers/js/espree.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const defaultOptions = {
};
const parserSettingsConfiguration = {
fields: [
['ecmaVersion', [3, 5, 6, 7], value => Number(value)],
['ecmaVersion', [3, 5, 6, 7, 8, 9], value => Number(value)],
['sourceType', ['script', 'module']],
'range',
'loc',
Expand Down
1 change: 1 addition & 0 deletions website/src/parsers/js/transformers/babel7/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export default {
'importMeta',
'bigInt',
'optionalCatchBinding',
'pipelineOperator',
],
},
generatorOpts: {
Expand Down
3 changes: 1 addition & 2 deletions website/src/parsers/markdown/remark.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import SettingsRenderer from '../utils/SettingsRenderer';
const ID = 'remark';
const defaultOptions = {
gfm: true,
yaml: true,
commonmark: false,
footnotes: false,
};
Expand Down Expand Up @@ -53,7 +52,7 @@ export default {
<div>
<p>
<a
href="https://github.com/wooorm/remark/tree/master/packages/remark-parse#options"
href="https://github.com/remarkjs/remark/tree/master/packages/remark-parse#options"
target="_blank" rel="noopener noreferrer">
Option descriptions
</a>
Expand Down
2 changes: 1 addition & 1 deletion website/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const path = require('path');
const webpack = require('webpack');

const DEV = process.env.NODE_ENV !== 'production';
const CACHE_BREAKER = 13;
const CACHE_BREAKER = 14;

const packages = fs.readdirSync(path.join(__dirname, 'packages'));
const vendorRegex = new RegExp(`/node_modules/(?!${packages.join('|')}/)`);
Expand Down
32 changes: 18 additions & 14 deletions website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2964,10 +2964,14 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"

flow-parser@^0.*, flow-parser@^0.59.0:
flow-parser@^0.*:
version "0.59.0"
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.59.0.tgz#f6ebcae61ffa187e420999d40ce0a801f39b2635"

flow-parser@^0.63.0:
version "0.63.1"
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.63.1.tgz#84fd647b58a370c2fc0462800e22ed77c3cdf249"

font-awesome@^4.5.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
Expand Down Expand Up @@ -4800,7 +4804,7 @@ parse-asn1@^5.0.0:
evp_bytestokey "^1.0.0"
pbkdf2 "^3.0.3"

parse-entities@^1.0.2:
parse-entities@^1.0.2, parse-entities@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890"
dependencies:
Expand Down Expand Up @@ -5625,17 +5629,17 @@ [email protected]:
version "0.2.7"
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"

remark-parse@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-4.0.0.tgz#99f1f049afac80382366e2e0d0bd55429dd45d8b"
remark-parse@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
dependencies:
collapse-white-space "^1.0.2"
is-alphabetical "^1.0.0"
is-decimal "^1.0.0"
is-whitespace-character "^1.0.0"
is-word-character "^1.0.0"
markdown-escapes "^1.0.0"
parse-entities "^1.0.2"
parse-entities "^1.1.0"
repeat-string "^1.5.4"
state-toggle "^1.0.0"
trim "0.0.1"
Expand All @@ -5645,9 +5649,9 @@ remark-parse@^4.0.0:
vfile-location "^2.0.0"
xtend "^4.0.1"

remark-stringify@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-4.0.0.tgz#4431884c0418f112da44991b4e356cfe37facd87"
remark-stringify@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
dependencies:
ccount "^1.0.0"
is-alphanumeric "^1.0.0"
Expand All @@ -5664,12 +5668,12 @@ remark-stringify@^4.0.0:
unherit "^1.0.4"
xtend "^4.0.1"

remark@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/remark/-/remark-8.0.0.tgz#287b6df2fe1190e263c1d15e486d3fa835594d6d"
remark@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
dependencies:
remark-parse "^4.0.0"
remark-stringify "^4.0.0"
remark-parse "^5.0.0"
remark-stringify "^5.0.0"
unified "^6.0.0"

remove-trailing-separator@^1.0.1:
Expand Down

0 comments on commit 19c8f6c

Please sign in to comment.