Merge pull request #3 from LucasBrazi06/dependabot/npm_and_yarn/acorn-6.4.1

diff --git a/.cfignore b/.cfignore
index 2ab298332b2acf18919ef6e9f739ffc753191075..53de5320b2b45d44adee97feca1ba6ced0db3c42 100644 (file)
--- a/.cfignore
+++ b/.cfignore
@@ -1,6 +1,7 @@
 .git
 .gitignore
 .gitattributes
+.gitmodules
 .jshintrc
 .eslintrc
 .vscode
@@ -15,4 +16,4 @@
 *~
 *.orig
 node_modules
-manifest-cf-template.yml
\ No newline at end of file
+manifest-cf-template.yml

diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
new file mode 100644 (file)
index 0000000..d021394
--- /dev/null
+++ b/.github/workflows/greetings.yml
@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Welcome to your first issue in e-Mobility software'
+        pr-message: 'Welcome to your first PR in e-Mobility software'

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644 (file)
index 0000000..3d7a77e
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,28 @@
+name: Lint CI
+
+on:
+  # push:
+  #   branches:
+  #     - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: npm install
+      run: npm ci
+    - name: npm run lint
+      run: npm run lint

diff --git a/.gitignore b/.gitignore
index 0e351bb90e42074985113e2d38f392b595113c22..3863e2ba767baf070749adf710cc323c0398800d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,7 @@ build/config.gypi
 
 # Clinic
 *.clinic-*
+
+# System Files
+.DS_Store
+Thumbs.db

diff --git a/docker/Makefile b/docker/Makefile
index 2b58f2db5ca65bd66cd9312701d44c7beba53d5e..d3eefbc01330c2219f9bb6267d57619186f307cc 100644 (file)
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -29,7 +29,7 @@ clean-containers:
 clean: clean-containers clean-images
 
 docker-tag-ecr:
-       docker tag $(PROJECT_NAME)_$(NAME):$(DOCKER_ECR_TAG) $(DOCKER_ECR_ACCOUNT_ID).dkr.ecr.$(DOCKER_ECR_REGION).amazonaws.com/$(DOCKER_ECR_REGISTRY_NAME):$(DOCKER_ECR_TAG)
+       docker tag $(PROJECT_NAME)_$(NAME) $(DOCKER_ECR_ACCOUNT_ID).dkr.ecr.$(DOCKER_ECR_REGION).amazonaws.com/$(DOCKER_ECR_REGISTRY_NAME):$(DOCKER_ECR_TAG)
 
 docker-push-ecr: $(NAME)-force docker-tag-ecr
        aws ecr get-login-password --region $(DOCKER_ECR_REGION) | docker login --username AWS --password-stdin $(DOCKER_ECR_ACCOUNT_ID).dkr.ecr.$(DOCKER_ECR_REGION).amazonaws.com/$(DOCKER_ECR_REGISTRY_NAME)

diff --git a/manifest-cf-template.yml b/manifest-cf-template.yml
index c31cbb5b894bb2d61ae8321b8479888d4a9935a0..13129e75538154d9c7538a31185c5c8a028c4058 100644 (file)
--- a/manifest-cf-template.yml
+++ b/manifest-cf-template.yml
@@ -1,5 +1,5 @@
 applications:
-- name: sap-ev-simulator-qa
+- name: sap-ev-simulator
   memory: 1G
   disk_quota: 1G
   instances: 1

diff --git a/package-lock.json b/package-lock.json
index 5c6627365b2e9e069e8686fa3306f7d6b6b77e9b..14291285e98451b684952e48405007aed6b2b9a3 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -3105,9 +3105,9 @@
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",

diff --git a/package.json b/package.json
index c3035d19d2e53717e7ae62521da6aeda27972820..dfb43a763d180bff72223047bebef5c4aac2b929 100644 (file)
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ev-simulator",
   "version": "1.0.0",
   "engines": {
-    "node": "13.x.x"
+    "node": ">=13.14.0"
   },
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "clinic:clean": "clinic clean",
     "npm-check": "npm-check",
-    "git:sdiff": "!git diff && git submodule foreach 'git diff'",
+    "git:sdiff": "git diff && git submodule foreach 'git diff'",
     "git:supdate": "git submodule update --remote --merge",
     "git:spush": "git push --recurse-submodules=on-demand"
   },

diff --git a/src/assets/configs-aws b/src/assets/configs-aws
index ad68154207ac0c3aa7d24e0deb5c18a9723b8d6d..5fb081a12dbcb2cc22acd9046a397eb9138898a5 160000 (submodule)
--- a/src/assets/configs-aws
+++ b/src/assets/configs-aws
@@ -1 +1 @@
-Subproject commit ad68154207ac0c3aa7d24e0deb5c18a9723b8d6d
+Subproject commit 5fb081a12dbcb2cc22acd9046a397eb9138898a5

diff --git a/src/assets/station/abb.station b/src/assets/station/abb.station
index 55a57e562de885b176734764d7e225cd3948e915..0106ad209dc12fdad64dd7673d8b3e3b3b3c978f 100644 (file)
--- a/src/assets/station/abb.station
+++ b/src/assets/station/abb.station
@@ -54,4 +54,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/evlink.station b/src/assets/station/evlink.station
index d00d6138a55fca0a54ac1087b8b9110752f93b3d..72e4fb2b07a95ed6ecac9d5394d70da68c38a2dd 100644 (file)
--- a/src/assets/station/evlink.station
+++ b/src/assets/station/evlink.station
@@ -32,4 +32,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/keba.station b/src/assets/station/keba.station
index 0bb8e6b031a755849c7927ff67c18d59ad22c4f4..876b9c96679bd7a68c3bd19a9bf85033fc525ac7 100644 (file)
--- a/src/assets/station/keba.station
+++ b/src/assets/station/keba.station
@@ -39,4 +39,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/schneider-imredd.station b/src/assets/station/schneider-imredd.station
index b5cc6bc15cc78d16c2290d72d0f0d19316564bff..9af157febe03503732a3bf06209f57c44ff21e59 100644 (file)
--- a/src/assets/station/schneider-imredd.station
+++ b/src/assets/station/schneider-imredd.station
@@ -39,4 +39,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/schneider.station b/src/assets/station/schneider.station
index b5cc6bc15cc78d16c2290d72d0f0d19316564bff..9af157febe03503732a3bf06209f57c44ff21e59 100644 (file)
--- a/src/assets/station/schneider.station
+++ b/src/assets/station/schneider.station
@@ -39,4 +39,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/siemens.mougins69.station b/src/assets/station/siemens.mougins69.station
index ef99f3300b2034e4d88e1b7b245bf339f0b59cde..f90d83a49a8c737d81b4f7411e80d0b15aaf5b14 100644 (file)
--- a/src/assets/station/siemens.mougins69.station
+++ b/src/assets/station/siemens.mougins69.station
@@ -42,4 +42,4 @@
             }]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/virtual-simple-atg.station b/src/assets/station/virtual-simple-atg.station
index 9ad9532935bbf4ba75e5fcd9b53a15ee6f49c7b4..7af070bfbf4ca655b8511a57e3d40759d2c9681b 100644 (file)
--- a/src/assets/station/virtual-simple-atg.station
+++ b/src/assets/station/virtual-simple-atg.station
@@ -68,7 +68,7 @@
             }
             ]
         }
-            
-        
+
+
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/virtual-simple.station b/src/assets/station/virtual-simple.station
index ef7e1ece5763edb417b23a77d30f84916fba68e9..5187e04ad5e34ce0265d2ec9efb6004cc87b1963 100644 (file)
--- a/src/assets/station/virtual-simple.station
+++ b/src/assets/station/virtual-simple.station
@@ -68,7 +68,7 @@
             }
             ]
         }
-            
-        
+
+
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/station/virtual.station b/src/assets/station/virtual.station
index 066b61db5142b893c06aae51f848ce48f0ab1497..d9153b9c2983f8b2ef7499c2809941618ed8d686 100644 (file)
--- a/src/assets/station/virtual.station
+++ b/src/assets/station/virtual.station
@@ -153,4 +153,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/assets/templateAuthorization.auth b/src/assets/templateAuthorization.auth
index b30214a23749d578153d866a58b069a75e86a763..6fd9690e19fc43acff7d2f3a33c95e827fc3d975 100644 (file)
--- a/src/assets/templateAuthorization.auth
+++ b/src/assets/templateAuthorization.auth
@@ -1,4 +1,5 @@
-[ "007",
+[
+"007",
 "0080001EDBA4E1",
 "00B700FE0CA4E1",
 "00E1007E6BA4E1",
@@ -241,4 +242,4 @@
 "mr20181005",
 "rf2005127191",
 "C3E4B3DD"
-]
\ No newline at end of file
+]