Skip to content

Commit 71c11db

Browse files
authored
Merge pull request #5351 from Shopify/shauns/02-04-streamline_dev_check
Streamline dev check
2 parents 0cfc771 + a133819 commit 71c11db

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

configurations/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"jsx": "react",
2121
"paths": {
2222
"@shopify/cli-kit/*": ["../packages/cli-kit/src/public/*"],
23+
"@shopify/theme/*": ["../packages/theme/src/*"],
2324
"@shopify/cli-kit/typing/*": ["../packages/cli-kit/src/typing/*"],
2425
},
2526
"types": [

configurations/vite.config.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,12 @@ export const aliases = (packagePath: string) => {
6767
},
6868
},
6969
{find: '@shopify/cli-kit', replacement: path.join(packagePath, '../cli-kit/src/index')},
70+
{
71+
find: /@shopify\/theme\/(.+)/,
72+
replacement: (importedModule: string) => {
73+
return path.join(packagePath, `../theme/src/${importedModule.replace('@shopify/theme/', '')}`)
74+
},
75+
},
76+
{find: '@shopify/theme', replacement: path.join(packagePath, '../theme/src/index')},
7077
]
7178
}

dev.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: shopify-cli-next
1+
name: cli
22

33
up:
44
- node:
@@ -60,7 +60,5 @@ commands:
6060
run: bin/spin
6161

6262
check:
63-
build: pnpm build
6463
type-check: pnpm nx affected --target=type-check
6564
lint: pnpm nx affected --target=lint
66-
unit-tests: pnpm nx affected --target=test --exclude=features

nx.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
"graphql-codegen:generate:partners",
5757
"graphql-codegen:generate:webhooks",
5858
"graphql-codegen:postfix",
59-
"graphql-codegen:formatting"
59+
"graphql-codegen:formatting",
60+
"type-check",
61+
"lint"
6062
],
6163
"runtimeCacheInputs": [
6264
"node bin/cache-inputs.js || node ../../bin/cache-inputs.js || node ../bin/cache-inputs.js"

packages/app/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
},
3939
"test": {
4040
"executor": "nx:run-commands",
41-
"dependsOn": ["^build"],
4241
"options": {
4342
"command": "pnpm vitest run",
4443
"cwd": "packages/app"

packages/app/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": "./tsconfig.json",
33
"exclude": ["**/*.test.ts"],
44
"references": [
5-
{"path": "../cli-kit"}
5+
{"path": "../cli-kit"},
6+
{"path": "../theme"}
67
]
78
}

packages/app/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"rootDir": "src",
99
"tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
1010
},
11-
"references": [{"path": "../cli-kit"}]
11+
"references": [{"path": "../cli-kit"}, {"path": "../theme"}]
1212
}

0 commit comments

Comments
 (0)