Merge pull request #1164 from Accenture/develop

Release 6.0.1
Accenture · Jan 10, 2024 · 50a86b5 · 50a86b5
2 parents c25af29 + 98807df
commit 50a86b5
Show file tree

Hide file tree

Showing 18 changed files with 1,139 additions and 698 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -39,6 +39,7 @@ body:
           label: Version
           description: What version of our software are you running? (mcdev --version)
           options:
+              - 6.0.1
               - 6.0.0
               - 5.3.0
               - 5.2.0

diff --git a/lib/cli.js b/lib/cli.js
@@ -617,13 +617,13 @@ function csvToArray(csv) {
     return !csv
         ? null
         : csv.includes(',')
-        ? csv
-              .split(',')
-              .map((item) =>
-                  // allow whitespace in comma-separated lists
-                  item.trim()
-              )
-              // make sure trailing commas are ignored
-              .filter(Boolean)
-        : [csv.trim()].filter(Boolean);
+          ? csv
+                .split(',')
+                .map((item) =>
+                    // allow whitespace in comma-separated lists
+                    item.trim()
+                )
+                // make sure trailing commas are ignored
+                .filter(Boolean)
+          : [csv.trim()].filter(Boolean);
 }
diff --git a/lib/metadataTypes/Automation.js b/lib/metadataTypes/Automation.js
@@ -945,8 +945,8 @@ class Automation extends MetadataType {
                 item.type = scheduleHelper
                     ? 'scheduled'
                     : item.fileTrigger
-                    ? 'triggered'
-                    : undefined;
+                      ? 'triggered'
+                      : undefined;
 
                 // el.schedule.timezoneName
                 if (item.type === 'scheduled') {
@@ -1203,10 +1203,10 @@ class Automation extends MetadataType {
         const patternType = recurHelper['BYMONTH']
             ? 'ByMonth'
             : recurHelper['BYWEEK']
-            ? 'ByWeek'
-            : recurHelper['BYDAY']
-            ? 'ByDay'
-            : 'Interval';
+              ? 'ByWeek'
+              : recurHelper['BYDAY']
+                ? 'ByDay'
+                : 'Interval';
         schedule.Recurrence[keyStem + 'lyRecurrencePatternType'] = patternType;
         schedule.Recurrence['@_xsi:type'] = keyStem + 'lyRecurrence';
         schedule.RecurrenceType = keyStem + 'ly';
@@ -1387,8 +1387,8 @@ class Automation extends MetadataType {
                               ical.COUNT
                                   ? ` for ${ical.COUNT} times`
                                   : ical.UNTIL
-                                  ? ' until end date'
-                                  : ''
+                                    ? ' until end date'
+                                    : ''
                           }`;
                 output += '\n';
             } else if (json.schedule) {

diff --git a/lib/util/init.npm.js b/lib/util/init.npm.js
@@ -81,10 +81,10 @@ const Init = {
             versionsDefault[name] = Object.keys(Util.packageJsonMcdev.dependencies).includes(name)
                 ? Util.packageJsonMcdev.dependencies[name]
                 : // then check mcdev.devDependencies
-                Object.keys(Util.packageJsonMcdev.devDependencies).includes(name)
-                ? Util.packageJsonMcdev.devDependencies[name]
-                : // fallback to using latest version if not found
-                  'latest';
+                  Object.keys(Util.packageJsonMcdev.devDependencies).includes(name)
+                  ? Util.packageJsonMcdev.devDependencies[name]
+                  : // fallback to using latest version if not found
+                    'latest';
         }
 
         const versionsProject = {};

diff --git a/lib/util/util.js b/lib/util/util.js
@@ -805,9 +805,9 @@ export const Util = {
         // \s*      whitespace characters, zero or more times
         // [^>]*?   any character that is not a >, zero or more times, un-greedily
         // (.*)     capture any character, zero or more times
-        // /ms      multiline and dotall flags
+        // /s      dotall flag
         // ideally the code looks like <script runat="server">...</script>
-        const scriptRegex = /^<\s*script [^>]*?>(.*)<\/\s*script\s*>$/ms;
+        const scriptRegex = /^<\s*script [^>]*?>(.*)<\/\s*script\s*>$/s;
         code = code.trim();
         const regexMatches = scriptRegex.exec(code);
         if (regexMatches?.length > 1) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ body: @@
               label: Version
               description: What version of our software are you running? (mcdev --version)
               options:
+                  - 6.0.1
                   - 6.0.0
                   - 5.3.0
                   - 5.2.0
@@ Expand Down @@