Merge pull request #5252 from Shopify/fd-fix-nx-dep

[Theme] Change how assets are resolved

package.json

@@ -124,7 +124,6 @@
     "ignoreDependencies": [
       "eslint-plugin-react",
       "eslint-plugin-react-hooks",
-      "@shopify/cli",
       "@shopify/cli-hydrogen",
       "@shopify/theme-check-node",
       "@shopify/theme-check-docs-updater"

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

@@ -1,13 +1,18 @@
-import {dirname, joinPath} from '@shopify/cli-kit/node/path'
-import {createRequire} from 'node:module'
-
-const require = createRequire(import.meta.url)
+import {findPathUp} from '@shopify/cli-kit/node/fs'
+import {joinPath, dirname} from '@shopify/cli-kit/node/path'
+import {fileURLToPath} from 'node:url'
 
 export async function resolveAssetPath(...subpaths: string[]) {
-  if (process.env.SHOPIFY_UNIT_TEST) {
-    return joinPath(__dirname, '..', '..', '..', ...subpaths)
+  const rootPkgJon = await findPathUp('package.json', {
+    cwd: fileURLToPath(import.meta.url),
+    type: 'file',
+  })
+
+  if (!rootPkgJon) {
+    throw new Error('Failed to find CLI root path')
   }
 
-  const cliRootPath = dirname(require.resolve('@shopify/cli/package.json'))
-  return joinPath(cliRootPath, 'dist', 'assets', ...subpaths)
+  return rootPkgJon.endsWith('/packages/theme/package.json')
+    ? joinPath(dirname(rootPkgJon), 'assets', ...subpaths)
+    : joinPath(dirname(rootPkgJon), 'dist', 'assets', ...subpaths)
 }