#1020: merge develop

Accenture · Oct 7, 2023 · 4165dd2 · 4165dd2
2 parents acd558f + 6fd5b63
commit 4165dd2
Show file tree

Hide file tree

Showing 288 changed files with 35,068 additions and 12,995 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -10,7 +10,7 @@
         "plugin:prettier/recommended",
         "plugin:unicorn/recommended"
     ],
-    "plugins": [],
+    "plugins": ["prettier"],
     "globals": {
         "Atomics": "readonly",
         "SharedArrayBuffer": "readonly"

diff --git a/.fork/custom-commands.json b/.fork/custom-commands.json
@@ -22,5 +22,17 @@
       "type": "url",
       "url": "https://github.com/Accenture/sfmc-devtools/compare/hotfix...$shortname?expand=1"
     }
+  },
+  {
+    "name": "Create Release-PR to master branch",
+    "target": "ref",
+    "refTargets": [
+      "localbranch",
+      "remotebranch"
+    ],
+    "action": {
+      "type": "url",
+      "url": "https://github.com/Accenture/sfmc-devtools/compare/main...$shortname?expand=1&template=pr_template_release.md"
+    }
   }
 ]
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -39,6 +39,8 @@ body:
           label: Version
           description: What version of our software are you running? (mcdev --version)
           options:
+              - 5.3.0
+              - 5.2.0
               - 5.1.0
               - 5.0.2
               - 5.0.1

diff --git a/.github/PULL_REQUEST_TEMPLATE/pr_template_release.md b/.github/PULL_REQUEST_TEMPLATE/pr_template_release.md
@@ -0,0 +1,19 @@
+# Release details
+
+## Checklist
+
+- [ ] Wiki updated with info in ticket listed under **Documentation**
+- [ ] ran `npm audit fix`
+- [ ] ran task version:major/minor/patch
+- [ ] updated [bug template](/.github/ISSUE_TEMPLATE/bug.yml) to include the new version
+- [ ] updated [.mcdevrc](/test/mockRoot/.mcdevrc.json) to the new version
+- [ ] (after merge) moved version tag to merge commit
+- [ ] created [new GitHub Release](https://github.com/Accenture/sfmc-devtools/releases/new) 
+
+## Documentation
+
+- closes #123456
+
+## Issues
+
+- closes #1234567
diff --git a/.github/workflows/code-test.yml b/.github/workflows/code-test.yml
@@ -20,7 +20,7 @@ jobs:
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - uses: actions/setup-node@v3
               with:

diff --git a/.github/workflows/coverage-base-update.yml b/.github/workflows/coverage-base-update.yml
@@ -13,7 +13,7 @@ jobs:
         name: Test and report
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.event.pull_request.head.sha }}
                   fetch-depth: 1000

diff --git a/.github/workflows/coverage-develop-branch.yml b/.github/workflows/coverage-develop-branch.yml
@@ -15,7 +15,7 @@ jobs:
         name: Test and upload coverage
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.event.ref }}
                   fetch-depth: 1000
@@ -26,14 +26,12 @@ jobs:
 
             - run: npm ci --ignore-scripts
 
-            - run: npm run lint
-
             - name: Run mcdev-tests with coverage
               run: npm run coverage
 
             - name: Prepare for Report Coverage (mini)
               run: |
-                  npx nyc report --reporter json-summary --exclude-after-remap false
+                  npx c8 report --reporter json-summary --exclude-after-remap false
 
             - name: Upload coverage artifact
               uses: actions/upload-artifact@v3

diff --git a/.github/workflows/coverage-main-branch.yml b/.github/workflows/coverage-main-branch.yml
@@ -15,7 +15,7 @@ jobs:
         name: Test and upload coverage
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.event.ref }}
                   fetch-depth: 1000
@@ -26,14 +26,12 @@ jobs:
 
             - run: npm ci --ignore-scripts
 
-            - run: npm run lint
-
             - name: Run mcdev-tests with coverage
               run: npm run coverage
 
             - name: Prepare for Report Coverage (mini)
               run: |
-                  npx nyc report --reporter json-summary --exclude-after-remap false
+                  npx c8 report --reporter json-summary --exclude-after-remap false
 
             - name: Upload coverage artifact
               uses: actions/upload-artifact@v3

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -12,7 +12,7 @@ jobs:
         name: Test and report
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.event.pull_request.head.sha }}
                   fetch-depth: 1000
@@ -23,14 +23,12 @@ jobs:
 
             - run: npm ci --ignore-scripts
 
-            - run: npm run lint
-
             - name: Run mcdev-tests with coverage
               run: npm run coverage
 
             - name: Prepare for Report Coverage
               run: |
-                  npx nyc report --reporter json-summary --exclude-after-remap false
+                  npx c8 report --reporter json-summary --exclude-after-remap false
                   npm i svelte-to-html@1.0.9
                   git fetch origin ${{ github.event.pull_request.base.ref }} --depth=1000
 

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -11,7 +11,7 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 16
@@ -22,7 +22,7 @@ jobs:
         needs: build
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 16

diff --git a/.prettierrc b/.prettierrc
@@ -2,6 +2,7 @@
     "tabWidth": 4,
     "printWidth": 100,
     "singleQuote": true,
+    "trailingComma": "es5",
     "overrides": [
         {
             "files": "*.json",

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -15,6 +15,10 @@
         "editorconfig.editorconfig",
         "esbenp.prettier-vscode",
 
+        // mcdev tests
+        "hbenl.vscode-mocha-test-adapter",
+        "IBM.output-colorizer",
+
         // Markdown / Readme.md
         "joernberkefeld.markdown-preview-bitbucket-innersource"
     ]