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.

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

feat: add node 18 support #6943

Merged
merged 5 commits into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@ jobs:
test_repository:
name: Run linter, build and test all packages
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14, 16, 18]
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- name: Install dependencies
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"dev:docs": "cd packages/docs && yarn dev",
"link-packages": "lerna link --force-local",
"lint": "eslint . --ext .js,.ts,.vue",
"test": "lerna run test",
"test:cache": "cd packages/cache && yarn test",
"test:http-cache": "cd packages/http-cache && yarn test",
"test:cli": "cd packages/cli && yarn test",
Expand Down Expand Up @@ -49,7 +50,7 @@
"rimraf": "^3.0.2",
"rollup": "^2.59.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.33",
"ts-jest": "^27.0.3",
"ts-node": "^8.4.1",
"tslib": "^2.1.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/cache/__tests__/nuxtModule.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ const mockNuxt = {
addPlugin: jest.fn(),

addServerMiddleware: jest.fn(({ handler }) => {
// Simulate request to invalidation endpoint
handler({}, { writeHead: jest.fn(), end: jest.fn() });
const responseMock = { writeHead: jest.fn(), end: jest.fn(), status: jest.fn(() => responseMock), send: jest.fn() };

handler({}, responseMock);
})
};

Expand Down
4 changes: 3 additions & 1 deletion packages/cache/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const baseConfig = require('../jest.base.config');

module.exports = baseConfig;
module.exports = {
...baseConfig
};
4 changes: 2 additions & 2 deletions packages/cache/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/cache",
"version": "2.7.5",
"version": "2.8.0",
"license": "MIT",
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand All @@ -12,7 +12,7 @@
"prepublish": "yarn build"
},
"dependencies": {
"@vue-storefront/core": "~2.7.5"
"@vue-storefront/core": "^2.8.0"
},
"peerDependencies": {
"@nuxtjs/composition-api": "^0.29.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/cli",
"version": "4.2.2",
"version": "4.3.0",
"description": "Vue Storefront's CLI.",
"bin": "./bin/run",
"homepage": "https://github.com/vuestorefront/vue-storefront",
Expand Down
17 changes: 0 additions & 17 deletions packages/core/__tests__/factories/_mountComposable.ts

This file was deleted.

4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/core",
"version": "2.7.6",
"version": "2.8.0",
"sideEffects": false,
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand Down Expand Up @@ -37,6 +37,6 @@
"access": "public"
},
"engines": {
"node": ">=14 <=16"
"node": ">= 14"
}
}
7 changes: 0 additions & 7 deletions packages/docs/changelog/6869.js

This file was deleted.

6 changes: 5 additions & 1 deletion packages/docs/reference/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.8.0

- feat: add support for the Node 18 ([6943](https://github.com/vuestorefront/vue-storefront/pull/6943)) - [Bartosz Herba](https://github.com/bartoszherba)

## 2.7.6

- chore: enhance custom query to allow sending metadata as object ([6928](https://github.com/vuestorefront/vue-storefront/pull/6928))
Expand Down Expand Up @@ -52,7 +56,7 @@ Date: 05.07.2022

- Docs update / corrects / fixes

- All new CLI `3.0.0`
- All new CLI `3.0.0`

## 2.5.13

Expand Down
6 changes: 3 additions & 3 deletions packages/health-check/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@vue-storefront/health-check",
"version": "2.7.5",
"version": "2.8.0",
"description": "",
"main": "lib/module.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\""
},
"author": "Vue Storefront",
"license": "MIT",
Expand All @@ -20,6 +20,6 @@
},
"homepage": "https://github.com/vuestorefront/vue-storefront#readme",
"engines": {
"node": ">=14 <=16"
"node": ">= 14"
}
}
4 changes: 2 additions & 2 deletions packages/http-cache/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/http-cache",
"version": "2.7.5",
"version": "2.8.0",
"license": "MIT",
"scripts": {
"test": "jest"
Expand All @@ -20,6 +20,6 @@
},
"homepage": "https://github.com/vuestorefront/vue-storefront#readme",
"engines": {
"node": ">=14 <=16"
"node": ">= 14"
}
}
3 changes: 1 addition & 2 deletions packages/middleware/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const baseConfig = require('../jest.base.config');

module.exports = {
...baseConfig,
collectCoverage: true
...baseConfig
};
4 changes: 2 additions & 2 deletions packages/middleware/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/middleware",
"version": "2.7.5",
"version": "2.8.0",
"description": "",
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
Expand All @@ -15,7 +15,7 @@
"author": "Vue Storefront",
"license": "MIT",
"dependencies": {
"@vue-storefront/core": "~2.7.5",
"@vue-storefront/core": "^2.8.0",
"consola": "2.15.3",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5",
Expand Down
6 changes: 3 additions & 3 deletions packages/nuxt-module/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@vue-storefront/nuxt",
"version": "2.7.5",
"version": "2.8.0",
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
"types": "lib/src/index.d.ts",
"scripts": {
"build": "rimraf lib && rollup -c",
"test": "echo \"Error: no test specified\" && exit 1",
"test": "echo \"Error: no test specified\"",
"prepublish": "yarn build"
},
"author": "Vue Storefront",
Expand All @@ -33,6 +33,6 @@
"plugins/**/*"
],
"engines": {
"node": ">=14 <=16"
"node": ">= 14"
}
}
6 changes: 3 additions & 3 deletions packages/nuxt-theme-module/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@vue-storefront/nuxt-theme",
"version": "2.7.5",
"version": "2.8.0",
"description": "",
"main": "lib/module.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\""
},
"author": "Vue Storefront",
"license": "MIT",
Expand All @@ -29,6 +29,6 @@
"@nuxtjs/composition-api": "^0.29.3"
},
"engines": {
"node": ">=14 <=16"
"node": ">= 14"
}
}
36 changes: 11 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2945,7 +2945,7 @@
estree-walker "^1.0.1"
picomatch "^2.2.2"

"@rollup/pluginutils@^4.1.0", "@rollup/pluginutils@^4.1.1":
"@rollup/pluginutils@^4.1.1", "@rollup/pluginutils@^4.1.2":
version "4.2.1"
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
Expand Down Expand Up @@ -8444,7 +8444,7 @@ find-cache-dir@^2.1.0:
make-dir "^2.0.0"
pkg-dir "^3.0.0"

find-cache-dir@^3.3.1:
find-cache-dir@^3.3.1, find-cache-dir@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
Expand Down Expand Up @@ -10204,7 +10204,7 @@ is-color-stop@^1.0.0, is-color-stop@^1.1.0:
rgb-regex "^1.0.1"
rgba-regex "^1.0.0"

is-core-module@^2.1.0, is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
is-core-module@^2.1.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
Expand Down Expand Up @@ -15123,14 +15123,6 @@ resolve.exports@^1.1.0:
resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==

[email protected]:
version "1.20.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
dependencies:
is-core-module "^2.2.0"
path-parse "^1.0.6"

resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
version "1.22.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
Expand Down Expand Up @@ -15245,16 +15237,15 @@ rollup-plugin-terser@^7.0.2:
serialize-javascript "^4.0.0"
terser "^5.0.0"

rollup-plugin-typescript2@^0.30.0:
version "0.30.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.30.0.tgz#1cc99ac2309bf4b9d0a3ebdbc2002aecd56083d3"
integrity sha512-NUFszIQyhgDdhRS9ya/VEmsnpTe+GERDMmFo0Y+kf8ds51Xy57nPNGglJY+W6x1vcouA7Au7nsTgsLFj2I0PxQ==
rollup-plugin-typescript2@^0.33:
version "0.33.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.33.0.tgz#2bb943f83e9d3a4c61a19aed5bee5bcff28d16a3"
integrity sha512-7ZXoZeX93kNb4/ICzOi2AlperVV6cAsNz8THqrbz+KNvpn47P2F/nFdK/BGhkoOsOwuYDuY57vccdZZrcd8/dA==
dependencies:
"@rollup/pluginutils" "^4.1.0"
find-cache-dir "^3.3.1"
fs-extra "8.1.0"
resolve "1.20.0"
tslib "2.1.0"
"@rollup/pluginutils" "^4.1.2"
find-cache-dir "^3.3.2"
fs-extra "^10.0.0"
tslib "^2.4.0"

rollup@^2.59.0:
version "2.75.7"
Expand Down Expand Up @@ -16963,11 +16954,6 @@ tsconfig-paths@^3.14.1:
minimist "^1.2.6"
strip-bom "^3.0.0"

[email protected]:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==

tslib@^1.8.1, tslib@^1.9.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
Expand Down