@jsii/check-node 1.112.0 → 1.113.0

package/lib/constants.d.ts

@@ -6,10 +6,9 @@ import { Range } from 'semver';
  */
 export declare class NodeRelease {
     /**
-     * How long before enf-of-life do we start warning customers? Expressed in
-     * milliseconds to make it easier to deal with JS dates.
+     * How long after end-of-life do we continue to support a node version.
      */
-    private static readonly DEPRECATION_WINDOW_MS;
+    private static readonly DEFAULT_EXTENDED_SUPPORT_MONTHS;
     /**
      * All registered node releases.
      */
@@ -31,18 +30,28 @@ export declare class NodeRelease {
     readonly majorVersion: number;
     /**
      * The date on which this release range starts to be considered end-of-life.
-     * May be `undefined` for "ancient" releases (before Node 12).
+     * Defaults to a pre-CDK date for "ancient" releases (before Node 12).
      */
-    readonly endOfLifeDate: Date | undefined;
+    readonly endOfLifeDate: Date;
     /**
-     * Determines whether this release is currently considered end-of-life.
+     * Determines whether this release has reached end of support for jsii.
+     * This is usually longer then endOfLife;
      */
-    readonly endOfLife: boolean;
+    readonly endOfJsiiSupportDate: Date;
     /**
      * Determines whether this release is within the deprecation window ahead of
      * it's end-of-life date.
      */
     readonly deprecated: boolean;
+    /**
+     * Determines whether this release has reached end-of-life.
+     */
+    readonly endOfLife: boolean;
+    /**
+     * Determines whether this major version line is currently "in support",
+     * meaning it is not end-of-life or within our extended support time frame.
+     */
+    readonly supported: boolean;
     /**
      * If `true` denotes that this version of node has not been added to the test
      * matrix yet. This is used when adding not-yet-released versions of node that
@@ -57,18 +66,10 @@ export declare class NodeRelease {
      * bugs).
      */
     readonly supportedRange: Range;
-    /**
-     * Determines whether this major version line is currently "in support",
-     * meaning it is not end-of-life nor pending.
-     */
-    readonly supported: boolean;
-    /** @internal visible for testing */
-    constructor(majorVersion: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11, opts: {
-        endOfLife: true;
-    });
     /** @internal visible for testing */
     constructor(majorVersion: number, opts: {
         endOfLife: Date;
+        endOfJsiiSupport?: Date;
         untested?: boolean;
         supportedRange?: string;
     });

package/lib/constants.js

@@ -10,22 +10,6 @@ const ONE_DAY_IN_MILLISECONDS = 86400000;
  * @see https://nodejs.org/en/about/releases/
  */
 class NodeRelease {
-    /** @internal visible for testing */
-    constructor(majorVersion, opts) {
-        var _a, _b;
-        this.majorVersion = majorVersion;
-        this.endOfLifeDate = opts.endOfLife === true ? undefined : opts.endOfLife;
-        this.untested = (_a = opts.untested) !== null && _a !== void 0 ? _a : false;
-        this.supportedRange = new semver_1.Range((_b = opts.supportedRange) !== null && _b !== void 0 ? _b : `^${majorVersion}.0.0`);
-        this.endOfLife =
-            opts.endOfLife === true || opts.endOfLife.getTime() <= Date.now();
-        this.deprecated =
-            !this.endOfLife &&
-                opts.endOfLife !== true &&
-                opts.endOfLife.getTime() - NodeRelease.DEPRECATION_WINDOW_MS <=
-                    Date.now();
-        this.supported = !this.untested && !this.endOfLife;
-    }
     /**
      * @returns the `NodeRelease` corresponding to the version of the node runtime
      *          executing this code (as provided by `process.version`), and a
@@ -46,6 +30,26 @@ class NodeRelease {
         }
         return { nodeRelease: undefined, knownBroken: false };
     }
+    /** @internal visible for testing */
+    constructor(majorVersion, opts) {
+        var _a, _b, _c;
+        this.untested = (_a = opts.untested) !== null && _a !== void 0 ? _a : false;
+        this.majorVersion = majorVersion;
+        this.supportedRange = new semver_1.Range((_b = opts.supportedRange) !== null && _b !== void 0 ? _b : `^${majorVersion}.0.0`);
+        this.endOfLifeDate = opts.endOfLife;
+        this.endOfLife =
+            opts.endOfLife.getTime() + ONE_DAY_IN_MILLISECONDS <= Date.now();
+        // jsii EOS defaults to 6 months after EOL
+        this.endOfJsiiSupportDate =
+            (_c = opts.endOfJsiiSupport) !== null && _c !== void 0 ? _c : new Date(this.endOfLifeDate.getFullYear(), this.endOfLifeDate.getMonth() +
+                NodeRelease.DEFAULT_EXTENDED_SUPPORT_MONTHS, this.endOfLifeDate.getDate());
+        const endOfJsiiSupport = this.endOfJsiiSupportDate.getTime() + ONE_DAY_IN_MILLISECONDS <=
+            Date.now();
+        // We deprecate (warn) from EOL to jsii EOS
+        this.deprecated = this.endOfLife && !endOfJsiiSupport;
+        // All tested and not EOS versions are supported
+        this.supported = !this.untested && !endOfJsiiSupport;
+    }
     toString() {
         const eolInfo = this.endOfLifeDate
             ? ` (Planned end-of-life: ${this.endOfLifeDate
@@ -57,16 +61,18 @@ class NodeRelease {
 }
 exports.NodeRelease = NodeRelease;
 /**
- * How long before enf-of-life do we start warning customers? Expressed in
- * milliseconds to make it easier to deal with JS dates.
+ * How long after end-of-life do we continue to support a node version.
  */
-NodeRelease.DEPRECATION_WINDOW_MS = 30 * ONE_DAY_IN_MILLISECONDS;
+NodeRelease.DEFAULT_EXTENDED_SUPPORT_MONTHS = 6;
 /**
  * All registered node releases.
  */
 NodeRelease.ALL_RELEASES = [
     // Historical releases (not relevant at time of writing this as they're all EOL now...)
-    ...[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map((majorVersion) => new NodeRelease(majorVersion, { endOfLife: true })),
+    ...[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map((majorVersion) => new NodeRelease(majorVersion, {
+        endOfLife: new Date('2018-01-01'),
+        untested: true,
+    })),
     // Past end-of-life releases
     new NodeRelease(12, {
         endOfLife: new Date('2022-04-30'),
@@ -89,10 +95,15 @@ NodeRelease.ALL_RELEASES = [
     }),
     new NodeRelease(19, { endOfLife: new Date('2023-06-01'), untested: true }),
     new NodeRelease(21, { endOfLife: new Date('2024-06-01'), untested: true }),
+    new NodeRelease(23, { endOfLife: new Date('2025-06-01'), untested: true }),
     // Currently active releases (as of last edit to this file...)
-    new NodeRelease(18, { endOfLife: new Date('2025-04-30') }),
+    new NodeRelease(18, {
+        endOfLife: new Date('2025-04-30'),
+        endOfJsiiSupport: new Date('2025-11-30'),
+    }),
     new NodeRelease(20, { endOfLife: new Date('2026-04-30') }),
     new NodeRelease(22, { endOfLife: new Date('2027-04-30') }),
+    new NodeRelease(24, { endOfLife: new Date('2028-04-30') }),
     // Future (planned releases)
 ];
 //# sourceMappingURL=constants.js.map

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkNode = exports.NodeRelease = void 0;
+exports.NodeRelease = void 0;
+exports.checkNode = checkNode;
 const chalk_1 = require("chalk");
 const console_1 = require("console");
 const process_1 = require("process");
@@ -19,16 +20,15 @@ function checkNode(envPrefix = 'JSII') {
     var _a;
     const { nodeRelease, knownBroken } = constants_1.NodeRelease.forThisRuntime();
     const defaultCallToAction = 'Should you encounter odd runtime issues, please try using one of the supported release before filing a bug report.';
-    if (nodeRelease === null || nodeRelease === void 0 ? void 0 : nodeRelease.endOfLife) {
+    if ((nodeRelease === null || nodeRelease === void 0 ? void 0 : nodeRelease.supported) === false) {
         const silenceVariable = `${envPrefix}_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION`;
         const silencedVersions = ((_a = process.env[silenceVariable]) !== null && _a !== void 0 ? _a : '')
             .split(',')
             .map((v) => v.trim());
-        const qualifier = nodeRelease.endOfLifeDate
-            ? ` on ${nodeRelease.endOfLifeDate.toISOString().slice(0, 10)}`
-            : '';
-        if (!silencedVersions.includes(nodeRelease.majorVersion.toString()))
-            veryVisibleMessage(chalk_1.bgRed.white.bold, `Node ${nodeRelease.majorVersion} has reached end-of-life${qualifier} and is not supported.`, `Please upgrade to a supported node version as soon as possible.`);
+        if (!silencedVersions.includes(nodeRelease.majorVersion.toString())) {
+            const eos = nodeRelease.endOfJsiiSupportDate.toISOString().slice(0, 10);
+            veryVisibleMessage(chalk_1.bgRed.white.bold, `Node ${nodeRelease.majorVersion} is end-of-life and not supported anymore by this software since ${eos}.`, `Please upgrade to a supported node version as soon as possible.`);
+        }
     }
     else if (knownBroken) {
         const silenceVariable = `${envPrefix}_SILENCE_WARNING_KNOWN_BROKEN_NODE_VERSION`;
@@ -44,8 +44,9 @@ function checkNode(envPrefix = 'JSII') {
     else if (nodeRelease === null || nodeRelease === void 0 ? void 0 : nodeRelease.deprecated) {
         const silenceVariable = `${envPrefix}_SILENCE_WARNING_DEPRECATED_NODE_VERSION`;
         if (!process.env[silenceVariable]) {
-            const deadline = nodeRelease.endOfLifeDate.toISOString().slice(0, 10);
-            veryVisibleMessage(chalk_1.bgYellowBright.black, `Node ${nodeRelease.majorVersion} is approaching end-of-life and will no longer be supported in new releases after ${deadline}.`, `Please upgrade to a supported node version as soon as possible.`, silenceVariable);
+            const eol = nodeRelease.endOfLifeDate.toISOString().slice(0, 10);
+            const eos = nodeRelease.endOfJsiiSupportDate.toISOString().slice(0, 10);
+            veryVisibleMessage(chalk_1.bgYellowBright.black, `Node ${nodeRelease.majorVersion} has reached end-of-life on ${eol} and will no longer be supported in new releases after ${eos}.`, `Please upgrade to a supported node version as soon as possible.`, silenceVariable);
         }
     }
     function veryVisibleMessage(chalk, message, callToAction, silenceVariable) {
@@ -56,7 +57,7 @@ function checkNode(envPrefix = 'JSII') {
             `This software is currently running on node ${process_1.version}.`,
             'As of the current release of this software, supported node releases are:',
             ...constants_1.NodeRelease.ALL_RELEASES.filter((release) => release.supported)
-                // We display those from longest remaining support to shortest (to incitate people to be ahead of future derepcations).
+                // We display those from longest remaining support to shortest (to indicate people to be ahead of future deprecations).
                 .sort((l, r) => {
                 var _a, _b, _c, _d;
                 return ((_b = (_a = r.endOfLifeDate) === null || _a === void 0 ? void 0 : _a.getTime()) !== null && _b !== void 0 ? _b : 0) -
@@ -83,5 +84,4 @@ function checkNode(envPrefix = 'JSII') {
         (0, console_1.error)(border);
     }
 }
-exports.checkNode = checkNode;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/check-node",
-  "version": "1.112.0",
+  "version": "1.113.0",
   "description": "Checks for supported node versions",
   "license": "Apache-2.0",
   "author": {
@@ -27,7 +27,7 @@
     "./run": "./lib/run.js"
   },
   "scripts": {
-    "build": "tsc --build && npm run lint",
+    "build": "tsc --build && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
@@ -37,6 +37,6 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "semver": "^7.7.1"
+    "semver": "^7.7.2"
   }
 }