@modern-js/utils 1.7.3 → 1.7.6

package/dist/monorepo.js

@@ -8,16 +8,16 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const compiled_1 = require("./compiled");
 const PACKAGE_MAX_DEPTH = 5;
-const WORKSPACES_FILES = {
+const WORKSPACE_FILES = {
     YARN: 'package.json',
-    PNPM: 'pnpm-workspaces.yaml',
+    PNPM: 'pnpm-workspace.yaml',
     LERNA: 'lerna.json',
 };
-const isLerna = (root) => fs_1.default.existsSync(path_1.default.join(root, WORKSPACES_FILES.LERNA));
+const isLerna = (root) => fs_1.default.existsSync(path_1.default.join(root, WORKSPACE_FILES.LERNA));
 exports.isLerna = isLerna;
 const isYarnWorkspaces = (root) => {
     var _a;
-    const pkg = path_1.default.join(root, WORKSPACES_FILES.YARN);
+    const pkg = path_1.default.join(root, WORKSPACE_FILES.YARN);
     if (!fs_1.default.existsSync(pkg)) {
         return false;
     }
@@ -25,12 +25,16 @@ const isYarnWorkspaces = (root) => {
     return Boolean((_a = json.workspaces) === null || _a === void 0 ? void 0 : _a.packages);
 };
 exports.isYarnWorkspaces = isYarnWorkspaces;
-const isPnpmWorkspaces = (root) => fs_1.default.existsSync(path_1.default.join(root, WORKSPACES_FILES.PNPM));
+const isPnpmWorkspaces = (root) => fs_1.default.existsSync(path_1.default.join(root, WORKSPACE_FILES.PNPM));
 exports.isPnpmWorkspaces = isPnpmWorkspaces;
 const isMonorepo = (root) => (0, exports.isLerna)(root) || (0, exports.isYarnWorkspaces)(root) || (0, exports.isPnpmWorkspaces)(root);
 exports.isMonorepo = isMonorepo;
 const isModernjsMonorepo = (root) => {
-    const json = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'package.json'), 'utf8'));
+    const pkgJsonPath = path_1.default.join(root, 'package.json');
+    if (!fs_1.default.existsSync(pkgJsonPath)) {
+        return false;
+    }
+    const json = JSON.parse(fs_1.default.readFileSync(pkgJsonPath, 'utf8'));
     const deps = {
         ...(json.dependencies || {}),
         ...(json.devDependencies || {}),
@@ -62,7 +66,7 @@ const getMonorepoPackages = (root) => {
         ({ packages } = json);
     }
     else {
-        ({ packages } = compiled_1.yaml.load(fs_1.default.readFileSync(path_1.default.join(root, WORKSPACES_FILES.PNPM), 'utf8')));
+        ({ packages } = compiled_1.yaml.load(fs_1.default.readFileSync(path_1.default.join(root, WORKSPACE_FILES.PNPM), 'utf8')));
     }
     if (packages) {
         return packages

package/dist/prettyInstructions.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="node" />
+import os from 'os';
 interface EntryPoint {
     entryName: string;
 }
 export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
+export declare const getIpv4Interfaces: () => os.NetworkInterfaceInfo[];
 export declare const prettyInstructions: (appContext: any, config: any) => string;
 export {};

package/dist/prettyInstructions.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettyInstructions = exports.isSingleEntry = void 0;
+exports.prettyInstructions = exports.getIpv4Interfaces = exports.isSingleEntry = void 0;
 const os_1 = __importDefault(require("os"));
 const compiled_1 = require("./compiled");
 const is_1 = require("./is");
@@ -11,20 +11,27 @@ const is_1 = require("./is");
 const isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === 'main';
 exports.isSingleEntry = isSingleEntry;
 const normalizeUrl = (url) => url.replace(/([^:]\/)\/+/g, '$1');
-const getAddressUrls = (protocol = 'http', port) => {
+const getIpv4Interfaces = () => {
     const interfaces = os_1.default.networkInterfaces();
     const ipv4Interfaces = [];
     Object.keys(interfaces).forEach(key => {
         interfaces[key].forEach(detail => {
-            if (detail.family === 'IPv4') {
+            // 'IPv4' is in Node <= 17, from 18 it's a number 4 or 6
+            const familyV4Value = typeof detail.family === 'string' ? 'IPv4' : 4;
+            if (detail.family === familyV4Value) {
                 ipv4Interfaces.push(detail);
             }
         });
     });
+    return ipv4Interfaces;
+};
+exports.getIpv4Interfaces = getIpv4Interfaces;
+const getAddressUrls = (protocol = 'http', port) => {
+    const ipv4Interfaces = (0, exports.getIpv4Interfaces)();
     return ipv4Interfaces.reduce((memo, detail) => {
         let type = 'Network:  ';
         let url = `${protocol}://${detail.address}:${port}`;
-        if (detail.address.includes(`localhost`)) {
+        if (detail.address.includes(`localhost`) || detail.internal) {
             type = 'Local:  ';
             url = `${protocol}://localhost:${port}`;
         }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.7.3",
+  "version": "1.7.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -32,7 +32,9 @@
     "./gzip-size": "./compiled/gzip-size/index.js",
     "./mime-types": "./compiled/mime-types/index.js",
     "./strip-ansi": "./compiled/strip-ansi/index.js",
-    "./browserslist": "./compiled/browserslist/index.js"
+    "./browserslist": "./compiled/browserslist/index.js",
+    "./webpack-chain": "./compiled/webpack-chain/index.js",
+    "./tsconfig-paths": "./compiled/tsconfig-paths/index.js"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -78,6 +80,12 @@
       ],
       "browserslist": [
         "./compiled/browserslist/index.d.ts"
+      ],
+      "webpack-chain": [
+        "./compiled/webpack-chain/types/index.d.ts"
+      ],
+      "tsconfig-paths": [
+        "./compiled/tsconfig-paths/lib/index.d.ts"
       ]
     }
   },
@@ -86,7 +94,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.3",
+    "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/jest": "^27",
@@ -101,7 +109,6 @@
       "command": "tsc",
       "files": [
         "src/**/*",
-        "compiled/**/*.js",
         "tsconfig.json",
         "package.json"
       ],
@@ -113,9 +120,9 @@
       "command": "jest --passWithNoTests",
       "files": [
         "src/**/*",
-        "compiled/**/*.js",
         "tsconfig.json",
-        "package.json"
+        "package.json",
+        "tests/**/*"
       ],
       "output": []
     }