Merge pull request #66 from moleculerjs/v3

Rewrite typescript project template (v3)

Author: icebob

.github/workflows/docker.yml

@@ -8,27 +8,20 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [16.x, 18.x]
         # transporter: [NATS, Redis, MQTT, AMQP, AMQP10, STAN, Kafka, TCP]
         transporter: [NATS, Redis, MQTT, AMQP, STAN, Kafka, TCP]
       fail-fast: false
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Use Node.js ${{ matrix.node-version }} with ${{ matrix.transporter }} transporter
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: Cache
-      uses: actions/cache@v2
-      with:
-        path: ~/.npm
-        key: cache-node-modules-${{ matrix.node-version }}
-
     - name: Install dependencies
-      run: npm install
+      run: npm i
 
     - name: Create answers file
       run: node update-answers.js
@@ -39,10 +32,6 @@ jobs:
     - name: Generate project with '${{ matrix.transporter }}' transporter
       run: npm test
 
-    - name: Run lint in the generated project
-      run: npm run lint
-      working-directory: ./ci-test
-
     - name: Run tests in the generated project
       run: npm test
       working-directory: ./ci-test
@@ -54,23 +43,20 @@ jobs:
       run: npm run dc:up
       working-directory: ./ci-test
 
-    - name: Sleeping 60 secs
-      run: sleep 60s
+    - name: Sleeping 30 secs
+      run: sleep 30
 
-    - name: Sleeping more in case of AMQP transporter
-      run: sleep 180
-      if: contains(matrix.transporter, 'AMQP')
-      
     - name: Check containers
       run: docker-compose ps
       working-directory: ./ci-test
 
+    - run: curl --silent --show-error --fail http://localhost:3000/api/greeter/hello
+    - run: curl --silent --show-error --fail http://localhost:3000/api/products
+
     - name: Check logs
       run: docker-compose logs
       working-directory: ./ci-test
-
-    - run: curl --silent --show-error --fail http://localhost:3000/api/greeter/hello
-    - run: curl --silent --show-error --fail http://localhost:3000/api/products
+      if: failure()
 
     - name: Stop containers
       run: npm run dc:down

.github/workflows/generate.yml

@@ -0,0 +1,47 @@
+name: Generate a demo project
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  generate:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js 18.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
+    
+    - name: Install dependencies
+      run: npm i
+    - name: Generate project
+      run: node_modules/.bin/moleculer init --answers test/demo/answers.json --no-install . project-demo
+
+    - name: Initialize Git repo
+      run: git init
+      working-directory: ./project-demo
+
+    - name: Set remote
+      run: git remote add origin https://${{ secrets.GH_TOKEN }}@github.com/moleculerjs/project-typescript-demo.git
+      working-directory: ./project-demo
+
+    - name: Add files
+      run: git add --all
+      working-directory: ./project-demo
+
+    - name: Configure Git user
+      run: git config --global user.email "hello@moleculer.services" && git config --global user.name "Moleculer"
+      working-directory: ./project-demo
+
+    - name: Commit
+      run: git commit -m "Generated files"
+      working-directory: ./project-demo
+    
+    - name: Git push
+      run: git push --force origin master
+      working-directory: ./project-demo

.github/workflows/kubernetes.yml

@@ -1,4 +1,3 @@
-
 name: Test with Kubernetes
 
 on: [push, pull_request]
@@ -9,23 +8,16 @@ jobs:
 
     strategy:
       matrix:
-        # transporter: [NATS, Redis, MQTT, AMQP, AMQP10, STAN, Kafka]
-        transporter: [NATS, Redis, MQTT, AMQP, STAN, Kafka]
+        transporter: [NATS, Redis, MQTT, AMQP, AMQP10, STAN, Kafka]
       fail-fast: false
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Use Node.js with ${{ matrix.transporter }} transporter
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
-    - name: Cache
-      uses: actions/cache@v2
+      uses: actions/setup-node@v3
       with:
-        path: ~/.npm
-        key: cache-node-modules-12.x
+        node-version: 18.x
 
     - name: Install dependencies
       run: npm i
@@ -46,50 +38,35 @@ jobs:
     - name: Start a local Docker Registry
       run: docker run -d --restart=always -p 5000:5000 --name registry registry:2
 
-    - name: Set Registry IP for KinD
-      run: |
-        REGISTRY_IP=$(docker inspect -f '{{.NetworkSettings.IPAddress}}' registry)
-        echo $REGISTRY_IP
-        sed -i "s/registry:5000/$REGISTRY_IP:5000/g" test/ci/kind-config.yaml
-        cat test/ci/kind-config.yaml
-    
     - name: Build Docker image
-      run: docker build -t ci-test .
+      run: docker build -t ci-test:demo .
       working-directory: ./ci-test
 
-    - name: Tagging
-      run: docker tag ci-test localhost:5000/ci-test
-
-    - name: Push Docker image
-      run: docker push localhost:5000/ci-test
-
     - uses: engineerd/setup-kind@v0.5.0
       with:
+        version: "v0.17.0"
         config: ./test/ci/kind-config.yaml
 
     - run: kubectl cluster-info
     - run: kubectl get nodes
     - run: kubectl get pods -n kube-system
 
+    - name: Load Docker image
+      run: kind load docker-image ci-test:demo ci-test:demo
+
     - name: Install NGINX Ingress
-      run: |
-        kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/nginx-0.27.0/deploy/static/mandatory.yaml
-        kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/nginx-0.27.0/deploy/static/provider/baremetal/service-nodeport.yaml
-        kubectl patch deployments -n ingress-nginx nginx-ingress-controller -p '{"spec":{"template":{"spec":{"containers":[{"name":"nginx-ingress-controller","ports":[{"containerPort":80,"hostPort":80},{"containerPort":443,"hostPort":443}]}],"nodeSelector":{"ingress-ready":"true"},"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Equal","effect":"NoSchedule"}]}}}}' 
-    
+      run: kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+
     - name: Kubectl apply
       working-directory: ./ci-test
       run: |
-        sed 's/image: ci-test/image: localhost:5000\/ci-test/g' k8s.yaml
-        sed 's/image: ci-test/image: localhost:5000\/ci-test/g' k8s.yaml | kubectl apply -f -
-    
-    - name: Sleeping 90 secs
-      run: sleep 90
-
-    - name: Sleeping more in case of AMQP transporter
-      run: sleep 180
-      if: contains(matrix.transporter, 'AMQP')
-      
+        # Fix nginx ingress issue: https://github.com/kubernetes/ingress-nginx/issues/5401#issuecomment-662424306
+        kubectl delete -A ValidatingWebhookConfiguration ingress-nginx-admission
+        sed 's/image: ci-test/image: ci-test:demo/g' k8s.yaml | kubectl apply -f -
+
+    - name: Sleeping 120 secs
+      run: sleep 120
+
     - name: Check pods
       run: kubectl get all
 

.idea/moleculer-template-project-typescript.iml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 MoleculerJS
+Copyright (c) 2023 MoleculerJS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -38,6 +38,8 @@ Template repo: moleculerjs/moleculer-template-project-typescript
 ? Select a exporter solution Console
 ? Add Docker & Kubernetes sample files? Yes
 ? Use ESLint to lint your code? Yes
+Create 'moleculer-demo' folder...
+? Would you like to run 'npm install'? Yes
 ```
 
 ## NPM scripts
@@ -55,6 +57,6 @@ Template repo: moleculerjs/moleculer-template-project-typescript
 moleculer-template-project-typescript is available under the [MIT license](https://tldrlegal.com/license/mit-license).
 
 ## Contact
-Copyright (c) 2020 MoleculerJS
+Copyright (c) 2023 MoleculerJS
 
 [![@moleculerjs](https://img.shields.io/badge/github-moleculerjs-green.svg)](https://github.com/moleculerjs) [![@MoleculerJS](https://img.shields.io/badge/twitter-MoleculerJS-blue.svg)](https://twitter.com/MoleculerJS)

README.md

@@ -85,7 +85,7 @@ module.exports = function(values) {
       {
         type: "list",
         name: "exporter",
-        message: "Select a exporter solution",
+        message: "Select an exporter solution",
         choices: [
           { name: "Console", value: "Console" },
           { name: "EventLegacy", value: "EventLegacy" },
@@ -95,7 +95,7 @@ module.exports = function(values) {
           { name: "Zipkin", value: "Zipkin" },
           { name: "NewRelic", value: "NewRelic" }
         ],
-        when(answers) { return answers.metrics; },
+        when(answers) { return answers.tracing; },
         default: "Console"
       },
       {
@@ -135,6 +135,9 @@ module.exports = function(values) {
       "test/unit/services/products.spec.ts": "dbService",
 
       ".eslintrc.js": "lint",
+      "tsconfig.eslint.json": "lint",
+      ".prettierignore": "lint",
+      ".prettierrc.json": "lint",
 
       ".dockerignore": "docker",
       "docker-compose.*": "docker",
@@ -143,7 +146,7 @@ module.exports = function(values) {
     },
 
     completeMessage: `
-    To get started:
+To get started:
 
 	cd {{projectName}}
 	npm run dev

meta.js

@@ -1,11 +1,10 @@
 {
   "name": "moleculer-template-project-typescript",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Project template for Moleculer-based projects with typescript",
   "main": "meta.js",
   "scripts": {
     "dev": "rimraf tmp && moleculer init . tmp",
-    "build": "moleculer init --answers test/now.sh/answers.json --install . tmp",
     "test": "moleculer init --answers test/ci/answers.json --install . ci-test",
     "start": "cd tmp && node node_modules/moleculer/bin/moleculer-runner services"
   },

now.json

@@ -4,3 +4,4 @@ Dockerfile
 node_modules
 test
 .vscode
+data