Skip to content

Commit 3d15385

Browse files
authored
Merge branch 'dev' into dependabot/docker/denoland/deno-distroless-2.1.2
2 parents dd9ca62 + e37a1d3 commit 3d15385

38 files changed

+1207
-216
lines changed

.dockerignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
_etc/
21
.github/
32
.vscode/
3+
etc/coverage/
4+
etc/coverage.lcov
5+
etc/temp/
46
.dockerignore
57
.editorconfig
68
.gitattributes

.github/dependabot.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
version: 2
2+
23
updates:
34
- package-ecosystem: "docker"
45
directory: "/"
56
schedule:
6-
interval: "weekly"
7+
interval: "monthly"
78
commit-message:
8-
prefix: "deps(docker): "
99
include: "scope"
1010
labels:
1111
- "dependencies"
12-
reviewers:
13-
- eser
1412

1513
- package-ecosystem: "github-actions"
1614
directory: "/"
1715
schedule:
18-
interval: "weekly"
16+
interval: "monthly"
17+
commit-message:
18+
include: "scope"
19+
labels:
20+
- "dependencies"
21+
22+
- package-ecosystem: "npm"
23+
directory: "/"
24+
schedule:
25+
interval: "monthly"
1926
commit-message:
20-
prefix: "deps(gh-actions): "
2127
include: "scope"
2228
labels:
2329
- "dependencies"
24-
reviewers:
25-
- eser

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# - windows-latest
4747
# - macOS-latest
4848
deno-version:
49-
- 1.45.2
49+
- 2.4.4
5050

5151
steps:
5252
- name: Checkout repository
@@ -55,23 +55,23 @@ jobs:
5555
fetch-depth: 2
5656

5757
- name: Setup Deno ${{ matrix.deno-version }}
58-
uses: denoland/setup-deno@v1
58+
uses: denoland/setup-deno@v2
5959
with:
6060
deno-version: ${{ matrix.deno-version }}
6161

6262
- name: Check formatting, linting, license headers, types and run tests
63-
run: deno task ok
63+
run: deno task validate
6464

6565
- name: Generate coverage report
6666
run: deno task test:coverage-gen
6767

6868
- name: Upload coverage
69-
uses: codecov/codecov-action@v4
69+
uses: codecov/codecov-action@v5
7070
env:
7171
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
7272
with:
7373
name: ${{ matrix.os }}
74-
files: ./_etc/coverage.lcov
74+
files: ./etc/coverage.lcov
7575

7676
delivery:
7777
name: Delivery
@@ -82,7 +82,7 @@ jobs:
8282
permissions:
8383
contents: write # Needed to push the repository
8484
id-token: write # Needed for auth with Deno Deploy
85-
pages: write # Needed for updating GitHub Pages
85+
pages: write # Needed for updating GitHub Pages
8686

8787
env:
8888
GITHUB_CLIENT_ID: ${{ secrets.GITHUB_CLIENT_ID }}
@@ -97,7 +97,7 @@ jobs:
9797
# token: ${{ secrets.GH_TOKEN }}
9898

9999
- name: Setup Deno (latest)
100-
uses: denoland/setup-deno@v1
100+
uses: denoland/setup-deno@v2
101101

102102
# - name: Build step
103103
# run: deno task build

.github/workflows/version-bump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fetch-depth: 2
1919

2020
- name: Setup Deno (latest)
21-
uses: denoland/setup-deno@v1
21+
uses: denoland/setup-deno@v2
2222

2323
- name: Run @deno/bump-workspaces
2424
run: |

.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ Thumbs.db
2121
*.swp
2222

2323
# coverage files
24-
/_etc/coverage/*
25-
/_etc/coverage.lcov
24+
/etc/coverage/*
25+
/etc/coverage.lcov
2626

2727
# package managers
2828
node_modules/*
29-
package-lock.json
3029

3130
# temporary files
32-
/_etc/temp/*
33-
!/_etc/temp/.gitkeep
31+
/etc/temp/*
32+
!/etc/temp/.gitkeep

.pre-commit-config.yaml

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.6.0
3+
rev: v5.0.0
44
hooks:
55
- id: check-added-large-files
66
args: ["--maxkb=1024"]
@@ -38,8 +38,16 @@ repos:
3838
test/apps/cf-workers-app/tsconfig.json
3939
)$
4040
- id: trailing-whitespace
41+
42+
- repo: https://github.com/compilerla/conventional-pre-commit
43+
rev: v4.2.0
44+
hooks:
45+
- id: conventional-pre-commit
46+
stages: [commit-msg]
47+
args: []
48+
4149
- repo: https://github.com/crate-ci/typos
42-
rev: v1.23.2
50+
rev: v1.35.5
4351
hooks:
4452
- id: typos
4553
verbose: true
@@ -50,58 +58,48 @@ repos:
5058
(?x)^(
5159
docs/.*|
5260
)$
53-
- repo: https://github.com/compilerla/conventional-pre-commit
54-
rev: v3.3.0
55-
hooks:
56-
- id: conventional-pre-commit
57-
stages: [commit-msg]
58-
args: []
61+
5962
- repo: local
6063
hooks:
61-
- id: local-precommit
62-
name: local pre-commit tasks
63-
description: Runs local pre-commit tasks.
64-
entry: bash -c 'deno task script:validate-configs; git add -u' --
65-
always_run: true
66-
pass_filenames: false
67-
language: system
68-
- id: kebab-case-files-only
69-
name: kebab-case files only
70-
entry: filenames must be kebab-case only
71-
language: fail
72-
files: '(?!\.test\.[jt]sx?$)[^a-z0-9.\/\[\]@-]'
73-
exclude: |
74-
(?x)^(
75-
_etc/.*|
76-
.github/.*|
77-
.git/COMMIT_EDITMSG|
78-
docs/.*|
79-
pkg/@eser/app-runtime/README.md|
80-
pkg/@eser/bundler/README.md|
81-
pkg/@eser/bundler/esbuild_v0.20.0.wasm|
82-
pkg/@eser/collector/README.md|
83-
pkg/@eser/config/README.md|
84-
pkg/@eser/di/README.md|
85-
pkg/@eser/directives/README.md|
86-
pkg/@eser/dotenv/README.md|
87-
pkg/@eser/events/README.md|
88-
pkg/@eser/fp/README.md|
89-
pkg/@eser/functions/README.md|
90-
pkg/@eser/jsx-runtime/README.md|
91-
pkg/@eser/logging/README.md|
92-
pkg/@eser/parsing/README.md|
93-
pkg/@eser/standards/README.md|
94-
pkg/@cool/cli/README.md|
95-
pkg/@cool/lime/README.md|
96-
test/apps/vite-app/README.md|
97-
Dockerfile|
98-
LICENSE|
99-
README.md
100-
)$
101-
- id: check-integrity
102-
name: check integrity
103-
description: Check formatting, linting, license headers, types and run tests.
104-
entry: deno task ok
105-
types_or: [javascript, jsx, ts, tsx, json, markdown]
106-
pass_filenames: false
107-
language: system
64+
- id: local-validation
65+
name: local pre-commit validation
66+
description: Validate formatting, linting, license headers, types and run tests.
67+
entry: bash -c 'deno task validate:fix; git add -u' --
68+
always_run: true
69+
pass_filenames: false
70+
language: system
71+
72+
- id: kebab-case-files-only
73+
name: kebab-case files only
74+
entry: filenames must be kebab-case only
75+
language: fail
76+
files: '(?!\.test\.[jt]sx?$)[^a-z0-9.\/\[\]@-]'
77+
exclude: |
78+
(?x)^(
79+
.github/.*|
80+
.git/COMMIT_EDITMSG|
81+
docs/.*|
82+
etc/coverage/.*|
83+
etc/temp/.*|
84+
pkg/@eser/app-runtime/README.md|
85+
pkg/@eser/bundler/README.md|
86+
pkg/@eser/bundler/esbuild_v0.20.0.wasm|
87+
pkg/@eser/collector/README.md|
88+
pkg/@eser/config/README.md|
89+
pkg/@eser/di/README.md|
90+
pkg/@eser/directives/README.md|
91+
pkg/@eser/dotenv/README.md|
92+
pkg/@eser/events/README.md|
93+
pkg/@eser/fp/README.md|
94+
pkg/@eser/functions/README.md|
95+
pkg/@eser/jsx-runtime/README.md|
96+
pkg/@eser/logging/README.md|
97+
pkg/@eser/parsing/README.md|
98+
pkg/@eser/standards/README.md|
99+
pkg/@cool/cli/README.md|
100+
pkg/@cool/lime/README.md|
101+
test/apps/vite-app/README.md|
102+
Dockerfile|
103+
LICENSE|
104+
README.md
105+
)$

.tool-versions

Lines changed: 0 additions & 2 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"coverage-gutters.coverageBaseDir": "./_etc",
2+
"coverage-gutters.coverageBaseDir": "./etc",
33
"coverage-gutters.coverageFileNames": [
44
"coverage.lcov"
55
],
@@ -14,7 +14,9 @@
1414
"deno.enable": true,
1515
"deno.lint": true,
1616
"deno.suggest.imports.autoDiscover": true,
17-
"deno.unstable": true,
17+
"deno.unstable": [
18+
"temporal"
19+
],
1820
"javascript.suggest.autoImports": true,
1921
"javascript.suggest.completeFunctionCalls": true,
2022
"javascript.suggest.completeJSDocs": true,

Dockerfile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
FROM denoland/deno:distroless-2.1.2
2-
3-
# The port that the application listens to.
4-
EXPOSE 8080
1+
FROM denoland/deno:2.4.4
52

63
# Prefer not to run as root.
74
USER deno
85

9-
WORKDIR /app
10-
11-
# # Cache the dependencies as a layer (the following two steps are re-run only when deps.ts is modified).
12-
# # Ideally cache deps.ts will download and compile _all_ external files used in main.ts.
13-
# COPY deps.ts .
14-
# RUN deno cache deps.ts
6+
# Set working directory
7+
WORKDIR /srv/playground
8+
ENV DENO_DIR=.deno_cache
159

16-
# These steps will be re-run upon each file change in your working directory:
17-
COPY ./ ./
10+
RUN mkdir -p .deno_cache
1811

19-
# Compile the main app so that it doesn't need to be compiled each startup/entry.
20-
RUN deno cache ./pkg/mod.ts
12+
# Install dependencies first to improve caching
13+
COPY --chown=deno:deno . ./
14+
RUN deno install --allow-scripts --reload --entrypoint ./pkg/mod.ts
2115

22-
ENTRYPOINT ["deno", "task", "repl"]
16+
CMD ["task", "repl"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<p align="center">
99
<a href="./">
10-
<img alt="eser stack javascript toolkit" src="./_etc/cover.svg" width="849" />
10+
<img alt="eser stack javascript toolkit" src="./etc/cover.svg" width="849" />
1111
</a>
1212
</p>
1313

@@ -70,7 +70,7 @@ strives to offer you an intuitive and delightful development experience.
7070
| -------------------------------------- | ----------------- | --------------------------------------------------- | ------------------------------------------------------------------------------- |
7171
| 📓 [@eser/directives](pkg/directives/) | Rules | The ground rules adhered to by the entire ecosystem | - |
7272
| 📑 [@eser/standards](pkg/standards/) | Abstraction | Provides common abstraction layers for DI | [![JSR](https://jsr.io/badges/@eser/standards)](https://jsr.io/@eser/standards) |
73-
| ⚙️ [@eser/di](pkg/di/) | Manager | Dependency injection system | [![JSR](https://jsr.io/badges/@eser/di)](https://jsr.io/@eser/di) |
73+
| ⚙️ [@eser/di](pkg/di/) | Manager | Dependency injection system | [![JSR](https://jsr.io/badges/@eser/di)](https://jsr.io/@eser/di) |
7474
| 🧱 [@eser/fp](pkg/fp/) | Functions Library | Tools for functional programming | [![JSR](https://jsr.io/badges/@eser/fp)](https://jsr.io/@eser/fp) |
7575
| 🔐 [@eser/config](pkg/config/) | Manager | Load configurations from environment | [![JSR](https://jsr.io/badges/@eser/config)](https://jsr.io/@eser/config) |
7676
| 〰️ [@eser/parsing](pkg/parsing/) | Manager | Parsing tools for various strings and streams | [![JSR](https://jsr.io/badges/@eser/parsing)](https://jsr.io/@eser/parsing) |

0 commit comments

Comments
 (0)