Refactor projectDir -> projectRoot (#3292)

expo · Mar 16, 2021 · 320f1b2 · 320f1b2
1 parent e180d0c
commit 320f1b2
Show file tree

Hide file tree

Showing 33 changed files with 357 additions and 348 deletions.
diff --git a/packages/config-plugins/src/android/Package.ts b/packages/config-plugins/src/android/Package.ts
@@ -147,8 +147,8 @@ export function setPackageInAndroidManifest(
   return androidManifest;
 }
 
-export async function getApplicationIdAsync(projectDir: string): Promise<string | null> {
-  const buildGradlePath = getAppBuildGradle(projectDir);
+export async function getApplicationIdAsync(projectRoot: string): Promise<string | null> {
+  const buildGradlePath = getAppBuildGradle(projectRoot);
   if (!(await fs.pathExists(buildGradlePath))) {
     return null;
   }

diff --git a/packages/dev-tools/server/DevToolsServer.ts b/packages/dev-tools/server/DevToolsServer.ts
@@ -49,7 +49,7 @@ export async function createAuthenticationContextAsync({ port }: { port: number
   };
 }
 
-export async function startAsync(projectDir: string): Promise<string> {
+export async function startAsync(projectRoot: string): Promise<string> {
   const port = await freeportAsync(19002, { hostnames: [null, 'localhost'] });
   const server = express();
 
@@ -73,19 +73,19 @@ export async function startAsync(projectDir: string): Promise<string> {
     httpServer.once('listening', resolve);
     httpServer.listen(port, listenHostname);
   });
-  startGraphQLServer(projectDir, httpServer, authenticationContext);
-  await ProjectSettings.setPackagerInfoAsync(projectDir, { devToolsPort: port });
+  startGraphQLServer(projectRoot, httpServer, authenticationContext);
+  await ProjectSettings.setPackagerInfoAsync(projectRoot, { devToolsPort: port });
   return `http://${listenHostname}:${port}`;
 }
 
 export function startGraphQLServer(
-  projectDir: string,
+  projectRoot: string,
   httpServer: http.Server,
   authenticationContext: any
 ) {
   const layout = createLayout();
   const issues = new Issues();
-  const messageBuffer = createMessageBuffer(projectDir, issues);
+  const messageBuffer = createMessageBuffer(projectRoot, issues);
   SubscriptionServer.create(
     {
       schema: GraphQLSchema,
@@ -94,7 +94,7 @@ export function startGraphQLServer(
       onOperation: (operation, params) => ({
         ...params,
         context: createContext({
-          projectDir,
+          projectDir: projectRoot,
           messageBuffer,
           layout,
           issues,

diff --git a/packages/expo-cli/e2e/__tests__/start-test.ts b/packages/expo-cli/e2e/__tests__/start-test.ts
@@ -6,7 +6,7 @@ import { ProjectSettings } from 'xdl';
 import { EXPO_CLI } from '../TestUtils';
 
 const tempDir = temporary.directory();
-const projectDir = path.join(tempDir, 'my-app');
+const projectRoot = path.join(tempDir, 'my-app');
 
 beforeAll(async () => {
   // jest.setTimeout(60000);
@@ -16,7 +16,7 @@ beforeAll(async () => {
 });
 
 xtest('start --offline', async () => {
-  const promise = spawnAsync(EXPO_CLI, ['start', '--offline'], { cwd: projectDir });
+  const promise = spawnAsync(EXPO_CLI, ['start', '--offline'], { cwd: projectRoot });
   const cli = promise.child;
 
   cli.stderr.pipe(process.stderr);
@@ -39,7 +39,7 @@ xtest('start --offline with existing packager info', async () => {
     packagerPid: 1337,
   });
 
-  const promise = spawnAsync(EXPO_CLI, ['start', '--offline'], { cwd: projectDir });
+  const promise = spawnAsync(EXPO_CLI, ['start', '--offline'], { cwd: projectRoot });
   const cli = promise.child;
 
   cli.stderr.pipe(process.stderr);

diff --git a/packages/expo-cli/src/commands/bundle-assets.ts b/packages/expo-cli/src/commands/bundle-assets.ts
@@ -11,9 +11,9 @@ type Options = {
   platform?: string;
 };
 
-async function action(projectDir: string, options: Options) {
+async function action(projectRoot: string, options: Options) {
   try {
-    await Detach.bundleAssetsAsync(projectDir, options);
+    await Detach.bundleAssetsAsync(projectRoot, options);
   } catch (e) {
     Log.error(e);
     Log.error(