From 296103fb2910672cb796ae5e45d40c5ec6f5e972 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 07:14:41 +0800 Subject: [PATCH 01/22] compile using babel for compatibility with older versions --- .babelrc.json | 5 +++++ .editorconfig | 3 +++ .travis.yml | 4 ++++ package.json | 3 +++ rollup.config.js | 5 ++++- 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .babelrc.json diff --git a/.babelrc.json b/.babelrc.json new file mode 100644 index 0000000..ece1d87 --- /dev/null +++ b/.babelrc.json @@ -0,0 +1,5 @@ +{ + "presets": [ + ["@babel/preset-env"] + ] +} diff --git a/.editorconfig b/.editorconfig index a22fb99..26bf60b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,3 +16,6 @@ indent_size = 2 [*.pegjs] indent_size = 2 + +[*.yml] +indent_size = 2 diff --git a/.travis.yml b/.travis.yml index 6ba643e..246f20a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,10 @@ script: - npm run build - npm run test:ci node_js: + - 0.10 + - 2 + - 4 + - 6 - 8 - 10 - 12 diff --git a/package.json b/package.json index 12f62b3..98dc20a 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,8 @@ "query" ], "devDependencies": { + "@babel/core": "^7.9.0", + "@babel/preset-env": "^7.9.0", "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-json": "^4.0.2", "@rollup/plugin-node-resolve": "^7.1.1", @@ -62,6 +64,7 @@ "nyc": "^15.0.0", "pegjs": "~0.10.0", "rollup": "^1.32.0", + "rollup-plugin-babel": "^4.4.0", "rollup-plugin-terser": "^5.2.0" }, "license": "BSD-3-Clause", diff --git a/rollup.config.js b/rollup.config.js index dedfb2d..b2f36dc 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -4,6 +4,8 @@ import nodeResolve from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs'; import json from '@rollup/plugin-json'; +import babel from 'rollup-plugin-babel'; + /** * @external RollupConfig * @type {PlainObject} @@ -30,7 +32,8 @@ function getRollupObject ({ minifying, format = 'umd' } = {}) { plugins: [ json(), nodeResolve(), - commonjs() + commonjs(), + babel() ] }; if (minifying) { From af6a94a26e60d4d3f8f3bfc0b59c530443f1efeb Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 07:34:45 +0800 Subject: [PATCH 02/22] - Update travis for some conditional installs --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 246f20a..99f87aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,23 @@ node_js: - 10 - 12 +before_install: + - npm config set depth 0 +before_script: > + node_version=$(node -v); + if [ ${node_version:3:1} = "." ]; then + echo "Node 10+" + npm install --no-save "eslint@6" + else + if [ ${node_version:1:1} -ge 8 ]; then + echo "Node 8+" + npm install --no-save "eslint@5" + else + echo "Node <= 6" + npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + fi + fi + matrix: include: - name: Lint From 23bad053c9151ba47979f3f3d477ce8a36d0730c Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 07:41:24 +0800 Subject: [PATCH 03/22] Try with older Rollup plugin versions --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 99f87aa..91befe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_script: > npm install --no-save "eslint@5" else echo "Node <= 6" - npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 rollup-plugin-babel@2.7.1 @rollup/plugin-json@3.1.0 @rollup/plugin-node-resolve@5 @rollup/plugin-commonjs@10 fi fi From 148149f0ad16e6b321dd563855d06508a3e8d8bc Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 08:02:37 +0800 Subject: [PATCH 04/22] attempt to avoid build on older versions --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91befe9..635ccde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: node_js script: - - npm run build - npm run test:ci node_js: - 0.10 @@ -19,13 +18,15 @@ before_script: > if [ ${node_version:3:1} = "." ]; then echo "Node 10+" npm install --no-save "eslint@6" + npm run build else if [ ${node_version:1:1} -ge 8 ]; then echo "Node 8+" npm install --no-save "eslint@5" + npm run build else echo "Node <= 6" - npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 rollup-plugin-babel@2.7.1 @rollup/plugin-json@3.1.0 @rollup/plugin-node-resolve@5 @rollup/plugin-commonjs@10 + npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 fi fi From 440dd1a9e5689b0bbb455a21116f0e98bd4ad7f4 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 08:11:22 +0800 Subject: [PATCH 05/22] Babel: Transform `Object.entries` --- .babelrc.json | 3 +++ package.json | 1 + 2 files changed, 4 insertions(+) diff --git a/.babelrc.json b/.babelrc.json index ece1d87..60fdb32 100644 --- a/.babelrc.json +++ b/.babelrc.json @@ -1,5 +1,8 @@ { "presets": [ ["@babel/preset-env"] + ], + "plugins": [ + ["transform-es2017-object-entries"] ] } diff --git a/package.json b/package.json index 98dc20a..76fa880 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-json": "^4.0.2", "@rollup/plugin-node-resolve": "^7.1.1", + "babel-plugin-transform-es2017-object-entries": "0.0.5", "chai": "^4.2.0", "eslint": "^6.8.0", "esm": "^3.2.25", From 12c769c49200410a2bfa0f74b99c81bad7a16f37 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 08:18:22 +0800 Subject: [PATCH 06/22] - Attempt using babel/register over esm to utilize babel plugin --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 76fa880..f651f92 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build:parser": "rm parser.js && pegjs --cache --format umd -o \"parser.js\" \"grammar.pegjs\"", "build:browser": "rollup -c", "build": "npm run build:parser && npm run build:browser", - "mocha": "mocha --require chai/register-assert --require esm tests", + "mocha": "mocha --require chai/register-assert --require @babel/register tests", "test": "nyc npm run mocha && npm run lint", "test:ci": "npm run mocha", "lint": "eslint ." @@ -53,13 +53,13 @@ "devDependencies": { "@babel/core": "^7.9.0", "@babel/preset-env": "^7.9.0", + "@babel/register": "^7.9.0", "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-json": "^4.0.2", "@rollup/plugin-node-resolve": "^7.1.1", "babel-plugin-transform-es2017-object-entries": "0.0.5", "chai": "^4.2.0", "eslint": "^6.8.0", - "esm": "^3.2.25", "esprima": "~4.0.1", "mocha": "^7.1.1", "nyc": "^15.0.0", From bf2688c2869e5e47cc338e1e8720317d1cc96d45 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 08:22:29 +0800 Subject: [PATCH 07/22] Babel: Transform dot-all regex --- .babelrc.json | 3 ++- package.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.babelrc.json b/.babelrc.json index 60fdb32..dd5e388 100644 --- a/.babelrc.json +++ b/.babelrc.json @@ -3,6 +3,7 @@ ["@babel/preset-env"] ], "plugins": [ - ["transform-es2017-object-entries"] + ["transform-es2017-object-entries"], + ["@babel/plugin-transform-dotall-regex"] ] } diff --git a/package.json b/package.json index f651f92..010080a 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ ], "devDependencies": { "@babel/core": "^7.9.0", + "@babel/plugin-transform-dotall-regex": "^7.8.3", "@babel/preset-env": "^7.9.0", "@babel/register": "^7.9.0", "@rollup/plugin-commonjs": "^11.0.2", From 8cbc7d5d178c4140b86bcc895c8b91d3f917ee0f Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 08:31:05 +0800 Subject: [PATCH 08/22] - Travis logic for using older Mocha versions --- .travis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 635ccde..0dc3a5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,18 @@ before_script: > npm install --no-save "eslint@5" npm run build else - echo "Node <= 6" - npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + if [ ${node_version:1:1} -ge 6 ]; then + echo "Node 6+" + npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + else + if [ ${node_version:1:1} -ge 4 ]; then + echo "Node 4+" + npm install --no-save "eslint@5" mocha@5 nyc@14.1.1 + else + echo "Node <4" + npm install --no-save "eslint@5" mocha@3 nyc@14.1.1 + fi + fi fi fi From 08420b15c85e8bb1db9ca5b3c8f868ebe999381a Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 08:49:13 +0800 Subject: [PATCH 09/22] Pass in core-js regexp constructor to tests (so tests can pass) Would need core-js on older Node versions to support the 's' flag but existing code shouldn't be using it anyways. --- .babelrc.json | 3 +-- package.json | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.babelrc.json b/.babelrc.json index dd5e388..60fdb32 100644 --- a/.babelrc.json +++ b/.babelrc.json @@ -3,7 +3,6 @@ ["@babel/preset-env"] ], "plugins": [ - ["transform-es2017-object-entries"], - ["@babel/plugin-transform-dotall-regex"] + ["transform-es2017-object-entries"] ] } diff --git a/package.json b/package.json index 010080a..29fd6f3 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build:parser": "rm parser.js && pegjs --cache --format umd -o \"parser.js\" \"grammar.pegjs\"", "build:browser": "rollup -c", "build": "npm run build:parser && npm run build:browser", - "mocha": "mocha --require chai/register-assert --require @babel/register tests", + "mocha": "mocha --require core-js/es/regexp/constructor --require chai/register-assert --require @babel/register tests", "test": "nyc npm run mocha && npm run lint", "test:ci": "npm run mocha", "lint": "eslint ." @@ -52,7 +52,6 @@ ], "devDependencies": { "@babel/core": "^7.9.0", - "@babel/plugin-transform-dotall-regex": "^7.8.3", "@babel/preset-env": "^7.9.0", "@babel/register": "^7.9.0", "@rollup/plugin-commonjs": "^11.0.2", @@ -60,6 +59,7 @@ "@rollup/plugin-node-resolve": "^7.1.1", "babel-plugin-transform-es2017-object-entries": "0.0.5", "chai": "^4.2.0", + "core-js": "^3.6.4", "eslint": "^6.8.0", "esprima": "~4.0.1", "mocha": "^7.1.1", From b78e02709fda8436b9d5b99678391bb3bcb11d21 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 09:10:20 +0800 Subject: [PATCH 10/22] - use babel-register for older Node versions --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0dc3a5c..43b543f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ sudo: false language: node_js -script: - - npm run test:ci node_js: - 0.10 - 2 @@ -19,22 +17,27 @@ before_script: > echo "Node 10+" npm install --no-save "eslint@6" npm run build + npm run test:ci else if [ ${node_version:1:1} -ge 8 ]; then echo "Node 8+" npm install --no-save "eslint@5" npm run build + npm run test:ci else if [ ${node_version:1:1} -ge 6 ]; then echo "Node 6+" npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + npm run test:ci else if [ ${node_version:1:1} -ge 4 ]; then echo "Node 4+" - npm install --no-save "eslint@5" mocha@5 nyc@14.1.1 + npm install --no-save "eslint@5" mocha@5 nyc@14.1.1 babel-register + mocha --require core-js/es/regexp/constructor --require chai/register-assert --require babel-register tests else echo "Node <4" - npm install --no-save "eslint@5" mocha@3 nyc@14.1.1 + npm install --no-save "eslint@5" mocha@3 nyc@14.1.1 babel-register + mocha --require core-js/es/regexp/constructor --require chai/register-assert --require babel-register tests fi fi fi From 6334c8caf3ae2bd45bb76893ee36949fccdd2e23 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 09:21:43 +0800 Subject: [PATCH 11/22] Revert "Pass in core-js regexp constructor to tests (so tests can pass)" This reverts commit 08420b15c85e8bb1db9ca5b3c8f868ebe999381a. --- .babelrc.json | 3 ++- package.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.babelrc.json b/.babelrc.json index 60fdb32..dd5e388 100644 --- a/.babelrc.json +++ b/.babelrc.json @@ -3,6 +3,7 @@ ["@babel/preset-env"] ], "plugins": [ - ["transform-es2017-object-entries"] + ["transform-es2017-object-entries"], + ["@babel/plugin-transform-dotall-regex"] ] } diff --git a/package.json b/package.json index 29fd6f3..010080a 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build:parser": "rm parser.js && pegjs --cache --format umd -o \"parser.js\" \"grammar.pegjs\"", "build:browser": "rollup -c", "build": "npm run build:parser && npm run build:browser", - "mocha": "mocha --require core-js/es/regexp/constructor --require chai/register-assert --require @babel/register tests", + "mocha": "mocha --require chai/register-assert --require @babel/register tests", "test": "nyc npm run mocha && npm run lint", "test:ci": "npm run mocha", "lint": "eslint ." @@ -52,6 +52,7 @@ ], "devDependencies": { "@babel/core": "^7.9.0", + "@babel/plugin-transform-dotall-regex": "^7.8.3", "@babel/preset-env": "^7.9.0", "@babel/register": "^7.9.0", "@rollup/plugin-commonjs": "^11.0.2", @@ -59,7 +60,6 @@ "@rollup/plugin-node-resolve": "^7.1.1", "babel-plugin-transform-es2017-object-entries": "0.0.5", "chai": "^4.2.0", - "core-js": "^3.6.4", "eslint": "^6.8.0", "esprima": "~4.0.1", "mocha": "^7.1.1", From 83cee96ca54834c7efbd6d921edff9ff92d86a90 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 28 Mar 2020 09:56:51 +0800 Subject: [PATCH 12/22] - Switch `engines` to 0.10 minimum --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 010080a..6225ab2 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ }, "license": "BSD-3-Clause", "engines": { - "node": ">=8.0" + "node": ">=0.10" }, "dependencies": { "estraverse": "^5.0.0" From 900c8d1f697bb4780834e55559c483fa3004ccd0 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Tue, 31 Mar 2020 13:19:20 +0800 Subject: [PATCH 13/22] - Undo dotall transformation (only works on literals) - Testing: Only check regexp s flag for Node >= 8 --- .babelrc.json | 3 +-- package.json | 1 - tests/queryAttribute.js | 14 ++++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.babelrc.json b/.babelrc.json index dd5e388..60fdb32 100644 --- a/.babelrc.json +++ b/.babelrc.json @@ -3,7 +3,6 @@ ["@babel/preset-env"] ], "plugins": [ - ["transform-es2017-object-entries"], - ["@babel/plugin-transform-dotall-regex"] + ["transform-es2017-object-entries"] ] } diff --git a/package.json b/package.json index 6225ab2..fc12407 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ ], "devDependencies": { "@babel/core": "^7.9.0", - "@babel/plugin-transform-dotall-regex": "^7.8.3", "@babel/preset-env": "^7.9.0", "@babel/register": "^7.9.0", "@rollup/plugin-commonjs": "^11.0.2", diff --git a/tests/queryAttribute.js b/tests/queryAttribute.js index 646c235..8a62893 100644 --- a/tests/queryAttribute.js +++ b/tests/queryAttribute.js @@ -177,12 +177,14 @@ describe('Attribute query', function () { ]); }); - it('regexp flag (s)', function () { - const matches = esquery(literal, '[value=/\f.\r/s]'); - assert.includeMembers(matches, [ - literal.body[0].declarations[0].init - ]); - }); + if ((/^(?:[89]|\d{2,})\./).test(process.version)) { + it('regexp flag (s)', function () { + const matches = esquery(literal, '[value=/\f.\r/s]'); + assert.includeMembers(matches, [ + literal.body[0].declarations[0].init + ]); + }); + } it('regexp flag (m)', function () { const matches = esquery(literal, '[value=/^\r/m]'); From 1f093f3a0719696b1d827adfdf612a21e73425df Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sat, 4 Apr 2020 10:16:52 +0800 Subject: [PATCH 14/22] Drop testing for pre-6 Node --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43b543f..e4862a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ sudo: false language: node_js node_js: - - 0.10 - - 2 - - 4 - 6 - 8 - 10 From 3700c83de06ef1679de99f39adb03b53566bf76d Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Thu, 9 Apr 2020 00:17:58 +0800 Subject: [PATCH 15/22] - Travis: Remove dead code --- .travis.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4862a3..f892245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,21 +22,9 @@ before_script: > npm run build npm run test:ci else - if [ ${node_version:1:1} -ge 6 ]; then - echo "Node 6+" - npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 - npm run test:ci - else - if [ ${node_version:1:1} -ge 4 ]; then - echo "Node 4+" - npm install --no-save "eslint@5" mocha@5 nyc@14.1.1 babel-register - mocha --require core-js/es/regexp/constructor --require chai/register-assert --require babel-register tests - else - echo "Node <4" - npm install --no-save "eslint@5" mocha@3 nyc@14.1.1 babel-register - mocha --require core-js/es/regexp/constructor --require chai/register-assert --require babel-register tests - fi - fi + echo "Node 6+" + npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + npm run test:ci fi fi From 132ce564af052c3a2a28792083c2c6e06ae0b774 Mon Sep 17 00:00:00 2001 From: Michael Ficarra Date: Wed, 8 Apr 2020 09:32:38 -0700 Subject: [PATCH 16/22] share script in .travis.yml --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f892245..69094e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ sudo: false language: node_js +script: + - npm run build + - npm run test:ci node_js: - 6 - 8 @@ -13,18 +16,13 @@ before_script: > if [ ${node_version:3:1} = "." ]; then echo "Node 10+" npm install --no-save "eslint@6" - npm run build - npm run test:ci else if [ ${node_version:1:1} -ge 8 ]; then echo "Node 8+" npm install --no-save "eslint@5" - npm run build - npm run test:ci else echo "Node 6+" npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 - npm run test:ci fi fi From 0b8640b811ca35aa556b1a484e07b3dc71497428 Mon Sep 17 00:00:00 2001 From: Michael Ficarra Date: Wed, 8 Apr 2020 09:33:20 -0700 Subject: [PATCH 17/22] remove trailing whitespace --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69094e8..b1120ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: node_js -script: - - npm run build +script: + - npm run build - npm run test:ci node_js: - 6 From 8c1ec34f14ba0de7dd60d92c8fe82d9ae4c7f824 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Thu, 9 Apr 2020 00:36:55 +0800 Subject: [PATCH 18/22] Use simpler Node version detection Co-Authored-By: Michael Ficarra --- tests/queryAttribute.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/queryAttribute.js b/tests/queryAttribute.js index 8a62893..9e717d6 100644 --- a/tests/queryAttribute.js +++ b/tests/queryAttribute.js @@ -177,7 +177,7 @@ describe('Attribute query', function () { ]); }); - if ((/^(?:[89]|\d{2,})\./).test(process.version)) { + if (parseInt(process.version) >= 8) { it('regexp flag (s)', function () { const matches = esquery(literal, '[value=/\f.\r/s]'); assert.includeMembers(matches, [ From d8b0377952bcab4511dc3c262d7dff28de28a006 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Thu, 9 Apr 2020 00:45:45 +0800 Subject: [PATCH 19/22] - Remove unneeded code --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1120ff..db7a9a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ node_js: - 10 - 12 -before_install: - - npm config set depth 0 before_script: > node_version=$(node -v); if [ ${node_version:3:1} = "." ]; then From 60c33c8e1cdb0148ef57af57cfe250be2785dbbd Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Thu, 9 Apr 2020 00:47:50 +0800 Subject: [PATCH 20/22] - Simplify `npm install` for default Node 10+ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db7a9a7..a800408 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_script: > node_version=$(node -v); if [ ${node_version:3:1} = "." ]; then echo "Node 10+" - npm install --no-save "eslint@6" + npm install else if [ ${node_version:1:1} -ge 8 ]; then echo "Node 8+" From a0381650b919eac5d23170caea91f0f40848dd92 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Thu, 9 Apr 2020 00:54:11 +0800 Subject: [PATCH 21/22] Try dropping `npm install` to rely on default --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a800408..159e803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ before_script: > node_version=$(node -v); if [ ${node_version:3:1} = "." ]; then echo "Node 10+" - npm install else if [ ${node_version:1:1} -ge 8 ]; then echo "Node 8+" From e6bb4e608cd6749c9dcd8c27a7e31d1fadcd1193 Mon Sep 17 00:00:00 2001 From: Michael Ficarra Date: Mon, 13 Apr 2020 13:27:04 -0700 Subject: [PATCH 22/22] Update .travis.yml --- .travis.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 159e803..9a00218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,27 +4,18 @@ script: - npm run build - npm run test:ci node_js: - - 6 - - 8 - 10 - 12 -before_script: > - node_version=$(node -v); - if [ ${node_version:3:1} = "." ]; then - echo "Node 10+" - else - if [ ${node_version:1:1} -ge 8 ]; then - echo "Node 8+" - npm install --no-save "eslint@5" - else - echo "Node 6+" - npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 - fi - fi - matrix: include: - name: Lint node_js: 12 script: npm run lint + - name: node 8 (old deps) + node_js: 8 + before_script: npm install --no-save "eslint@5" + - name: node 6 (old deps; skip build) + node_js: 6 + before_script: npm install --no-save "eslint@5" mocha@6.2.2 nyc@14.1.1 + script: npm run test:ci