Skip to content

Commit 3ccd8e0

Browse files
bryanjosbryanjos
committed
Update js deps
1 parent d8db026 commit 3ccd8e0

File tree

12 files changed

+6646
-4372
lines changed

12 files changed

+6646
-4372
lines changed

‎.eslintrc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
'no-restricted-syntax': 'off',
77
'no-underscore-dangle': 'off',
88
'import/extensions': 'off',
9-
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
9+
'import/no-extraneous-dependencies': ['error', {devDependencies: true}],
1010
},
1111
extends: 'airbnb-base',
1212
plugins: ['import'],
@@ -15,4 +15,4 @@ module.exports = {
1515
node: true,
1616
mocha: true,
1717
},
18-
};
18+
}

‎.formatter.exs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[
2+
import_deps: [:phoenix],
3+
inputs: ["*.{ex,exs}", "{config,lib,priv,test}/**/*.{ex,exs}"]
4+
]

‎.tool-versions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
erlang 20.3
2-
elixir 1.6.5-otp-20
3-
nodejs 8.9.1
1+
erlang 22.0
2+
elixir 1.9.1-otp-22
3+
nodejs 12.8.1

‎.travis.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ cache:
1010
- deps
1111
- node_modules
1212
install:
13-
- nvm install 12.8.0 && nvm use 12.8.0
14-
- npm install -g yarn
15-
- yarn
13+
- nvm install 12.8.1 && nvm use 12.8.1
14+
- npm install
1615
- mix local.hex --force
1716
- mix local.rebar --force
1817
- mix deps.get
@@ -23,6 +22,6 @@ notifications:
2322
webhooks:
2423
urls:
2524
- https://webhooks.gitter.im/e/fbd8944d285c0696dc41
26-
on_success: always # options: [always|never|change] default: always
27-
on_failure: always # options: [always|never|change] default: always
28-
on_start: never # options: [always|never|change] default: always
25+
on_success: always # options: [always|never|change] default: always
26+
on_failure: always # options: [always|never|change] default: always
27+
on_start: never # options: [always|never|change] default: always

‎CONTRIBUTING.md‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ This contributing guide is based on the contributing for Elixir with changes sui
66

77
Use the issues tracker for:
88

9-
* [bug reports](#bug-reports)
10-
* [submitting pull requests](#pull-requests)
11-
* [feature requests](#feature-requests)
9+
- [bug reports](#bug-reports)
10+
- [submitting pull requests](#pull-requests)
11+
- [feature requests](#feature-requests)
1212

1313
## Bug reports
1414

@@ -51,7 +51,7 @@ Example:
5151
## Feature requests
5252

5353
Feature requests are welcome. But take a moment to find
54-
out whether your idea fits with the scope and aims of the project. It's up to *you*
54+
out whether your idea fits with the scope and aims of the project. It's up to _you_
5555
to make a strong case to convince the community of the merits of this feature.
5656
Please provide as much detail and context as possible.
5757

@@ -63,18 +63,18 @@ found in Elixir in ElixirScript.
6363

6464
ElixirScript is broken up into the following parts:
6565

66-
* The compiler, written in Elixir
67-
* The JavaScript core
66+
- The compiler, written in Elixir
67+
- The JavaScript core
6868

69-
The ElixirScript compiler is in the `lib` folder of the project.
69+
The ElixirScript compiler is in the `lib` folder of the project.
7070
Here is where Elixir code is converted into JavaScript.
7171

72-
The JavaScript code is in the `src/javascript`.
72+
The JavaScript code is in the `src/javascript`.
7373
This is where the special forms and the Erlang Compatibility Layer are defined
7474

75-
The ElixirScript tests can be run using `mix test`
75+
The ElixirScript tests are ran using `mix test`
7676

77-
The JavaScript tests can be run using `yarn test`
77+
The JavaScript tests are ran using `npm test`
7878

7979
Please make sure all tests pass after making changes. Also make sure to include tests for
8080
the changes you made.
@@ -104,72 +104,72 @@ documentation. When working with Git, we recommend the following process
104104
in order to craft an excellent pull request:
105105

106106
1. [Fork](https://help.github.com/fork-a-repo/) the project, clone your fork,
107-
and configure the remotes:
107+
and configure the remotes:
108108

109-
```sh
110-
# Clone your fork of the repo into the current directory
111-
git clone https://github.com/<your-username>/elixirscript
112-
# Navigate to the newly cloned directory
113-
cd elixirscript
114-
# Assign the original repo to a remote called "upstream"
115-
git remote add upstream https://github.com/elixirscript/elixirscript
116-
```
109+
```sh
110+
# Clone your fork of the repo into the current directory
111+
git clone https://github.com/<your-username>/elixirscript
112+
# Navigate to the newly cloned directory
113+
cd elixirscript
114+
# Assign the original repo to a remote called "upstream"
115+
git remote add upstream https://github.com/elixirscript/elixirscript
116+
```
117117

118118
2. If you cloned a while ago, get the latest changes from upstream:
119119

120-
```sh
121-
git checkout master
122-
git pull upstream master
123-
```
120+
```sh
121+
git checkout master
122+
git pull upstream master
123+
```
124124

125125
3. Create a new topic branch (off of `master`) to contain your feature, change,
126-
or fix.
126+
or fix.
127127

128-
**IMPORTANT**: Making changes in `master` is discouraged. You should always
129-
keep your local `master` in sync with upstream `master` and make your
130-
changes in topic branches.
128+
**IMPORTANT**: Making changes in `master` is discouraged. You should always
129+
keep your local `master` in sync with upstream `master` and make your
130+
changes in topic branches.
131131

132-
```sh
133-
git checkout -b <topic-branch-name>
134-
```
132+
```sh
133+
git checkout -b <topic-branch-name>
134+
```
135135

136136
4. Commit your changes in logical chunks. Keep your commit messages organized,
137-
with a short description in the first line and more detailed information on
138-
the following lines. Feel free to use Git's
139-
[interactive rebase](https://help.github.com/articles/interactive-rebase)
140-
feature to tidy up your commits before making them public.
137+
with a short description in the first line and more detailed information on
138+
the following lines. Feel free to use Git's
139+
[interactive rebase](https://help.github.com/articles/interactive-rebase)
140+
feature to tidy up your commits before making them public.
141141

142142
5. Make sure all the tests are still passing.
143143

144-
```sh
145-
mix test
146-
yarn test
147-
```
144+
```sh
145+
mix test
146+
npm test
147+
```
148148

149-
This is needed to ensure your changes can
150-
pass all the tests.
149+
This is needed to ensure your changes can
150+
pass all the tests.
151151

152152
6. Push your topic branch up to your fork:
153153

154-
```sh
155-
git push origin <topic-branch-name>
156-
```
154+
```sh
155+
git push origin <topic-branch-name>
156+
```
157157

158158
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
159-
with a clear title and description.
159+
with a clear title and description.
160160

161161
8. If you haven't updated your pull request for a while, you should consider
162-
rebasing on master and resolving any conflicts.
163-
164-
**IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You
165-
should always `git rebase` on `master` to bring your changes up to date when
166-
necessary.
167-
168-
```sh
169-
git checkout master
170-
git pull upstream master
171-
git checkout <your-topic-branch>
172-
git rebase master
173-
```
162+
rebasing on master and resolving any conflicts.
163+
164+
**IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You
165+
should always `git rebase` on `master` to bring your changes up to date when
166+
necessary.
167+
168+
```sh
169+
git checkout master
170+
git pull upstream master
171+
git checkout <your-topic-branch>
172+
git rebase master
173+
```
174174

175175
Thank you for your contributions!

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ default: deps compile
55
compile: js_compile elixir_compile
66

77
js_compile:
8-
yarn build
8+
npm run build
99

1010
elixir_compile:
1111
mix compile
1212

1313
test: js_compile elixir_test js_test
1414

1515
js_test:
16-
yarn test
16+
npm test
1717

1818
elixir_test:
1919
mix test --cover
@@ -29,4 +29,4 @@ elixir_deps:
2929
mix deps.get
3030

3131
js_deps:
32-
yarn
32+
npm install

0 commit comments

Comments
 (0)