@scandipwa/magento-scripts 1.15.1 → 1.15.2

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

@@ -27,13 +27,13 @@ const adjustComposerJson = async ({
     const composerData = await getJsonFileData(path.join(baseConfig.magentoDir, 'composer.json'));
 
     // fix composer magento repository
-    if (!composerData.repositories
+    if (composerData && (!composerData.repositories
         || (Array.isArray(composerData.repositories)
             && !composerData.repositories.some((repo) => repo.type === 'composer' && repo.url.includes('repo.magento.com'))
         )
         || (typeof composerData.repositories === 'object'
             && !Object.values(composerData.repositories).some((repo) => repo.type === 'composer' && repo.url.includes('repo.magento.com')))
-    ) {
+    )) {
         task.output = 'No Magento repository is set in composer.json! Setting up...';
         await runComposerCommand('config repo.0 composer https://repo.magento.com', {
             magentoVersion,
@@ -44,7 +44,7 @@ const adjustComposerJson = async ({
     }
 
     // if composer-root-update-plugin is not installed in composer, install it.
-    if (!composerData.require['magento/composer-root-update-plugin']) {
+    if (composerData && !composerData.require['magento/composer-root-update-plugin']) {
         task.output = 'Installing magento/composer-root-update-plugin!';
         await runComposerCommand('require magento/composer-root-update-plugin:^1',
             {
@@ -56,8 +56,8 @@ const adjustComposerJson = async ({
     }
 
     // if for some reason both editions are installed, throw an error
-    if (
-        composerData.require[magentoProductCommunityEdition]
+    if (composerData
+        && composerData.require[magentoProductCommunityEdition]
         && composerData.require[magentoProductEnterpriseEdition]
     ) {
         throw new KnownError('Somehow, both Magento editions are installed!\nPlease choose only one edition an modify your composer.json manually!');
@@ -67,7 +67,7 @@ const adjustComposerJson = async ({
         .find((edition) => edition !== magentoProductSelectedEdition);
 
     // if opposite edition is installed than selected in config file, throw an error
-    if (composerData.require[oppositeEdition]) {
+    if (composerData && composerData.require[oppositeEdition]) {
         throw new KnownError(`You have installed ${oppositeEdition} but selected magento.edition as ${magentoEdition} in config file!
 
 Change magento edition in config file or manually reinstall correct magento edition!`);
@@ -75,7 +75,7 @@ Change magento edition in config file or manually reinstall correct magento edit
 
     // if magento package is not installed in composer, require it.
 
-    if (!composerData.require[magentoProductSelectedEdition]) {
+    if (composerData && !composerData.require[magentoProductSelectedEdition]) {
         task.output = `Installing ${magentoProductSelectedEdition}=${magentoPackageVersion}!`;
         await runComposerCommand(`require ${magentoProductSelectedEdition}:${magentoPackageVersion}`,
             {
@@ -170,7 +170,7 @@ const installMagento = () => ({
         task.title = `Installing Magento ${magentoPackageVersion}`;
         task.output = 'Creating Magento project';
 
-        if (!await pathExists(path.join(baseConfig.magentoDir, 'composer.json'))) {
+        if (!await pathExists(path.join(process.cwd(), 'composer.json'))) {
             await createMagentoProject({
                 magentoProject,
                 magentoPackageVersion,

package/lib/util/CSA-theme.js

@@ -6,7 +6,7 @@ const getCSAThemes = async ({ cwd = process.cwd() } = {}) => {
         path.join(cwd, 'composer.json')
     );
 
-    if (!composerData.repositories) {
+    if (!composerData || !composerData.repositories) {
         return [];
     }
 

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "1.15.1",
+    "version": "1.15.2",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "ba6f9e613e4448cf449c6e82f8d95ff546de2294"
+    "gitHead": "6ddbd68e15d1868386f559f7edd6610dbc80a8e4"
 }