From 9908f2f0117b5681ac825201a510ccc0485cb9d9 Mon Sep 17 00:00:00 2001 From: Vance Lucas Date: Wed, 13 Jul 2022 16:33:45 -0500 Subject: [PATCH 1/4] Node version min. = 18 --- README.md | 3 ++- package.json | 25 ++++++------------------- templates/demo-store/package.json | 3 +++ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c9eb3d53b4..3b80c9313d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,8 @@ Spin up a Hydrogen app in your browser with our [playground](https://hydrogen.ne **Requirements:** - `yarn` or `npm` -- Node.js version 16.5.0 or higher +- Node.js version 18.0.0 or higher [with globally available browser-compatible + APIs](https://nodejs.org/ko/blog/announcements/v18-release-announce/#new-globally-available-browser-compatible-apis) **Installation:** diff --git a/package.json b/package.json index 2df59bcacd..2db14fcfee 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,9 @@ "name": "hydrogen-monorepo", "private": true, "packageManager": "yarn@1.22.17", - "workspaces": [ - "templates/*", - "packages/*", - "packages/playground/*" - ], + "workspaces": ["templates/*", "packages/*", "packages/playground/*"], "engines": { - "node": ">=14" + "node": ">=18" }, "scripts": { "dev": "yarn turbo run dev --parallel --filter=@shopify/hydrogen-ui --filter=@shopify/hydrogen", @@ -74,19 +70,10 @@ "pre-commit": "lint-staged" }, "lint-staged": { - "*.{js,jsx}": [ - "prettier --write" - ], - "*.{ts,tsx}": [ - "eslint", - "prettier --parser=typescript --write" - ], - "*.html": [ - "prettier --write" - ], - "*.md": [ - "prettier --write" - ] + "*.{js,jsx}": ["prettier --write"], + "*.{ts,tsx}": ["eslint", "prettier --parser=typescript --write"], + "*.html": ["prettier --write"], + "*.md": ["prettier --write"] }, "resolutions": { "unified": "9.2.2" diff --git a/templates/demo-store/package.json b/templates/demo-store/package.json index 3f62f5dc36..fa08b4fc12 100644 --- a/templates/demo-store/package.json +++ b/templates/demo-store/package.json @@ -4,6 +4,9 @@ "version": "0.0.0", "license": "MIT", "private": true, + "engines": { + "node": ">=18" + }, "scripts": { "dev": "shopify hydrogen dev", "build": "shopify hydrogen build", From ec2bae076982f4906ca2e80dd58a3182c6579c63 Mon Sep 17 00:00:00 2001 From: Vance Lucas Date: Wed, 13 Jul 2022 16:38:33 -0500 Subject: [PATCH 2/4] Minimumn Node Version = 18 --- templates/hello-world/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/hello-world/package.json b/templates/hello-world/package.json index bd8bdffb8f..759db6c8e8 100644 --- a/templates/hello-world/package.json +++ b/templates/hello-world/package.json @@ -4,6 +4,9 @@ "version": "0.0.0", "license": "MIT", "private": true, + "engines": { + "node": ">=18" + }, "scripts": { "dev": "shopify hydrogen dev", "build": "shopify hydrogen build", From 8eede872283256d1a198ec98969052da0c50e2d5 Mon Sep 17 00:00:00 2001 From: Gustavo Caso Date: Thu, 14 Jul 2022 13:30:44 +0200 Subject: [PATCH 3/4] update noce version for workflows --- .github/workflows/oxygen-deployment.yml | 2 +- .github/workflows/tests_and_lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/oxygen-deployment.yml b/.github/workflows/oxygen-deployment.yml index caa3c9bc7c..89df24c9ba 100644 --- a/.github/workflows/oxygen-deployment.yml +++ b/.github/workflows/oxygen-deployment.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v2 with: - node-version: 16 + node-version: 18 cache: 'yarn' - name: Install the packages diff --git a/.github/workflows/tests_and_lint.yml b/.github/workflows/tests_and_lint.yml index 2870761e2c..b122ed280d 100644 --- a/.github/workflows/tests_and_lint.yml +++ b/.github/workflows/tests_and_lint.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest] - node-version: [16.x, 18.x] + node-version: [18.x] name: OS ${{ matrix.os }} / NodeJS ${{ matrix.node-version }} From d9de30bf54f3bbb117095eec920dae3aaa5d03f3 Mon Sep 17 00:00:00 2001 From: Gustavo Caso Date: Thu, 14 Jul 2022 13:37:02 +0200 Subject: [PATCH 4/4] run prettier --- package.json | 23 ++++++++++++++++++----- packages/hydrogen/CHANGELOG.md | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2db14fcfee..bb6a5da086 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,11 @@ "name": "hydrogen-monorepo", "private": true, "packageManager": "yarn@1.22.17", - "workspaces": ["templates/*", "packages/*", "packages/playground/*"], + "workspaces": [ + "templates/*", + "packages/*", + "packages/playground/*" + ], "engines": { "node": ">=18" }, @@ -70,10 +74,19 @@ "pre-commit": "lint-staged" }, "lint-staged": { - "*.{js,jsx}": ["prettier --write"], - "*.{ts,tsx}": ["eslint", "prettier --parser=typescript --write"], - "*.html": ["prettier --write"], - "*.md": ["prettier --write"] + "*.{js,jsx}": [ + "prettier --write" + ], + "*.{ts,tsx}": [ + "eslint", + "prettier --parser=typescript --write" + ], + "*.html": [ + "prettier --write" + ], + "*.md": [ + "prettier --write" + ] }, "resolutions": { "unified": "9.2.2" diff --git a/packages/hydrogen/CHANGELOG.md b/packages/hydrogen/CHANGELOG.md index dfb74e8d0c..f1c453e95a 100644 --- a/packages/hydrogen/CHANGELOG.md +++ b/packages/hydrogen/CHANGELOG.md @@ -16,7 +16,7 @@ } from '@shopify/hydrogen/platforms'; // Platform entry handler - export default function(request) { + export default function (request) { if (isAsset(new URL(request.url).pathname)) { return platformAssetHandler(request); }