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

fix: Ensure CLI works out-of-the-box on Node 16+ #1774

Merged
merged 4 commits into from
Jan 14, 2023
Merged

fix: Ensure CLI works out-of-the-box on Node 16+ #1774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c59243e
fix: Ensure CLI works out-of-the-box on Node 16+
rschristian Jan 14, 2023
8e239fa
fix: I can't spell
rschristian Jan 14, 2023
de2e3b0
docs: Adding changeset
rschristian Jan 14, 2023
814f8e8
test: Fixing test images (unrelated)
rschristian Jan 14, 2023
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: 5 additions & 0 deletions .changeset/fair-teachers-marry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'preact-cli': patch
---

Injects necessary Node options config into new projects if user's Node version is 16+
10 changes: 10 additions & 0 deletions packages/cli/src/commands/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const {
warn,
dirExists,
normalizeTemplatesResponse,
isNodeVersionGreater,
} = require('../util');
const {
CUSTOM_TEMPLATE,
Expand Down Expand Up @@ -313,6 +314,15 @@ exports.create = async function createCommand(repo, dest, argv) {
spinner.text = 'Updating `name` within `package.json` file';
pkgData.name = argv.name.toLowerCase().replace(/\s+/g, '_');
}

if (repo.startsWith(ORG) && isNodeVersionGreater('16.0.0')) {
pkgData.scripts.build =
'cross-env NODE_OPTIONS=--openssl-legacy-provider preact build';
pkgData.scripts.dev =
'cross-env NODE_OPTIONS=--openssl-legacy-provider preact watch';
pkgData.devDependencies['cross-env'] = '^7.0.3';
}

// Find a `manifest.json`; use the first match, if any
let files = await glob(target + '/**/manifest.json');
let manifest = files[0] && JSON.parse(await readFile(files[0]));
Expand Down
10 changes: 3 additions & 7 deletions packages/cli/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ const sade = require('sade');
const notifier = require('update-notifier');
const { error } = require('./util');
const pkg = require('../package.json');
const { isNodeVersionGreater } = require('./util');

const ver = process.version;
const min = pkg.engines.node;
if (
ver
.substring(1)
.localeCompare(min.match(/\d+/g).join('.'), 'en', { numeric: true }) === -1
) {
if (!isNodeVersionGreater(min)) {
error(
`You are using Node ${ver} but preact-cli requires Node ${min}. Please upgrade Node to continue!\n`
`You are using Node ${process.version} but preact-cli requires Node ${min}. Please upgrade Node to continue!\n`
);
}

Expand Down
10 changes: 10 additions & 0 deletions packages/cli/src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ exports.toBool = function (val) {
return val !== void 0 && val !== false && !/false|0/.test(val);
};

exports.isNodeVersionGreater = function (minimum) {
return (
process.version
.substring(1)
.localeCompare(minimum.match(/\d+/g).join('.'), 'en', {
numeric: true,
}) === 1
);
};

exports.esmImport = require('esm')(module);

/**
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/tests/images/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ exports.default = Object.assign({}, common, {
'assets/preact-logo.svg': 645,
'assets/preact-logo-inverse.svg': 649,
'assets/favicon.ico': 15086,
'ssr-build/ssr-bundle.2b941.css': 2601,
'ssr-build/ssr-bundle.2b941.css.map': 3708,
'ssr-build/ssr-bundle.82489.css': 2601,
'ssr-build/ssr-bundle.82489.css.map': 3708,
'ssr-build/ssr-bundle.js': 28830,
'ssr-build/ssr-bundle.js.map': 52686,
'ssr-build/asset-manifest.json': 178,
'bundle.4c6ac.css': 1276,
'bundle.fbf1b.js': 22529,
'bundle.fbf1b.js.map': 111801,
'bundle.c4895.js': 22529,
'bundle.c4895.js.map': 111801,
'favicon.ico': 15086,
'index.html': 4127,
'manifest.json': 455,
'preact_prerender_data.json': 11,
'push-manifest.json': 388,
'asset-manifest.json': 1142,
'route-home.chunk.c490f.css': 834,
'route-home.chunk.50bd0.js': 1149,
'route-home.chunk.50bd0.js.map': 1961,
'route-home.chunk.9bcab.css': 834,
'route-home.chunk.5d28d.js': 1149,
'route-home.chunk.5d28d.js.map': 1961,
'route-profile.chunk.4c330.js': 3490,
'route-profile.chunk.4c330.js.map': 15002,
});
Expand Down