Skip to content

Commit 85fde87

Browse files
committedJan 28, 2020
Merge remote-tracking branch 'socraticorg/mathsteps/master' into 'nitin42/mathsteps/build-configuration' (PR: google#175)
2 parents bfdf4b4 + 8a8f26b commit 85fde87

File tree

90 files changed

+3736
-601
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3736
-601
lines changed
 

‎.eslintrc.js

+14
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ module.exports = {
6666
],
6767
"strict": [
6868
"error"
69+
],
70+
"eol-last": [
71+
"error",
72+
"always"
73+
],
74+
"no-multiple-empty-lines": [
75+
"error",
76+
{
77+
"max": 2,
78+
"maxEOF": 1
79+
}
80+
],
81+
"no-trailing-spaces": [
82+
"error"
6983
]
7084
}
7185
};

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ We're excited to see your [pull request](https://help.github.com/articles/about-
9393
before you get started, so others are aware that you're working on it. If
9494
there's no existing issue for the change you'd like to make, you can
9595
[create a new issue](https://github.com/socraticorg/mathsteps/issues/new).
96-
96+
9797
- The best issues to work on are [these issues that are not assigned or long term goals](https://github.com/socraticorg/mathsteps/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20-label%3Aassigned%20%20-label%3Aquestion%20%20-label%3A%22longer%20term%20goals%22%20%20-label%3A%22needs%20further%20discussion%22%20)
9898

9999
- Make sure all the unit tests pass (with `npm test`) before creating the pull
@@ -110,7 +110,7 @@ We're excited to see your [pull request](https://help.github.com/articles/about-
110110
which makes sure tests are passing and the code is eslint-compliant.
111111
- If you want to see what the expression tree looks like at any point in the
112112
code (for debugging), you can log a `node` as an expression string (e.g.
113-
'2x + 5') with `console.log(print(node))`, and you can log the full tree
113+
'2x + 5') with `console.log(print.ascii(node))`, and you can log the full tree
114114
structure with `console.log(JSON.stringify(node, null, 2))`
115115

116116

0 commit comments

Comments
 (0)