always use next precedence, update tests

vercel · Aug 22, 2023 · 6e459e6 · 6e459e6
1 parent 89a0335
commit 6e459e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -401,12 +401,10 @@ export async function renderToHTMLOrFlight(
     const createComponentAndStyles = async ({
       filePath,
       getComponent,
-      shouldPreload,
       injectedCSS,
     }: {
       filePath: string
       getComponent: () => any
-      shouldPreload: boolean
       injectedCSS: Set<string>
     }): Promise<any> => {
       const cssHrefs = getCssInlinedLinkTags(
@@ -433,11 +431,7 @@ export async function renderToHTMLOrFlight(
             // During HMR, it's critical to use different `precedence` values
             // for different stylesheets, so their order will be kept.
             // https://github.com/facebook/react/pull/25060
-            const precedence = shouldPreload
-              ? process.env.NODE_ENV === 'development'
-                ? 'next_' + href
-                : 'next'
-              : undefined
+            const precedence = 'next'
 
             return (
               <link
@@ -614,15 +608,13 @@ export async function renderToHTMLOrFlight(
         ? await createComponentAndStyles({
             filePath: template[1],
             getComponent: template[0],
-            shouldPreload: true,
             injectedCSS: injectedCSSWithCurrentLayout,
           })
         : [React.Fragment]
 
       const [ErrorComponent, errorStyles] = error
         ? await createComponentAndStyles({
             filePath: error[1],
-            shouldPreload: true,
             getComponent: error[0],
             injectedCSS: injectedCSSWithCurrentLayout,
           })
@@ -631,7 +623,6 @@ export async function renderToHTMLOrFlight(
       const [Loading, loadingStyles] = loading
         ? await createComponentAndStyles({
             filePath: loading[1],
-            shouldPreload: true,
             getComponent: loading[0],
             injectedCSS: injectedCSSWithCurrentLayout,
           })
@@ -654,7 +645,6 @@ export async function renderToHTMLOrFlight(
       const [NotFound, notFoundStyles] = notFound
         ? await createComponentAndStyles({
             filePath: notFound[1],
-            shouldPreload: true,
             getComponent: notFound[0],
             injectedCSS: injectedCSSWithCurrentLayout,
           })

diff --git a/test/e2e/app-dir/app-css/index.test.ts b/test/e2e/app-dir/app-css/index.test.ts
@@ -175,11 +175,12 @@ createNextDescribe(
 
       describe('special entries', () => {
         it('should include css imported in loading.js', async () => {
-          const html = await next.render('/loading-bug/hi')
-          // The link tag should be included together with loading
-          expect(html).toMatch(
-            /<link rel="stylesheet" href="(.+)\.css(\?v=\d+)?"\/><h2>Loading...<\/h2>/
-          )
+          const $ = await next.render$('/loading-bug/hi')
+          // The link tag should be included together with loading with "next" precedence
+
+          expect($('link[data-precedence="next"]').length).toBe(1)
+
+          expect($('body h2').text()).toBe('Loading...')
         })
 
         it('should include css imported in client template.js', async () => {