@scandipwa/magento-scripts 1.14.1-alpha.10 → 1.14.1-alpha.11

package/lib/tasks/requirements/dependency/arch.js

@@ -1,4 +1,5 @@
 const dependenciesForPlatforms = require('../../../config/dependencies-for-platforms');
+const UnknownError = require('../../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const installDependenciesTask = require('../../../util/install-dependencies-task');
 
@@ -15,7 +16,7 @@ const archDependenciesCheck = () => ({
                 const result = pkg.match(pkgRegex);
 
                 if (!result) {
-                    throw new Error(`Package without a version!\n\n${pkg}\n\nHOW?`);
+                    throw new UnknownError(`Package without a version!\n\n${pkg}\n\nHOW?`);
                 }
 
                 return result[1];

package/lib/tasks/requirements/dependency/centos.js

@@ -11,9 +11,10 @@ const centosDependenciesCheck = () => ({
         const installedDependencies = (await execAsyncSpawn('yum list installed')).split('\n')
             .filter((pkg) => !pkg.toLowerCase().includes('installed packages'))
             .map((pkg) => pkg.match(/^(\S+)/i))
-            .filter((pkg) => pkg)
+            .filter(Boolean)
             .map((pkg) => pkg[1])
             .map((pkg) => pkg.match(/^(\S+)\.\S+/i))
+            .filter(Boolean)
             .map((pkg) => pkg[1]);
 
         const dependenciesToInstall = dependenciesForPlatforms

package/lib/tasks/requirements/dependency/fedora.js

@@ -11,9 +11,10 @@ const fedoraDependenciesCheck = () => ({
         const installedDependencies = (await execAsyncSpawn('yum list installed')).split('\n')
             .filter((pkg) => !pkg.toLowerCase().includes('installed packages'))
             .map((pkg) => pkg.match(/^(\S+)/i))
-            .filter((pkg) => pkg)
+            .filter(Boolean)
             .map((pkg) => pkg[1])
             .map((pkg) => pkg.match(/^(\S+)\.\S+/i))
+            .filter(Boolean)
             .map((pkg) => pkg[1]);
 
         const dependenciesToInstall = dependenciesForPlatforms

package/lib/tasks/requirements/docker/index.js

@@ -1,5 +1,6 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const os = require('os');
+const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const getIsWsl = require('../../../util/is-wsl');
 const installDocker = require('./install');
@@ -35,7 +36,7 @@ NOTE: After installation it's recommended to log out and log back in so your gro
                             task: (ctx) => {
                                 task.title = `Using docker version ${ctx.dockerVersion}`;
 
-                                throw new Error(
+                                throw new KnownError(
                                     `Docker is installed successfully!
 Please log out and log back to so your group membership is re-evaluated!
 Learn more here: ${ logger.style.link('https://docs.docker.com/engine/install/linux-postinstall/') }`
@@ -45,15 +46,15 @@ Learn more here: ${ logger.style.link('https://docs.docker.com/engine/install/li
                     ]);
                 }
 
-                throw new Error('Docker is not installed!');
+                throw new KnownError('Docker is not installed!');
             } else if (isWsl) {
-                throw new Error(
+                throw new KnownError(
                     `You don't have Docker installed!
 Follow this instructions to install Docker on Windows:
 ${ logger.style.link('https://docs.create-magento-app.com/getting-started/prerequisites/windows-requirements#2-install-docker-desktop-for-windows') }`
                 );
             } else {
-                throw new Error(
+                throw new KnownError(
                     `You don't have Docker installed!
 Follow this instructions to install Docker on Mac:
 ${ logger.style.link('https://docs.create-magento-app.com/getting-started/prerequisites/installation-on-macos#3-install-docker-for-mac') }`

package/lib/tasks/requirements/docker/install.js

@@ -2,6 +2,7 @@ const osPlatform = require('../../../util/os-platform');
 const { execCommandTask } = require('../../../util/exec-async-command');
 const installDependenciesTask = require('../../../util/install-dependencies-task');
 const executeSudoCommand = require('../../../util/execute-sudo-command');
+const KnownError = require('../../../errors/known-error');
 
 const downloadDockerInstallScriptCommand = () => execCommandTask('curl -fsSL https://get.docker.com -o get-docker.sh');
 const runDockerInstallScriptCommand = () => executeSudoCommand('sudo sh get-docker.sh');
@@ -48,7 +49,7 @@ const installDocker = () => ({
             ]);
         }
         default: {
-            throw new Error(`Docker is not installed!
+            throw new KnownError(`Docker is not installed!
 Your distro ${distro} is not supported by automatic installation.`);
         }
         }

package/lib/tasks/requirements/docker/running-status.js

@@ -1,4 +1,5 @@
 const os = require('os');
+const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const getIsWsl = require('../../../util/is-wsl');
 const pathExists = require('../../../util/path-exists');
@@ -31,7 +32,7 @@ const checkDockerStatusMacOS = () => ({
                 let attempts = 0;
                 while (!ready) {
                     if (attempts > 24 && !ready) {
-                        throw new Error('Docker haven\'t started in 2 mins, exiting...');
+                        throw new KnownError('Docker haven\'t started in 2 mins, exiting...');
                     }
                     try {
                         const { code: startupCode } = await getDockerVersion();
@@ -67,7 +68,7 @@ const checkDockerStatusWSL = () => ({
         const { result, code } = await getDockerVersion();
 
         if (code !== 0 && result.includes('Is the docker daemon running?')) {
-            throw new Error(`Docker is not running!
+            throw new KnownError(`Docker is not running!
 
 Please open Docker Desktop application for Windows and make sure that Docker is running. Then you can try again!`);
         }

package/lib/tasks/requirements/docker/version.js

@@ -1,3 +1,4 @@
+const UnknownError = require('../../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 
 /**
@@ -14,7 +15,7 @@ const getDockerVersion = () => ({
 
             ctx.dockerVersion = dockerVersion;
         } else {
-            throw new Error(`Got unexpected result during Docker version retrieval!\n\n${ result }`);
+            throw new UnknownError(`Got unexpected result during Docker version retrieval!\n\n${ result }`);
         }
     }
 });

package/lib/tasks/requirements/node-version.js

@@ -1,4 +1,5 @@
 const semver = require('semver');
+const KnownError = require('../../errors/known-error');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -9,7 +10,7 @@ const checkNodeVersion = () => ({
         const { node } = process.versions;
 
         if (!semver.gte(node, '12.0.0')) {
-            throw new Error(
+            throw new KnownError(
                 `Your Node.js version is out of date!
 You need to upgrade Node.js to at lease version 12 to work with this software!`
             );

package/lib/tasks/requirements/php-version.js

@@ -3,6 +3,8 @@ const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
 const phpbrewConfig = require('../../config/phpbrew');
+const KnownError = require('../../errors/known-error');
+const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const pathExists = require('../../util/path-exists');
 const compileOptions = require('../php/compile-options');
@@ -52,7 +54,7 @@ const installPHPForPHPBrew = () => ({
                     }
                 );
             } catch (e) {
-                throw new Error(
+                throw new KnownError(
                     `Failed to compile the required by PHPBrew PHP version.
 Tried compiling the PHP version ${ latestStablePHP74 }.
 Use your favorite search engine to resolve the issue.
@@ -79,10 +81,10 @@ export PHPBREW_PATH=${phpbrewConfig.homePath}/php/${phpbrewPHPName}/bin
                 }
             );
         } catch (e) {
-            throw new Error(`Something went wrong when trying to switch PHP to ${phpbrewPHPName}!\n\n${e}`);
+            throw new UnknownError(`Something went wrong when trying to switch PHP to ${phpbrewPHPName}!\n\n${e}`);
         }
 
-        throw new Error(`You will need to restart your terminal and run ${logger.style.command('start')} again.
+        throw new KnownError(`You will need to restart your terminal and run ${logger.style.command('start')} again.
 
 You can use keyboard shortcut ${logger.style.command('CTRL+D')} to close terminal.`);
     },

package/lib/tasks/requirements/phpbrew/index.js

@@ -1,4 +1,5 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const KnownError = require('../../../errors/known-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const installPHPBrew = require('./install');
 const getPHPBrewVersion = require('./version');
@@ -32,7 +33,7 @@ Do you want to install it automatically?`
                 ]);
             }
 
-            throw new Error(
+            throw new KnownError(
                 `To install PHPBrew, you must first make sure the requirements are met.
 The requirements are available here: ${ logger.style.link('https://github.com/phpbrew/phpbrew/wiki/Requirement') }.
 Then, you can follow the installation instruction, here: ${ logger.style.link('https://phpbrew.github.io/phpbrew/#installation') }.

package/lib/tasks/requirements/phpbrew/install.js

@@ -5,6 +5,7 @@ const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const installDependenciesTask = require('../../../util/install-dependencies-task');
 const osPlatform = require('../../../util/os-platform');
+const KnownError = require('../../../errors/known-error');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -167,7 +168,7 @@ When you ready, press select Yes and installation will continue.`
             });
 
             if (!continueInstall) {
-                throw new Error(`Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
+                throw new KnownError(`Add following string to your shells configuration file: ${logger.style.code('[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc')}
 
 Then you can continue installation.`);
             }

package/lib/tasks/requirements/phpbrew/version.js

@@ -1,3 +1,4 @@
+const UnknownError = require('../../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const safeRegexExtract = require('../../../util/safe-regex-extract');
 
@@ -15,7 +16,7 @@ const getPHPBrewVersion = () => ({
                 string: result,
                 regex: /phpbrew - ([\d.]+)/i,
                 onNoMatch: () => {
-                    throw new Error(`No phpbrew version found in phpbrew version output!\n\n${result}`);
+                    throw new UnknownError(`No phpbrew version found in phpbrew version output!\n\n${result}`);
                 }
             });
 

package/lib/tasks/requirements/platform.js

@@ -6,6 +6,7 @@ const { platforms, darwinMinimalVersion } = require('../../config');
 const dependencyCheck = require('./dependency');
 const { getArch } = require('../../util/arch');
 const getIsWsl = require('../../util/is-wsl');
+const KnownError = require('../../errors/known-error');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -16,14 +17,14 @@ const checkPlatform = () => ({
         const currentPlatform = os.platform();
 
         if (!platforms.includes(currentPlatform)) {
-            throw new Error(
+            throw new KnownError(
                 `Your current OS platform is ${ logger.style.misc(currentPlatform) }.
                 Unfortunately, currently we only support ${ platforms.map((platform) => logger.style.misc(platform)).join(',') }.`
             );
         }
 
         if (macosVersion.isMacOS && !macosVersion.isGreaterThanOrEqualTo(darwinMinimalVersion)) {
-            throw new Error(
+            throw new KnownError(
                 'Please update your system!',
                 `MacOS bellow version ${ logger.style.misc(darwinMinimalVersion) } is not supported.`
             );

package/lib/tasks/start.js

@@ -30,6 +30,7 @@ const enableMagentoComposerPlugins = require('./magento/enable-magento-composer-
 const getIsWsl = require('../util/is-wsl');
 const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
+const validatePHPInstallation = require('./php/validate-php');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -113,6 +114,7 @@ const configureProject = () => ({
             })
         },
         configurePhp(),
+        validatePHPInstallation(),
         installPrestissimo(),
         installMagento(),
         enableMagentoComposerPlugins(),
@@ -189,7 +191,7 @@ const start = () => ({
                     const instanceMetadata = getInstanceMetadata(ctx);
                     const locationOnTheWeb = instanceMetadata.frontend.find(({ title }) => title === WEB_LOCATION_TITLE);
 
-                    openBrowser(locationOnTheWeb.text);
+                    openBrowser(locationOnTheWeb.link);
                 },
                 options: {
                     showTimer: false

package/lib/tasks/theme/build-theme.js

@@ -3,6 +3,7 @@ const pathExists = require('../../util/path-exists');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const matchFilesystem = require('../../util/match-filesystem');
+const UnknownError = require('../../errors/unknown-error');
 
 /**
  * @type {(theme: import('../../../typings/theme').Theme) => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -26,7 +27,7 @@ const buildTheme = ({ themePath }) => ({
                     }
                 });
             } catch (e) {
-                throw new Error(`We were unable to install theme dependencies in ${themePath} using ${logger.style.code(commandToInstallDependencies)} command!
+                throw new UnknownError(`We were unable to install theme dependencies in ${themePath} using ${logger.style.code(commandToInstallDependencies)} command!
 If you have ${logger.style.file('package-lock.json')} in theme directory make sure it's up to date with ${logger.style.file('package.json')} file content.`);
             }
         }

package/lib/tasks/theme/install-theme.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const UnknownError = require('../../errors/unknown-error');
 const getJsonfileData = require('../../util/get-jsonfile-data');
 const runComposerCommand = require('../../util/run-composer');
 
@@ -24,7 +25,7 @@ const installTheme = (theme) => ({
                 }
             });
         } catch (e) {
-            throw new Error(
+            throw new UnknownError(
                 `Unexpected error while installing theme.
 See ERROR log below.\n\n${e}`
             );

package/lib/tasks/theme/retrieve-theme-data.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const KnownError = require('../../errors/known-error');
 const getJsonfileData = require('../../util/get-jsonfile-data');
 const pathExists = require('../../util/path-exists');
 
@@ -26,7 +27,7 @@ const retrieveThemeData = (themePath) => ({
         const composerData = await getJsonfileData(path.join(absoluteThemePath, 'composer.json'));
 
         if (!composerData) {
-            throw new Error(`composer.json file not found in "${themePath}"`);
+            throw new KnownError(`composer.json file not found in "${themePath}"`);
         }
 
         ctx.themePath = themePath;

package/lib/tasks/theme/setup-persisted-query.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const UnknownError = require('../../errors/unknown-error');
 const envPhpToJson = require('../../util/env-php-json');
 const getJsonfileData = require('../../util/get-jsonfile-data');
 const runMagentoCommand = require('../../util/run-magento');
@@ -51,7 +52,7 @@ const persistedQuerySetup = () => ({
                 magentoVersion
             });
         } catch (e) {
-            throw new Error(
+            throw new UnknownError(
                 `Unexpected error while setting redis for pq!.
                 See ERROR log below.\n\n${e}`
             );

package/lib/tasks/theme/setup-themes.js

@@ -7,6 +7,7 @@ const setupPersistedQuery = require('./setup-persisted-query');
 const upgradeMagento = require('../magento/setup-magento/upgrade-magento');
 const disableFullPageCache = require('../magento/setup-magento/disable-full-page-cache');
 const buildTheme = require('./build-theme');
+const KnownError = require('../../errors/known-error');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -61,7 +62,7 @@ const setupThemes = () => ({
             const composerData = await getJsonfileData(path.join(absoluteThemePath, 'composer.json'));
 
             if (!composerData) {
-                throw new Error(`composer.json file not found in "${themePath}"`);
+                throw new KnownError(`composer.json file not found in "${themePath}"`);
             }
 
             return {

package/lib/tasks/theme/symlink-theme.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const UnknownError = require('../../errors/unknown-error');
 const getJsonfileData = require('../../util/get-jsonfile-data');
 const runComposerCommand = require('../../util/run-composer');
 
@@ -27,7 +28,7 @@ const symlinkTheme = (theme) => ({
                 }
             });
         } catch (e) {
-            throw new Error(
+            throw new UnknownError(
                 `Unexpected error while configuring theme symbolic link.
                 See ERROR log above.\n\n${e}`
             );