Skip to content

Update build tools and upgrade CI to node 14 #237

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 7, 2021
Merged

Update build tools and upgrade CI to node 14 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25b005e
update CI to node 14
jhuleatt Sep 3, 2021
5d2e0df
see if updating other deps helps
jhuleatt Sep 3, 2021
0af6317
make TS happy
jhuleatt Sep 3, 2021
7121ec4
lint
jhuleatt Sep 3, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
node-version:
- 12.x
- 14.x
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
7 changes: 5 additions & 2 deletions scripts/separate-snippets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down