@scandipwa/magento-scripts 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (347) hide show
  1. package/.eslintrc +6 -1
  2. package/exec.js +75 -39
  3. package/index.js +87 -46
  4. package/lib/commands/cleanup.js +18 -21
  5. package/lib/commands/cli.js +138 -73
  6. package/lib/commands/execute.js +5 -5
  7. package/lib/commands/import-db.js +21 -24
  8. package/lib/commands/link.js +17 -20
  9. package/lib/commands/logs.js +91 -91
  10. package/lib/commands/start.js +229 -191
  11. package/lib/commands/status.js +64 -50
  12. package/lib/commands/stop.js +14 -11
  13. package/lib/config/check-configuration-file.js +33 -28
  14. package/lib/config/cma-config.js +4 -4
  15. package/lib/config/config.js +40 -18
  16. package/lib/config/dependencies-for-platforms.js +33 -3
  17. package/lib/config/docker.js +259 -157
  18. package/lib/config/get-magento-version-config.js +45 -38
  19. package/lib/config/get-port-config.js +30 -44
  20. package/lib/config/get-project-configuration.js +8 -8
  21. package/lib/config/index.js +51 -42
  22. package/lib/config/magento/required-php-extensions/index.js +33 -19
  23. package/lib/config/magento/required-php-extensions/magento-2.3.js +2 -2
  24. package/lib/config/magento/required-php-extensions/magento-2.4.js +2 -2
  25. package/lib/config/magento-config.js +4 -4
  26. package/lib/config/php-config.js +8 -6
  27. package/lib/config/port-config.js +62 -43
  28. package/lib/config/save-config.js +6 -6
  29. package/lib/config/scandipwa-versions.js +2 -2
  30. package/lib/config/services/composer/versions/composer-1.js +2 -2
  31. package/lib/config/services/composer/versions/composer-2.js +2 -2
  32. package/lib/config/services/composer/versions/index.js +1 -1
  33. package/lib/config/services/elasticsearch/base-repo.js +1 -1
  34. package/lib/config/services/elasticsearch/default-es-env.js +4 -1
  35. package/lib/config/services/elasticsearch/versions/elasticsearch-6.8.js +17 -14
  36. package/lib/config/services/elasticsearch/versions/elasticsearch-7.10.js +4 -4
  37. package/lib/config/services/elasticsearch/versions/elasticsearch-7.12.js +4 -4
  38. package/lib/config/services/elasticsearch/versions/elasticsearch-7.16.js +4 -4
  39. package/lib/config/services/elasticsearch/versions/elasticsearch-7.17.js +4 -4
  40. package/lib/config/services/elasticsearch/versions/elasticsearch-7.6.js +4 -4
  41. package/lib/config/services/elasticsearch/versions/elasticsearch-7.7.js +4 -4
  42. package/lib/config/services/elasticsearch/versions/elasticsearch-7.9.js +4 -4
  43. package/lib/config/services/elasticsearch/versions/index.js +9 -9
  44. package/lib/config/services/maildev/index.js +5 -2
  45. package/lib/config/services/mariadb/versions/index.js +1 -1
  46. package/lib/config/services/mariadb/versions/mariadb-10.2.js +3 -3
  47. package/lib/config/services/mariadb/versions/mariadb-10.3.js +3 -3
  48. package/lib/config/services/mariadb/versions/mariadb-10.4.js +3 -3
  49. package/lib/config/services/nginx/versions/index.js +1 -1
  50. package/lib/config/services/nginx/versions/nginx-1.18.js +5 -4
  51. package/lib/config/services/php/base-repo.js +1 -1
  52. package/lib/config/services/php/extensions/apcu.js +3 -3
  53. package/lib/config/services/php/extensions/bcmath.js +2 -2
  54. package/lib/config/services/php/extensions/curl.js +3 -6
  55. package/lib/config/services/php/extensions/gd.js +4 -3
  56. package/lib/config/services/php/extensions/index.js +9 -8
  57. package/lib/config/services/php/extensions/intl.js +3 -5
  58. package/lib/config/services/php/extensions/opcache.js +3 -5
  59. package/lib/config/services/php/extensions/pdo_mysql.js +2 -2
  60. package/lib/config/services/php/extensions/soap.js +3 -5
  61. package/lib/config/services/php/extensions/sodium.js +3 -5
  62. package/lib/config/services/php/extensions/xdebug.js +5 -3
  63. package/lib/config/services/php/extensions/xsl.js +3 -5
  64. package/lib/config/services/php/extensions/zip.js +3 -5
  65. package/lib/config/services/php/versions/index.js +1 -1
  66. package/lib/config/services/php/versions/php-7.2.js +13 -9
  67. package/lib/config/services/php/versions/php-7.3.js +13 -9
  68. package/lib/config/services/php/versions/php-7.4.js +13 -9
  69. package/lib/config/services/php/versions/php-8.1.js +13 -9
  70. package/lib/config/services/redis/index.js +1 -1
  71. package/lib/config/services/redis/redis-5.0.js +2 -2
  72. package/lib/config/services/redis/redis-6.0.js +2 -2
  73. package/lib/config/services/redis/redis-6.2.js +2 -2
  74. package/lib/config/services/ssl-terminator/index.js +6 -5
  75. package/lib/config/services/varnish/index.js +1 -1
  76. package/lib/config/services/varnish/varnish-6-0.js +7 -5
  77. package/lib/config/services/varnish/varnish-6-6.js +7 -5
  78. package/lib/config/services/varnish/varnish-7-0.js +7 -5
  79. package/lib/config/system-config.js +55 -32
  80. package/lib/config/templates/mariadb.template.cnf +2 -0
  81. package/lib/config/versions/index.js +48 -27
  82. package/lib/config/versions/magento-2.2.10.js +22 -15
  83. package/lib/config/versions/magento-2.3.0.js +22 -15
  84. package/lib/config/versions/magento-2.3.1.js +22 -15
  85. package/lib/config/versions/magento-2.3.2-p1.js +22 -15
  86. package/lib/config/versions/magento-2.3.2-p2.js +22 -15
  87. package/lib/config/versions/magento-2.3.2.js +22 -15
  88. package/lib/config/versions/magento-2.3.3-p1.js +22 -15
  89. package/lib/config/versions/magento-2.3.3.js +22 -15
  90. package/lib/config/versions/magento-2.3.4-p1.js +22 -15
  91. package/lib/config/versions/magento-2.3.4-p2.js +22 -15
  92. package/lib/config/versions/magento-2.3.4.js +22 -15
  93. package/lib/config/versions/magento-2.3.5-p1.js +22 -15
  94. package/lib/config/versions/magento-2.3.5-p2.js +22 -15
  95. package/lib/config/versions/magento-2.3.5.js +27 -15
  96. package/lib/config/versions/magento-2.3.6-p1.js +22 -15
  97. package/lib/config/versions/magento-2.3.6.js +22 -15
  98. package/lib/config/versions/magento-2.3.7-p1.js +22 -15
  99. package/lib/config/versions/magento-2.3.7-p2.js +22 -15
  100. package/lib/config/versions/magento-2.3.7-p3.js +22 -15
  101. package/lib/config/versions/magento-2.3.7-p4.js +22 -15
  102. package/lib/config/versions/magento-2.3.7.js +22 -15
  103. package/lib/config/versions/magento-2.4.0-p1.js +22 -15
  104. package/lib/config/versions/magento-2.4.0.js +22 -15
  105. package/lib/config/versions/magento-2.4.1-p1.js +23 -16
  106. package/lib/config/versions/magento-2.4.1.js +23 -16
  107. package/lib/config/versions/magento-2.4.2-p1.js +23 -16
  108. package/lib/config/versions/magento-2.4.2-p2.js +23 -16
  109. package/lib/config/versions/magento-2.4.2.js +23 -16
  110. package/lib/config/versions/magento-2.4.3-p1.js +23 -16
  111. package/lib/config/versions/magento-2.4.3-p2.js +23 -16
  112. package/lib/config/versions/magento-2.4.3-p3.js +23 -16
  113. package/lib/config/versions/magento-2.4.3.js +23 -16
  114. package/lib/config/versions/magento-2.4.4-p1.js +23 -16
  115. package/lib/config/versions/magento-2.4.4-p2.js +23 -16
  116. package/lib/config/versions/magento-2.4.4.js +23 -16
  117. package/lib/config/versions/magento-2.4.5-p1.js +23 -16
  118. package/lib/config/versions/magento-2.4.5.js +23 -17
  119. package/lib/config/xml-parser.js +21 -20
  120. package/lib/errors/known-error.js +8 -6
  121. package/lib/errors/unknown-error.js +8 -6
  122. package/lib/tasks/cache/create-cache-folder.js +10 -10
  123. package/lib/tasks/cache/index.js +1 -1
  124. package/lib/tasks/cache/remove-cache-folder.js +9 -9
  125. package/lib/tasks/cleanup.js +22 -24
  126. package/lib/tasks/cli/create-bashrc-config.js +19 -11
  127. package/lib/tasks/cli/index.js +10 -13
  128. package/lib/tasks/composer/index.js +20 -15
  129. package/lib/tasks/composer/local-auth-json.js +32 -18
  130. package/lib/tasks/database/connect-to-database.js +71 -51
  131. package/lib/tasks/database/create-magento-database.js +7 -7
  132. package/lib/tasks/database/create-magento-user.js +33 -20
  133. package/lib/tasks/database/default-magento-database.js +1 -1
  134. package/lib/tasks/database/default-magento-user.js +2 -2
  135. package/lib/tasks/database/dump-theme-config.js +16 -12
  136. package/lib/tasks/database/fix-db.js +62 -52
  137. package/lib/tasks/database/import-dump-to-database.js +122 -85
  138. package/lib/tasks/database/import-remote-db/index.js +16 -18
  139. package/lib/tasks/database/import-remote-db/ssh/database-dump-command.js +2 -2
  140. package/lib/tasks/database/import-remote-db/ssh/index.js +34 -35
  141. package/lib/tasks/database/import-remote-db/ssh/readymage.js +41 -38
  142. package/lib/tasks/database/import-remote-db/ssh/regular-server.js +44 -46
  143. package/lib/tasks/database/index.js +1 -1
  144. package/lib/tasks/database/magento-tables.js +3 -3
  145. package/lib/tasks/database/restore-theme-config.js +26 -19
  146. package/lib/tasks/docker/api.d.ts +1 -1
  147. package/lib/tasks/docker/api.js +31 -33
  148. package/lib/tasks/docker/containers/container-api.d.ts +49 -14
  149. package/lib/tasks/docker/containers/container-api.js +112 -83
  150. package/lib/tasks/docker/containers/index.js +3 -3
  151. package/lib/tasks/docker/containers/tasks.js +171 -99
  152. package/lib/tasks/docker/convert-composer-home-to-composer-cache-volume.js +34 -25
  153. package/lib/tasks/docker/convert-legacy-volumes.js +91 -55
  154. package/lib/tasks/docker/convert-mysql-to-mariadb.js +178 -147
  155. package/lib/tasks/docker/image/image-api.d.ts +2 -3
  156. package/lib/tasks/docker/image/image-api.js +41 -34
  157. package/lib/tasks/docker/image/index.js +2 -2
  158. package/lib/tasks/docker/index.js +26 -21
  159. package/lib/tasks/docker/network/index.js +3 -3
  160. package/lib/tasks/docker/network/network-api.d.ts +11 -8
  161. package/lib/tasks/docker/network/network-api.js +53 -61
  162. package/lib/tasks/docker/network/tasks.js +41 -31
  163. package/lib/tasks/docker/project-image-builder.js +175 -92
  164. package/lib/tasks/docker/system/index.js +2 -2
  165. package/lib/tasks/docker/system/system-api.d.ts +2 -2
  166. package/lib/tasks/docker/system/system-api.js +16 -19
  167. package/lib/tasks/docker/volume/index.js +3 -3
  168. package/lib/tasks/docker/volume/tasks.js +63 -46
  169. package/lib/tasks/docker/volume/volume-api.d.ts +8 -5
  170. package/lib/tasks/docker/volume/volume-api.js +59 -76
  171. package/lib/tasks/execute.js +91 -55
  172. package/lib/tasks/file-system/create-mariadb-config.js +18 -10
  173. package/lib/tasks/file-system/create-nginx-config.js +18 -19
  174. package/lib/tasks/file-system/create-php-config.js +12 -8
  175. package/lib/tasks/file-system/create-php-debug-config.js +23 -18
  176. package/lib/tasks/file-system/create-php-fpm-config.js +14 -9
  177. package/lib/tasks/file-system/create-phpstorm-config/database-config.js +144 -112
  178. package/lib/tasks/file-system/create-phpstorm-config/eslint-config.js +69 -45
  179. package/lib/tasks/file-system/create-phpstorm-config/exclude-folder-config.js +69 -70
  180. package/lib/tasks/file-system/create-phpstorm-config/index.js +28 -24
  181. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/coding-standard-config.js +9 -9
  182. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/config.js +23 -23
  183. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/custom-ruleset-path-config.js +22 -19
  184. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/default-properties-config.js +26 -16
  185. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/eslint-inspection-config.js +14 -15
  186. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/index.js +43 -34
  187. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/inspection-tools-config.js +14 -6
  188. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/magento-coding-standard-config.js +9 -9
  189. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/mess-detector-validation-inspection-config.js +53 -47
  190. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/paths.js +41 -12
  191. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/php-cs-fixer-validation-inspection-config.js +33 -30
  192. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/php-cs-validation-inspection-config.js +35 -38
  193. package/lib/tasks/file-system/create-phpstorm-config/inspection-tools-config/stylelint-inspection-config.js +14 -15
  194. package/lib/tasks/file-system/create-phpstorm-config/keys.js +10 -10
  195. package/lib/tasks/file-system/create-phpstorm-config/php-config/index.js +33 -25
  196. package/lib/tasks/file-system/create-phpstorm-config/php-config/mess-detector-config.js +28 -25
  197. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-code-sniffer-config.js +53 -32
  198. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-config.js +7 -7
  199. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-cs-fixer-config.js +37 -27
  200. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-interpreters-config.js +53 -31
  201. package/lib/tasks/file-system/create-phpstorm-config/php-config/php-project-shared-configuration-config.js +42 -30
  202. package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/index.js +33 -20
  203. package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/php-docker-settings-config.js +3 -3
  204. package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/setup-php-docker-container-settings-config.js +27 -16
  205. package/lib/tasks/file-system/create-phpstorm-config/setup-xml-structure.js +14 -13
  206. package/lib/tasks/file-system/create-phpstorm-config/stylelint-config.js +52 -34
  207. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/composer-settings-config.js +41 -33
  208. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/format-setting-config.js +39 -27
  209. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/index.js +34 -30
  210. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/mess-detector-project-configuration-config.js +32 -22
  211. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-code-sniffer-project-configuration-config.js +32 -22
  212. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-cs-fixer-project-configuration-config.js +32 -22
  213. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-debug-general-config.js +42 -31
  214. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-server-config.js +45 -33
  215. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-stan-project-configuration-config.js.js +32 -22
  216. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-workspace-project-configuration-config.js +22 -19
  217. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/properties-component-config.js +35 -21
  218. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/psalm-project-configuration-config.js.js +31 -22
  219. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/run-manager-config.js +38 -28
  220. package/lib/tasks/file-system/create-phpstorm-config/workspace-config/workspace-config.js +5 -5
  221. package/lib/tasks/file-system/create-phpstorm-config/xml-utils.js +3 -2
  222. package/lib/tasks/file-system/create-ssl-terminator-config.js +46 -34
  223. package/lib/tasks/file-system/create-varnish-config.js +20 -23
  224. package/lib/tasks/file-system/create-vscode-config.js +66 -49
  225. package/lib/tasks/file-system/index.js +29 -25
  226. package/lib/tasks/import-dump.js +54 -45
  227. package/lib/tasks/link.js +24 -23
  228. package/lib/tasks/magento/enable-magento-composer-plugins.js +213 -149
  229. package/lib/tasks/magento/index.js +1 -1
  230. package/lib/tasks/magento/install-magento-project.js +158 -97
  231. package/lib/tasks/magento/remove-magento.js +30 -24
  232. package/lib/tasks/magento/setup-magento/adjust-full-page-cache.js +27 -15
  233. package/lib/tasks/magento/setup-magento/configure-elasticsearch.js +23 -10
  234. package/lib/tasks/magento/setup-magento/create-admin.js +21 -13
  235. package/lib/tasks/magento/setup-magento/delete-admin-users.js +5 -5
  236. package/lib/tasks/magento/setup-magento/delete-customers.js +16 -10
  237. package/lib/tasks/magento/setup-magento/delete-orders.js +16 -10
  238. package/lib/tasks/magento/setup-magento/disable-2fa.js +11 -8
  239. package/lib/tasks/magento/setup-magento/disable-maintenance-mode.js +7 -7
  240. package/lib/tasks/magento/setup-magento/disable-page-builder.js +5 -4
  241. package/lib/tasks/magento/setup-magento/flush-redis-config.js +14 -8
  242. package/lib/tasks/magento/setup-magento/increase-admin-session-lifetime.js +21 -17
  243. package/lib/tasks/magento/setup-magento/index-products.js +4 -6
  244. package/lib/tasks/magento/setup-magento/index.js +54 -47
  245. package/lib/tasks/magento/setup-magento/install-magento.js +112 -79
  246. package/lib/tasks/magento/setup-magento/migrate-database.js +115 -96
  247. package/lib/tasks/magento/setup-magento/set-base-url.js +35 -21
  248. package/lib/tasks/magento/setup-magento/set-deployment-mode.js +15 -13
  249. package/lib/tasks/magento/setup-magento/set-mail-config.js +20 -14
  250. package/lib/tasks/magento/setup-magento/set-url-rewrite.js +13 -9
  251. package/lib/tasks/magento/setup-magento/upgrade-magento.js +30 -22
  252. package/lib/tasks/magento/setup-magento/urn-highlighter.js +11 -11
  253. package/lib/tasks/magento/setup-magento/varnish-config.js +42 -32
  254. package/lib/tasks/magento/setup-magento/waiting-for-redis.js +6 -8
  255. package/lib/tasks/magento/setup-magento/waiting-for-varnish.js +108 -65
  256. package/lib/tasks/magento/uninstall-magento.js +19 -16
  257. package/lib/tasks/php/php-container.d.ts +19 -0
  258. package/lib/tasks/php/php-container.js +50 -46
  259. package/lib/tasks/php/update-env-php.js +50 -30
  260. package/lib/tasks/project-config/index.js +12 -8
  261. package/lib/tasks/requirements/composer-credentials.js +215 -112
  262. package/lib/tasks/requirements/docker/context.js +49 -37
  263. package/lib/tasks/requirements/docker/index.js +123 -89
  264. package/lib/tasks/requirements/docker/install-on-mac.js +21 -14
  265. package/lib/tasks/requirements/docker/install.js +63 -52
  266. package/lib/tasks/requirements/docker/performance.js +40 -24
  267. package/lib/tasks/requirements/docker/permissions.js +27 -17
  268. package/lib/tasks/requirements/docker/running-status.js +79 -66
  269. package/lib/tasks/requirements/docker/version.js +14 -11
  270. package/lib/tasks/requirements/index.js +33 -29
  271. package/lib/tasks/requirements/node-version.js +8 -8
  272. package/lib/tasks/requirements/php-version.js +14 -11
  273. package/lib/tasks/requirements/platform.js +42 -26
  274. package/lib/tasks/requirements/rosetta.js +15 -12
  275. package/lib/tasks/start.js +172 -148
  276. package/lib/tasks/status/index.js +155 -88
  277. package/lib/tasks/stop.js +22 -18
  278. package/lib/tasks/theme/build-theme.js +50 -33
  279. package/lib/tasks/theme/install-theme.js +31 -18
  280. package/lib/tasks/theme/link-theme.js +27 -21
  281. package/lib/tasks/theme/retrieve-theme-data.js +24 -18
  282. package/lib/tasks/theme/setup-themes.js +87 -59
  283. package/lib/tasks/theme/symlink-theme.js +44 -22
  284. package/lib/util/CSA-theme.js +23 -21
  285. package/lib/util/analytics.js +130 -75
  286. package/lib/util/arch.js +22 -18
  287. package/lib/util/clean-object.js +15 -10
  288. package/lib/util/config-file-validator.js +63 -54
  289. package/lib/util/config-php-json.js +34 -16
  290. package/lib/util/connection-string.js +41 -27
  291. package/lib/util/console-block.js +112 -65
  292. package/lib/util/database.js +56 -33
  293. package/lib/util/deepmerge.d.ts +1 -1
  294. package/lib/util/deepmerge.js +19 -28
  295. package/lib/util/dockerfile-builder/build-instructions.js +159 -143
  296. package/lib/util/dockerfile-builder/index.js +47 -73
  297. package/lib/util/dockerfile-builder/types.d.ts +2 -1
  298. package/lib/util/download-file.js +28 -16
  299. package/lib/util/env-php-json.js +42 -16
  300. package/lib/util/exec-async-command.d.ts +9 -9
  301. package/lib/util/exec-async-command.js +82 -59
  302. package/lib/util/exec-async.d.ts +2 -0
  303. package/lib/util/exec-async.js +12 -5
  304. package/lib/util/execute-in-container.js +22 -27
  305. package/lib/util/execute-sudo-command.js +11 -15
  306. package/lib/util/get-brew-bin-path.js +27 -23
  307. package/lib/util/get-installed-magento-version.js +22 -16
  308. package/lib/util/get-jsonfile-data.js +14 -9
  309. package/lib/util/install-dependencies-task.js +53 -41
  310. package/lib/util/instance-metadata.js +44 -29
  311. package/lib/util/ip.js +16 -12
  312. package/lib/util/is-running-root.js +6 -3
  313. package/lib/util/is-wsl.js +10 -10
  314. package/lib/util/macos-version.js +12 -11
  315. package/lib/util/magento-task.js +14 -9
  316. package/lib/util/match-filesystem.js +22 -16
  317. package/lib/util/move-file.js +40 -25
  318. package/lib/util/nginx-logs-parser.js +50 -39
  319. package/lib/util/open-browser.js +8 -5
  320. package/lib/util/os-platform.js +40 -32
  321. package/lib/util/path-exists-sync.js +10 -6
  322. package/lib/util/path-exists.js +6 -6
  323. package/lib/util/php-task.js +11 -10
  324. package/lib/util/portscanner.js +97 -85
  325. package/lib/util/prefix.js +31 -22
  326. package/lib/util/resolve-configuration-with-overrides.js +30 -15
  327. package/lib/util/rmdir-safe.js +15 -11
  328. package/lib/util/run-composer.js +16 -16
  329. package/lib/util/run-container-image.js +9 -4
  330. package/lib/util/run-magento.js +16 -17
  331. package/lib/util/run-php.js +16 -21
  332. package/lib/util/safe-regex-extract.js +8 -12
  333. package/lib/util/set-config.js +24 -15
  334. package/lib/util/sleep.js +7 -2
  335. package/lib/util/systemctl.js +62 -44
  336. package/lib/util/wait-for-it.js +42 -33
  337. package/lib/util/wait-for-logs.js +42 -35
  338. package/lib/util/xdg-open-exists.js +19 -19
  339. package/package.json +7 -3
  340. package/tsconfig.json +24 -0
  341. package/typings/context.d.ts +76 -34
  342. package/typings/index.d.ts +44 -19
  343. package/typings/override.d.ts +14 -0
  344. package/typings/phpstorm.d.ts +19 -19
  345. package/.prettierrc +0 -3
  346. package/lib/util/get-php-for-phpbrew.js +0 -30
  347. package/lib/util/request.js +0 -0
@@ -1,12 +1,12 @@
1
- const path = require('path');
2
- const fs = require('fs');
3
- const logger = require('@scandipwa/scandipwa-dev-utils/logger');
4
- const semver = require('semver');
5
- const pathExists = require('../../util/path-exists');
6
- const getJsonfileData = require('../../util/get-jsonfile-data');
1
+ const path = require('path')
2
+ const fs = require('fs')
3
+ const logger = require('@scandipwa/scandipwa-dev-utils/logger')
4
+ const semver = require('semver')
5
+ const pathExists = require('../../util/path-exists')
6
+ const getJsonfileData = require('../../util/get-jsonfile-data')
7
7
 
8
- const vendorPath = path.join(process.cwd(), 'vendor');
9
- const composerJsonPath = path.join(process.cwd(), 'composer.json');
8
+ const vendorPath = path.join(process.cwd(), 'vendor')
9
+ const composerJsonPath = path.join(process.cwd(), 'composer.json')
10
10
 
11
11
  /**
12
12
  * @returns {Promise<string[]}
@@ -15,109 +15,146 @@ const getInstalledComposerPlugins = async () => {
15
15
  const rootVendorFolders = await fs.promises.readdir(vendorPath, {
16
16
  encoding: 'utf-8',
17
17
  withFileTypes: true
18
- });
19
-
20
- const composerPlugins = (await Promise.all(
21
- rootVendorFolders.map(async (f) => {
22
- if (f.isDirectory()) {
23
- const vendorDirectoryPath = path.join(vendorPath, f.name);
24
-
25
- const vendorPackages = await fs.promises.readdir(vendorDirectoryPath, {
26
- encoding: 'utf-8',
27
- withFileTypes: true
28
- });
29
-
30
- const vendorPackagesComposerPlugins = (await Promise.all(
31
- vendorPackages.map(async (p) => {
32
- if (p.isDirectory()) {
33
- const vendorPackageComposerJsonPath = path.join(vendorDirectoryPath, p.name, 'composer.json');
34
-
35
- if (await pathExists(vendorPackageComposerJsonPath)) {
36
- const {
37
- name: vendorPackageName,
38
- type: vendorPackageType
39
- } = JSON.parse(await fs.promises.readFile(vendorPackageComposerJsonPath, {
40
- encoding: 'utf-8'
41
- }));
42
-
43
- if (vendorPackageType === 'composer-plugin') {
44
- return vendorPackageName;
18
+ })
19
+
20
+ /** @type {string[]} */
21
+ const init = []
22
+ const composerPlugins = (
23
+ await Promise.all(
24
+ rootVendorFolders.map(async (f) => {
25
+ if (f.isDirectory()) {
26
+ const vendorDirectoryPath = path.join(vendorPath, f.name)
27
+
28
+ const vendorPackages = await fs.promises.readdir(
29
+ vendorDirectoryPath,
30
+ {
31
+ encoding: 'utf-8',
32
+ withFileTypes: true
33
+ }
34
+ )
35
+
36
+ /**
37
+ * @type {string[]}
38
+ */
39
+ const vendorPackagesComposerPlugins = (
40
+ await Promise.all(
41
+ vendorPackages.map(async (p) => {
42
+ if (p.isDirectory()) {
43
+ const vendorPackageComposerJsonPath =
44
+ path.join(
45
+ vendorDirectoryPath,
46
+ p.name,
47
+ 'composer.json'
48
+ )
49
+
50
+ if (
51
+ await pathExists(
52
+ vendorPackageComposerJsonPath
53
+ )
54
+ ) {
55
+ /**
56
+ *
57
+ */
58
+ const {
59
+ name: vendorPackageName,
60
+ type: vendorPackageType
61
+ } = JSON.parse(
62
+ await fs.promises.readFile(
63
+ vendorPackageComposerJsonPath,
64
+ {
65
+ encoding: 'utf-8'
66
+ }
67
+ )
68
+ )
69
+
70
+ if (
71
+ vendorPackageType ===
72
+ 'composer-plugin'
73
+ ) {
74
+ return vendorPackageName
75
+ }
76
+
77
+ return null
78
+ }
45
79
  }
46
80
 
47
- return null;
48
- }
49
- }
81
+ return null
82
+ })
83
+ )
84
+ ).filter((p) => typeof p === 'string')
50
85
 
51
- return null;
52
- })
53
- )).filter((p) => typeof p === 'string');
54
-
55
- return vendorPackagesComposerPlugins;
56
- }
86
+ return vendorPackagesComposerPlugins
87
+ }
57
88
 
58
- return null;
59
- })
60
- ))
61
- .reduce((acc, val) => acc.concat(val), []) // flattens the array
62
- .filter((p) => typeof p === 'string');
89
+ return null
90
+ })
91
+ )
92
+ )
93
+ .reduce((acc, val) => (val ? acc.concat(val) : acc), init) // flattens the array
94
+ .filter((p) => typeof p === 'string')
63
95
 
64
- return composerPlugins;
65
- };
96
+ return composerPlugins
97
+ }
66
98
 
67
99
  /**
68
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
100
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
69
101
  */
70
102
  const enableMagentoComposerPlugins = () => ({
71
103
  task: async (ctx, task) => {
72
104
  if (!semver.satisfies(ctx.composerVersion, '^2.2.0')) {
73
- task.skip();
74
- return;
105
+ task.skip()
106
+ return
75
107
  }
76
108
 
77
- task.title = 'Checking allowed Composer plugins...';
78
-
79
- const composerPlugins = await getInstalledComposerPlugins();
80
- const composerJsonData = await getJsonfileData(composerJsonPath);
81
- const {
82
- config: {
83
- 'allow-plugins': allowPlugins = {}
84
- } = {}
85
- } = composerJsonData;
86
- const allowPluginsKeys = Object.keys(allowPlugins);
87
-
88
- const missingPluginsFromAllowPlugins = composerPlugins.filter((plugin) => {
89
- const [pluginVendor, pluginName] = plugin.split('/');
90
- return !allowPluginsKeys.some((allowedPlugin) => {
91
- const [allowedPluginVendor, allowedPluginName] = allowedPlugin.split('/');
92
- if (allowedPluginVendor === pluginVendor) {
93
- if (allowedPluginName === '*') {
94
- return true;
95
- }
109
+ task.title = 'Checking allowed Composer plugins...'
110
+
111
+ const composerPlugins = await getInstalledComposerPlugins()
112
+ const composerJsonData = await getJsonfileData(composerJsonPath)
113
+ const { config: { 'allow-plugins': allowPlugins = {} } = {} } =
114
+ composerJsonData
115
+ const allowPluginsKeys = Object.keys(allowPlugins)
116
+
117
+ const missingPluginsFromAllowPlugins = composerPlugins.filter(
118
+ (plugin) => {
119
+ const [pluginVendor, pluginName] = plugin.split('/')
120
+ return !allowPluginsKeys.some((allowedPlugin) => {
121
+ const [allowedPluginVendor, allowedPluginName] =
122
+ allowedPlugin.split('/')
123
+ if (allowedPluginVendor === pluginVendor) {
124
+ if (allowedPluginName === '*') {
125
+ return true
126
+ }
96
127
 
97
- return allowedPluginName === pluginName;
98
- }
128
+ return allowedPluginName === pluginName
129
+ }
99
130
 
100
- return false;
101
- });
102
- });
131
+ return false
132
+ })
133
+ }
134
+ )
103
135
 
104
136
  if (
105
- allowPluginsKeys.length === 0
106
- || missingPluginsFromAllowPlugins.length > 0
137
+ allowPluginsKeys.length === 0 ||
138
+ missingPluginsFromAllowPlugins.length > 0
107
139
  ) {
108
- const missingVendors = missingPluginsFromAllowPlugins.reduce((acc, val) => {
109
- const [pluginVendor] = val.split('/');
110
-
111
- if (acc.length === 0) {
112
- return [pluginVendor];
113
- }
140
+ /** @type {string[]} */
141
+ const init = []
142
+ const missingVendors = missingPluginsFromAllowPlugins.reduce(
143
+ (acc, val) => {
144
+ const [pluginVendor] = val.split('/')
145
+
146
+ if (acc.length === 0) {
147
+ return [pluginVendor]
148
+ }
114
149
 
115
- if (!acc.includes(pluginVendor)) {
116
- return [...acc, pluginVendor];
117
- }
150
+ if (!acc.includes(pluginVendor)) {
151
+ return [...acc, pluginVendor]
152
+ }
118
153
 
119
- return acc;
120
- }, []);
154
+ return acc
155
+ },
156
+ init
157
+ )
121
158
 
122
159
  const pluginOptions = [
123
160
  {
@@ -132,13 +169,15 @@ const enableMagentoComposerPlugins = () => ({
132
169
  name: 'skip',
133
170
  message: 'Skip this step'
134
171
  }
135
- ];
172
+ ]
136
173
 
137
174
  if (missingVendors.length === 1) {
138
175
  pluginOptions.unshift({
139
176
  name: 'all',
140
- message: `Enable all (${logger.style.code(`"${missingVendors[0]}/*"`)})`
141
- });
177
+ message: `Enable all (${logger.style.code(
178
+ `"${missingVendors[0]}/*"`
179
+ )})`
180
+ })
142
181
  }
143
182
 
144
183
  const answerForEnablingPlugins = await task.prompt({
@@ -150,71 +189,96 @@ ${missingPluginsFromAllowPlugins.map((p) => logger.style.code(p)).join('\n')}
150
189
 
151
190
  Do you want to enable them all or disable some of them?`,
152
191
  choices: pluginOptions
153
- });
192
+ })
154
193
 
155
194
  switch (answerForEnablingPlugins.toLowerCase()) {
156
- case 'all': {
157
- composerJsonData.config = {
158
- ...(composerJsonData.config || {}),
159
- 'allow-plugins': {
160
- ...allowPlugins,
161
- [`${missingVendors[0]}/*`]: true
195
+ case 'all': {
196
+ composerJsonData.config = {
197
+ ...(composerJsonData.config || {}),
198
+ 'allow-plugins': {
199
+ ...allowPlugins,
200
+ [`${missingVendors[0]}/*`]: true
201
+ }
162
202
  }
163
- };
164
203
 
165
- await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
166
- encoding: 'utf-8'
167
- });
168
- break;
169
- }
170
- case 'all-individual': {
171
- composerJsonData.config = {
172
- ...(composerJsonData.config || {}),
173
- 'allow-plugins': {
174
- ...allowPlugins,
175
- ...missingPluginsFromAllowPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
204
+ await fs.promises.writeFile(
205
+ composerJsonPath,
206
+ JSON.stringify(composerJsonData, null, 4),
207
+ {
208
+ encoding: 'utf-8'
209
+ }
210
+ )
211
+ break
212
+ }
213
+ case 'all-individual': {
214
+ composerJsonData.config = {
215
+ ...(composerJsonData.config || {}),
216
+ 'allow-plugins': {
217
+ ...allowPlugins,
218
+ ...missingPluginsFromAllowPlugins.reduce(
219
+ (acc, val) => ({ ...acc, [val]: true }),
220
+ {}
221
+ )
222
+ }
176
223
  }
177
- };
178
224
 
179
- await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
180
- encoding: 'utf-8'
181
- });
182
- break;
183
- }
184
- case 'manual': {
185
- const userEnabledPlugins = await task.prompt({
186
- type: 'MultiSelect',
187
- message: 'Please pick plugins you want to enable!',
188
- choices: missingPluginsFromAllowPlugins.map((p) => ({ name: p }))
189
- });
190
-
191
- const disabledPlugins = composerPlugins.filter((p) => !userEnabledPlugins.includes(p));
192
-
193
- composerJsonData.config = {
194
- ...(composerJsonData.config || {}),
195
- 'allow-plugins': {
196
- ...allowPlugins,
197
- ...disabledPlugins.reduce((acc, val) => ({ ...acc, [val]: false }), {}),
198
- ...userEnabledPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
225
+ await fs.promises.writeFile(
226
+ composerJsonPath,
227
+ JSON.stringify(composerJsonData, null, 4),
228
+ {
229
+ encoding: 'utf-8'
230
+ }
231
+ )
232
+ break
233
+ }
234
+ case 'manual': {
235
+ const userEnabledPlugins = await task.prompt({
236
+ type: 'MultiSelect',
237
+ message: 'Please pick plugins you want to enable!',
238
+ choices: missingPluginsFromAllowPlugins.map((p) => ({
239
+ name: p
240
+ }))
241
+ })
242
+
243
+ const disabledPlugins = composerPlugins.filter(
244
+ (p) => !userEnabledPlugins.includes(p)
245
+ )
246
+
247
+ composerJsonData.config = {
248
+ ...(composerJsonData.config || {}),
249
+ 'allow-plugins': {
250
+ ...allowPlugins,
251
+ ...disabledPlugins.reduce(
252
+ (acc, val) => ({ ...acc, [val]: false }),
253
+ {}
254
+ ),
255
+ ...userEnabledPlugins.reduce(
256
+ (acc, val) => ({ ...acc, [val]: true }),
257
+ {}
258
+ )
259
+ }
199
260
  }
200
- };
201
261
 
202
- await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
203
- encoding: 'utf-8'
204
- });
262
+ await fs.promises.writeFile(
263
+ composerJsonPath,
264
+ JSON.stringify(composerJsonData, null, 4),
265
+ {
266
+ encoding: 'utf-8'
267
+ }
268
+ )
205
269
 
206
- break;
207
- }
208
- case 'skip this step': {
209
- task.skip();
210
- break;
211
- }
212
- default: {
213
- //
214
- }
270
+ break
271
+ }
272
+ case 'skip this step': {
273
+ task.skip()
274
+ break
275
+ }
276
+ default: {
277
+ //
278
+ }
215
279
  }
216
280
  }
217
281
  }
218
- });
282
+ })
219
283
 
220
- module.exports = enableMagentoComposerPlugins;
284
+ module.exports = enableMagentoComposerPlugins
@@ -3,4 +3,4 @@ module.exports = {
3
3
  setupMagento: require('./setup-magento'),
4
4
  uninstallMagento: require('./uninstall-magento'),
5
5
  removeMagento: require('./remove-magento')
6
- };
6
+ }