diff --git a/packages/pwa-kit-create-app/scripts/create-mobify-app.js b/packages/pwa-kit-create-app/scripts/create-mobify-app.js index ce29fb7d1e..fe3b83ca29 100755 --- a/packages/pwa-kit-create-app/scripts/create-mobify-app.js +++ b/packages/pwa-kit-create-app/scripts/create-mobify-app.js @@ -393,15 +393,15 @@ const extractTemplate = (templateName, outputDir) => { sh.rm('-rf', tmp) } -const userNode = process.versions.node -const requiredNode = new semver.Range(generatorPkg.engines.node) -const isUsingCompatibleNode = semver.satisfies(userNode, requiredNode) +const foundNode = process.versions.node +const requiredNode = generatorPkg.engines.node +const isUsingCompatibleNode = semver.satisfies(foundNode, new semver.Range(requiredNode)) const main = (opts) => { if (!isUsingCompatibleNode) { console.log('') console.warn( - `Warning: You are using Node ${userNode}. ` + + `Warning: You are using Node ${foundNode}. ` + `Your app may not work as expected when deployed to Managed ` + `Runtime servers which are compatible with Node ${requiredNode}` ) diff --git a/packages/pwa-kit-react-sdk/src/ssr/server/express.js b/packages/pwa-kit-react-sdk/src/ssr/server/express.js index 300fabf95a..10471483ce 100644 --- a/packages/pwa-kit-react-sdk/src/ssr/server/express.js +++ b/packages/pwa-kit-react-sdk/src/ssr/server/express.js @@ -340,17 +340,18 @@ export const createApp = (options) => { const validateConfiguration = (options) => { // Check that we are running under a compatible version of node /* istanbul ignore next */ - const requiredNode = new semver.Range(pkg.engines.node) + const requiredNode = pkg.engines.node + const foundNode = process.versions.node /* istanbul ignore next */ if ( !semver.satisfies( - process.versions.node, // A string like '8.10.0' - requiredNode + foundNode, // A string like '8.10.0' + new semver.Range(requiredNode) ) ) { /* istanbul ignore next */ console.warn( - `Warning: You are using Node ${process.versions.node}. ` + + `Warning: You are using Node ${foundNode}. ` + `Your app may not work as expected when deployed to Managed ` + `Runtime servers which are compatible with Node ${requiredNode}` ) diff --git a/scripts/check-version.js b/scripts/check-version.js index 6921b6dec6..4c261b6a0f 100755 --- a/scripts/check-version.js +++ b/scripts/check-version.js @@ -33,18 +33,18 @@ if (!fs.existsSync(path.join('node_modules', 'semver'))) { } const semver = require('semver') -const requiredNode = new semver.Range(pkg.engines.node) +const requiredNode = pkg.engines.node const foundNode = process.version -const requiredNpm = new semver.Range(pkg.engines.npm) +const requiredNpm = pkg.engines.npm const foundNpm = spawnSync(npm, ['-v']).stdout.toString().trim() const warnings = [] -if (!semver.satisfies(foundNode, requiredNode)) { +if (!semver.satisfies(foundNode, new semver.Range(requiredNode))) { warnings.push(`- Node: ${foundNode} is installed, but we require ${requiredNode}`) } -if (!semver.satisfies(foundNpm, requiredNpm)) { +if (!semver.satisfies(foundNpm, new semver.Range(requiredNpm))) { warnings.push(`- NPM: ${foundNpm} is installed, but we require ${requiredNpm}`) }