apn-app-manager 2.2.0 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apn-app-manager",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },

package/src/actions/cloneAction.js

@@ -366,11 +366,11 @@ function formatSelectedFilesLog() {
   for (const key of Object.keys(context)) {
     if (key.includes("Path") && !util.isBlank(context[key])) {
       if (!Array.isArray(context[key])) {
-        selectedFilesMap[key] = path.relative(cons.curDir, context[key]);
+        selectedFilesMap[key] = util.normalizeFilePath(path.relative(cons.curDir, context[key]));
       } else {
         let filePaths = [];
         context[key].forEach(filePath => {
-          filePaths.push(path.relative(cons.curDir, filePath));
+          filePaths.push(util.normalizeFilePath(path.relative(cons.curDir, filePath)));
         });
         selectedFilesMap[key] = lodash.sortBy(filePaths);
       }

package/src/handlers/fileSelectHandler.js

@@ -24,7 +24,7 @@ function selectFile(promptText, fileTypes, optional, multiple, ignoreFiles, leve
   let files = [];
   util.handleDirFiles(cons.curDir, fileTypes, levelsToParse, 1, function (filePath) {
     if (!lodash.includes(ignoreFiles, filePath)) {
-      files.push(path.relative(cons.curDir, filePath));
+      files.push(util.normalizeFilePath(path.relative(cons.curDir, filePath)));
     }
   });
   if (multiple) {

package/src/util.js

@@ -405,6 +405,11 @@ module.exports = {
 
   // Returns true if in test mode
   isTestMode: isTestMode,
+
+  // Normalizes a file path to always use forward slashes
+  normalizeFilePath: function (filePath) {
+    return filePath.replace(/\\/g, "/");
+  },
 };
 
 // ---------------------------------------------------
@@ -447,7 +452,7 @@ function str(strings, ...keys) {
 
 // Loops through a directory with a callback function
 function handleDir(dirName, filesOnly, fileTypes, levelsToParse, startAtLevel, parseLevel, callback) {
-  const contents = fs.readdirSync(dirName, "utf8", true);
+  const contents = fs.readdirSync(dirName, "utf8", true).sort();
   contents.forEach(content => {
     const contentPath = path.resolve(dirName, content);
     const isFile = fs.statSync(contentPath).isFile();