chore(cli): Create 'convertToUnixPath' in fs-utils function (#1699)

ionic-team · Jun 24, 2019 · 044c3d4 · 044c3d4
1 parent 9780b6d
commit 044c3d4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/cli/src/android/common.ts b/cli/src/android/common.ts
@@ -2,7 +2,7 @@ import { runCommand } from '../common';
 import { Config } from '../config';
 import { getPluginPlatform, Plugin, PluginType } from '../plugin';
 import { mkdirs } from 'fs-extra';
-import { copyAsync, existsAsync, existsSync, readFileAsync, removeAsync, writeFileAsync } from '../util/fs';
+import { convertToUnixPath, copyAsync, existsAsync, existsSync, readFileAsync, removeAsync, writeFileAsync } from '../util/fs';
 import { resolve, join } from 'path';
 import { getIncompatibleCordovaPlugins } from '../cordova';
 
@@ -26,7 +26,7 @@ export function resolvePlugin(plugin: Plugin): Plugin | null {
     }
     plugin.android = {
       type: PluginType.Core,
-      path: pluginFilesPath.replace(/\\/g, '/')
+      path: convertToUnixPath(pluginFilesPath)
     };
   } else if (plugin.xml) {
     plugin.android = {

diff --git a/cli/src/android/update.ts b/cli/src/android/update.ts
@@ -3,7 +3,7 @@ import { buildXmlElement, checkPlatformVersions, logFatal, logInfo, parseXML, re
 import { getAllElements, getFilePath, getPlatformElement, getPluginPlatform, getPlugins, getPluginType, printPlugins, Plugin, PluginType } from '../plugin';
 import { getAndroidPlugins } from './common';
 import { checkAndInstallDependencies, handleCordovaPluginsJS } from '../cordova';
-import { copySync, readFileAsync, removeSync, writeFileAsync } from '../util/fs';
+import { convertToUnixPath, copySync, readFileAsync, removeSync, writeFileAsync} from '../util/fs';
 import { join, relative, resolve } from 'path';
 
 const platform = 'android';
@@ -54,12 +54,12 @@ export async function installGradlePlugins(config: Config, capacitorPlugins: Plu
 
   const settingsPath = join(config.app.rootDir, 'android');
   const dependencyPath = join(config.app.rootDir, 'android', 'app');
-  const relativeCapcitorAndroidPath = relative(settingsPath, capacitorAndroidPath).replace(/\\/g, '/');
+  const relativeCapcitorAndroidPath = convertToUnixPath(relative(settingsPath, capacitorAndroidPath));
   const settingsLines = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('${relativeCapcitorAndroidPath}')
 ${capacitorPlugins.map(p => {
-    const relativePluginPath = relative(settingsPath, p.rootPath).replace(/\\/g, '/');
+    const relativePluginPath = convertToUnixPath(relative(settingsPath, p.rootPath));
     return `
 include ':${getGradlePackageName(p.id)}'
 project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePluginPath}/${p.android!.path}')
@@ -70,7 +70,7 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
   let frameworksArray: Array<any> = [];
   let prefsArray: Array<any> = [];
   cordovaPlugins.map( p => {
-    const relativePluginPath = relative(dependencyPath, p.rootPath).replace(/\\/g, '/');
+    const relativePluginPath = convertToUnixPath(relative(dependencyPath, p.rootPath));
     const frameworks = getPlatformElement(p, platform, 'framework');
     frameworks.map((framework: any) => {
       if (framework.$.custom && framework.$.custom === 'true' && framework.$.type && framework.$.type === 'gradleReference') {
@@ -83,7 +83,7 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
   });
   let frameworkString = frameworksArray.join('\n');
   prefsArray.map((preference: any) => {
-    frameworkString = frameworkString.replace(new RegExp(('$'+preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);
+    frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);
   });
   const dependencyLines = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 
@@ -120,7 +120,7 @@ export async function handleCordovaPluginsGradle(config: Config,  cordovaPlugins
   let applyArray: Array<any> = [];
   applyArray.push(`apply from: "cordova.variables.gradle"`);
   cordovaPlugins.map( p => {
-    const relativePluginPath = relative(pluginsFolder, p.rootPath).replace(/\\/g, '/');
+    const relativePluginPath = convertToUnixPath(relative(pluginsFolder, p.rootPath));
     const frameworks = getPlatformElement(p, platform, 'framework');
     frameworks.map((framework: any) => {
       if (!framework.$.type && !framework.$.custom) {
@@ -267,4 +267,4 @@ function contains(a: Array<any>, obj: any, k: string) {
     }
   }
   return false;
-}
+}
diff --git a/cli/src/ios/update.ts b/cli/src/ios/update.ts
@@ -1,6 +1,6 @@
 import { checkCocoaPods, checkIOSProject, getIOSPlugins } from './common';
 import { CheckFunction, checkPlatformVersions, logFatal, resolveNode, runCommand, runTask } from '../common';
-import { copySync, readFileAsync, readFileSync, removeSync, writeFileAsync, writeFileSync } from '../util/fs';
+import { convertToUnixPath, copySync, readFileAsync, readFileSync, removeSync, writeFileAsync, writeFileSync } from '../util/fs';
 import { Config } from '../config';
 import { join, relative, resolve } from 'path';
 import { realpathSync } from 'fs';
@@ -95,7 +95,7 @@ export function generatePodFile(config: Config, plugins: Plugin[]) {
   }
 
   const podfilePath = join(config.app.rootDir, 'ios', 'App');
-  const relativeCapacitoriOSPath = relative(podfilePath, capacitoriOSPath).replace(/\\/g, '/');
+  const relativeCapacitoriOSPath = convertToUnixPath(relative(podfilePath, capacitoriOSPath));
 
   const capacitorPlugins = plugins.filter(p => getPluginType(p, platform) === PluginType.Core);
   const pods = capacitorPlugins

diff --git a/cli/src/util/fs.ts b/cli/src/util/fs.ts
@@ -30,3 +30,6 @@ export const existsAsync = async (path: string) => {
     return false;
   }
 };
+export const convertToUnixPath = (path: string) => {
+  return path.replace(/\\/g, '/');
+};