Do not ignore package-lock.json (#1134)

.docker/cli.dockerfile

@@ -77,7 +77,7 @@ COPY ${WEBROOT}/themes/custom/your_site_theme/patches /app/${WEBROOT}/themes/cus
 # Install NodeJS dependencies.
 # Since Drupal does not use NodeJS for production, it does not matter if we
 # install development dependencnies here - they are not exposed in any way.
-RUN npm --prefix /app/${WEBROOT}/themes/custom/your_site_theme install --no-audit --no-progress --unsafe-perm
+RUN npm --prefix /app/${WEBROOT}/themes/custom/your_site_theme ci --no-audit --no-progress --unsafe-perm
 
 # Copy all files into appllication source directory. Existing files are always
 # overridden.

.drevops/installer/src/Command/InstallCommand.php

@@ -587,7 +587,7 @@ protected function processWebroot($dir) {
       static::dirReplaceContent(': web', ': ' . $new_name, $dir);
       static::dirReplaceContent('=web', '=' . $new_name, $dir);
       static::dirReplaceContent('!web', '!' . $new_name, $dir);
-      static::dirReplaceContent('/web', '/' . $new_name, $dir);
+      static::dirReplaceContent('/\/web\//', '/' . $new_name . '/', $dir);
       rename($dir . DIRECTORY_SEPARATOR . 'web', $dir . DIRECTORY_SEPARATOR . $new_name);
     }
   }
@@ -1868,22 +1868,11 @@ protected static function dirContains($needle, $dir) {
   }
 
   protected static function isRegex($str) {
-    if (preg_match('/^(.{3,}?)[imsxuADU]*$/', $str, $m)) {
-      $start = substr($m[1], 0, 1);
-      $end = substr($m[1], -1);
-
-      if ($start === $end) {
-        return !preg_match('/[*?[:alnum:] \\\\]/', $start);
-      }
-
-      foreach ([['{', '}'], ['(', ')'], ['[', ']'], ['<', '>']] as $delimiters) {
-        if ($start === $delimiters[0] && $end === $delimiters[1]) {
-          return TRUE;
-        }
-      }
+    if ($str === '' || strlen($str) < 3) {
+      return FALSE;
     }
 
-    return FALSE;
+    return @preg_match($str, '') !== FALSE;
   }
 
   protected static function fileReplaceContent($needle, $replacement, $filename) {

.drevops/installer/tests/phpunit/unit/HelpersTest.php

@@ -107,4 +107,47 @@ public static function dataProviderToCamelCase() {
     ];
   }
 
+  /**
+   * @dataProvider dataProviderIsRegex
+   */
+  public function testIsRegex($value, $expected) {
+    $actual = $this->callProtectedMethod(InstallCommand::class, 'isRegex', [$value]);
+    $this->assertEquals($expected, $actual);
+  }
+
+  public static function dataProviderIsRegex() {
+    return [
+      ['', FALSE],
+
+      // Valid regular expressions.
+      ["/^[a-z]$/", TRUE],
+      ["#[a-z]*#i", TRUE],
+      ["{[0-9]+}", TRUE],
+      ["(\\d+)", TRUE],
+      ["<[A-Z]{3,6}>", TRUE],
+
+      // Invalid regular expressions (wrong delimiters or syntax).
+      ["^[a-z]$", FALSE],
+      ["/[a-z", FALSE],
+      ["[a-z]+/", FALSE],
+      ["{[a-z]*", FALSE],
+      ["(a-z]", FALSE],
+
+      // Edge cases.
+      // Valid, but '*' as delimiter would be invalid.
+      ["/a*/", TRUE],
+      // Empty string.
+      ["", FALSE],
+      // Just delimiters, no pattern.
+      ["//", FALSE],
+
+      ['web/', FALSE],
+      ['web\/', FALSE],
+      [': web', FALSE],
+      ['=web', FALSE],
+      ['!web', FALSE],
+      ['/web', FALSE],
+    ];
+  }
+
 }

.drevops/tests/bats/workflow.install.bats

@@ -56,7 +56,7 @@ load _helper.workflow.bash
 }
 
 @test "Workflow: DB-driven, custom webroot" {
-  prepare_sut "Starting DB-driven WORKFLOW tests in build directory ${BUILD_DIR}" "rootdoc"
+  prepare_sut "Starting DB-driven WORKFLOW with custom webroot tests in build directory ${BUILD_DIR}" "rootdoc"
 
   assert_ahoy_download_db
 

.gitignore

@@ -42,7 +42,6 @@ web/sites/default/*
 #;< DREVOPS_DEV
 #; Ignore these files in DrevOps itself, but do not ignore in consumer site.
 /composer.lock
-package-lock.json
 #;> DREVOPS_DEV
 
 # Ignore dependencies cache files.