From 02259185c9e1dfd1b1774f6a9bf27eb2232e651f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 13 May 2022 12:52:29 +0200 Subject: [PATCH] extract version detection of nextjs & webpack out, add nextjs detection, add test --- lib/cli/src/detect-nextjs.test.ts | 53 +++++++++++++++++++++++++++++++ lib/cli/src/detect-nextjs.ts | 30 +++++++++++++++++ lib/cli/src/detect-webpack.ts | 32 +++++++++++++++++++ lib/cli/src/detect.ts | 30 +++++++---------- 4 files changed, 126 insertions(+), 19 deletions(-) create mode 100644 lib/cli/src/detect-nextjs.test.ts create mode 100644 lib/cli/src/detect-nextjs.ts create mode 100644 lib/cli/src/detect-webpack.ts diff --git a/lib/cli/src/detect-nextjs.test.ts b/lib/cli/src/detect-nextjs.test.ts new file mode 100644 index 00000000000..c3730991baf --- /dev/null +++ b/lib/cli/src/detect-nextjs.test.ts @@ -0,0 +1,53 @@ +import { detectNextJS } from './detect-nextjs'; + +test('detect nothing if it fails', () => { + const out = detectNextJS({ + type: 'npm', + executeCommand: () => { + throw new Error('test error'); + }, + }); + expect(out).toEqual(false); +}); + +test('detect from npm ls', () => { + const outputFromCommand = ` +/path/to/cwd +└── next@12.0.7 + `; + const out = detectNextJS({ type: 'npm', executeCommand: () => outputFromCommand }); + expect(out).toEqual(12); +}); + +test('detect from npm why', () => { + const outputFromCommand = ` +next@12.0.7 +node_modules/next + next@"^12.0.7" from the root project + peer next@">=10.2.0" from eslint-config-next@12.0.7 + node_modules/eslint-config-next + dev eslint-config-next@"^12.0.7" from the root project +`; + const out = detectNextJS({ type: 'npm', executeCommand: () => outputFromCommand }); + expect(out).toEqual(12); +}); + +test('detect from yarn why', () => { + const outputFromCommand = ` +yarn why v1.22.18 +[1/4] 🤔 Why do we have the module "next"...? +[2/4] 🚚 Initialising dependency graph... +[3/4] 🔍 Finding dependency... +[4/4] 🚡 Calculating file sizes... +=> Found "next@12.0.7" +info Has been hoisted to "next" +info This module exists because it's specified in "dependencies". +info Disk size without dependencies: "XX.XXMB" +info Disk size with unique dependencies: "XX.XXMB" +info Disk size with transitive dependencies: "XX.XXMB" +info Number of shared dependencies: XXX +✨ Done in 0.XXs. +`; + const out = detectNextJS({ type: 'npm', executeCommand: () => outputFromCommand }); + expect(out).toEqual(12); +}); diff --git a/lib/cli/src/detect-nextjs.ts b/lib/cli/src/detect-nextjs.ts new file mode 100644 index 00000000000..2b9ca5ce642 --- /dev/null +++ b/lib/cli/src/detect-nextjs.ts @@ -0,0 +1,30 @@ +import { JsPackageManager } from './js-package-manager'; + +const regex = /[\s"\n]next.*?(\d+).*/; + +export const detectNextJS = ( + packageManager: Pick +): number | false => { + try { + let out = ''; + if (packageManager.type === 'npm') { + try { + // npm <= v7 + out = packageManager.executeCommand('npm', ['ls', 'next']); + } catch (e2) { + // npm >= v8 + out = packageManager.executeCommand('npm', ['why', 'next']); + } + } else { + out = packageManager.executeCommand('yarn', ['why', 'next']); + } + + const [, version] = out.match(regex); + + return version && parseInt(version, 10) ? parseInt(version, 10) : false; + } catch (err) { + // + } + + return false; +}; diff --git a/lib/cli/src/detect-webpack.ts b/lib/cli/src/detect-webpack.ts new file mode 100644 index 00000000000..992eb0c0996 --- /dev/null +++ b/lib/cli/src/detect-webpack.ts @@ -0,0 +1,32 @@ +import type { JsPackageManager } from './js-package-manager'; + +export const detectWebpack = (packageManager: JsPackageManager): number | false => { + try { + let out = ''; + if (packageManager.type === 'npm') { + try { + // npm <= v7 + out = packageManager.executeCommand('npm', ['ls', 'webpack']); + } catch (e2) { + // npm >= v8 + out = packageManager.executeCommand('npm', ['why', 'webpack']); + } + } else { + out = packageManager.executeCommand('yarn', ['why', 'webpack']); + } + + // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4) + if (out.includes('webpack@4') || out.includes('webpack@npm:4')) { + return 4; + } + + // the user has webpack 4 installed, but not 5 + if (out.includes('webpack@5') || out.includes('webpack@npm:5')) { + return 5; + } + } catch (err) { + // + } + + return false; +}; diff --git a/lib/cli/src/detect.ts b/lib/cli/src/detect.ts index a53dcfe00e3..feecf46e915 100644 --- a/lib/cli/src/detect.ts +++ b/lib/cli/src/detect.ts @@ -14,6 +14,8 @@ import { } from './project_types'; import { getBowerJson, paddedLog } from './helpers'; import { PackageJson, readPackageJson, JsPackageManager } from './js-package-manager'; +import { detectWebpack } from './detect-webpack'; +import { detectNextJS } from './detect-nextjs'; const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs']; @@ -112,31 +114,21 @@ export function detectBuilder(packageManager: JsPackageManager) { return CoreBuilder.Vite; } - try { - let out = ''; - if (packageManager.type === 'npm') { - try { - // npm <= v7 - out = packageManager.executeCommand('npm', ['ls', 'webpack']); - } catch (e2) { - // npm >= v8 - out = packageManager.executeCommand('npm', ['why', 'webpack']); - } - } else { - out = packageManager.executeCommand('yarn', ['why', 'webpack']); + const webpackVersion = detectWebpack(packageManager); + if (webpackVersion) { + if (webpackVersion <= 4) { + return CoreBuilder.Webpack4; } - - // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4) - if (out.includes('webpack@4') || out.includes('webpack@npm:4')) { + if (webpackVersion >= 5) { return CoreBuilder.Webpack5; } + } - // the user has webpack 4 installed, but not 5 - if (out.includes('webpack@5') || out.includes('webpack@npm:5')) { + const nextJSVersion = detectNextJS(packageManager); + if (nextJSVersion) { + if (nextJSVersion >= 11) { return CoreBuilder.Webpack5; } - } catch (err) { - // } // Fallback to webpack4