From 1ffcd8c7bdb5df01777d3ca92d1d2805f35b9f1a Mon Sep 17 00:00:00 2001 From: Curran Date: Tue, 15 Aug 2023 12:18:38 -0400 Subject: [PATCH 1/3] Upgrade eslint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7c5636a..3da8a7c3 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "devDependencies": { "chai": "^4.3.7", "coveralls": "^3.1.1", - "eslint": "^7.32.0", + "eslint": "^8.47.0", "eslint-config-google": "^0.14.0", "lolex": "^5.1.2", "mocha": "^10.2.0", From a989ef0d833a5842b14d988e04b20695c806d661 Mon Sep 17 00:00:00 2001 From: Curran Date: Tue, 15 Aug 2023 12:32:37 -0400 Subject: [PATCH 2/3] Got lint to work --- .eslintrc.js | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index eb5ad967..c83d81a4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -40,7 +40,8 @@ var SHAREDB_RULES = { module.exports = { extends: 'google', parserOptions: { - ecmaVersion: 3 + ecmaVersion: 3, + allowReserved: true }, rules: Object.assign( {}, @@ -55,7 +56,8 @@ module.exports = { files: ['examples/counter-json1-vite/*.js'], parserOptions: { ecmaVersion: 6, - sourceType: 'module' + sourceType: 'module', + allowReserved: false }, rules: { quotes: ['error', 'single'] diff --git a/package.json b/package.json index 3da8a7c3..dbadf466 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "chai": "^4.3.7", "coveralls": "^3.1.1", "eslint": "^8.47.0", - "eslint-config-google": "^0.14.0", "lolex": "^5.1.2", + "eslint-config-google": "^0.14.0", "mocha": "^10.2.0", "nyc": "^15.1.0", "ot-json0-v2": "https://github.com/ottypes/json0#90a3ae26364c4fa3b19b6df34dad46707a704421", From f7b0b7bbdd539adaad0acfcb783eb8c35353a30b Mon Sep 17 00:00:00 2001 From: Curran Date: Tue, 15 Aug 2023 12:44:00 -0400 Subject: [PATCH 3/3] Restore deps ordering --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbadf466..3da8a7c3 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "chai": "^4.3.7", "coveralls": "^3.1.1", "eslint": "^8.47.0", - "lolex": "^5.1.2", "eslint-config-google": "^0.14.0", + "lolex": "^5.1.2", "mocha": "^10.2.0", "nyc": "^15.1.0", "ot-json0-v2": "https://github.com/ottypes/json0#90a3ae26364c4fa3b19b6df34dad46707a704421",