Merge branch 'master' into noOverwrite1128-monorepo&filters

lmgyuan · Jul 31, 2024 · 4a1f332 · 4a1f332
2 parents 5fea3a7 + ef865ad
commit 4a1f332
Show file tree

Hide file tree

Showing 9 changed files with 1,494 additions and 3,999 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -6,7 +6,6 @@
   "linked": [],
   "access": "public",
   "baseBranch": "master",
-  "ignore": ["@asyncapi/nunjucks-filters"],
   "updateInternalDependencies": "patch",
   "privatePackages": {
     "version": true,

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build Image
         uses: docker/build-push-action@v4
         with:
-          context: './apps/generator'
+          context: "{{defaultContext}}:apps/generator"
           push: true
           load: false
           build-args: |

diff --git a/apps/generator/CHANGELOG.md b/apps/generator/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @asyncapi/generator
 
+## 2.1.3
+
+### Patch Changes
+
+- 93fb8e8: Updated the method for importing the Nunjucks filter dependency
+
+## 2.1.2
+
+### Patch Changes
+
+- a3e93ef: update the git context for the docker versioning.
+
 ## 2.1.1
 
 ### Patch Changes

diff --git a/apps/generator/Dockerfile b/apps/generator/Dockerfile
@@ -1,6 +1,6 @@
 ARG ASYNCAPI_GENERATOR_VERSION=1.10.9
 
-FROM node:14-alpine
+FROM node:18-alpine
 
 WORKDIR /app
 

diff --git a/apps/generator/jest.config.js b/apps/generator/jest.config.js
@@ -4,6 +4,6 @@ module.exports = {
   moduleNameMapper: {
     '^nimma/legacy$': '<rootDir>../../node_modules/nimma/dist/legacy/cjs/index.js',
     '^nimma/(.*)': '<rootDir>../../node_modules/nimma/dist/cjs/$1',
-    '^nunjucks-filters$': path.resolve(__dirname, '../nunjucks-filters'),
+    '^@asyncapi/nunjucks-filters$': path.resolve(__dirname, '../nunjucks-filters'),
   },
 };
diff --git a/apps/generator/lib/filtersRegistry.js b/apps/generator/lib/filtersRegistry.js
@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const xfs = require('fs.extra');
 const { isAsyncFunction } = require('./utils');
-const nunjucksFilters = require('nunjucks-filters');
+const nunjucksFilters = require('@asyncapi/nunjucks-filters');
 
 /**
  * Registers all template filters.

diff --git a/apps/generator/package.json b/apps/generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/generator",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "The AsyncAPI generator. It can generate documentation, code, anything!",
   "main": "./lib/generator.js",
   "bin": {
@@ -74,7 +74,7 @@
     "source-map-support": "^0.5.19",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.3",
-    "nunjucks-filters": "file:../nunjucks-filters"
+    "@asyncapi/nunjucks-filters": "*"
   },
   "devDependencies": {
     "eslint": "^6.8.0",

diff --git a/apps/generator/test/test-project/package.json b/apps/generator/test/test-project/package.json
@@ -19,7 +19,7 @@
         "moduleNameMapper": {
             "^nimma/legacy$": "<rootDir>/../../../../node_modules/nimma/dist/legacy/cjs/index.js",
             "^nimma/(.*)": "<rootDir>/../../../../node_modules/nimma/dist/cjs/$1",
-            "^nunjucks-filters$": "<rootDir>/../../../nunjucks-filters"        
+            "^@asyncapi/nunjucks-filters$": "<rootDir>/../../../nunjucks-filters"        
         }
     }
 }