Skip to content

Commit cab123a

Browse files
authored
Merge branch 'master' into api-generation-for-components
2 parents 52d3a00 + 85f3307 commit cab123a

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ test-results
3939
**/Dockerfile
4040
**/docker-compose*.yml
4141
**/docker-compose*.yaml
42+
!**/template/**/docker-compose*.yml
43+
!**/template/**/docker-compose*.yaml

Development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ git clone https://github.com/{your_username}/generator.git
3131
cd generator
3232
```
3333

34-
After cloning the repository, you should setup the fork properly and configure the `remote` repository as described [here](https://github.com/asyncapi/community/blob/master/git-workflow.md)
34+
After cloning the repository, you should setup the fork properly and configure the `remote` repository as described in the [AsyncAPI git workflow guidelines](https://github.com/asyncapi/community/blob/master/docs/010-contribution-guidelines/git-workflow.md)
3535

3636
2. Install dependencies:
3737

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NODE_VERSION=18
1+
ARG NODE_VERSION=24.11
22
FROM node:${NODE_VERSION}-alpine AS base
33

44
WORKDIR /app
@@ -28,6 +28,7 @@ FROM base AS final
2828

2929
# Copy package.json files extracted by turbo prune
3030
COPY --from=installer /out/json/ .
31+
COPY --from=installer /app/jest.config.base.js ./jest.config.base.js
3132
COPY --from=installer /out/package-lock.json ./package-lock.json
3233

3334
# Install dependencies only with package.json files to make use of cache
@@ -36,6 +37,9 @@ RUN npm ci --ignore-scripts
3637
# Copy the rest of the source code
3738
COPY --from=installer /out/full/ .
3839

40+
# turbo prune excludes runtime template assets
41+
COPY --from=installer /app/packages/templates ./packages/templates
42+
3943
# Change ownership of the /app directory to the node user
4044
RUN chown -R node:node /app
4145

apps/generator/docs/template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Baked-in templates benefit from:
2929

3030
In contrast, **standalone templates** (described below) are maintained as independent Node.js packages, may live in separate repositories, and can be managed or installed separately from the core generator.
3131

32-
Learn more from document [Baked-in Templates](#baked-in-templates).
32+
Learn more from document [Baked-in Templates](baked-in-templates).
3333

3434
### Standalone templates
3535

apps/generator/test/test-templates/react-template/package-lock.json

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

0 commit comments

Comments
 (0)