generator-razor 13.4.8 → 13.4.10

package/app/index.js

@@ -297,13 +297,8 @@ module.exports = class extends Generator {
 
     this._createSymlinks(this, path, () => {
       copydir(t.templatePath(version), t.destinationPath('./'), () => {
-        if (version === '124' || version === '134') {
-          t._localconf12(t)
-          t._local12Settings(t)
-        } else {
-          t._localconf(t)
-          t._localSettings(t)
-        }
+        t._localconf12(t)
+        t._localSettings(t)
 
         t._createDb((response) => {
           t._processSqlFile(t, response, () => {
@@ -339,8 +334,8 @@ module.exports = class extends Generator {
     fs.unlink('package.json', () => {})
     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 || rzr.Version.indexOf('12.4') !== -1 || rzr.Version.indexOf('13.4') !== -1) {
+    // Copy razor extensions after install to typo3conf/ext/, starting with TYPO3 >= 12.4.x
+    if (rzr.Version.indexOf('12.4') !== -1 || rzr.Version.indexOf('13.4') !== -1 || rzr.Version.indexOf('14.3') !== -1) {
       fs.copy('typo3conf/ext/razor/Initialisation/Extensions', 'typo3conf/ext')
     }
   }
@@ -352,11 +347,11 @@ module.exports = class extends Generator {
       json: true
     }, (error, response, body) => {
       if (!error && response.statusCode === 200) {
-        const releases11 = body['11']['releases']
         const releases12 = body['12']['releases']
         const releases13 = body['13']['releases']
+        const releases14 = body['14']['releases']
 
-        const releasesObj = t._mergeOptions(releases13, releases12, releases11)
+        const releasesObj = t._mergeOptions(releases14, releases13, releases12)
 
         const keys = Object.keys(releasesObj)
         const len = keys.length
@@ -402,28 +397,6 @@ module.exports = class extends Generator {
   }
 
   _localconf (t) {
-    fs.readFile('typo3conf/LocalConfiguration.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._localconfWrite(newContent)
-      })
-
-      if (err) {
-        console.error('error setting LocalConfiguration.php')
-      }
-    })
-  }
-
-  _localconf12 (t) {
     fs.readFile('typo3conf/system/settings.php', 'utf8', (err, content) => {
       let newContent = t._substituteMarker(content, '###DBNEW###', rzr.DbNew.toLowerCase(), true)
       newContent = t._substituteMarker(newContent, '###HOST###', rzr.DbHostname, true)
@@ -436,7 +409,7 @@ module.exports = class extends Generator {
       hash.then(function (res) {
         newContent = t._substituteMarker(newContent, '###PASS###', res, true)
 
-        t._localconfWrite12(newContent)
+        t._localconfWrite(newContent)
       })
 
       if (err) {
@@ -446,41 +419,10 @@ module.exports = class extends Generator {
   }
 
   _localconfWrite (content) {
-    fs.writeFile('typo3conf/LocalConfiguration.php', content, 'utf8', () => {})
-  }
-
-  _localconfWrite12 (content) {
     fs.writeFile('typo3conf/system/settings.php', content, 'utf8', () => {})
   }
 
   _localSettings (t) {
-    if (rzr.Transport === 'smtp') {
-      let encryptVariable = '###SMTP_ENCRYPT###'
-      if (rzr.Encrypt === true || rzr.Encrypt === false) {
-        encryptVariable = "'###SMTP_ENCRYPT###'"
-      }
-
-      fs.readFile('typo3conf/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/Local.php', newContent, 'utf8', () => {})
-
-        if (err) {
-          console.error('error setting local settings')
-        }
-      })
-    } else {
-      fs.unlink('typo3conf/Local.php', () => {})
-    }
-  }
-
-  _local12Settings (t) {
     if (rzr.Transport === 'smtp') {
       let encryptVariable = '###SMTP_ENCRYPT###'
       if (rzr.Encrypt === true || rzr.Encrypt === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-razor",
-  "version": "13.4.8",
+  "version": "13.4.10",
   "description": "Yeoman generator for razor TYPO3 distribution",
   "license": "MIT",
   "main": "app/index.js",