Skip to content

Commit e07baa6

Browse files
committed
Merge branch 'merging'
2 parents 0108622 + 7b0101a commit e07baa6

19 files changed

+624
-681
lines changed

.c8rc.coveralls.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"report-dir": "./coverage",
44
"all": true,
55
"include": ["src", "index.ts"],
6-
"exclude": ["./*.ts", "./**/*.d.ts"]
6+
"exclude": ["./*.ts", "./**/*.d.ts", "./**/*/types.ts"]
77
}

.c8rc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"report-dir": "./coverage",
44
"all": true,
55
"include": ["src", "index.ts"],
6-
"exclude": ["./*.ts", "./**/*.d.ts"]
6+
"exclude": ["./*.ts", "./**/*.d.ts", "./**/*/types.ts"]
77
}

.devcontainer/.post-create

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export NODE_OPTIONS='--enable-source-maps --no-warnings=ExperimentalWarning --loader ts-node/esm'
1+
echo 'done'

.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM mcr.microsoft.com/devcontainers/base:ubuntu

.devcontainer/devcontainer.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "predicates.ts",
3-
"build": {
4-
"dockerfile": "Dockerfile"
5-
},
6-
"postCreateCommand": "npm config set git-tag-version=false && npm install && echo \"source ./.devcontainer/.post-create\" >> /home/node/.bashrc",
7-
"remoteUser": "node",
3+
"dockerComposeFile": "./docker-compose.yml",
4+
"service": "devcontainer",
5+
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
6+
"postCreateCommand": "npm config set git-tag-version=false && npm install",
7+
"remoteUser": "vscode",
88
"updateRemoteUserUID": true,
99
"customizations": {
1010
"vscode": {
@@ -14,7 +14,15 @@
1414
"github.vscode-github-actions",
1515
"ms-azuretools.vscode-docker",
1616
"ms-vscode.makefile-tools"
17-
]
17+
],
18+
"settings": {
19+
"chat.agent.enabled": false
20+
}
21+
}
22+
},
23+
"features": {
24+
"ghcr.io/devcontainers/features/node:1": {
25+
"version": "23"
1826
}
1927
}
2028
}

.devcontainer/docker-compose.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
services:
2+
devcontainer:
3+
build:
4+
dockerfile: devcontainer.DockerFile
5+
restart: always
6+
command: sleep infinity
7+
volumes:
8+
- ../../:/workspaces:cached

.editorconfig

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
# EditorConfig is awesome: https://EditorConfig.org
2-
3-
# top-most EditorConfig file
4-
root = true
5-
6-
[*]
7-
indent_style = tab
8-
indent_size = 4
9-
end_of_line = lf
10-
charset = utf-8
11-
trim_trailing_whitespace = true
12-
insert_final_newline = true
13-
14-
[package.json]
15-
indent_style = space
16-
indent_size = 2
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
[*]
7+
indent_style = tab
8+
indent_size = 4
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
14+
[package.json]
15+
indent_style = space
16+
indent_size = 2
17+
18+
[*.yml]
19+
indent_style = space
20+
indent_size = 4

.github/workflows/node.js.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,31 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Use Node.js 22.x
15-
uses: actions/setup-node@v4
14+
- name: Use Node.js 23.x
15+
uses: actions/setup-node@v5
1616
with:
17-
node-version: 22.x
17+
node-version: 23.x
1818
cache: 'npm'
1919
- run: npm ci
2020
- run: ./node_modules/.bin/tsc --project ./tsconfig.app-check.json
2121
- run: ./node_modules/.bin/prettier . --check
2222
- run: ./node_modules/.bin/eslint "./**/*.ts"
2323
coverage:
24+
if: github.event.repository.visibility == 'public'
2425
needs: basic-checks
2526
runs-on: ubuntu-latest
2627
steps:
2728
- uses: actions/checkout@v4
28-
- name: Use Node.js 22.x
29-
uses: actions/setup-node@v4
29+
- name: Use Node.js 23.x
30+
uses: actions/setup-node@v5
3031
with:
31-
node-version: 22.x
32+
node-version: 23.x
3233
cache: 'npm'
3334
- run: npm ci
35+
- name: Build
36+
run: ./node_modules/.bin/tsc --project ./tsconfig.app.json
3437
- name: Generate coverage
35-
run: ./node_modules/.bin/c8 --config=./.c8rc.coveralls.json ./node_modules/.bin/ts-node ./tests.ts
36-
env:
37-
NODE_OPTIONS: '--enable-source-maps --no-warnings=ExperimentalWarning --loader ts-node/esm'
38+
run: ./node_modules/.bin/c8 --config=./.c8rc.coveralls.json node ./tests.ts
3839
- name: Coveralls GitHub Action
3940
uses: coverallsapp/github-action@v2.2.3
4041
with:

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
/.idea/
1414
/Makefile
1515
/.editorconfig
16-
/.eslintignore
1716
/.eslintcache
1817
/eslint.config*.mjs
1918
/.prettierignore
2019
/.prettierrc
2120
/tsconfig*.json
21+
/rollup.config.js

0 commit comments

Comments
 (0)