🩹 fix(patch): sage default paths (#2660) (#2667)

Fixes problem with @roots/sage paths. See #2660. ## Type of change **PATCH: backwards compatible change**
roots · Dec 9, 2024 · aeba9d1 · aeba9d1
1 parent 271d22a
commit aeba9d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/sources/@roots/sage/src/sage/index.ts b/sources/@roots/sage/src/sage/index.ts
@@ -67,10 +67,12 @@ class Sage extends Extension {
     bud
       .setPath({
         '@dist': `public`,
+        '@src': `resources`,
+      })
+      .setPath({
         '@fonts': `@src/fonts`,
         '@images': `@src/images`,
         '@scripts': `@src/scripts`,
-        '@src': `resources`,
         '@styles': `@src/styles`,
         '@views': `@src/views`,
       })

diff --git a/sources/@roots/sage/test/sage/extension.test.ts b/sources/@roots/sage/test/sage/extension.test.ts
@@ -60,18 +60,21 @@ describe(`@roots/sage`, async () => {
     await bud.extensions.add(`@roots/sage`)
 
     expect(bud.extensions.has(`@roots/sage/blade-loader`)).toBeTruthy()
-    expect(bud.extensions.get(`@roots/sage/blade-loader`).enabled).toBeTruthy()
+    expect(
+      bud.extensions.get(`@roots/sage/blade-loader`).enabled,
+    ).toBeTruthy()
   })
 
-
   it(`sage.blade.enable`, async () => {
     expect(bud.extensions.has(`@roots/sage/blade-loader`)).toBeFalsy()
 
     await bud.extensions.add(`@roots/sage`)
 
     bud.sage.blade.enable(false).done()
 
-    expect(bud.extensions.get(`@roots/sage/blade-loader`).enabled).toBeFalsy()
+    expect(
+      bud.extensions.get(`@roots/sage/blade-loader`).enabled,
+    ).toBeFalsy()
   })
 
   it(`should register errything`, async () => {
@@ -82,10 +85,12 @@ describe(`@roots/sage`, async () => {
 
     expect(setPathSpy).toHaveBeenCalledWith({
       '@dist': `public`,
+      '@src': `resources`,
+    })
+    expect(setPathSpy).toHaveBeenCalledWith({
       '@fonts': `@src/fonts`,
       '@images': `@src/images`,
       '@scripts': `@src/scripts`,
-      '@src': `resources`,
       '@styles': `@src/styles`,
       '@views': `@src/views`,
     })
@@ -98,7 +103,7 @@ describe(`@roots/sage`, async () => {
 
     expect(bud.hooks.filter(`build.output.uniqueName`)).toEqual(
       // @ts-ignore
-      bud.sage.getUniqueName()
+      bud.sage.getUniqueName(),
     )
   })