WIP - if we kept backwards compatibility

packages/cli-kit/src/public/node/fs.ts

@@ -571,6 +571,7 @@ export async function findPathUp(
 export interface MatchGlobOptions {
   matchBase: boolean
   noglobstar: boolean
+  dot?: boolean
 }
 
 /**

packages/theme/src/cli/utilities/asset-ignore.test.ts

@@ -309,17 +309,16 @@ describe('asset-ignore', () => {
       ])
     })
 
-    test(`should return all files in a directory when only option is a directory pattern`, () => {
+    test(`should return all files in a directory when using proper glob pattern`, () => {
       const options = {
-        only: ['assets/'],
+        only: ['templates/**/*'],
       }
 
       const actualChecksums = applyIgnoreFilters(checksums, options)
 
       expect(actualChecksums).toEqual([
-        {key: 'assets/basic.css', checksum: '00000000000000000000000000000000'},
-        {key: 'assets/complex.css', checksum: '11111111111111111111111111111111'},
-        {key: 'assets/image.png', checksum: '22222222222222222222222222222222'},
+        {key: 'templates/404.json', checksum: '6666666666666666666666666666666'},
+        {key: 'templates/customers/account.json', checksum: '7777777777777777777777777777777'},
       ])
     })
   })
@@ -360,9 +359,9 @@ describe('asset-ignore', () => {
       ])
     })
 
-    test(`should ignore all files in a directory when ignore option is a directory pattern`, () => {
+    test(`should ignore all files in a directory when using proper glob pattern`, () => {
       const options = {
-        ignore: ['assets/'],
+        ignore: ['assets/**/*'],
       }
 
       const actualChecksums = applyIgnoreFilters(checksums, options)

packages/theme/src/cli/utilities/asset-ignore.ts

@@ -2,6 +2,7 @@ import {uniqBy} from '@shopify/cli-kit/common/array'
 import {fileExists, readFile, matchGlob as originalMatchGlob} from '@shopify/cli-kit/node/fs'
 import {outputDebug} from '@shopify/cli-kit/node/output'
 import {joinPath} from '@shopify/cli-kit/node/path'
+import {renderWarning} from '@shopify/cli-kit/node/ui'
 
 const SHOPIFY_IGNORE = '.shopifyignore'
 const templatesRegex = /templates\/\*(\.(json|liquid))?$/
@@ -89,8 +90,11 @@ function matchGlob(key: string, pattern: string) {
   if (result) return true
 
   if (!pattern.includes('*') && pattern.endsWith('/')) {
-    const directoryPattern = `${pattern}**`
-    return originalMatchGlob(key, directoryPattern, matchOpts)
+    renderWarning({
+      headline: 'Directory pattern not supported.',
+      body: `Try using ${pattern}**/* instead.`,
+    })
+    return false
   }
 
   // When the the standard match fails and the pattern includes '/*.', we
@@ -100,6 +104,23 @@ function matchGlob(key: string, pattern: string) {
     return originalMatchGlob(key, pattern.replace(templatesRegex, 'templates/**/*$1'), matchOpts)
   }
 
+  if (pattern.includes('**/*')) {
+    if (pattern.startsWith('templates/') && pattern.includes('**/*.')) {
+      return (
+        key.split('/').length > 2 &&
+        originalMatchGlob(key, pattern, {
+          ...matchOpts,
+          noglobstar: false,
+        })
+      )
+    }
+
+    return originalMatchGlob(key, pattern, {
+      ...matchOpts,
+      noglobstar: false,
+    })
+  }
+
   return false
 }