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

Node warnings with more readable Node versions #410

Merged
merged 2 commits into from
Mar 1, 2022
Merged

Node warnings with more readable Node versions #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9bc934
Node warnings with better version formatting
vmarta Feb 16, 2022
e69edec
Merge branch 'develop' into better-node-version-formatting
vmarta Mar 1, 2022
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
8 changes: 4 additions & 4 deletions packages/pwa-kit-create-app/scripts/create-mobify-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
)
Expand Down
9 changes: 5 additions & 4 deletions packages/pwa-kit-react-sdk/src/ssr/server/express.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
)
Expand Down
8 changes: 4 additions & 4 deletions scripts/check-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`)
}

Expand Down