Skip to content

Commit 2973d67

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix/instance-tsuid
2 parents 66c1aee + 214a9ab commit 2973d67

File tree

6 files changed

+46
-27
lines changed

6 files changed

+46
-27
lines changed

.github/workflows/publish-package.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,22 @@ on:
77

88
jobs:
99
publish-package:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu:latest
1111
environment: publish
1212

1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

17-
- name: Setup Node.js
18-
uses: actions/setup-node@v1
19-
with:
20-
node-version: 16
21-
22-
- name: Install packages
23-
uses: bahmutov/npm-install@v1
17+
- name: Install
18+
uses: oven-sh/setup-bun@v2
19+
run: bun install
2420

2521
- name: Run build
26-
run: npm run build
22+
run: bun run build
2723

2824
- name: Run tests
29-
run: npm run test
25+
run: bun run test
3026

3127
- name: Semantic release
3228
uses: cycjimmy/semantic-release-action@v3

.github/workflows/tests.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,14 @@ jobs:
1010

1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v3
14-
15-
- name: Setup Node.js
16-
uses: actions/setup-node@v3
17-
with:
18-
node-version: 16
13+
uses: actions/checkout@v4
1914

2015
- name: Install packages
21-
uses: bahmutov/npm-install@v1
16+
uses: oven-sh/setup-bun@v2
17+
run: bun install
2218

2319
- name: Run build
24-
run: npm run build
20+
run: bun run build
2521

2622
- name: Run tests
27-
run: npm run test
23+
run: bun run test

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ bower_components
3131

3232
# Build directory
3333
build/
34+
dist/
3435

3536
# Dependency directories
3637
node_modules/
@@ -56,12 +57,16 @@ typings/
5657

5758
# Yarn lock file
5859
yarn.lock
60+
bun.lock
5961

6062
# dotenv environment variables file
6163
.env
6264

6365
.idea
6466

67+
*.code-workspace
68+
.vscode/
69+
6570
# docker files created by the docker containers for testing
6671
tmp
6772

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ before_script:
1919

2020
script:
2121
- npm install
22+
- echo travis build definition
2223
- npm run build

netlify.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[build]
2+
command = "npm install && npm run build"
3+
publish = "build"
4+
5+
[build.environment]
6+
NODE_VERSION = "20"
7+
NPM_FLAGS = "--legacy-peer-deps" # Optional, useful if you run into dependency resolution issues
8+
9+
[build.lifecycle]
10+
# This will run before the build command
11+
onPostBuild = "npm run test"
12+
13+
[[redirects]]
14+
from = "/*"
15+
to = "/index.html"
16+
status = 200

package-lock.json

Lines changed: 12 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)