@lando/drupal 0.5.0 → 0.6.0

package/node_modules/lodash/wrapperReverse.js

@@ -0,0 +1,44 @@
+var LazyWrapper = require('./_LazyWrapper'),
+    LodashWrapper = require('./_LodashWrapper'),
+    reverse = require('./reverse'),
+    thru = require('./thru');
+
+/**
+ * This method is the wrapper version of `_.reverse`.
+ *
+ * **Note:** This method mutates the wrapped array.
+ *
+ * @name reverse
+ * @memberOf _
+ * @since 0.1.0
+ * @category Seq
+ * @returns {Object} Returns the new `lodash` wrapper instance.
+ * @example
+ *
+ * var array = [1, 2, 3];
+ *
+ * _(array).reverse().value()
+ * // => [3, 2, 1]
+ *
+ * console.log(array);
+ * // => [3, 2, 1]
+ */
+function wrapperReverse() {
+  var value = this.__wrapped__;
+  if (value instanceof LazyWrapper) {
+    var wrapped = value;
+    if (this.__actions__.length) {
+      wrapped = new LazyWrapper(this);
+    }
+    wrapped = wrapped.reverse();
+    wrapped.__actions__.push({
+      'func': thru,
+      'args': [reverse],
+      'thisArg': undefined
+    });
+    return new LodashWrapper(wrapped, this.__chain__);
+  }
+  return this.thru(reverse);
+}
+
+module.exports = wrapperReverse;

package/node_modules/lodash/wrapperValue.js

@@ -0,0 +1,21 @@
+var baseWrapperValue = require('./_baseWrapperValue');
+
+/**
+ * Executes the chain sequence to resolve the unwrapped value.
+ *
+ * @name value
+ * @memberOf _
+ * @since 0.1.0
+ * @alias toJSON, valueOf
+ * @category Seq
+ * @returns {*} Returns the resolved unwrapped value.
+ * @example
+ *
+ * _([1, 2, 3]).value();
+ * // => [1, 2, 3]
+ */
+function wrapperValue() {
+  return baseWrapperValue(this.__wrapped__, this.__actions__);
+}
+
+module.exports = wrapperValue;

package/node_modules/lodash/xor.js

@@ -0,0 +1,28 @@
+var arrayFilter = require('./_arrayFilter'),
+    baseRest = require('./_baseRest'),
+    baseXor = require('./_baseXor'),
+    isArrayLikeObject = require('./isArrayLikeObject');
+
+/**
+ * Creates an array of unique values that is the
+ * [symmetric difference](https://en.wikipedia.org/wiki/Symmetric_difference)
+ * of the given arrays. The order of result values is determined by the order
+ * they occur in the arrays.
+ *
+ * @static
+ * @memberOf _
+ * @since 2.4.0
+ * @category Array
+ * @param {...Array} [arrays] The arrays to inspect.
+ * @returns {Array} Returns the new array of filtered values.
+ * @see _.difference, _.without
+ * @example
+ *
+ * _.xor([2, 1], [2, 3]);
+ * // => [1, 3]
+ */
+var xor = baseRest(function(arrays) {
+  return baseXor(arrayFilter(arrays, isArrayLikeObject));
+});
+
+module.exports = xor;

package/node_modules/lodash/xorBy.js

@@ -0,0 +1,39 @@
+var arrayFilter = require('./_arrayFilter'),
+    baseIteratee = require('./_baseIteratee'),
+    baseRest = require('./_baseRest'),
+    baseXor = require('./_baseXor'),
+    isArrayLikeObject = require('./isArrayLikeObject'),
+    last = require('./last');
+
+/**
+ * This method is like `_.xor` except that it accepts `iteratee` which is
+ * invoked for each element of each `arrays` to generate the criterion by
+ * which by which they're compared. The order of result values is determined
+ * by the order they occur in the arrays. The iteratee is invoked with one
+ * argument: (value).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Array
+ * @param {...Array} [arrays] The arrays to inspect.
+ * @param {Function} [iteratee=_.identity] The iteratee invoked per element.
+ * @returns {Array} Returns the new array of filtered values.
+ * @example
+ *
+ * _.xorBy([2.1, 1.2], [2.3, 3.4], Math.floor);
+ * // => [1.2, 3.4]
+ *
+ * // The `_.property` iteratee shorthand.
+ * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+ * // => [{ 'x': 2 }]
+ */
+var xorBy = baseRest(function(arrays) {
+  var iteratee = last(arrays);
+  if (isArrayLikeObject(iteratee)) {
+    iteratee = undefined;
+  }
+  return baseXor(arrayFilter(arrays, isArrayLikeObject), baseIteratee(iteratee, 2));
+});
+
+module.exports = xorBy;

package/node_modules/lodash/xorWith.js

@@ -0,0 +1,34 @@
+var arrayFilter = require('./_arrayFilter'),
+    baseRest = require('./_baseRest'),
+    baseXor = require('./_baseXor'),
+    isArrayLikeObject = require('./isArrayLikeObject'),
+    last = require('./last');
+
+/**
+ * This method is like `_.xor` except that it accepts `comparator` which is
+ * invoked to compare elements of `arrays`. The order of result values is
+ * determined by the order they occur in the arrays. The comparator is invoked
+ * with two arguments: (arrVal, othVal).
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Array
+ * @param {...Array} [arrays] The arrays to inspect.
+ * @param {Function} [comparator] The comparator invoked per element.
+ * @returns {Array} Returns the new array of filtered values.
+ * @example
+ *
+ * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+ * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+ *
+ * _.xorWith(objects, others, _.isEqual);
+ * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+ */
+var xorWith = baseRest(function(arrays) {
+  var comparator = last(arrays);
+  comparator = typeof comparator == 'function' ? comparator : undefined;
+  return baseXor(arrayFilter(arrays, isArrayLikeObject), undefined, comparator);
+});
+
+module.exports = xorWith;

package/node_modules/lodash/zip.js

@@ -0,0 +1,22 @@
+var baseRest = require('./_baseRest'),
+    unzip = require('./unzip');
+
+/**
+ * Creates an array of grouped elements, the first of which contains the
+ * first elements of the given arrays, the second of which contains the
+ * second elements of the given arrays, and so on.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Array
+ * @param {...Array} [arrays] The arrays to process.
+ * @returns {Array} Returns the new array of grouped elements.
+ * @example
+ *
+ * _.zip(['a', 'b'], [1, 2], [true, false]);
+ * // => [['a', 1, true], ['b', 2, false]]
+ */
+var zip = baseRest(unzip);
+
+module.exports = zip;

package/node_modules/lodash/zipObject.js

@@ -0,0 +1,24 @@
+var assignValue = require('./_assignValue'),
+    baseZipObject = require('./_baseZipObject');
+
+/**
+ * This method is like `_.fromPairs` except that it accepts two arrays,
+ * one of property identifiers and one of corresponding values.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.4.0
+ * @category Array
+ * @param {Array} [props=[]] The property identifiers.
+ * @param {Array} [values=[]] The property values.
+ * @returns {Object} Returns the new object.
+ * @example
+ *
+ * _.zipObject(['a', 'b'], [1, 2]);
+ * // => { 'a': 1, 'b': 2 }
+ */
+function zipObject(props, values) {
+  return baseZipObject(props || [], values || [], assignValue);
+}
+
+module.exports = zipObject;

package/node_modules/lodash/zipObjectDeep.js

@@ -0,0 +1,23 @@
+var baseSet = require('./_baseSet'),
+    baseZipObject = require('./_baseZipObject');
+
+/**
+ * This method is like `_.zipObject` except that it supports property paths.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.1.0
+ * @category Array
+ * @param {Array} [props=[]] The property identifiers.
+ * @param {Array} [values=[]] The property values.
+ * @returns {Object} Returns the new object.
+ * @example
+ *
+ * _.zipObjectDeep(['a.b[0].c', 'a.b[1].d'], [1, 2]);
+ * // => { 'a': { 'b': [{ 'c': 1 }, { 'd': 2 }] } }
+ */
+function zipObjectDeep(props, values) {
+  return baseZipObject(props || [], values || [], baseSet);
+}
+
+module.exports = zipObjectDeep;

package/node_modules/lodash/zipWith.js

@@ -0,0 +1,32 @@
+var baseRest = require('./_baseRest'),
+    unzipWith = require('./unzipWith');
+
+/**
+ * This method is like `_.zip` except that it accepts `iteratee` to specify
+ * how grouped values should be combined. The iteratee is invoked with the
+ * elements of each group: (...group).
+ *
+ * @static
+ * @memberOf _
+ * @since 3.8.0
+ * @category Array
+ * @param {...Array} [arrays] The arrays to process.
+ * @param {Function} [iteratee=_.identity] The function to combine
+ *  grouped values.
+ * @returns {Array} Returns the new array of grouped elements.
+ * @example
+ *
+ * _.zipWith([1, 2], [10, 20], [100, 200], function(a, b, c) {
+ *   return a + b + c;
+ * });
+ * // => [111, 222]
+ */
+var zipWith = baseRest(function(arrays) {
+  var length = arrays.length,
+      iteratee = length > 1 ? arrays[length - 1] : undefined;
+
+  iteratee = typeof iteratee == 'function' ? (arrays.pop(), iteratee) : undefined;
+  return unzipWith(arrays, iteratee);
+});
+
+module.exports = zipWith;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@lando/drupal",
   "description": "A Lando plugin that provides a tight integration with Drupal.",
-  "version": "0.5.0",
-  "author": "John Ouellet @labboy0276",
+  "version": "0.6.0",
+  "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/drupal",
   "bugs": "https://github.com/lando/drupal/issues/new/choose",
@@ -10,11 +10,14 @@
   "keywords": [
     "lando",
     "lando-plugin",
+    "lando-recipe",
     "drupal"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
+  "bundledDependencies": true,
+  "lando": {},
   "main": "index.js",
   "nyc": {
     "include": [
@@ -31,8 +34,8 @@
   },
   "scripts": {
     "coverage": "nyc report --reporter=text-lcov | coveralls",
-    "docs:dev": "vuepress dev docs",
-    "docs:build": "vuepress build docs --dest _site",
+    "docs:dev": "vuepress dev docs --clean-cache --clean-temp",
+    "docs:build": "vuepress build docs",
     "docs:lint": "eslint -c docs/.eslintrc.json --quiet docs/.vuepress",
     "lint": "eslint --quiet . && yarn docs:lint",
     "release": "bump --prompt --tag --all --push",
@@ -41,22 +44,21 @@
     "test": "yarn lint && yarn test:unit"
   },
   "dependencies": {
-    "js-yaml": "^3.4.6",
-    "lodash": "^4.17.21",
-    "tar": "^6.1.11"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^0.6.4",
-    "@lando/vuepress-theme-lando-docs": "^0.2.3",
+    "@lando/vuepress-theme-default-plus": "1.0.0-beta.34",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
     "eslint-config-google": "^0.9.1",
     "eslint-plugin-vue": "^8.0.3",
+    "js-yaml": "^4.1.0",
     "mocha": "^9.1.2",
     "nyc": "^15.1.0",
     "version-bump-prompt": "^4.2.1",
-    "vuepress": "^2.0.0-beta.27"
+    "vuepress": "^2.0.0-beta.43"
   }
 }

package/recipes/drupal10/builder.js

@@ -0,0 +1,42 @@
+'use strict';
+
+// Modules
+const _ = require('lodash');
+
+// Get install DC command
+// const utils = require('./../../lib/utils');
+// const dcInstall = utils.getPhar('https://drupalconsole.com/installer', '/tmp/drupal.phar', '/usr/local/bin/drupal');
+
+/*
+ * Build Drupal 10
+ */
+module.exports = {
+  name: 'drupal10',
+  parent: '_drupaly',
+  config: {
+    confSrc: __dirname,
+    defaultFiles: {},
+    php: '8.1',
+    drush: '^11',
+  },
+  builder: (parent, config) => class LandoDrupal10 extends parent {
+    constructor(id, options = {}) {
+      options = _.merge({}, config, options);
+      // Set drush to false
+      options.drush = false;
+
+      // Let's make sure we set appropripate default versions for things
+      // See: https://www.drupal.org/docs/system-requirements/database-server-requirements
+      if (_.get(options, 'database') === 'mysql') {
+        options.database = 'mysql:5.7';
+      } else if (_.get(options, 'database') === 'mariadb') {
+        options.database = 'mariadb:10.3';
+      } else if (_.get(options, 'database') === 'postgres') {
+        options.database = 'postgres:12';
+      }
+
+      // Send it downstream
+      super(id, options);
+    };
+  },
+};

package/recipes/drupal10/default.conf.tpl

@@ -0,0 +1,113 @@
+server {
+  listen 80 default_server;
+  listen 443 ssl;
+  server_name localhost;
+  ssl_certificate           /certs/cert.crt;
+  ssl_certificate_key       /certs/cert.key;
+  ssl_verify_client         off;
+  ssl_session_cache    shared:SSL:1m;
+  ssl_session_timeout  5m;
+  ssl_ciphers  HIGH:!aNULL:!MD5;
+  ssl_prefer_server_ciphers  on;
+  port_in_redirect off;
+  client_max_body_size 100M;
+  root "{{LANDO_WEBROOT}}";
+  location = /favicon.ico {
+      log_not_found off;
+      access_log off;
+  }
+
+  location = /robots.txt {
+      allow all;
+      log_not_found off;
+      access_log off;
+  }
+
+  # Very rarely should these ever be accessed outside of your lan
+  location ~* \.(txt|log)$ {
+      allow 192.168.0.0/16;
+      deny all;
+  }
+
+  location ~ \..*/.*\.php$ {
+      return 403;
+  }
+
+  location ~ ^/sites/.*/private/ {
+      return 403;
+  }
+
+  # Allow "Well-Known URIs" as per RFC 5785
+  location ~* ^/.well-known/ {
+      allow all;
+  }
+
+  # Block access to "hidden" files and directories whose names begin with a
+  # period. This includes directories used by version control systems such
+  # as Subversion or Git to store control files.
+  location ~ (^|/)\. {
+      return 403;
+  }
+
+  location / {
+      # try_files $uri @rewrite; # For Drupal <= 6
+      try_files $uri /index.php?$query_string; # For Drupal >= 7
+  }
+
+  location @rewrite {
+      rewrite ^/(.*)$ /index.php?q=$1;
+  }
+
+  # Don't allow direct access to PHP files in the vendor directory.
+  location ~ /vendor/.*\.php$ {
+      deny all;
+      return 404;
+  }
+
+  # In Drupal 10, we must also match new paths where the '.php' appears in
+  # the middle, such as update.php/selection. The rule we use is strict,
+  # and only allows this pattern with the update.php front controller.
+  # This allows legacy path aliases in the form of
+  # blog/index.php/legacy-path to continue to route to Drupal nodes. If
+  # you do not have any paths like that, then you might prefer to use a
+  # laxer rule, such as:
+  #   location ~ \.php(/|$) {
+  # The laxer rule will continue to work if Drupal uses this new URL
+  # pattern with front controllers other than update.php in a future
+  # release.
+  location ~ '\.php$|^/update.php' {
+      fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
+      # Security note: If you're running a version of PHP older than the
+      # latest 5.3, you should have "cgi.fix_pathinfo = 0;" in php.ini.
+      # See http://serverfault.com/q/627903/94922 for details.
+      include fastcgi_params;
+      # Block httpoxy attacks. See https://httpoxy.org/.
+      fastcgi_param HTTP_PROXY "";
+      fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+      fastcgi_param PATH_INFO $fastcgi_path_info;
+      fastcgi_param QUERY_STRING $query_string;
+      fastcgi_intercept_errors on;
+      # PHP 5 socket location.
+      #fastcgi_pass unix:/var/run/php5-fpm.sock;
+      # PHP 7 socket location.
+      #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+      #lando
+      fastcgi_pass fpm:9000;
+  }
+  # Fighting with Styles? This little gem is amazing.
+  # location ~ ^/sites/.*/files/imagecache/ { # For Drupal <= 6
+  location ~ ^(/[a-z\-]+)?/sites/.*/files/styles/ { # For Drupal >= 7
+      try_files $uri @rewrite;
+  }
+  # Handle private files through Drupal. Private file's path can come
+  # with a language prefix.
+  location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7
+      try_files $uri /index.php?$query_string;
+  }
+
+  location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+      expires max;
+      log_not_found off;
+  }
+
+}

package/recipes/drupal10/init.js

@@ -0,0 +1,8 @@
+'use strict';
+
+/*
+ * Init Lamp
+ */
+module.exports = {
+  name: 'drupal10',
+};

package/recipes/drupal10/mysql.cnf

@@ -0,0 +1,110 @@
+#
+# The MySQL database server configuration file for Lando
+#
+
+[mysqld]
+#
+# * Basic Settings
+#
+# Data is stored in a volume on the db container /sql
+default-storage-engine = innodb
+
+#
+# * Fine Tuning
+#
+key_buffer_size    = 384M
+max_allowed_packet  = 32M
+thread_stack    = 400K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+#max_connections        = 100
+#table_cache            = 64
+#thread_concurrency     = 10
+read_rnd_buffer_size = 8M
+myisam_sort_buffer_size = 64M
+table_open_cache = 512
+sort_buffer_size = 2M
+read_buffer_size = 2M
+
+#
+# * Query Cache Configuration
+#
+query_cache_limit = 1M
+query_cache_size = 64M
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /src/.lando/log/mysql.log
+#general_log             = 1
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
+# Here you can see queries with especially long duration
+#log_slow_queries = /var/log/mysql/mysql-slow.log
+#long_query_time = 2
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id    = 1
+#log_bin      = /src/.lando/log/mysql-bin.log
+expire_logs_days = 10
+max_binlog_size = 100M
+#binlog_do_db   = include_database_name
+#binlog_ignore_db = include_database_name
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+#
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
+#innodb_log_group_home_dir = C:\mysql\data/
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 384M
+#innodb_additional_mem_pool_size = 20M
+# Set .._log_file_size to 25 % of buffer pool size
+innodb_log_file_size = 100M
+#innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 0
+#innodb_lock_wait_timeout = 50
+innodb_buffer_pool_size = 384M
+innodb_log_buffer_size  = 4M
+innodb_file_per_table   = 1
+innodb_open_files       = 256
+innodb_io_capacity      = 512
+innodb_flush_method     = O_DIRECT
+innodb_thread_concurrency = 8
+innodb_lock_wait_timeout = 120
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet  = 32M
+
+[mysql]
+#no-auto-rehash # faster start of mysql but no tab completion
+
+[isamchk]
+key_buffer_size = 384M
+sort_buffer_size = 256M
+read_buffer = 2M
+write_buffer = 2M

package/recipes/drupal10/php.ini

@@ -0,0 +1,49 @@
+[PHP]
+
+;;;;;;;;;;;;;;;
+; PHP Globals ;
+;;;;;;;;;;;;;;;
+
+short_open_tag = Off
+output_buffering = 4096
+allow_call_time_pass_reference = Off
+request_order = "GP"
+register_long_arrays = Off
+register_argc_argv = Off
+magic_quotes_gpc = Off
+enable_dl = Off
+allow_url_fopen = On
+realpath_cache_size = "800K"
+realpath_cache_ttl = "86400"
+disable_functions =
+sendmail_path=/bin/true
+;include_path = ".:/usr/share/pear:/usr/share/php"
+
+[Date]
+date.timezone = "UTC"
+
+;;;;;;;;;;;;;;;;;;;;;;
+;; PACKAGE SETTINGS ;;
+;;;;;;;;;;;;;;;;;;;;;;
+
+; Xdebug
+xdebug.max_nesting_level = 512
+xdebug.show_exception_trace = 0
+xdebug.collect_params = 0
+xdebug.remote_autostart = 1
+xdebug.start_with_request = trigger
+xdebug.mode = ${XDEBUG_MODE}
+
+; Globals
+expose_php = on
+max_execution_time = 90
+max_input_time = 900
+max_input_vars = 10000
+memory_limit = ${PHP_MEMORY_LIMIT}
+upload_max_filesize = 100M
+post_max_size = 100M
+error_reporting = E_ALL & ~E_DEPRECATED
+ignore_repeated_errors = on
+html_errors = off
+display_errors = on
+log_errors = on

package/recipes/drupal7/builder.js

@@ -12,7 +12,7 @@ module.exports = {
   config: {
     confSrc: __dirname,
     defaultFiles: {},
-    php: '7.2',
+    php: '7.4',
   },
   builder: (parent, config) => class LandoDrupal7 extends parent {
     constructor(id, options = {}) {

package/recipes/drupal9/builder.js

@@ -17,7 +17,7 @@ module.exports = {
     confSrc: __dirname,
     defaultFiles: {},
     php: '8.0',
-    drush: '^10',
+    drush: '^11',
   },
   builder: (parent, config) => class LandoDrupal9 extends parent {
     constructor(id, options = {}) {