From 0e2683d50bc02683339f407970d324dbe7f2be29 Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Tue, 16 Nov 2021 18:41:03 +0900 Subject: [PATCH 1/2] Update dev deps --- package.json | 66 +++++++++---------- src/common/create-require.ts | 3 +- src/external/node-event-generator.ts | 2 +- .../ast/multiple-scripts-with-ts/ast.json | 1 + 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index bed4c3ef..76f27a49 100644 --- a/package.json +++ b/package.json @@ -22,44 +22,44 @@ "semver": "^7.3.5" }, "devDependencies": { - "@babel/core": "^7.15.0", - "@babel/eslint-parser": "^7.15.0", - "@babel/plugin-syntax-decorators": "^7.14.5", - "@babel/plugin-syntax-pipeline-operator": "^7.15.0", - "@babel/plugin-syntax-typescript": "^7.14.5", - "@types/debug": "0.0.30", - "@types/eslint": "^7.2.6", - "@types/estree": "0.0.45", - "@types/lodash": "^4.14.120", - "@types/mocha": "^5.2.4", - "@types/node": "^10.12.21", - "@types/semver": "^7.3.6", - "@typescript-eslint/eslint-plugin": "^5.0.0-0", - "@typescript-eslint/parser": "^5.0.0-0", - "chokidar": "^2.0.4", - "codecov": "^3.1.0", - "cross-spawn": "^6.0.5", + "@babel/core": "^7.16.0", + "@babel/eslint-parser": "^7.16.3", + "@babel/plugin-syntax-decorators": "^7.16.0", + "@babel/plugin-syntax-pipeline-operator": "^7.16.0", + "@babel/plugin-syntax-typescript": "^7.16.0", + "@types/debug": "^4.1.7", + "@types/eslint": "^7.29.0", + "@types/estree": "^0.0.50", + "@types/lodash": "^4.14.177", + "@types/mocha": "^9.0.0", + "@types/node": "^16.11.7", + "@types/semver": "^7.3.9", + "@typescript-eslint/eslint-plugin": "^5.4.0", + "@typescript-eslint/parser": "^5.4.0", + "chokidar": "^3.5.2", + "codecov": "^3.8.3", + "cross-spawn": "^7.0.3", "dts-bundle": "^0.7.3", - "eslint": "^8.0.0", + "eslint": "^8.2.0", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-jsonc": "^1.4.0", + "eslint-plugin-jsonc": "^2.0.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-node-dependencies": "^0.5.0", + "eslint-plugin-node-dependencies": "^0.6.0", "eslint-plugin-prettier": "^4.0.0", - "fs-extra": "^7.0.1", - "jsonc-eslint-parser": "^0.6.0", - "mocha": "^6.1.4", + "fs-extra": "^10.0.0", + "jsonc-eslint-parser": "^2.0.2", + "mocha": "^9.1.3", "npm-run-all": "^4.1.5", - "nyc": "^14.0.0", - "opener": "^1.5.1", - "prettier": "^2.3.1", - "rimraf": "^2.6.3", - "rollup": "^1.1.2", - "rollup-plugin-node-resolve": "^4.0.0", - "rollup-plugin-sourcemaps": "^0.4.2", - "ts-node": "^8.1.0", - "typescript": "~4.0.5", - "wait-on": "^3.2.0", + "nyc": "^15.1.0", + "opener": "^1.5.2", + "prettier": "^2.4.1", + "rimraf": "^3.0.2", + "rollup": "^2.60.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-sourcemaps": "^0.6.3", + "ts-node": "^10.4.0", + "typescript": "~4.4.4", + "wait-on": "^6.0.0", "warun": "^1.0.0" }, "scripts": { diff --git a/src/common/create-require.ts b/src/common/create-require.ts index 4f180ac5..6c536680 100644 --- a/src/common/create-require.ts +++ b/src/common/create-require.ts @@ -4,8 +4,7 @@ export const createRequire: (filename: string) => (modname: string) => any = // Added in v12.2.0 (Module as any).createRequire || // Added in v10.12.0, but deprecated in v12.2.0. - // eslint-disable-next-line node/no-deprecated-api - Module.createRequireFromPath || + (Module as any).createRequireFromPath || // Polyfill - This is not executed on the tests on node@>=10. /* istanbul ignore next */ ((modname) => { diff --git a/src/external/node-event-generator.ts b/src/external/node-event-generator.ts index d02be8a5..7c74c54a 100644 --- a/src/external/node-event-generator.ts +++ b/src/external/node-event-generator.ts @@ -143,7 +143,7 @@ function tryParseSelector(rawSelector: string): Selector { try { return esquery.parse(rawSelector.replace(/:exit$/, "")) } - catch (err) { + catch (err: any) { if (typeof err.offset === "number") { throw new Error(`Syntax error in selector "${rawSelector}" at position ${err.offset}: ${err.message}`) } diff --git a/test/fixtures/ast/multiple-scripts-with-ts/ast.json b/test/fixtures/ast/multiple-scripts-with-ts/ast.json index 94c84439..0f45883f 100644 --- a/test/fixtures/ast/multiple-scripts-with-ts/ast.json +++ b/test/fixtures/ast/multiple-scripts-with-ts/ast.json @@ -138,6 +138,7 @@ 36, 58 ], + "assertions": [], "loc": { "start": { "line": 4, From c1519359ce3d335cf62bf42f627aa3137a05b04f Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Tue, 16 Nov 2021 20:02:37 +0900 Subject: [PATCH 2/2] update --- package.json | 2 +- test/define-custom-blocks-visitor.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 76f27a49..61ebcf13 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "eslint-plugin-node-dependencies": "^0.6.0", "eslint-plugin-prettier": "^4.0.0", "fs-extra": "^10.0.0", - "jsonc-eslint-parser": "^2.0.2", + "jsonc-eslint-parser": "^2.0.3", "mocha": "^9.1.3", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", diff --git a/test/define-custom-blocks-visitor.js b/test/define-custom-blocks-visitor.js index 5a660835..31f6e942 100644 --- a/test/define-custom-blocks-visitor.js +++ b/test/define-custom-blocks-visitor.js @@ -298,10 +298,13 @@ describe("parserServices.defineCustomBlocksVisitor tests", () => { const messages = linter.verify(code, LINTER_CONFIG) assert.strictEqual(messages.length, 3) - assert.strictEqual(messages[0].message, "Unexpected token :") + assert.strictEqual(messages[0].message, "Unexpected token ':'.") assert.strictEqual(messages[0].line, 3) assert.strictEqual(messages[0].column, 6) - assert.strictEqual(messages[1].message, "Unexpected end of expression.") + assert.strictEqual( + messages[1].message, + "Expected to be an expression, but got empty.", + ) assert.strictEqual(messages[1].line, 5) assert.strictEqual(messages[1].column, 19) assert.strictEqual(