Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch CI to node 12.16 (fixes #30) #31

Merged
merged 1 commit into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 13 additions & 39 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
version: 2

shared:
node8: &node8
node12: &node12
docker:
- image: circleci/node:9

node9: &node9
docker:
- image: circleci/node:9
- image: cimg/node:12.22

restore-yarn-cache: &restore-yarn-cache
restore_cache:
Expand Down Expand Up @@ -43,50 +39,28 @@ shared:
command: yarn lint

jobs:
build-node8:
build-node12:
<<: *build
<<: *node8
<<: *node12

test-node8:
test-node12:
<<: *test
<<: *node8
<<: *node12

lint-node8:
lint-node12:
<<: *lint
<<: *node8

build-node9:
<<: *build
<<: *node9

test-node9:
<<: *test
<<: *node9

lint-node9:
<<: *lint
<<: *node9
<<: *node12

workflows:
version: 2
pr:
jobs:
- build-node8

- test-node8:
requires:
- build-node8

- lint-node8:
requires:
- build-node8

- build-node9
- build-node12

- lint-node9:
- lint-node12:
requires:
- build-node9
- build-node12

- test-node9:
- test-node12:
requires:
- build-node9
- build-node12
5 changes: 3 additions & 2 deletions lib/Jexl.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ Jexl.prototype.addTransform = function(name, fn) {
*/
Jexl.prototype.addTransforms = function(map) {
for (var key in map) {
if (map.hasOwnProperty(key)) this._transforms[key] = map[key];
if (Object.prototype.hasOwnProperty.call(map, key))
this._transforms[key] = map[key];
}
};

Expand Down Expand Up @@ -192,7 +193,7 @@ Jexl.prototype._getCustomGrammar = function() {
if (!this._customGrammar) {
this._customGrammar = {};
for (var key in defaultGrammar) {
if (defaultGrammar.hasOwnProperty(key))
if (Object.prototype.hasOwnProperty.call(defaultGrammar, key))
this._customGrammar[key] = defaultGrammar[key];
}
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"devDependencies": {
"chai": "^2.0.0",
"chai-as-promised": "^4.2.0",
"mocha": "^2.1.0",
"eslint": "^4.18.1",
"eslint": "^8.24.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-prettier": "^2.6.0",
"license-webpack-plugin": "0.5.1",
"mocha": "^2.1.0",
"prettier": "^1.10.2",
"webpack": "3.1.0"
}
Expand Down
5 changes: 3 additions & 2 deletions vendor/mozjexl.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ Jexl.prototype.addTransform = function(name, fn) {
*/
Jexl.prototype.addTransforms = function(map) {
for (var key in map) {
if (map.hasOwnProperty(key)) this._transforms[key] = map[key];
if (Object.prototype.hasOwnProperty.call(map, key))
this._transforms[key] = map[key];
}
};

Expand Down Expand Up @@ -478,7 +479,7 @@ Jexl.prototype._getCustomGrammar = function() {
if (!this._customGrammar) {
this._customGrammar = {};
for (var key in defaultGrammar) {
if (defaultGrammar.hasOwnProperty(key))
if (Object.prototype.hasOwnProperty.call(defaultGrammar, key))
this._customGrammar[key] = defaultGrammar[key];
}
}
Expand Down
Loading