@expo/cli 0.7.0 → 0.8.0

package/build/src/start/server/type-generation/routes.js

@@ -0,0 +1,292 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.setupTypedRoutes = setupTypedRoutes;
+exports.getTypedRoutesUtils = getTypedRoutesUtils;
+exports.extrapolateGroupRoutes = extrapolateGroupRoutes;
+exports.setToUnionType = exports.CAPTURE_GROUP_REGEX = exports.ARRAY_GROUP_REGEX = exports.SLUG = exports.CATCH_ALL = exports.CAPTURE_DYNAMIC_PARAMS = void 0;
+var _promises = _interopRequireDefault(require("fs/promises"));
+var _lodash = require("lodash");
+var _path = _interopRequireDefault(require("path"));
+var _template = require("../../../utils/template");
+var _metroWatchTypeScriptFiles = require("../metro/metroWatchTypeScriptFiles");
+var _router = require("../metro/router");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const CAPTURE_DYNAMIC_PARAMS = /\[(?:\.{3})?(\w*?)[\]$]/g;
+exports.CAPTURE_DYNAMIC_PARAMS = CAPTURE_DYNAMIC_PARAMS;
+const CATCH_ALL = /\[\.\.\..+?\]/g;
+exports.CATCH_ALL = CATCH_ALL;
+const SLUG = /\[.+?\]/g;
+exports.SLUG = SLUG;
+const ARRAY_GROUP_REGEX = /\(\w+?,.*?\)/g;
+exports.ARRAY_GROUP_REGEX = ARRAY_GROUP_REGEX;
+const CAPTURE_GROUP_REGEX = /[\\(,](\w+?)(?=[,\\)])/g;
+exports.CAPTURE_GROUP_REGEX = CAPTURE_GROUP_REGEX;
+async function setupTypedRoutes({ server , metro , typesDirectory , projectRoot  }) {
+    const appRoot = (0, _router).getExpoRouterRootDirectory(projectRoot);
+    const { filePathToRoute , staticRoutes , dynamicRoutes , addFilePath  } = getTypedRoutesUtils(appRoot);
+    if (metro) {
+        // Setup out watcher first
+        (0, _metroWatchTypeScriptFiles).metroWatchTypeScriptFiles({
+            projectRoot: appRoot,
+            server,
+            metro,
+            eventTypes: [
+                "add",
+                "delete",
+                "change"
+            ],
+            async callback ({ filePath , type  }) {
+                let shouldRegenerate = false;
+                if (type === "delete") {
+                    const route = filePathToRoute(filePath);
+                    staticRoutes.delete(route);
+                    dynamicRoutes.delete(route);
+                    shouldRegenerate = true;
+                } else {
+                    shouldRegenerate = addFilePath(filePath);
+                }
+                if (shouldRegenerate) {
+                    regenerateRouterDotTS(typesDirectory, new Set([
+                        ...staticRoutes.values()
+                    ].flatMap((v)=>Array.from(v)
+                    )), new Set([
+                        ...dynamicRoutes.values()
+                    ].flatMap((v)=>Array.from(v)
+                    )), new Set(dynamicRoutes.keys()));
+                }
+            }
+        });
+    }
+    // Do we need to walk the entire tree on startup?
+    // Idea: Store the list of files in the last write, then simply check Git for what files have changed
+    await walk(appRoot, addFilePath);
+    regenerateRouterDotTS(typesDirectory, new Set([
+        ...staticRoutes.values()
+    ].flatMap((v)=>Array.from(v)
+    )), new Set([
+        ...dynamicRoutes.values()
+    ].flatMap((v)=>Array.from(v)
+    )), new Set(dynamicRoutes.keys()));
+}
+/**
+ * Generate a router.d.ts file that contains all of the routes in the project.
+ * Should be debounced as its very common for developers to make changes to multiple files at once (eg Save All)
+ */ const regenerateRouterDotTS = (0, _lodash).debounce((typesDir, staticRoutes, dynamicRoutes, dynamicRouteTemplates)=>{
+    _promises.default.writeFile(_path.default.resolve(typesDir, "./router.d.ts"), routerDotTSTemplate({
+        staticRoutes: setToUnionType(staticRoutes),
+        dynamicRoutes: setToUnionType(dynamicRoutes),
+        dynamicRouteParams: setToUnionType(dynamicRouteTemplates)
+    }));
+}, 100);
+function getTypedRoutesUtils(appRoot) {
+    const staticRoutes = new Map([
+        [
+            "/",
+            new Set("/")
+        ]
+    ]);
+    const dynamicRoutes = new Map();
+    const filePathToRoute = (filePath)=>{
+        return filePath.replace(appRoot, "").replace(/index.[jt]sx?/, "").replace(/\.[jt]sx?$/, "");
+    };
+    const addFilePath = (filePath)=>{
+        if (filePath.match(/_layout\.[tj]sx?$/)) {
+            return false;
+        }
+        const route1 = filePathToRoute(filePath);
+        // We have already processed this file
+        if (staticRoutes.has(route1) || dynamicRoutes.has(route1)) {
+            return false;
+        }
+        const dynamicParams = new Set([
+            ...route1.matchAll(CAPTURE_DYNAMIC_PARAMS)
+        ].map((match)=>match[1]
+        ));
+        const isDynamic = dynamicParams.size > 0;
+        const addRoute = (originalRoute, route)=>{
+            if (isDynamic) {
+                let set = dynamicRoutes.get(originalRoute);
+                if (!set) {
+                    set = new Set();
+                    dynamicRoutes.set(originalRoute, set);
+                }
+                set.add(route.replaceAll(CATCH_ALL, "${CatchAllSlug<T>}").replaceAll(SLUG, "${SafeSlug<T>}"));
+            } else {
+                let set = staticRoutes.get(originalRoute);
+                if (!set) {
+                    set = new Set();
+                    staticRoutes.set(originalRoute, set);
+                }
+                set.add(route);
+            }
+        };
+        if (!route1.match(ARRAY_GROUP_REGEX)) {
+            addRoute(route1, route1);
+        }
+        // Does this route have a group? eg /(group)
+        if (route1.includes("/(")) {
+            const routeWithoutGroups = route1.replace(/\/\(.+?\)/g, "");
+            addRoute(route1, routeWithoutGroups);
+            // If there are multiple groups, we need to expand them
+            // eg /(test1,test2)/page => /test1/page & /test2/page
+            for (const routeWithSingleGroup of extrapolateGroupRoutes(route1)){
+                addRoute(route1, routeWithSingleGroup);
+            }
+        }
+        return true;
+    };
+    return {
+        staticRoutes,
+        dynamicRoutes,
+        filePathToRoute,
+        addFilePath
+    };
+}
+const setToUnionType = (set)=>{
+    return set.size > 0 ? [
+        ...set
+    ].map((s)=>`\`${s}\``
+    ).join(" | ") : "never";
+};
+exports.setToUnionType = setToUnionType;
+/**
+ * Recursively walk a directory and call the callback with the file path.
+ */ async function walk(directory, callback) {
+    const files = await _promises.default.readdir(directory);
+    for (const file of files){
+        const p = _path.default.join(directory, file);
+        if ((await _promises.default.stat(p)).isDirectory()) {
+            await walk(p, callback);
+        } else {
+            // Normalise the paths so they are easier to convert to URLs
+            const normalizedPath = p.replaceAll(_path.default.sep, "/").replaceAll(" ", "_");
+            callback(normalizedPath);
+        }
+    }
+}
+function extrapolateGroupRoutes(route, routes = new Set()) {
+    // Create a version with no groups. We will then need to cleanup double and/or trailing slashes
+    routes.add(route.replaceAll(ARRAY_GROUP_REGEX, "").replaceAll(/\/+/g, "/").replace(/\/$/, ""));
+    const match = route.match(ARRAY_GROUP_REGEX);
+    if (!match) {
+        routes.add(route);
+        return routes;
+    }
+    const groupsMatch = match[0];
+    for (const group of groupsMatch.matchAll(CAPTURE_GROUP_REGEX)){
+        extrapolateGroupRoutes(route.replace(groupsMatch, `(${group[1]})`), routes);
+    }
+    return routes;
+}
+/**
+ * NOTE: This code refers to a specific version of `expo-router` and is therefore unsafe to
+ * mix with arbitrary versions.
+ * TODO: Version this code with `expo-router` or version expo-router with `@expo/cli`.
+ */ const routerDotTSTemplate = _template.unsafeTemplate`declare module "expo-router" {
+  import type { LinkProps as OriginalLinkProps } from "expo-router/build/link/Link";
+  export * from "expo-router/build";
+
+  type StaticRoutes = ${"staticRoutes"}
+  type DynamicRoutes<T extends string> = ${"dynamicRoutes"}
+  type DynamicRouteTemplate = ${"dynamicRouteParams"} 
+
+  type SearchOrHash = \`?\${string}\` | \`#\${string}\`;
+
+  type RelativePathString = \`./\${string}\` | \`../\${string}\` | '..';
+
+  type Suffix = "" | SearchOrHash;
+
+  type SafeSlug<S extends string> = S extends \`\${string}/\${string}\`
+    ? never
+    : S extends \`\${string}\${SearchOrHash}\`
+    ? never
+    : S extends ""
+    ? never
+    : S;
+
+  type CatchAllSlug<S extends string> = S extends \`\${string}\${SearchOrHash}\`
+    ? never
+    : S extends ""
+    ? never
+    : S;
+
+  type InvaildPartialSlug = | \`\${string | never}\${'[' | ']'}\${string | never}\`
+
+  type IsParameter<Part> = Part extends \`[\${infer ParamName}]\`
+    ? ParamName
+    : never;
+
+  type FilteredParts<Path> = Path extends \`\${infer PartA}/\${infer PartB}\`
+    ? IsParameter<PartA> | FilteredParts<PartB>
+    : IsParameter<Path>;
+
+  type RouteParams<Path> = {
+    [Key in FilteredParts<Path> as Key extends \`...\${infer Name}\` ? Name : Key]: 
+      Key extends \`...\${string}\` ? string[] : string;
+  };
+
+  type Route<T> = T extends DynamicRouteTemplate
+    ? never
+    :
+        | StaticRoutes
+        | RelativePathString
+        | \`\${StaticRoutes}\${Suffix}\`
+        | (T extends \`\${DynamicRoutes<infer P>}\${Suffix}\`
+            ? P extends InvaildPartialSlug
+              ? never
+              : T
+            : never);
+
+  export type Href<T> = Route<T> | HrefObject<T> | DynamicRouteTemplate
+
+  export type HrefObject<T> = {
+    pathname: Route<T> | DynamicRouteTemplate
+  } & HrefObjectParams<T>;
+
+  type HrefObjectParams<T> = T extends RelativePathString
+    ? { params?: Record<string, string> }
+    : T extends { pathname: DynamicRouteTemplate }
+    ? { params: RouteParams<InferPathName<T>> }
+    : unknown;
+
+  /** Returns the search parameters for a route **/
+  export type SearchParams<T extends DynamicRouteTemplate | StaticRoutes | RelativePathString> =
+    T extends DynamicRouteTemplate ? RouteParams<T> : {};
+
+  type InferPathName<T> = T extends { pathname: infer P } ? P : never;
+
+  export interface LinkProps<T> extends OriginalLinkProps {
+    href: T extends DynamicRouteTemplate ? HrefObject<T> : Href<T>;
+  }
+
+  export interface LinkComponent {
+    <T>(props: React.PropsWithChildren<LinkProps<T>>): JSX.Element;
+    /** Helper method to resolve an Href object into a string. */
+    resolveHref: <T>(href: Href<T>) => string;
+  }
+
+  export const Link: LinkComponent;
+
+  export type Router = {
+    /** Navigate to the provided href. */
+    push: <T>(href: Href<T>) => void;
+    /** Navigate to route without appending to the history. */
+    replace: <T>(href: Href<T>) => void;
+    /** Go back in the history. */
+    back: () => void;
+    /** Update the current route query params. */
+    setParams: <T extends string = ''>(params?: T extends '' ? Record<string, string> : RouteParams<T>) => void;
+  };
+
+  export function useRouter<T>(): Router<T>
+  export function useLocalSearchParams<T extends DynamicRouteTemplate | StaticRoutes | RelativePathString>(): SearchParams<T>
+}
+`;
+
+//# sourceMappingURL=routes.js.map

package/build/src/start/server/type-generation/routes.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/type-generation/routes.ts"],"sourcesContent":["import fs from 'fs/promises';\nimport { debounce } from 'lodash';\nimport { Server } from 'metro';\nimport path from 'path';\n\nimport { unsafeTemplate } from '../../../utils/template';\nimport { ServerLike } from '../BundlerDevServer';\nimport { metroWatchTypeScriptFiles } from '../metro/metroWatchTypeScriptFiles';\nimport { getExpoRouterRootDirectory } from '../metro/router';\n\n// /test/[...param1]/[param2]/[param3] - captures [\"param1\", \"param2\", \"param3\"]\nexport const CAPTURE_DYNAMIC_PARAMS = /\\[(?:\\.{3})?(\\w*?)[\\]$]/g;\n// /[...param1]/ - Match [...param1]\nexport const CATCH_ALL = /\\[\\.\\.\\..+?\\]/g;\n// /[param1] - Match [param1]\nexport const SLUG = /\\[.+?\\]/g;\n// /(group1,group2,group3)/test - match (group1,group2,group3)\nexport const ARRAY_GROUP_REGEX = /\\(\\w+?,.*?\\)/g;\n// /(group1,group2,group3)/test - captures [\"group1\", \"group2\", \"group3\"]\nexport const CAPTURE_GROUP_REGEX = /[\\\\(,](\\w+?)(?=[,\\\\)])/g;\n\nexport interface SetupTypedRoutesOptions {\n  server: ServerLike;\n  metro?: Server | null;\n  typesDirectory: string;\n  projectRoot: string;\n}\n\nexport async function setupTypedRoutes({\n  server,\n  metro,\n  typesDirectory,\n  projectRoot,\n}: SetupTypedRoutesOptions) {\n  const appRoot = getExpoRouterRootDirectory(projectRoot);\n\n  const { filePathToRoute, staticRoutes, dynamicRoutes, addFilePath } =\n    getTypedRoutesUtils(appRoot);\n\n  if (metro) {\n    // Setup out watcher first\n    metroWatchTypeScriptFiles({\n      projectRoot: appRoot,\n      server,\n      metro,\n      eventTypes: ['add', 'delete', 'change'],\n      async callback({ filePath, type }) {\n        let shouldRegenerate = false;\n        if (type === 'delete') {\n          const route = filePathToRoute(filePath);\n          staticRoutes.delete(route);\n          dynamicRoutes.delete(route);\n          shouldRegenerate = true;\n        } else {\n          shouldRegenerate = addFilePath(filePath);\n        }\n\n        if (shouldRegenerate) {\n          regenerateRouterDotTS(\n            typesDirectory,\n            new Set([...staticRoutes.values()].flatMap((v) => Array.from(v))),\n            new Set([...dynamicRoutes.values()].flatMap((v) => Array.from(v))),\n            new Set(dynamicRoutes.keys())\n          );\n        }\n      },\n    });\n  }\n\n  // Do we need to walk the entire tree on startup?\n  // Idea: Store the list of files in the last write, then simply check Git for what files have changed\n  await walk(appRoot, addFilePath);\n\n  regenerateRouterDotTS(\n    typesDirectory,\n    new Set([...staticRoutes.values()].flatMap((v) => Array.from(v))),\n    new Set([...dynamicRoutes.values()].flatMap((v) => Array.from(v))),\n    new Set(dynamicRoutes.keys())\n  );\n}\n\n/**\n * Generate a router.d.ts file that contains all of the routes in the project.\n * Should be debounced as its very common for developers to make changes to multiple files at once (eg Save All)\n */\nconst regenerateRouterDotTS = debounce(\n  (\n    typesDir: string,\n    staticRoutes: Set<string>,\n    dynamicRoutes: Set<string>,\n    dynamicRouteTemplates: Set<string>\n  ) => {\n    fs.writeFile(\n      path.resolve(typesDir, './router.d.ts'),\n      routerDotTSTemplate({\n        staticRoutes: setToUnionType(staticRoutes),\n        dynamicRoutes: setToUnionType(dynamicRoutes),\n        dynamicRouteParams: setToUnionType(dynamicRouteTemplates),\n      })\n    );\n  },\n  100\n);\n\n/**\n * Utility functions for typed routes\n *\n * These are extracted for easier testing\n */\nexport function getTypedRoutesUtils(appRoot: string) {\n  const staticRoutes = new Map<string, Set<string>>([['/', new Set('/')]]);\n  const dynamicRoutes = new Map<string, Set<string>>();\n\n  const filePathToRoute = (filePath: string) => {\n    return filePath\n      .replace(appRoot, '')\n      .replace(/index.[jt]sx?/, '')\n      .replace(/\\.[jt]sx?$/, '');\n  };\n\n  const addFilePath = (filePath: string): boolean => {\n    if (filePath.match(/_layout\\.[tj]sx?$/)) {\n      return false;\n    }\n\n    const route = filePathToRoute(filePath);\n\n    // We have already processed this file\n    if (staticRoutes.has(route) || dynamicRoutes.has(route)) {\n      return false;\n    }\n\n    const dynamicParams = new Set(\n      [...route.matchAll(CAPTURE_DYNAMIC_PARAMS)].map((match) => match[1])\n    );\n    const isDynamic = dynamicParams.size > 0;\n\n    const addRoute = (originalRoute: string, route: string) => {\n      if (isDynamic) {\n        let set = dynamicRoutes.get(originalRoute);\n\n        if (!set) {\n          set = new Set();\n          dynamicRoutes.set(originalRoute, set);\n        }\n\n        set.add(\n          route.replaceAll(CATCH_ALL, '${CatchAllSlug<T>}').replaceAll(SLUG, '${SafeSlug<T>}')\n        );\n      } else {\n        let set = staticRoutes.get(originalRoute);\n\n        if (!set) {\n          set = new Set();\n          staticRoutes.set(originalRoute, set);\n        }\n\n        set.add(route);\n      }\n    };\n\n    if (!route.match(ARRAY_GROUP_REGEX)) {\n      addRoute(route, route);\n    }\n\n    // Does this route have a group? eg /(group)\n    if (route.includes('/(')) {\n      const routeWithoutGroups = route.replace(/\\/\\(.+?\\)/g, '');\n      addRoute(route, routeWithoutGroups);\n\n      // If there are multiple groups, we need to expand them\n      // eg /(test1,test2)/page => /test1/page & /test2/page\n      for (const routeWithSingleGroup of extrapolateGroupRoutes(route)) {\n        addRoute(route, routeWithSingleGroup);\n      }\n    }\n\n    return true;\n  };\n\n  return {\n    staticRoutes,\n    dynamicRoutes,\n    filePathToRoute,\n    addFilePath,\n  };\n}\n\nexport const setToUnionType = <T>(set: Set<T>) => {\n  return set.size > 0 ? [...set].map((s) => `\\`${s}\\``).join(' | ') : 'never';\n};\n\n/**\n * Recursively walk a directory and call the callback with the file path.\n */\nasync function walk(directory: string, callback: (filePath: string) => void) {\n  const files = await fs.readdir(directory);\n  for (const file of files) {\n    const p = path.join(directory, file);\n    if ((await fs.stat(p)).isDirectory()) {\n      await walk(p, callback);\n    } else {\n      // Normalise the paths so they are easier to convert to URLs\n      const normalizedPath = p.replaceAll(path.sep, '/').replaceAll(' ', '_');\n      callback(normalizedPath);\n    }\n  }\n}\n\n/**\n * Given a route, return all possible routes that could be generated from it.\n */\nexport function extrapolateGroupRoutes(\n  route: string,\n  routes: Set<string> = new Set()\n): Set<string> {\n  // Create a version with no groups. We will then need to cleanup double and/or trailing slashes\n  routes.add(route.replaceAll(ARRAY_GROUP_REGEX, '').replaceAll(/\\/+/g, '/').replace(/\\/$/, ''));\n\n  const match = route.match(ARRAY_GROUP_REGEX);\n\n  if (!match) {\n    routes.add(route);\n    return routes;\n  }\n\n  const groupsMatch = match[0];\n\n  for (const group of groupsMatch.matchAll(CAPTURE_GROUP_REGEX)) {\n    extrapolateGroupRoutes(route.replace(groupsMatch, `(${group[1]})`), routes);\n  }\n\n  return routes;\n}\n\n/**\n * NOTE: This code refers to a specific version of `expo-router` and is therefore unsafe to\n * mix with arbitrary versions.\n * TODO: Version this code with `expo-router` or version expo-router with `@expo/cli`.\n */\nconst routerDotTSTemplate = unsafeTemplate`declare module \"expo-router\" {\n  import type { LinkProps as OriginalLinkProps } from \"expo-router/build/link/Link\";\n  export * from \"expo-router/build\";\n\n  type StaticRoutes = ${'staticRoutes'}\n  type DynamicRoutes<T extends string> = ${'dynamicRoutes'}\n  type DynamicRouteTemplate = ${'dynamicRouteParams'} \n\n  type SearchOrHash = \\`?\\${string}\\` | \\`#\\${string}\\`;\n\n  type RelativePathString = \\`./\\${string}\\` | \\`../\\${string}\\` | '..';\n\n  type Suffix = \"\" | SearchOrHash;\n\n  type SafeSlug<S extends string> = S extends \\`\\${string}/\\${string}\\`\n    ? never\n    : S extends \\`\\${string}\\${SearchOrHash}\\`\n    ? never\n    : S extends \"\"\n    ? never\n    : S;\n\n  type CatchAllSlug<S extends string> = S extends \\`\\${string}\\${SearchOrHash}\\`\n    ? never\n    : S extends \"\"\n    ? never\n    : S;\n\n  type InvaildPartialSlug = | \\`\\${string | never}\\${'[' | ']'}\\${string | never}\\`\n\n  type IsParameter<Part> = Part extends \\`[\\${infer ParamName}]\\`\n    ? ParamName\n    : never;\n\n  type FilteredParts<Path> = Path extends \\`\\${infer PartA}/\\${infer PartB}\\`\n    ? IsParameter<PartA> | FilteredParts<PartB>\n    : IsParameter<Path>;\n\n  type RouteParams<Path> = {\n    [Key in FilteredParts<Path> as Key extends \\`...\\${infer Name}\\` ? Name : Key]: \n      Key extends \\`...\\${string}\\` ? string[] : string;\n  };\n\n  type Route<T> = T extends DynamicRouteTemplate\n    ? never\n    :\n        | StaticRoutes\n        | RelativePathString\n        | \\`\\${StaticRoutes}\\${Suffix}\\`\n        | (T extends \\`\\${DynamicRoutes<infer P>}\\${Suffix}\\`\n            ? P extends InvaildPartialSlug\n              ? never\n              : T\n            : never);\n\n  export type Href<T> = Route<T> | HrefObject<T> | DynamicRouteTemplate\n\n  export type HrefObject<T> = {\n    pathname: Route<T> | DynamicRouteTemplate\n  } & HrefObjectParams<T>;\n\n  type HrefObjectParams<T> = T extends RelativePathString\n    ? { params?: Record<string, string> }\n    : T extends { pathname: DynamicRouteTemplate }\n    ? { params: RouteParams<InferPathName<T>> }\n    : unknown;\n\n  /** Returns the search parameters for a route **/\n  export type SearchParams<T extends DynamicRouteTemplate | StaticRoutes | RelativePathString> =\n    T extends DynamicRouteTemplate ? RouteParams<T> : {};\n\n  type InferPathName<T> = T extends { pathname: infer P } ? P : never;\n\n  export interface LinkProps<T> extends OriginalLinkProps {\n    href: T extends DynamicRouteTemplate ? HrefObject<T> : Href<T>;\n  }\n\n  export interface LinkComponent {\n    <T>(props: React.PropsWithChildren<LinkProps<T>>): JSX.Element;\n    /** Helper method to resolve an Href object into a string. */\n    resolveHref: <T>(href: Href<T>) => string;\n  }\n\n  export const Link: LinkComponent;\n\n  export type Router = {\n    /** Navigate to the provided href. */\n    push: <T>(href: Href<T>) => void;\n    /** Navigate to route without appending to the history. */\n    replace: <T>(href: Href<T>) => void;\n    /** Go back in the history. */\n    back: () => void;\n    /** Update the current route query params. */\n    setParams: <T extends string = ''>(params?: T extends '' ? Record<string, string> : RouteParams<T>) => void;\n  };\n\n  export function useRouter<T>(): Router<T>\n  export function useLocalSearchParams<T extends DynamicRouteTemplate | StaticRoutes | RelativePathString>(): SearchParams<T>\n}\n`;\n"],"names":["setupTypedRoutes","getTypedRoutesUtils","extrapolateGroupRoutes","CAPTURE_DYNAMIC_PARAMS","CATCH_ALL","SLUG","ARRAY_GROUP_REGEX","CAPTURE_GROUP_REGEX","server","metro","typesDirectory","projectRoot","appRoot","getExpoRouterRootDirectory","filePathToRoute","staticRoutes","dynamicRoutes","addFilePath","metroWatchTypeScriptFiles","eventTypes","callback","filePath","type","shouldRegenerate","route","delete","regenerateRouterDotTS","Set","values","flatMap","v","Array","from","keys","walk","debounce","typesDir","dynamicRouteTemplates","fs","writeFile","path","resolve","routerDotTSTemplate","setToUnionType","dynamicRouteParams","Map","replace","match","has","dynamicParams","matchAll","map","isDynamic","size","addRoute","originalRoute","set","get","add","replaceAll","includes","routeWithoutGroups","routeWithSingleGroup","s","join","directory","files","readdir","file","p","stat","isDirectory","normalizedPath","sep","routes","groupsMatch","group","unsafeTemplate"],"mappings":"AAAA;;;;QA4BsBA,gBAAgB,GAAhBA,gBAAgB;QAiFtBC,mBAAmB,GAAnBA,mBAAmB;QAuGnBC,sBAAsB,GAAtBA,sBAAsB;;AApNvB,IAAA,SAAa,kCAAb,aAAa,EAAA;AACH,IAAA,OAAQ,WAAR,QAAQ,CAAA;AAEhB,IAAA,KAAM,kCAAN,MAAM,EAAA;AAEQ,IAAA,SAAyB,WAAzB,yBAAyB,CAAA;AAEd,IAAA,0BAAoC,WAApC,oCAAoC,CAAA;AACnC,IAAA,OAAiB,WAAjB,iBAAiB,CAAA;;;;;;AAGrD,MAAMC,sBAAsB,6BAA6B,AAAC;QAApDA,sBAAsB,GAAtBA,sBAAsB;AAE5B,MAAMC,SAAS,mBAAmB,AAAC;QAA7BA,SAAS,GAATA,SAAS;AAEf,MAAMC,IAAI,aAAa,AAAC;QAAlBA,IAAI,GAAJA,IAAI;AAEV,MAAMC,iBAAiB,kBAAkB,AAAC;QAApCA,iBAAiB,GAAjBA,iBAAiB;AAEvB,MAAMC,mBAAmB,4BAA4B,AAAC;QAAhDA,mBAAmB,GAAnBA,mBAAmB;AASzB,eAAeP,gBAAgB,CAAC,EACrCQ,MAAM,CAAA,EACNC,KAAK,CAAA,EACLC,cAAc,CAAA,EACdC,WAAW,CAAA,EACa,EAAE;IAC1B,MAAMC,OAAO,GAAGC,CAAAA,GAAAA,OAA0B,AAAa,CAAA,2BAAb,CAACF,WAAW,CAAC,AAAC;IAExD,MAAM,EAAEG,eAAe,CAAA,EAAEC,YAAY,CAAA,EAAEC,aAAa,CAAA,EAAEC,WAAW,CAAA,EAAE,GACjEhB,mBAAmB,CAACW,OAAO,CAAC,AAAC;IAE/B,IAAIH,KAAK,EAAE;QACT,0BAA0B;QAC1BS,CAAAA,GAAAA,0BAAyB,AAyBvB,CAAA,0BAzBuB,CAAC;YACxBP,WAAW,EAAEC,OAAO;YACpBJ,MAAM;YACNC,KAAK;YACLU,UAAU,EAAE;gBAAC,KAAK;gBAAE,QAAQ;gBAAE,QAAQ;aAAC;YACvC,MAAMC,QAAQ,EAAC,EAAEC,QAAQ,CAAA,EAAEC,IAAI,CAAA,EAAE,EAAE;gBACjC,IAAIC,gBAAgB,GAAG,KAAK,AAAC;gBAC7B,IAAID,IAAI,KAAK,QAAQ,EAAE;oBACrB,MAAME,KAAK,GAAGV,eAAe,CAACO,QAAQ,CAAC,AAAC;oBACxCN,YAAY,CAACU,MAAM,CAACD,KAAK,CAAC,CAAC;oBAC3BR,aAAa,CAACS,MAAM,CAACD,KAAK,CAAC,CAAC;oBAC5BD,gBAAgB,GAAG,IAAI,CAAC;iBACzB,MAAM;oBACLA,gBAAgB,GAAGN,WAAW,CAACI,QAAQ,CAAC,CAAC;iBAC1C;gBAED,IAAIE,gBAAgB,EAAE;oBACpBG,qBAAqB,CACnBhB,cAAc,EACd,IAAIiB,GAAG,CAAC;2BAAIZ,YAAY,CAACa,MAAM,EAAE;qBAAC,CAACC,OAAO,CAAC,CAACC,CAAC,GAAKC,KAAK,CAACC,IAAI,CAACF,CAAC,CAAC;oBAAA,CAAC,CAAC,EACjE,IAAIH,GAAG,CAAC;2BAAIX,aAAa,CAACY,MAAM,EAAE;qBAAC,CAACC,OAAO,CAAC,CAACC,CAAC,GAAKC,KAAK,CAACC,IAAI,CAACF,CAAC,CAAC;oBAAA,CAAC,CAAC,EAClE,IAAIH,GAAG,CAACX,aAAa,CAACiB,IAAI,EAAE,CAAC,CAC9B,CAAC;iBACH;aACF;SACF,CAAC,CAAC;KACJ;IAED,iDAAiD;IACjD,qGAAqG;IACrG,MAAMC,IAAI,CAACtB,OAAO,EAAEK,WAAW,CAAC,CAAC;IAEjCS,qBAAqB,CACnBhB,cAAc,EACd,IAAIiB,GAAG,CAAC;WAAIZ,YAAY,CAACa,MAAM,EAAE;KAAC,CAACC,OAAO,CAAC,CAACC,CAAC,GAAKC,KAAK,CAACC,IAAI,CAACF,CAAC,CAAC;IAAA,CAAC,CAAC,EACjE,IAAIH,GAAG,CAAC;WAAIX,aAAa,CAACY,MAAM,EAAE;KAAC,CAACC,OAAO,CAAC,CAACC,CAAC,GAAKC,KAAK,CAACC,IAAI,CAACF,CAAC,CAAC;IAAA,CAAC,CAAC,EAClE,IAAIH,GAAG,CAACX,aAAa,CAACiB,IAAI,EAAE,CAAC,CAC9B,CAAC;CACH;AAED;;;GAGG,CACH,MAAMP,qBAAqB,GAAGS,CAAAA,GAAAA,OAAQ,AAiBrC,CAAA,SAjBqC,CACpC,CACEC,QAAgB,EAChBrB,YAAyB,EACzBC,aAA0B,EAC1BqB,qBAAkC,GAC/B;IACHC,SAAE,QAAA,CAACC,SAAS,CACVC,KAAI,QAAA,CAACC,OAAO,CAACL,QAAQ,EAAE,eAAe,CAAC,EACvCM,mBAAmB,CAAC;QAClB3B,YAAY,EAAE4B,cAAc,CAAC5B,YAAY,CAAC;QAC1CC,aAAa,EAAE2B,cAAc,CAAC3B,aAAa,CAAC;QAC5C4B,kBAAkB,EAAED,cAAc,CAACN,qBAAqB,CAAC;KAC1D,CAAC,CACH,CAAC;CACH,EACD,GAAG,CACJ,AAAC;AAOK,SAASpC,mBAAmB,CAACW,OAAe,EAAE;IACnD,MAAMG,YAAY,GAAG,IAAI8B,GAAG,CAAsB;QAAC;YAAC,GAAG;YAAE,IAAIlB,GAAG,CAAC,GAAG,CAAC;SAAC;KAAC,CAAC,AAAC;IACzE,MAAMX,aAAa,GAAG,IAAI6B,GAAG,EAAuB,AAAC;IAErD,MAAM/B,eAAe,GAAG,CAACO,QAAgB,GAAK;QAC5C,OAAOA,QAAQ,CACZyB,OAAO,CAAClC,OAAO,EAAE,EAAE,CAAC,CACpBkC,OAAO,kBAAkB,EAAE,CAAC,CAC5BA,OAAO,eAAe,EAAE,CAAC,CAAC;KAC9B,AAAC;IAEF,MAAM7B,WAAW,GAAG,CAACI,QAAgB,GAAc;QACjD,IAAIA,QAAQ,CAAC0B,KAAK,qBAAqB,EAAE;YACvC,OAAO,KAAK,CAAC;SACd;QAED,MAAMvB,MAAK,GAAGV,eAAe,CAACO,QAAQ,CAAC,AAAC;QAExC,sCAAsC;QACtC,IAAIN,YAAY,CAACiC,GAAG,CAACxB,MAAK,CAAC,IAAIR,aAAa,CAACgC,GAAG,CAACxB,MAAK,CAAC,EAAE;YACvD,OAAO,KAAK,CAAC;SACd;QAED,MAAMyB,aAAa,GAAG,IAAItB,GAAG,CAC3B;eAAIH,MAAK,CAAC0B,QAAQ,CAAC/C,sBAAsB,CAAC;SAAC,CAACgD,GAAG,CAAC,CAACJ,KAAK,GAAKA,KAAK,CAAC,CAAC,CAAC;QAAA,CAAC,CACrE,AAAC;QACF,MAAMK,SAAS,GAAGH,aAAa,CAACI,IAAI,GAAG,CAAC,AAAC;QAEzC,MAAMC,QAAQ,GAAG,CAACC,aAAqB,EAAE/B,KAAa,GAAK;YACzD,IAAI4B,SAAS,EAAE;gBACb,IAAII,GAAG,GAAGxC,aAAa,CAACyC,GAAG,CAACF,aAAa,CAAC,AAAC;gBAE3C,IAAI,CAACC,GAAG,EAAE;oBACRA,GAAG,GAAG,IAAI7B,GAAG,EAAE,CAAC;oBAChBX,aAAa,CAACwC,GAAG,CAACD,aAAa,EAAEC,GAAG,CAAC,CAAC;iBACvC;gBAEDA,GAAG,CAACE,GAAG,CACLlC,KAAK,CAACmC,UAAU,CAACvD,SAAS,EAAE,oBAAoB,CAAC,CAACuD,UAAU,CAACtD,IAAI,EAAE,gBAAgB,CAAC,CACrF,CAAC;aACH,MAAM;gBACL,IAAImD,GAAG,GAAGzC,YAAY,CAAC0C,GAAG,CAACF,aAAa,CAAC,AAAC;gBAE1C,IAAI,CAACC,GAAG,EAAE;oBACRA,GAAG,GAAG,IAAI7B,GAAG,EAAE,CAAC;oBAChBZ,YAAY,CAACyC,GAAG,CAACD,aAAa,EAAEC,GAAG,CAAC,CAAC;iBACtC;gBAEDA,GAAG,CAACE,GAAG,CAAClC,KAAK,CAAC,CAAC;aAChB;SACF,AAAC;QAEF,IAAI,CAACA,MAAK,CAACuB,KAAK,CAACzC,iBAAiB,CAAC,EAAE;YACnCgD,QAAQ,CAAC9B,MAAK,EAAEA,MAAK,CAAC,CAAC;SACxB;QAED,4CAA4C;QAC5C,IAAIA,MAAK,CAACoC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACxB,MAAMC,kBAAkB,GAAGrC,MAAK,CAACsB,OAAO,eAAe,EAAE,CAAC,AAAC;YAC3DQ,QAAQ,CAAC9B,MAAK,EAAEqC,kBAAkB,CAAC,CAAC;YAEpC,uDAAuD;YACvD,sDAAsD;YACtD,KAAK,MAAMC,oBAAoB,IAAI5D,sBAAsB,CAACsB,MAAK,CAAC,CAAE;gBAChE8B,QAAQ,CAAC9B,MAAK,EAAEsC,oBAAoB,CAAC,CAAC;aACvC;SACF;QAED,OAAO,IAAI,CAAC;KACb,AAAC;IAEF,OAAO;QACL/C,YAAY;QACZC,aAAa;QACbF,eAAe;QACfG,WAAW;KACZ,CAAC;CACH;AAEM,MAAM0B,cAAc,GAAG,CAAIa,GAAW,GAAK;IAChD,OAAOA,GAAG,CAACH,IAAI,GAAG,CAAC,GAAG;WAAIG,GAAG;KAAC,CAACL,GAAG,CAAC,CAACY,CAAC,GAAK,CAAC,EAAE,EAAEA,CAAC,CAAC,EAAE,CAAC;IAAA,CAAC,CAACC,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;CAC7E,AAAC;QAFWrB,cAAc,GAAdA,cAAc;AAI3B;;GAEG,CACH,eAAeT,IAAI,CAAC+B,SAAiB,EAAE7C,QAAoC,EAAE;IAC3E,MAAM8C,KAAK,GAAG,MAAM5B,SAAE,QAAA,CAAC6B,OAAO,CAACF,SAAS,CAAC,AAAC;IAC1C,KAAK,MAAMG,IAAI,IAAIF,KAAK,CAAE;QACxB,MAAMG,CAAC,GAAG7B,KAAI,QAAA,CAACwB,IAAI,CAACC,SAAS,EAAEG,IAAI,CAAC,AAAC;QACrC,IAAI,CAAC,MAAM9B,SAAE,QAAA,CAACgC,IAAI,CAACD,CAAC,CAAC,CAAC,CAACE,WAAW,EAAE,EAAE;YACpC,MAAMrC,IAAI,CAACmC,CAAC,EAAEjD,QAAQ,CAAC,CAAC;SACzB,MAAM;YACL,4DAA4D;YAC5D,MAAMoD,cAAc,GAAGH,CAAC,CAACV,UAAU,CAACnB,KAAI,QAAA,CAACiC,GAAG,EAAE,GAAG,CAAC,CAACd,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,AAAC;YACxEvC,QAAQ,CAACoD,cAAc,CAAC,CAAC;SAC1B;KACF;CACF;AAKM,SAAStE,sBAAsB,CACpCsB,KAAa,EACbkD,MAAmB,GAAG,IAAI/C,GAAG,EAAE,EAClB;IACb,+FAA+F;IAC/F+C,MAAM,CAAChB,GAAG,CAAClC,KAAK,CAACmC,UAAU,CAACrD,iBAAiB,EAAE,EAAE,CAAC,CAACqD,UAAU,SAAS,GAAG,CAAC,CAACb,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAC;IAE/F,MAAMC,KAAK,GAAGvB,KAAK,CAACuB,KAAK,CAACzC,iBAAiB,CAAC,AAAC;IAE7C,IAAI,CAACyC,KAAK,EAAE;QACV2B,MAAM,CAAChB,GAAG,CAAClC,KAAK,CAAC,CAAC;QAClB,OAAOkD,MAAM,CAAC;KACf;IAED,MAAMC,WAAW,GAAG5B,KAAK,CAAC,CAAC,CAAC,AAAC;IAE7B,KAAK,MAAM6B,KAAK,IAAID,WAAW,CAACzB,QAAQ,CAAC3C,mBAAmB,CAAC,CAAE;QAC7DL,sBAAsB,CAACsB,KAAK,CAACsB,OAAO,CAAC6B,WAAW,EAAE,CAAC,CAAC,EAAEC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAEF,MAAM,CAAC,CAAC;KAC7E;IAED,OAAOA,MAAM,CAAC;CACf;AAED;;;;GAIG,CACH,MAAMhC,mBAAmB,GAAGmC,SAAc,eAAA,CAAC;;;;sBAIrB,EAAE,cAAc,CAAC;yCACE,EAAE,eAAe,CAAC;8BAC7B,EAAE,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6FrD,CAAC,AAAC"}

package/build/src/start/server/type-generation/tsconfig.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.forceUpdateTSConfig = forceUpdateTSConfig;
+exports.getTSConfigUpdates = getTSConfigUpdates;
+exports.forceRemovalTSConfig = forceRemovalTSConfig;
+exports.getTSConfigRemoveUpdates = getTSConfigRemoveUpdates;
+var _jsonFile = _interopRequireDefault(require("@expo/json-file"));
+var _chalk = _interopRequireDefault(require("chalk"));
+var _path = _interopRequireDefault(require("path"));
+var _log = require("../../../log");
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+async function forceUpdateTSConfig(projectRoot) {
+    // This runs after the TypeScript prerequisite, so we know the tsconfig.json exists
+    const tsConfigPath = _path.default.join(projectRoot, "tsconfig.json");
+    const { tsConfig , updates  } = getTSConfigUpdates(_jsonFile.default.read(tsConfigPath, {
+        json5: true
+    }));
+    await writeUpdates(tsConfigPath, tsConfig, updates);
+}
+function getTSConfigUpdates(tsConfig) {
+    const updates = new Set();
+    if (!tsConfig.include) {
+        tsConfig.include = [
+            "**/*.ts",
+            "**/*.tsx",
+            ".expo/types/**/*.ts",
+            "expo-env.d.ts"
+        ];
+        updates.add("include");
+    } else if (Array.isArray(tsConfig.include)) {
+        if (!tsConfig.include.includes(".expo/types/**/*.ts")) {
+            tsConfig.include = [
+                ...tsConfig.include,
+                ".expo/types/**/*.ts"
+            ];
+            updates.add("include");
+        }
+        if (!tsConfig.include.includes("expo-env.d.ts")) {
+            tsConfig.include = [
+                ...tsConfig.include,
+                "expo-env.d.ts"
+            ];
+            updates.add("include");
+        }
+    }
+    return {
+        tsConfig,
+        updates
+    };
+}
+async function forceRemovalTSConfig(projectRoot) {
+    // This runs after the TypeScript prerequisite, so we know the tsconfig.json exists
+    const tsConfigPath = _path.default.join(projectRoot, "tsconfig.json");
+    const { tsConfig , updates  } = getTSConfigRemoveUpdates(_jsonFile.default.read(tsConfigPath, {
+        json5: true
+    }));
+    await writeUpdates(tsConfigPath, tsConfig, updates);
+}
+function getTSConfigRemoveUpdates(tsConfig) {
+    const updates = new Set();
+    if (Array.isArray(tsConfig.include)) {
+        const filtered = tsConfig.include.filter((i)=>i !== "expo-env.d.ts" && i !== ".expo/types/**/*.ts"
+        );
+        if (filtered.length !== tsConfig.include.length) {
+            updates.add("include");
+        }
+        tsConfig.include = filtered;
+    }
+    return {
+        tsConfig,
+        updates
+    };
+}
+async function writeUpdates(tsConfigPath, tsConfig, updates) {
+    if (updates.size) {
+        await _jsonFile.default.writeAsync(tsConfigPath, tsConfig);
+        for (const update of updates){
+            _log.Log.log(_chalk.default`{bold TypeScript}: The {cyan tsconfig.json#${update}} property has been updated`);
+        }
+    }
+}
+
+//# sourceMappingURL=tsconfig.js.map

package/build/src/start/server/type-generation/tsconfig.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/start/server/type-generation/tsconfig.ts"],"sourcesContent":["import JsonFile, { JSONObject } from '@expo/json-file';\nimport chalk from 'chalk';\nimport path from 'path';\n\nimport { Log } from '../../../log';\n\n/**\n * Force updates a project tsconfig with Expo values.\n */\nexport async function forceUpdateTSConfig(projectRoot: string) {\n  // This runs after the TypeScript prerequisite, so we know the tsconfig.json exists\n  const tsConfigPath = path.join(projectRoot, 'tsconfig.json');\n  const { tsConfig, updates } = getTSConfigUpdates(\n    JsonFile.read(tsConfigPath, {\n      json5: true,\n    })\n  );\n\n  await writeUpdates(tsConfigPath, tsConfig, updates);\n}\n\nexport function getTSConfigUpdates(tsConfig: JSONObject) {\n  const updates = new Set<string>();\n\n  if (!tsConfig.include) {\n    tsConfig.include = ['**/*.ts', '**/*.tsx', '.expo/types/**/*.ts', 'expo-env.d.ts'];\n    updates.add('include');\n  } else if (Array.isArray(tsConfig.include)) {\n    if (!tsConfig.include.includes('.expo/types/**/*.ts')) {\n      tsConfig.include = [...tsConfig.include, '.expo/types/**/*.ts'];\n      updates.add('include');\n    }\n\n    if (!tsConfig.include.includes('expo-env.d.ts')) {\n      tsConfig.include = [...tsConfig.include, 'expo-env.d.ts'];\n      updates.add('include');\n    }\n  }\n\n  return { tsConfig, updates };\n}\n\nexport async function forceRemovalTSConfig(projectRoot: string) {\n  // This runs after the TypeScript prerequisite, so we know the tsconfig.json exists\n  const tsConfigPath = path.join(projectRoot, 'tsconfig.json');\n  const { tsConfig, updates } = getTSConfigRemoveUpdates(\n    JsonFile.read(tsConfigPath, {\n      json5: true,\n    })\n  );\n\n  await writeUpdates(tsConfigPath, tsConfig, updates);\n}\n\nexport function getTSConfigRemoveUpdates(tsConfig: JSONObject) {\n  const updates = new Set<string>();\n\n  if (Array.isArray(tsConfig.include)) {\n    const filtered = (tsConfig.include as string[]).filter(\n      (i) => i !== 'expo-env.d.ts' && i !== '.expo/types/**/*.ts'\n    );\n\n    if (filtered.length !== tsConfig.include.length) {\n      updates.add('include');\n    }\n\n    tsConfig.include = filtered;\n  }\n\n  return { tsConfig, updates };\n}\n\nasync function writeUpdates(tsConfigPath: string, tsConfig: JSONObject, updates: Set<string>) {\n  if (updates.size) {\n    await JsonFile.writeAsync(tsConfigPath, tsConfig);\n    for (const update of updates) {\n      Log.log(\n        chalk`{bold TypeScript}: The {cyan tsconfig.json#${update}} property has been updated`\n      );\n    }\n  }\n}\n"],"names":["forceUpdateTSConfig","getTSConfigUpdates","forceRemovalTSConfig","getTSConfigRemoveUpdates","projectRoot","tsConfigPath","path","join","tsConfig","updates","JsonFile","read","json5","writeUpdates","Set","include","add","Array","isArray","includes","filtered","filter","i","length","size","writeAsync","update","Log","log","chalk"],"mappings":"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"}

package/build/src/start/server/webTemplate.js

@@ -8,13 +8,14 @@ var _config = require("@expo/config");
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _templates = require("../../customize/templates");
+var _html = require("../../export/html");
 var _env = require("../../utils/env");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-async function createTemplateHtmlFromExpoConfigAsync(projectRoot, { scripts , exp =(0, _config).getConfig(projectRoot, {
+async function createTemplateHtmlFromExpoConfigAsync(projectRoot, { scripts , cssLinks , exp =(0, _config).getConfig(projectRoot, {
     skipSDKVersionRequirement: true
 }).exp  }) {
     var ref, ref1, ref2;
@@ -22,6 +23,7 @@ async function createTemplateHtmlFromExpoConfigAsync(projectRoot, { scripts , ex
     return createTemplateHtmlAsync(projectRoot, {
         langIsoCode: (ref3 = (ref = exp.web) == null ? void 0 : ref.lang) != null ? ref3 : "en",
         scripts,
+        cssLinks,
         title: (_webName = (0, _config).getNameFromConfig(exp).webName) != null ? _webName : "Expo App",
         description: (ref1 = exp.web) == null ? void 0 : ref1.description,
         themeColor: (ref2 = exp.web) == null ? void 0 : ref2.themeColor
@@ -46,13 +48,27 @@ function getFileFromLocalPublicFolder(projectRoot, { publicFolder , filePath  })
     }
     return _fs.default.promises.readFile(filePath, "utf8");
 }
-async function createTemplateHtmlAsync(projectRoot, { scripts , description , langIsoCode , title , themeColor  }) {
+async function createTemplateHtmlAsync(projectRoot, { scripts , cssLinks , description , langIsoCode , title , themeColor  }) {
     // Resolve the best possible index.html template file.
     let contents = await getTemplateIndexHtmlAsync(projectRoot);
     contents = contents.replace("%LANG_ISO_CODE%", langIsoCode);
     contents = contents.replace("%WEB_TITLE%", title);
-    contents = contents.replace("</body>", scripts.map((url)=>`<script src="${url}"></script>`
-    ).join("") + "</body>");
+    contents = (0, _html).appendScriptsToHtml(contents, scripts);
+    if (cssLinks) {
+        contents = (0, _html).appendLinkToHtml(contents, cssLinks.map((href)=>[
+                // NOTE: We probably don't have to preload the CSS files for SPA-styled websites.
+                {
+                    as: "style",
+                    rel: "preload",
+                    href
+                },
+                {
+                    rel: "stylesheet",
+                    href
+                }, 
+            ]
+        ).flat());
+    }
     if (themeColor) {
         contents = addMeta(contents, `name="theme-color" content="${themeColor}"`);
     }

package/build/src/start/server/webTemplate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/start/server/webTemplate.ts"],"sourcesContent":["import { ExpoConfig, getConfig, getNameFromConfig } from '@expo/config';\nimport fs from 'fs';\nimport path from 'path';\n\nimport { TEMPLATES } from '../../customize/templates';\nimport { env } from '../../utils/env';\n\n/**\n * Create a static HTML for SPA styled websites.\n * This method attempts to reuse the same patterns as `@expo/webpack-config`.\n */\nexport async function createTemplateHtmlFromExpoConfigAsync(\n  projectRoot: string,\n  {\n    scripts,\n    exp = getConfig(projectRoot, { skipSDKVersionRequirement: true }).exp,\n  }: {\n    scripts: string[];\n    exp?: ExpoConfig;\n  }\n) {\n  return createTemplateHtmlAsync(projectRoot, {\n    langIsoCode: exp.web?.lang ?? 'en',\n    scripts,\n    title: getNameFromConfig(exp).webName ?? 'Expo App',\n    description: exp.web?.description,\n    themeColor: exp.web?.themeColor,\n  });\n}\n\nfunction getFileFromLocalPublicFolder(\n  projectRoot: string,\n  { publicFolder, filePath }: { publicFolder: string; filePath: string }\n): string | null {\n  const localFilePath = path.resolve(projectRoot, publicFolder, filePath);\n  if (!fs.existsSync(localFilePath)) {\n    return null;\n  }\n  return localFilePath;\n}\n\n/** Attempt to read the `index.html` from the local project before falling back on the template `index.html`. */\nasync function getTemplateIndexHtmlAsync(projectRoot: string): Promise<string> {\n  let filePath = getFileFromLocalPublicFolder(projectRoot, {\n    // TODO: Maybe use the app.json override.\n    publicFolder: env.EXPO_PUBLIC_FOLDER,\n    filePath: 'index.html',\n  });\n  if (!filePath) {\n    filePath = TEMPLATES.find((value) => value.id === 'index.html')!.file(projectRoot);\n  }\n  return fs.promises.readFile(filePath, 'utf8');\n}\n\n/** Return an `index.html` string with template values added. */\nexport async function createTemplateHtmlAsync(\n  projectRoot: string,\n  {\n    scripts,\n    description,\n    langIsoCode,\n    title,\n    themeColor,\n  }: {\n    scripts: string[];\n    description?: string;\n    langIsoCode: string;\n    title: string;\n    themeColor?: string;\n  }\n): Promise<string> {\n  // Resolve the best possible index.html template file.\n  let contents = await getTemplateIndexHtmlAsync(projectRoot);\n\n  contents = contents.replace('%LANG_ISO_CODE%', langIsoCode);\n  contents = contents.replace('%WEB_TITLE%', title);\n  contents = contents.replace(\n    '</body>',\n    scripts.map((url) => `<script src=\"${url}\"></script>`).join('') + '</body>'\n  );\n\n  if (themeColor) {\n    contents = addMeta(contents, `name=\"theme-color\" content=\"${themeColor}\"`);\n  }\n\n  if (description) {\n    contents = addMeta(contents, `name=\"description\" content=\"${description}\"`);\n  }\n\n  return contents;\n}\n\n/** Add a `<meta />` tag to the `<head />` element. */\nfunction addMeta(contents: string, meta: string): string {\n  return contents.replace('</head>', `<meta ${meta}>\\n</head>`);\n}\n"],"names":["createTemplateHtmlFromExpoConfigAsync","createTemplateHtmlAsync","projectRoot","scripts","exp","getConfig","skipSDKVersionRequirement","getNameFromConfig","langIsoCode","web","lang","title","webName","description","themeColor","getFileFromLocalPublicFolder","publicFolder","filePath","localFilePath","path","resolve","fs","existsSync","getTemplateIndexHtmlAsync","env","EXPO_PUBLIC_FOLDER","TEMPLATES","find","value","id","file","promises","readFile","contents","replace","map","url","join","addMeta","meta"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/start/server/webTemplate.ts"],"sourcesContent":["import { ExpoConfig, getConfig, getNameFromConfig } from '@expo/config';\nimport fs from 'fs';\nimport path from 'path';\n\nimport { TEMPLATES } from '../../customize/templates';\nimport { appendLinkToHtml, appendScriptsToHtml } from '../../export/html';\nimport { env } from '../../utils/env';\n\n/**\n * Create a static HTML for SPA styled websites.\n * This method attempts to reuse the same patterns as `@expo/webpack-config`.\n */\nexport async function createTemplateHtmlFromExpoConfigAsync(\n  projectRoot: string,\n  {\n    scripts,\n    cssLinks,\n    exp = getConfig(projectRoot, { skipSDKVersionRequirement: true }).exp,\n  }: {\n    scripts: string[];\n    cssLinks?: string[];\n    exp?: ExpoConfig;\n  }\n) {\n  return createTemplateHtmlAsync(projectRoot, {\n    langIsoCode: exp.web?.lang ?? 'en',\n    scripts,\n    cssLinks,\n    title: getNameFromConfig(exp).webName ?? 'Expo App',\n    description: exp.web?.description,\n    themeColor: exp.web?.themeColor,\n  });\n}\n\nfunction getFileFromLocalPublicFolder(\n  projectRoot: string,\n  { publicFolder, filePath }: { publicFolder: string; filePath: string }\n): string | null {\n  const localFilePath = path.resolve(projectRoot, publicFolder, filePath);\n  if (!fs.existsSync(localFilePath)) {\n    return null;\n  }\n  return localFilePath;\n}\n\n/** Attempt to read the `index.html` from the local project before falling back on the template `index.html`. */\nasync function getTemplateIndexHtmlAsync(projectRoot: string): Promise<string> {\n  let filePath = getFileFromLocalPublicFolder(projectRoot, {\n    // TODO: Maybe use the app.json override.\n    publicFolder: env.EXPO_PUBLIC_FOLDER,\n    filePath: 'index.html',\n  });\n  if (!filePath) {\n    filePath = TEMPLATES.find((value) => value.id === 'index.html')!.file(projectRoot);\n  }\n  return fs.promises.readFile(filePath, 'utf8');\n}\n\n/** Return an `index.html` string with template values added. */\nexport async function createTemplateHtmlAsync(\n  projectRoot: string,\n  {\n    scripts,\n    cssLinks,\n    description,\n    langIsoCode,\n    title,\n    themeColor,\n  }: {\n    scripts: string[];\n    cssLinks?: string[];\n    description?: string;\n    langIsoCode: string;\n    title: string;\n    themeColor?: string;\n  }\n): Promise<string> {\n  // Resolve the best possible index.html template file.\n  let contents = await getTemplateIndexHtmlAsync(projectRoot);\n\n  contents = contents.replace('%LANG_ISO_CODE%', langIsoCode);\n  contents = contents.replace('%WEB_TITLE%', title);\n\n  contents = appendScriptsToHtml(contents, scripts);\n\n  if (cssLinks) {\n    contents = appendLinkToHtml(\n      contents,\n      cssLinks\n        .map((href) => [\n          // NOTE: We probably don't have to preload the CSS files for SPA-styled websites.\n          {\n            as: 'style',\n            rel: 'preload',\n            href,\n          },\n          {\n            rel: 'stylesheet',\n            href,\n          },\n        ])\n        .flat()\n    );\n  }\n\n  if (themeColor) {\n    contents = addMeta(contents, `name=\"theme-color\" content=\"${themeColor}\"`);\n  }\n\n  if (description) {\n    contents = addMeta(contents, `name=\"description\" content=\"${description}\"`);\n  }\n\n  return contents;\n}\n\n/** Add a `<meta />` tag to the `<head />` element. */\nfunction addMeta(contents: string, meta: string): string {\n  return contents.replace('</head>', `<meta ${meta}>\\n</head>`);\n}\n"],"names":["createTemplateHtmlFromExpoConfigAsync","createTemplateHtmlAsync","projectRoot","scripts","cssLinks","exp","getConfig","skipSDKVersionRequirement","getNameFromConfig","langIsoCode","web","lang","title","webName","description","themeColor","getFileFromLocalPublicFolder","publicFolder","filePath","localFilePath","path","resolve","fs","existsSync","getTemplateIndexHtmlAsync","env","EXPO_PUBLIC_FOLDER","TEMPLATES","find","value","id","file","promises","readFile","contents","replace","appendScriptsToHtml","appendLinkToHtml","map","href","as","rel","flat","addMeta","meta"],"mappings":"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"}

package/build/src/start/server/webpack/WebpackBundlerDevServer.js

@@ -11,6 +11,7 @@ var Log = _interopRequireWildcard(require("../../../log"));
 var _env = require("../../../utils/env");
 var _errors = require("../../../utils/errors");
 var _ip = require("../../../utils/ip");
+var _nodeEnv = require("../../../utils/nodeEnv");
 var _port = require("../../../utils/port");
 var _progress = require("../../../utils/progress");
 var _dotExpo = require("../../project/dotExpo");
@@ -117,7 +118,7 @@ class WebpackBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
         // Add manifest middleware to the other middleware.
         // TODO: Move this in to expo/dev-server.
         const middleware = await this.getManifestMiddlewareAsync(options);
-        nativeMiddleware.middleware.use(middleware);
+        nativeMiddleware.middleware.use(middleware.getHandler());
         return nativeMiddleware;
     }
     async getAvailablePortAsync(options) {
@@ -283,7 +284,8 @@ class WebpackBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
             https: options.https
         };
         var _mode;
-        setMode((_mode = env.mode) != null ? _mode : "development");
+        (0, _nodeEnv).setNodeEnv((_mode = env.mode) != null ? _mode : "development");
+        require("@expo/env").load(env.projectRoot);
         // Check if the project has a webpack.config.js in the root.
         const projectWebpackConfig = this.getProjectConfigFilePath();
         let config;
@@ -322,10 +324,6 @@ class WebpackBundlerDevServer extends _bundlerDevServer.BundlerDevServer {
     }
 }
 exports.WebpackBundlerDevServer = WebpackBundlerDevServer;
-function setMode(mode) {
-    process.env.BABEL_ENV = mode;
-    process.env.NODE_ENV = mode;
-}
 function getProjectWebpackConfigFilePath(projectRoot) {
     return _resolveFrom.default.silent(projectRoot, "./webpack.config.js");
 }