From 25b005e8aaa317db5d97f08632ed22da04d0b586 Mon Sep 17 00:00:00 2001 From: Jeff <3759507+jhuleatt@users.noreply.github.com> Date: Fri, 3 Sep 2021 17:51:46 +0000 Subject: [PATCH 1/4] update CI to node 14 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3eddc3bd..ee2c87f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: node-version: - - 12.x + - 14.x steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 From 5d2e0dfd7b1520a001953b52975163d895ccdf18 Mon Sep 17 00:00:00 2001 From: Jeff <3759507+jhuleatt@users.noreply.github.com> Date: Fri, 3 Sep 2021 17:58:58 +0000 Subject: [PATCH 2/4] see if updating other deps helps --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e7621ce2..3a2162d2 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ }, "license": "Apache-2.0", "devDependencies": { - "@types/node": "^15.12.2", - "eslint": "^7.16.0", - "pnpm": "^6.7.4", + "@types/node": "^16.7.10", + "eslint": "^7.32.0", + "pnpm": "^6.14.6", "rimraf": "^3.0.2", - "ts-node": "^9.0.0", - "typescript": "^3.8.3" + "ts-node": "^10.2.1", + "typescript": "^4.4.2" } -} +} \ No newline at end of file From 0af6317941b38ccd5c670b60a356d690a582ae4c Mon Sep 17 00:00:00 2001 From: Jeff <3759507+jhuleatt@users.noreply.github.com> Date: Fri, 3 Sep 2021 19:00:44 +0000 Subject: [PATCH 3/4] make TS happy --- scripts/separate-snippets.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/separate-snippets.ts b/scripts/separate-snippets.ts index 86821383..ff93a58f 100644 --- a/scripts/separate-snippets.ts +++ b/scripts/separate-snippets.ts @@ -171,12 +171,15 @@ function collectSnippets(filePath: string): SnippetsConfig { const suffixLine = lines.find((l) => !!l.match(RE_SNIPPETS_SUFFIX)); if (suffixLine) { const m = suffixLine.match(RE_SNIPPETS_SUFFIX); - config.suffix = m[1]; + + if (m && m[1]) { + config.suffix = m[1]; + } } // A temporary array holding the names of snippets we're currently within. // This allows for handling nested snippets. - let inSnippetNames = []; + let inSnippetNames: string[] = []; for (const line of lines) { const startMatch = line.match(RE_START_SNIPPET); From 7121ec4bb7e3884570272d432be9cdb0ba1fb66b Mon Sep 17 00:00:00 2001 From: Jeff <3759507+jhuleatt@users.noreply.github.com> Date: Fri, 3 Sep 2021 19:06:57 +0000 Subject: [PATCH 4/4] lint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3a2162d2..cb7d9157 100644 --- a/package.json +++ b/package.json @@ -17,4 +17,4 @@ "ts-node": "^10.2.1", "typescript": "^4.4.2" } -} \ No newline at end of file +}