Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release fixes 2024.7 #2312

Merged
merged 7 commits into from
Jul 10, 2024
Merged

Release fixes 2024.7 #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13818df
Disable bundle analysis by default on CI
frandiox Jul 10, 2024
0d309fd
Remove tailwind as part of the quickstart flag
frandiox Jul 10, 2024
34c558b
Move CLI to dev deps
frandiox Jul 10, 2024
c8148c4
Changesets
frandiox Jul 10, 2024
57ab2cf
Fix
frandiox Jul 10, 2024
6a7c66c
Fix
frandiox Jul 10, 2024
b09cbab
Fix
frandiox Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tender-lies-mate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'skeleton': patch
---

Moved `@shopify/cli` from `dependencies` to `devDependencies`.
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/cli/src/commands/hydrogen/build.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ describe('build', () => {
outputMock.clear();
vi.stubEnv('NODE_ENV', 'production');

await expect(runBuild({directory: tmpDir})).resolves.not.toThrow();
await expect(
runBuild({directory: tmpDir, bundleStats: true}),
).resolves.not.toThrow();

const expectedBundlePath = 'dist/server/index.js';

Expand Down
3 changes: 1 addition & 2 deletions packages/cli/src/commands/hydrogen/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default class Build extends Command {
'bundle-stats': Flags.boolean({
description:
'Show a bundle size summary after building. Defaults to true, use `--no-bundle-stats` to disable.',
default: true,
allowNo: true,
}),
};
Expand Down Expand Up @@ -127,7 +126,7 @@ export async function runBuild({
disableRouteWarning = false,
lockfileCheck = true,
assetPath = '/',
bundleStats = true,
bundleStats = !isCI(),
watch = false,
onServerBuildStart,
onServerBuildFinish,
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/hydrogen/init.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ describe('init', () => {
shortcut: true,
quickstart: true,
git: true,
styling: 'tailwind',
// TODO: enable Tailwind once v4 is stable
styling: 'none',
});
});

Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/commands/hydrogen/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ export async function runInit(
options.path ??= './hydrogen-quickstart';
options.routes ??= true;
options.shortcut ??= true;
options.styling ??= 'tailwind';
// TODO: enable Tailwind once v4 is stable
options.styling ??= 'none';
}

const showUpgrade = await checkCurrentCLIVersion();
Expand Down
1 change: 0 additions & 1 deletion packages/create-hydrogen/integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ describe('create-hydrogen', () => {
│ │
│ Shopify: Mock.shop │
│ Language: JavaScript │
│ Styling: Tailwind (v4 alpha) │
│ Routes: │
│ • Home (/ & /:catchAll) │
│ • Page (/pages/:handle) │
Expand Down
2 changes: 1 addition & 1 deletion templates/skeleton/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"dependencies": {
"@remix-run/react": "^2.10.1",
"@remix-run/server-runtime": "^2.10.1",
"@shopify/cli": "^3.63.2",
"@shopify/cli-hydrogen": "*",
"@shopify/hydrogen": "2024.7.0",
"@shopify/remix-oxygen": "^2.0.4",
Expand All @@ -30,6 +29,7 @@
"@graphql-codegen/cli": "5.0.2",
"@remix-run/dev": "^2.10.1",
"@remix-run/eslint-config": "^2.10.1",
"@shopify/cli": "^3.63.2",
"@shopify/hydrogen-codegen": "^0.3.1",
"@shopify/mini-oxygen": "^3.0.3",
"@shopify/oxygen-workers-types": "^4.1.2",
Expand Down
Loading