Merge branch 'release/3.2.2'

Author: junedomingo

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rename",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Rename react-native app with just one command",
   "main": "lib/index.js",
   "scripts": {
@@ -63,8 +63,9 @@
     "cheerio": "^1.0.0-rc.12",
     "commander": "^9.4.1",
     "dotenv": "^16.0.3",
-    "globby": "^13.1.2",
+    "globby": "^13.1.3",
     "html-entities": "^2.3.3",
+    "normalize-path": "^3.0.0",
     "replace-in-file": "^6.3.5",
     "shelljs": "^0.8.5",
     "update-check": "^1.5.4"

package.json

@@ -43,10 +43,11 @@ export const bundleIDToPath = bundleID => bundleID.replace(/\./g, '/');
 export const decodeXmlEntities = name => decode(name, { level: 'xml' });
 export const encodeXmlEntities = name =>
   encode(name, { mode: 'nonAscii', level: 'xml', numeric: 'hexadecimal' });
+const normalizePath = process.platform === 'win32' ? require('normalize-path') : p => p;
 const androidValuesStringsFullPath = path.join(APP_PATH, androidValuesStrings);
 
 export const validateCreation = () => {
-  const iosInfoPlistFullPath = globbySync(path.join(APP_PATH, iosPlist))[0];
+  const iosInfoPlistFullPath = globbySync(normalizePath(path.join(APP_PATH, iosPlist)))[0];
   const fileExists =
     fs.existsSync(iosInfoPlistFullPath) && fs.existsSync(androidValuesStringsFullPath);
 
@@ -139,7 +140,7 @@ const getElementFromXml = ({ filepath, selector }) => {
 };
 
 export const getIosCurrentName = () => {
-  const filepath = globbySync(path.join(APP_PATH, iosPlist))[0];
+  const filepath = globbySync(normalizePath(path.join(APP_PATH, iosPlist)))[0];
   const selector = 'dict > key:contains("CFBundleDisplayName") + string';
   const element = getElementFromXml({ filepath, selector });
 
@@ -167,7 +168,7 @@ export const getAndroidCurrentBundleID = () => {
  * @returns {string} The name of the xcode project folder
  */
 export const getIosXcodeProjectPathName = () => {
-  const xcodeProjectPath = globbySync(path.join(APP_PATH, iosXcodeproj), {
+  const xcodeProjectPath = globbySync(normalizePath(path.join(APP_PATH, iosXcodeproj)), {
     onlyDirectories: true,
   });
 
@@ -300,7 +301,7 @@ const updateElementInXml = async ({ filepath, selector, text }) => {
 
 export const updateIosNameInInfoPlist = async newName => {
   await updateElementInXml({
-    filepath: globbySync(path.join(APP_PATH, iosPlist))[0],
+    filepath: globbySync(normalizePath(path.join(APP_PATH, iosPlist)))[0],
     selector: 'dict > key:contains("CFBundleDisplayName") + string',
     text: newName,
   });
@@ -319,9 +320,9 @@ export const renameAndroidBundleIDFolders = async ({
   newBundleIDAsPath,
 }) => {
   const currentBundleIDFoldersRelativePaths = globbySync(
-    path.join(APP_PATH, `${androidJava}/${currentBundleIDAsPath}`),
+    normalizePath(path.join(APP_PATH, `${androidJava}`)),
     { onlyDirectories: true }
-  ).map(folderPath => toRelativePath(folderPath));
+  ).map(folderPath => normalizePath(toRelativePath(`${folderPath}/${currentBundleIDAsPath}`)));
 
   await renameFoldersAndFiles({
     foldersAndFilesPaths: currentBundleIDFoldersRelativePaths,
@@ -417,12 +418,15 @@ ${chalk.green('SUCCESS! 🎉 🎉 🎉')} Your app has been renamed to "${chalk.
     chalk.yellow(`- Make sure to check old .xcodeproj and .xcworkspace in ios folder, please delete them manually.
 - Please make sure to run "npx pod-install" and "watchman watch-del-all" before running the app.
 
-If you like this tool, please give it a star on GitHub: https://github.com/junedomingo/react-native-rename`)
+If you like this tool, please give it a star on GitHub: https://github.com/junedomingo/react-native-rename
+
+`)
   );
 };
 
 export const gitStageChanges = () => {
   shell.cd(APP_PATH);
+  shell.exec('git config --local core.autocrlf false');
   shell.exec('git add .');
 };