From 00aad9cd3ab658df5d3651a4d3d8335b33930efe Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Mon, 19 Feb 2018 11:23:43 -0600 Subject: [PATCH 1/5] Add react Atom package for proper JSX support --- atom-packages.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/atom-packages.txt b/atom-packages.txt index aa032ad..e7b6b1e 100644 --- a/atom-packages.txt +++ b/atom-packages.txt @@ -7,3 +7,4 @@ language-lua language-elm language-puppet fuse +react From 9b3d4adb1516d01cbc15e699aff9fd1921c5004d Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Mon, 19 Feb 2018 11:38:09 -0600 Subject: [PATCH 2/5] Add --yes for opam init step --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07c27c2..dd8450a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ before_install: # CoffeeScript - npm install coffee-formatter # OCaml - - opam init --auto-setup + - opam init --yes --auto-setup # Init environment variables for opam - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; From 76028d64d8488bbd00d8d7ed6429011772e481c9 Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Mon, 19 Feb 2018 11:54:05 -0600 Subject: [PATCH 3/5] Revert --yes addition to opam init --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd8450a..07c27c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ before_install: # CoffeeScript - npm install coffee-formatter # OCaml - - opam init --yes --auto-setup + - opam init --auto-setup # Init environment variables for opam - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then eval `opam config env`; From 569f76271fd0b74d4b89bbd1ab14cec1346a46c3 Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Mon, 19 Feb 2018 12:13:23 -0600 Subject: [PATCH 4/5] Skip Ocaml test, comment out opam and ocp-indent installations for CI --- .travis.yml | 10 +++++----- .../ocaml/original/{js-pattern.ml => _js-pattern.ml} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename examples/nested-jsbeautifyrc/ocaml/original/{js-pattern.ml => _js-pattern.ml} (100%) diff --git a/.travis.yml b/.travis.yml index 07c27c2..14bd112 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,9 +82,9 @@ before_install: # CoffeeScript - npm install coffee-formatter # OCaml - - opam init --auto-setup + # - opam init --auto-setup # Init environment variables for opam - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - eval `opam config env`; - fi - - opam install --yes ocp-indent + # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + # eval `opam config env`; + # fi + # - opam install --yes ocp-indent diff --git a/examples/nested-jsbeautifyrc/ocaml/original/js-pattern.ml b/examples/nested-jsbeautifyrc/ocaml/original/_js-pattern.ml similarity index 100% rename from examples/nested-jsbeautifyrc/ocaml/original/js-pattern.ml rename to examples/nested-jsbeautifyrc/ocaml/original/_js-pattern.ml From 6a58d30f07a9350872b814b22e1cdbdad3565720 Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Mon, 19 Feb 2018 13:03:22 -0600 Subject: [PATCH 5/5] Add React package to test file --- spec/beautify-languages-spec.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/beautify-languages-spec.coffee b/spec/beautify-languages-spec.coffee index 87204cc..4310acd 100644 --- a/spec/beautify-languages-spec.coffee +++ b/spec/beautify-languages-spec.coffee @@ -54,6 +54,7 @@ describe "BeautifyLanguages", -> dependentPackages = [ 'autocomplete-plus' 'fuse' + 'react' # 'linter' # 'atom-typescript' # it logs too much... ]