@scandipwa/magento-scripts 1.11.1-alpha.0 → 1.11.1

package/lib/config/dependencies-for-platforms.js

@@ -12,7 +12,8 @@ const dependenciesForPlatforms = {
             'freetype',
             'oniguruma',
             'icu4c',
-            'libxml2'
+            'libxml2',
+            'openssl@1.1'
         ],
         installCommand: (deps) => `brew install ${deps}`
     },

package/lib/tasks/cleanup.js

@@ -10,7 +10,7 @@ const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const cleanup = () => ({
     title: 'Cleanup project',

package/lib/tasks/import-dump.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const { checkRequirements } = require('./requirements');
 const {
     importDumpToMySQL,
@@ -14,9 +15,10 @@ const {
     configureProject
 } = require('./start');
 const importRemoteDb = require('./mysql/import-remote-db');
+const matchFilesystem = require('../util/match-filesystem');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const importDump = () => ({
     title: 'Importing Database Dump',
@@ -27,6 +29,16 @@ const importDump = () => ({
         stopProject(),
         retrieveFreshProjectConfiguration(),
         configureProject(),
+        {
+            title: 'Installing Magento',
+            // skip setup if env.php and config.php are present in app/etc folder
+            skip: () => matchFilesystem(path.resolve('app/etc'), ['config.php', 'env.php']),
+            task: (subCtx, subTask) => subTask.newListr(
+                setupMagento({
+                    onlyInstallMagento: true
+                })
+            )
+        },
         dumpThemeConfig(),
         importDumpToMySQL(),
         restoreThemeConfig(),

package/lib/tasks/magento/setup-magento/set-base-url.js

@@ -21,7 +21,8 @@ module.exports = () => ({
             { path: 'web/unsecure/base_url', value: httpUrl },
             { path: 'web/secure/base_url', value: httpsUrl },
             { path: 'web/secure/use_in_frontend', value: enableSecureFrontend },
-            { path: 'web/secure/use_in_adminhtml', value: enableSecureFrontend }
+            { path: 'web/secure/use_in_adminhtml', value: enableSecureFrontend },
+            { path: 'web/cookie/cookie_domain', value: null }
         ], { mysqlConnection, task });
     }
 });

package/lib/tasks/php/compile-options.js

@@ -52,7 +52,7 @@ const compileOptions = {
             '+iconv',
             '+json',
             '+mbstring',
-            '+openssl=$(brew --prefix openssl)', // ="$(brew --prefix openssl)"
+            '+openssl=$(brew --prefix openssl@1.1)', // ="$(brew --prefix openssl@1.1)"
             '+xml',
             '+mysql',
             '+pdo',
@@ -70,11 +70,11 @@ const compileOptions = {
         ],
         env: {
             // eslint-disable-next-line max-len
-            PKG_CONFIG_PATH: '$PKG_CONFIG_PATH:$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix icu4c)/lib/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig:$(brew --prefix curl-openssl)/lib/pkgconfig:$(brew --prefix zlib)/lib/pkgconfig',
-            CPATH: '$CPATH:$(brew --prefix openssl)/include',
+            PKG_CONFIG_PATH: '$PKG_CONFIG_PATH:$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix icu4c)/lib/pkgconfig:$(brew --prefix openssl@1.1)/lib/pkgconfig:$(brew --prefix curl-openssl@1.1)/lib/pkgconfig:$(brew --prefix zlib)/lib/pkgconfig',
+            CPATH: '$CPATH:$(brew --prefix openssl@1.1)/include',
             CXX: 'g++ -DTRUE=1 -DFALSE=0',
             CC: 'gcc -DTRUE=1 -DFALSE=0',
-            LDFLAGS: '$(brew --prefix openssl)/lib/libssl.dylib $(brew --prefix openssl)/lib/libcrypto.dylib'
+            LDFLAGS: '$(brew --prefix openssl@1.1)/lib/libssl.dylib $(brew --prefix openssl@1.1)/lib/libcrypto.dylib'
         }
     }
 };

package/lib/tasks/stop.js

@@ -5,7 +5,7 @@ const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const stop = () => ({
     title: 'Stopping project',

package/lib/util/match-filesystem.js

@@ -5,6 +5,7 @@ const pathExists = require('./path-exists');
  * Check file system structure to detect possible unfinished installation
  * @param {String} cwd working directory
  * @param {Object} structure Object with template files structure
+ * @return {Promise<boolean>}
  */
 const matchFilesystem = async (cwd, structure) => {
     if (Array.isArray(structure)) {

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.11.1-alpha.0",
+    "version": "1.11.1",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -41,5 +41,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "dc9bf271548fdb83afcd84f4b099f5a82b9a0b8d"
+    "gitHead": "f2b7cbd752b96db4cd57441eb37434f3bf2065c3"
 }