generator-razor 3.2.3 → 4.0.0

package/app/index.js

@@ -293,12 +293,19 @@ module.exports = class extends Generator {
       version = '95'
     } else if (rzr.Version.indexOf('11.5') !== -1) {
       version = '115'
+    } else if (rzr.Version.indexOf('12.4') !== -1) {
+      version = '124'
     }
 
     this._createSymlinks(this, path, () => {
       copydir(t.templatePath(version), t.destinationPath('./'), () => {
-        t._localconf(t)
-        t._localSettings(t)
+        if (version === '124') {
+          t._localconf12(t)
+          t._local12Settings(t)
+        } else {
+          t._localconf(t)
+          t._localSettings(t)
+        }
 
         t._createDb((response) => {
           t._processSqlFile(t, response, () => {
@@ -318,6 +325,8 @@ module.exports = class extends Generator {
       branch = 'razor9'
     } else if (rzr.Version.indexOf('11.5') !== -1) {
       branch = 'razor11'
+    } else if (rzr.Version.indexOf('12.4') !== -1) {
+      branch = 'razor12-dev'
     }
 
     // yarn settings
@@ -335,7 +344,7 @@ module.exports = class extends Generator {
     fs.unlink('typo3conf/ext/.yarn-integrity', () => {})
 
     // Copy razor extensions after install to typo3conf/ext/, starting with TYPO3 >= 11.5.x
-    if (rzr.Version.indexOf('11.5') !== -1) {
+    if (rzr.Version.indexOf('11.5') !== -1 || rzr.Version.indexOf('12.4') !== -1) {
       fs.copy('typo3conf/ext/razor/Initialisation/Extensions', 'typo3conf/ext')
     }
   }
@@ -350,8 +359,9 @@ module.exports = class extends Generator {
         const releases9 = body['9']['releases']
         const releases10 = body['10']['releases']
         const releases11 = body['11']['releases']
+        const releases12 = body['12']['releases']
 
-        const releasesObj = t._mergeOptions(releases11, releases10, releases9)
+        const releasesObj = t._mergeOptions(releases12, releases11, releases10, releases9)
 
         const keys = Object.keys(releasesObj)
         const len = keys.length
@@ -359,7 +369,7 @@ module.exports = class extends Generator {
 
         // Filter out only 11.5.x 10.4.x, 9.5.x
         for (let i = 0; i < len; i++) {
-          if (keys[i].indexOf('9.5.') !== -1 || keys[i].indexOf('10.4.') !== -1 || keys[i].indexOf('11.5.') !== -1) {
+          if (keys[i].indexOf('9.5.') !== -1 || keys[i].indexOf('10.4.') !== -1 || keys[i].indexOf('11.5.') !== -1 || keys[i].indexOf('12.4.') !== -1) {
             arr.push({
               name: keys[i],
               value: keys[i]
@@ -372,14 +382,15 @@ module.exports = class extends Generator {
     })
   }
 
-  _mergeOptions (obj1, obj2, obj3) {
-    const obj4 = {}
+  _mergeOptions (obj1, obj2, obj3, obj4) {
+    const obj5 = {}
 
-    for (let attrname in obj1) { obj4[attrname] = obj1[attrname] }
-    for (let attrname in obj2) { obj4[attrname] = obj2[attrname] }
-    for (let attrname in obj3) { obj4[attrname] = obj3[attrname] }
+    for (let attrname in obj1) { obj5[attrname] = obj1[attrname] }
+    for (let attrname in obj2) { obj5[attrname] = obj2[attrname] }
+    for (let attrname in obj3) { obj5[attrname] = obj3[attrname] }
+    for (let attrname in obj4) { obj5[attrname] = obj4[attrname] }
 
-    return obj4
+    return obj5
   }
 
   _createSymlinks (t, path, callback) {
@@ -413,7 +424,29 @@ module.exports = class extends Generator {
       })
 
       if (err) {
-        console.error('error setting localconf settings')
+        console.error('error setting LocalConfiguration.php')
+      }
+    })
+  }
+
+  _localconf12 (t) {
+    fs.readFile('typo3conf/system/local.php', 'utf8', (err, content) => {
+      let newContent = t._substituteMarker(content, '###DBNEW###', rzr.DbNew.toLowerCase(), true)
+      newContent = t._substituteMarker(newContent, '###HOST###', rzr.DbHostname, true)
+      newContent = t._substituteMarker(newContent, '###PROJECTNAME###', rzr.ProjectName, true)
+
+      const encryptionKey = crypto.randomBytes((96 + 1) / 2).toString('hex')
+      newContent = t._substituteMarker(newContent, '###ENCRYPTION_KEY###', encryptionKey, true)
+
+      const hash = argon2.hash(rzr.Pass)
+      hash.then(function (res) {
+        newContent = t._substituteMarker(newContent, '###PASS###', res, true)
+
+        t._localconfWrite12(newContent)
+      })
+
+      if (err) {
+        console.error('error setting settings.php')
       }
     })
   }
@@ -422,6 +455,10 @@ module.exports = class extends Generator {
     fs.writeFile('typo3conf/LocalConfiguration.php', content, 'utf8', () => {})
   }
 
+  _localconf12Write (content) {
+    fs.writeFile('typo3conf/system/settings.php', content, 'utf8', () => {})
+  }
+
   _localSettings (t) {
     if (rzr.Transport === 'smtp') {
       let encryptVariable = '###SMTP_ENCRYPT###'
@@ -449,6 +486,33 @@ module.exports = class extends Generator {
     }
   }
 
+  _local12Settings (t) {
+    if (rzr.Transport === 'smtp') {
+      let encryptVariable = '###SMTP_ENCRYPT###'
+      if (rzr.Encrypt === true || rzr.Encrypt === false) {
+        encryptVariable = "'###SMTP_ENCRYPT###'"
+      }
+
+      fs.readFile('typo3conf/system/local.php', 'utf8', (err, content) => {
+        let newContent = t._substituteMarker(content, '###TRANSPORT###', rzr.Transport, true)
+        newContent = t._substituteMarker(newContent, encryptVariable, rzr.Encrypt, true)
+        newContent = t._substituteMarker(newContent, '###SMTP_PASS###', rzr.SmtpPass, true)
+        newContent = t._substituteMarker(newContent, '###SMTP_SERVER###', rzr.SmtpServer, true)
+        newContent = t._substituteMarker(newContent, '###SMTP_USER###', rzr.SmtpUser, true)
+        newContent = t._substituteMarker(newContent, '###SMTP_EMAIL###', rzr.SmtpEmail, true)
+        newContent = t._substituteMarker(newContent, '###SMTP_NAME###', rzr.SmtpName, true)
+
+        fs.writeFile('typo3conf/system/local.php', newContent, 'utf8', () => {})
+
+        if (err) {
+          console.error('error setting local settings')
+        }
+      })
+    } else {
+      fs.unlink('typo3conf/system/local.php', () => {})
+    }
+  }
+
   _createDb (callback) {
     const charset = 'utf8mb4'
     const collate = 'utf8mb4_unicode_ci'

package/app/templates/104/_.htaccess-dev

@@ -1,3 +1,3 @@
 <FilesMatch \.php$>
-  SetHandler proxy:fcgi://php73:9000
+  SetHandler proxy:fcgi://php74:9000
 </FilesMatch>

package/app/templates/104/_.htaccess-dev-ssl

@@ -1,5 +1,5 @@
 <FilesMatch \.php$>
-  SetHandler proxy:fcgi://php73:9000
+  SetHandler proxy:fcgi://php74:9000
 </FilesMatch>
 
 # ----------------------------------------------------------------------

package/app/templates/115/_.htaccess-dev

@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 
 <FilesMatch \.php$>
-  SetHandler proxy:fcgi://php74:9000
+  SetHandler proxy:fcgi://php80:9000
 </FilesMatch>
 
 # ------------------------------------------------------------------------------
@@ -46,8 +46,7 @@ RewriteCond %{HTTP_USER_AGENT} "Mozilla.*Gecko.*Firefox/([1-9]|[1-2][0-9])[^0-9]
 RewriteCond %{HTTP_USER_AGENT} "^Firefox[\/\s]([1-9]|[1-2][0-9])[^0-9]" [NC,OR]
 RewriteCond %{HTTP_USER_AGENT} "AppleWebKit.*Version\/[1-8]\.[0-9\.]*\ Safari" [NC,OR]
 RewriteCond %{HTTP_USER_AGENT} "AppleWebKit.*Version\/[1-8]\.[0-9\.]*\ Mobile\/[A-z0-9]+\ Safari" [NC,OR]
-RewriteCond %{HTTP_USER_AGENT} "(MSIE\ |Trident.+rv:)[1-9][1-9]" [NC]
-#RewriteCond %{HTTP_USER_AGENT} "MSIE ([6-9]|10)" [NC]
+RewriteCond %{HTTP_USER_AGENT} (MSIE|Trident) [NC]
 RewriteRule .* browser-support.html [L]
 
 # ----------------------------------------------------------------------
@@ -200,6 +199,7 @@ AddEncoding gzip .gzip
       application/rss+xml \
       application/schema+json \
       application/vnd.geo+json \
+      application/geo+json \
       application/vnd.ms-fontobject \
       application/x-font-ttf \
       application/x-javascript \
@@ -208,6 +208,8 @@ AddEncoding gzip .gzip
       application/xml \
       font/eot \
       font/opentype \
+      font/otf \
+      font/ttf \
       image/bmp \
       image/svg+xml \
       image/vnd.microsoft.icon \
@@ -248,6 +250,7 @@ AddEncoding gzip .gzip
   ExpiresByType application/ld+json                   "access plus 0 seconds"
   ExpiresByType application/schema+json               "access plus 0 seconds"
   ExpiresByType application/vnd.geo+json              "access plus 0 seconds"
+  ExpiresByType application/geo+json                  "access plus 0 seconds"
   ExpiresByType application/xml                       "access plus 0 seconds"
   ExpiresByType text/xml                              "access plus 0 seconds"
 
@@ -267,9 +270,13 @@ AddEncoding gzip .gzip
   ExpiresByType text/cache-manifest                   "access plus 0 seconds"
 
   ExpiresByType audio/ogg                             "access plus 1 month"
+  ExpiresByType image/apng                            "access plus 1 month"
+  ExpiresByType image/avif                            "access plus 1 month"
+  ExpiresByType image/avif-sequence                   "access plus 1 month"
   ExpiresByType image/bmp                             "access plus 1 year"
   ExpiresByType image/gif                             "access plus 1 year"
   ExpiresByType image/jpeg                            "access plus 1 year"
+  ExpiresByType image/jxl                             "access plus 1 month"
   ExpiresByType image/png                             "access plus 1 year"
   ExpiresByType image/svg+xml                         "access plus 1 month"
   ExpiresByType image/webp                            "access plus 1 month"
@@ -281,14 +288,18 @@ AddEncoding gzip .gzip
   ExpiresByType application/rdf+xml                   "access plus 1 hour"
   ExpiresByType application/rss+xml                   "access plus 1 hour"
 
+  ExpiresByType font/collection                       "access plus 1 month"
   ExpiresByType application/vnd.ms-fontobject         "access plus 1 month"
   ExpiresByType font/eot                              "access plus 1 month"
   ExpiresByType font/opentype                         "access plus 1 month"
+  ExpiresByType font/otf                              "access plus 1 month"
   ExpiresByType application/x-font-ttf                "access plus 1 month"
+  ExpiresByType font/ttf                              "access plus 1 month"
   ExpiresByType application/font-woff                 "access plus 1 month"
   ExpiresByType application/x-font-woff               "access plus 1 month"
   ExpiresByType font/woff                             "access plus 1 month"
   ExpiresByType application/font-woff2                "access plus 1 month"
+  ExpiresByType font/woff2                            "access plus 1 month"
 
   ExpiresByType text/x-cross-domain-policy            "access plus 1 week"
 
@@ -332,7 +343,10 @@ AddEncoding gzip .gzip
 
   AddType audio/mp4                                   f4a f4b m4a
   AddType audio/ogg                                   oga ogg opus
+  AddType image/avif                                  avif
+  AddType image/avif-sequence                         avifs
   AddType image/bmp                                   bmp
+  AddType image/jxl                                   jxl
   AddType image/webp                                  webp
   AddType video/mp4                                   f4v f4p m4v mp4
   AddType video/ogg                                   ogv
@@ -609,7 +623,6 @@ RewriteRule ^.*\.sfc$ %{ENV:CWD}index.php?eID=sfc_manifest [QSA,L]
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{REQUEST_FILENAME} !-l
-  RewriteCond %{REQUEST_URI} ^/typo3/.*$
   RewriteRule ^typo3/(.*)$ %{ENV:CWD}typo3/index.php [QSA,L]
 
   # If the file/symlink/directory does not exist => Redirect to index.php.

package/app/templates/115/_.htaccess-dev-ssl

@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 
 <FilesMatch \.php$>
-  SetHandler proxy:fcgi://php74:9000
+  SetHandler proxy:fcgi://php80:9000
 </FilesMatch>
 
 # ------------------------------------------------------------------------------
@@ -46,8 +46,7 @@ RewriteCond %{HTTP_USER_AGENT} "Mozilla.*Gecko.*Firefox/([1-9]|[1-2][0-9])[^0-9]
 RewriteCond %{HTTP_USER_AGENT} "^Firefox[\/\s]([1-9]|[1-2][0-9])[^0-9]" [NC,OR]
 RewriteCond %{HTTP_USER_AGENT} "AppleWebKit.*Version\/[1-8]\.[0-9\.]*\ Safari" [NC,OR]
 RewriteCond %{HTTP_USER_AGENT} "AppleWebKit.*Version\/[1-8]\.[0-9\.]*\ Mobile\/[A-z0-9]+\ Safari" [NC,OR]
-RewriteCond %{HTTP_USER_AGENT} "(MSIE\ |Trident.+rv:)[1-9][1-9]" [NC]
-#RewriteCond %{HTTP_USER_AGENT} "MSIE ([6-9]|10)" [NC]
+RewriteCond %{HTTP_USER_AGENT} (MSIE|Trident) [NC]
 RewriteRule .* browser-support.html [L]
 
 # ----------------------------------------------------------------------
@@ -200,6 +199,7 @@ AddEncoding gzip .gzip
       application/rss+xml \
       application/schema+json \
       application/vnd.geo+json \
+      application/geo+json \
       application/vnd.ms-fontobject \
       application/x-font-ttf \
       application/x-javascript \
@@ -208,6 +208,8 @@ AddEncoding gzip .gzip
       application/xml \
       font/eot \
       font/opentype \
+      font/otf \
+      font/ttf \
       image/bmp \
       image/svg+xml \
       image/vnd.microsoft.icon \
@@ -248,6 +250,7 @@ AddEncoding gzip .gzip
   ExpiresByType application/ld+json                   "access plus 0 seconds"
   ExpiresByType application/schema+json               "access plus 0 seconds"
   ExpiresByType application/vnd.geo+json              "access plus 0 seconds"
+  ExpiresByType application/geo+json                  "access plus 0 seconds"
   ExpiresByType application/xml                       "access plus 0 seconds"
   ExpiresByType text/xml                              "access plus 0 seconds"
 
@@ -267,9 +270,13 @@ AddEncoding gzip .gzip
   ExpiresByType text/cache-manifest                   "access plus 0 seconds"
 
   ExpiresByType audio/ogg                             "access plus 1 month"
+  ExpiresByType image/apng                            "access plus 1 month"
+  ExpiresByType image/avif                            "access plus 1 month"
+  ExpiresByType image/avif-sequence                   "access plus 1 month"
   ExpiresByType image/bmp                             "access plus 1 year"
   ExpiresByType image/gif                             "access plus 1 year"
   ExpiresByType image/jpeg                            "access plus 1 year"
+  ExpiresByType image/jxl                             "access plus 1 month"
   ExpiresByType image/png                             "access plus 1 year"
   ExpiresByType image/svg+xml                         "access plus 1 month"
   ExpiresByType image/webp                            "access plus 1 month"
@@ -281,14 +288,18 @@ AddEncoding gzip .gzip
   ExpiresByType application/rdf+xml                   "access plus 1 hour"
   ExpiresByType application/rss+xml                   "access plus 1 hour"
 
+  ExpiresByType font/collection                       "access plus 1 month"
   ExpiresByType application/vnd.ms-fontobject         "access plus 1 month"
   ExpiresByType font/eot                              "access plus 1 month"
   ExpiresByType font/opentype                         "access plus 1 month"
+  ExpiresByType font/otf                              "access plus 1 month"
   ExpiresByType application/x-font-ttf                "access plus 1 month"
+  ExpiresByType font/ttf                              "access plus 1 month"
   ExpiresByType application/font-woff                 "access plus 1 month"
   ExpiresByType application/x-font-woff               "access plus 1 month"
   ExpiresByType font/woff                             "access plus 1 month"
   ExpiresByType application/font-woff2                "access plus 1 month"
+  ExpiresByType font/woff2                            "access plus 1 month"
 
   ExpiresByType text/x-cross-domain-policy            "access plus 1 week"
 
@@ -332,7 +343,10 @@ AddEncoding gzip .gzip
 
   AddType audio/mp4                                   f4a f4b m4a
   AddType audio/ogg                                   oga ogg opus
+  AddType image/avif                                  avif
+  AddType image/avif-sequence                         avifs
   AddType image/bmp                                   bmp
+  AddType image/jxl                                   jxl
   AddType image/webp                                  webp
   AddType video/mp4                                   f4v f4p m4v mp4
   AddType video/ogg                                   ogv
@@ -609,7 +623,6 @@ RewriteRule ^.*\.sfc$ %{ENV:CWD}index.php?eID=sfc_manifest [QSA,L]
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{REQUEST_FILENAME} !-l
-  RewriteCond %{REQUEST_URI} ^/typo3/.*$
   RewriteRule ^typo3/(.*)$ %{ENV:CWD}typo3/index.php [QSA,L]
 
   # If the file/symlink/directory does not exist => Redirect to index.php.