Skip to content

Commit e7eeba2

Browse files
glo82145glo82145
authored
PWA-3216::upgarding node 14 to 18 (#4279)
* PWA-3216::upgarding node 14 to 18 * PWA-3216::upgarding node 14 to 18 * PWA-3216::updated node to 18 * PWA-3216::updated node to 18 * removing package-lock.json
1 parent cd0adbc commit e7eeba2

File tree

66 files changed

+5230
-4862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+5230
-4862
lines changed

‎dev.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is intended to be used with ./docker-compose.yml #
33
##############################################################
44

5-
FROM node:14.18.1-alpine as build
5+
FROM node:18.16.1-alpine as build
66
# working directory
77
WORKDIR /usr/src/app
88

@@ -30,7 +30,7 @@ RUN yarn install --frozen-lockfile
3030
RUN yarn run build
3131

3232
# MULTI-STAGE BUILD
33-
FROM node:14.18.1-alpine
33+
FROM node:18.16.1-alpine
3434
# working directory
3535
WORKDIR /usr/src/app
3636
# node:alpine comes with a configured user and group

‎package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"url": "https://github.com/magento/pwa-studio/issues"
2323
},
2424
"scripts": {
25-
"build": "yarn venia run build",
26-
"build:dev": "yarn venia run build:dev",
25+
"build": "export NODE_OPTIONS=--openssl-legacy-provider && yarn venia run build",
26+
"build:dev": "export NODE_OPTIONS=--openssl-legacy-provider && yarn venia run build:dev",
2727
"clean:all": "yarn workspaces run -s clean && rimraf ./node_modules",
2828
"clean:dist": "yarn workspaces run clean",
2929
"coveralls": "cat ./coverage/lcov.info | coveralls",
@@ -36,17 +36,18 @@
3636
"stage:venia": "yarn venia start",
3737
"stats:venia": "yarn venia run build:analyze && yarn venia run stats",
3838
"storybook:venia": "yarn workspace @magento/venia-ui run storybook",
39-
"test": "jest",
40-
"test:ci": "jest --no-cache --max-workers=3 --json --outputFile=test-results.json",
41-
"test:debug": "node --inspect-brk node_modules/.bin/jest --no-cache --no-coverage --runInBand --testTimeout 86400",
42-
"test:dev": "jest --watch",
39+
"test": "export NODE_OPTIONS=--openssl-legacy-provider && jest",
40+
"test:ci": "export NODE_OPTIONS=--openssl-legacy-provider && jest --no-cache --max-workers=3 --json --outputFile=test-results.json",
41+
"test:debug": "export NODE_OPTIONS=--openssl-legacy-provider && node --inspect-brk node_modules/.bin/jest --no-cache --no-coverage --runInBand --testTimeout 86400",
42+
"test:dev": "export NODE_OPTIONS=--openssl-legacy-provider && jest --watch",
4343
"validate-queries": "graphql validate --keepClientFields --noStrictFragments",
4444
"venia": "yarn workspace @magento/venia-concept",
4545
"watch:all": "node scripts/watch-all.js",
4646
"watch:venia": "yarn venia run watch"
4747
},
4848
"dependencies": {
49-
"caniuse-lite": "~1.0.30001335"
49+
"caniuse-lite": "~1.0.30001335",
50+
"setimmediate": "^1.0.5"
5051
},
5152
"devDependencies": {
5253
"@babel/plugin-transform-runtime": "~7.4.4",
@@ -98,7 +99,7 @@
9899
"@graphql-tools/prisma-loader": "6.3.0"
99100
},
100101
"engines": {
101-
"node": ">=14.x",
102+
"node": ">=18.x",
102103
"yarn": ">=1.12.0"
103104
},
104105
"bundlesize": [

‎packages/babel-preset-peregrine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"react-refresh": "~0.8.3"
3434
},
3535
"engines": {
36-
"node": ">=14.x",
36+
"node": ">=18.x",
3737
"yarn": ">=1.12.0"
3838
}
3939
}

‎packages/pagebuilder/lib/ContentTypes/Banner/__tests__/__snapshots__/banner.shimmer.spec.js.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ exports[`renders a BannerShimmer component with minHeight 1`] = `
6767
onClick={[Function]}
6868
onDragStart={[Function]}
6969
onKeyDown={[Function]}
70-
onKeyUp={[Function]}
7170
onMouseDown={[Function]}
7271
onMouseEnter={[Function]}
7372
onMouseLeave={[Function]}

‎packages/pagebuilder/lib/ContentTypes/Banner/__tests__/__snapshots__/banner.spec.js.snap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ exports[`on hover displays button and overlay 1`] = `
6868
onClick={[Function]}
6969
onDragStart={[Function]}
7070
onKeyDown={[Function]}
71-
onKeyUp={[Function]}
7271
onMouseDown={[Function]}
7372
onMouseEnter={[Function]}
7473
onMouseLeave={[Function]}
@@ -158,7 +157,6 @@ exports[`on hover displays button and overlay 2`] = `
158157
onClick={[Function]}
159158
onDragStart={[Function]}
160159
onKeyDown={[Function]}
161-
onKeyUp={[Function]}
162160
onMouseDown={[Function]}
163161
onMouseEnter={[Function]}
164162
onMouseLeave={[Function]}
@@ -346,7 +344,6 @@ exports[`renders a configured collage-left Banner component on mobile 1`] = `
346344
onClick={[Function]}
347345
onDragStart={[Function]}
348346
onKeyDown={[Function]}
349-
onKeyUp={[Function]}
350347
onMouseDown={[Function]}
351348
onMouseEnter={[Function]}
352349
onMouseLeave={[Function]}
@@ -540,7 +537,6 @@ exports[`renders an empty Banner component 1`] = `
540537
onClick={[Function]}
541538
onDragStart={[Function]}
542539
onKeyDown={[Function]}
543-
onKeyUp={[Function]}
544540
onMouseDown={[Function]}
545541
onMouseEnter={[Function]}
546542
onMouseLeave={[Function]}

‎packages/pagebuilder/lib/ContentTypes/ButtonItem/__tests__/__snapshots__/buttonItem.spec.js.snap

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ exports[`renders a ButtonItem component 1`] = `
88
onClick={[Function]}
99
onDragStart={[Function]}
1010
onKeyDown={[Function]}
11-
onKeyUp={[Function]}
1211
onMouseDown={[Function]}
1312
onMouseEnter={[Function]}
1413
onMouseLeave={[Function]}
@@ -53,7 +52,6 @@ exports[`renders a ButtonItem component with all properties configured 1`] = `
5352
onClick={[Function]}
5453
onDragStart={[Function]}
5554
onKeyDown={[Function]}
56-
onKeyUp={[Function]}
5755
onMouseDown={[Function]}
5856
onMouseEnter={[Function]}
5957
onMouseLeave={[Function]}

‎packages/peregrine/lib/targets/__tests__/peregrine-targets.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
global.setImmediate;
12
const {
23
buildModuleWith,
34
mockBuildBus,

‎packages/peregrine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"redux-actions": "~2.6.5"
5050
},
5151
"engines": {
52-
"node": ">=14.x",
52+
"node": ">=18.x",
5353
"yarn": ">=1.12.0"
5454
},
5555
"pwa-studio": {

‎packages/pwa-buildpack/lib/WebpackTools/targetables/__tests__/__snapshots__/TargetableReactComponent.spec.js.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ Object.defineProperty(exports, \\"__esModule\\", {
272272
exports.Checkbox = Checkbox;
273273
var _react = require(\\"react\\");
274274
const _excluded = [\\"classes\\", \\"fieldState\\", \\"id\\", \\"label\\", \\"message\\"];
275-
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
276-
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
277-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
278-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== \\"function\\") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
279-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== \\"object\\" && typeof obj !== \\"function\\") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== \\"default\\" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
275+
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
276+
function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
277+
function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
278+
function _getRequireWildcardCache(e) { if (\\"function\\" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
279+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || \\"object\\" != typeof e && \\"function\\" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if (\\"default\\" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
280280
const DynamicComponent$3 = (0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./path/to/a-third/component'))));
281281
const DynamicBlerg$2 = (0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./path/to/another/component'))));
282282
const DynamicBlerg$1 = (0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('./path/to/dynamic/component'))));

‎packages/pwa-buildpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"workbox-webpack-plugin": "~6.2.4"
103103
},
104104
"engines": {
105-
"node": ">=14.x",
105+
"node": ">=18.x",
106106
"yarn": ">=1.12.0"
107107
},
108108
"pwa-studio": {

0 commit comments

Comments
 (0)