[TASK] Do not add type if html5 doctype (#81)

* [TASK] Setup local environment

* [TASK] Do not add type if html5 doctype

Resolves: #80

.github/workflows/ci.yaml

@@ -6,7 +6,7 @@ on: [ push, pull_request ]
 jobs:
   php-lint:
     name: "PHP linter"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         php-versions: [ 7.4 ]

.gitignore

@@ -2,10 +2,16 @@
 /.Build
 /.php_cs.cache
 /composer.lock
-/Resources/Public/Private
+/Resources/Public/Build
+/Resources/Private/Templates/Page.html
 /Resources/Private/Php/Libraries/vendor
 /phpunit.xml
 /var
 .phpunit.result.cache
 .ddev/
 config
+assets
+webpack.config.js
+node_modules
+package.json
+yarn.lock

Classes/Asset/TagRenderer.php

@@ -79,6 +79,10 @@ public function renderWebpackScriptTags(string $entryName, string $position = se
                 'crossorigin' => '',
             ], $parameters);
 
+            if ($this->removeType($parameters)) {
+                unset($attributes['type']);
+            }
+
             $attributes = array_values($attributes);
 
             $pageRendererMethodName = 'addJS' . ($position === self::POSITION_FOOTER ? 'Footer' : '');
@@ -160,4 +164,25 @@ private function getTypoScriptFrontendController(): TypoScriptFrontendController
     {
         return $GLOBALS['TSFE'];
     }
+
+    private function removeType(array $parameters): bool
+    {
+        if (array_key_exists('type', $parameters)) {
+            return false;
+        }
+
+        if ($this->applicationType === null) {
+            return false;
+        }
+
+        if (!$this->applicationType->isFrontend()) {
+            return false;
+        }
+
+        if ($this->getTypoScriptFrontendController()->config['config']['doctype'] !== 'html5') {
+            return false;
+        }
+
+        return true;
+    }
 }

Configuration/TypoScript/constants.typoscript

@@ -1,7 +1,7 @@
 plugin.tx_typo3encore {
     settings {
-        entrypointJsonPath = EXT:typo3_encore/Resources/Public/entrypoints.json
-        manifestJsonPath = EXT:typo3_encore/Resources/Public/manifest.json
+        entrypointJsonPath = EXT:typo3_encore/Resources/Public/Build/entrypoints.json
+        manifestJsonPath = EXT:typo3_encore/Resources/Public/Build/manifest.json
 
         # Throw an exception if the entrypoints.json file is missing or an entry is missing from the data
         strictMode = 0

Tests/Functional/Fixtures/Frontend/MainRendererHtml5.typoscript

@@ -0,0 +1,4 @@
+@import 'EXT:typo3_encore/Configuration/TypoScript/setup.typoscript'
+@import './MainRenderer.typoscript'
+
+config.doctype = html5

Tests/Functional/IncludeFilesTest.php

@@ -81,6 +81,24 @@ public function addFilesWithAbsRefPrefix(): void
         self::assertStringContainsString('sha384-ysKW+jP4sNH9UfX9+fqN4iC/RB3L9jmWUd8ABJrBbAHFwL6wNmvNT5x178Fx6Xh0', $content);
     }
 
+    /**
+     * @test
+     */
+    public function addFilesWithHtml5DocType(): void
+    {
+        $this->setUpFrontendRootPage(
+            self::ROOT_PAGE_UID,
+            [
+                'EXT:typo3_encore/Tests/Functional/Fixtures/Frontend/MainRendererHtml5.typoscript',
+            ]
+        );
+        $this->setUpSites(self::ROOT_PAGE_UID, []);
+        $response = $this->executeFrontendRequest((new InternalRequest())->withPageId(self::ROOT_PAGE_UID));
+
+        $content = $response->getBody()->__toString();
+        self::assertStringNotContainsString('text/javascript', $content);
+    }
+
     protected function setUpSites(int $pageId, array $sites): void
     {
         if (empty($sites[$pageId])) {

composer.json

@@ -23,7 +23,8 @@
     "typo3/cms-core": "^10.4.2 || ^11.0",
     "symfony/web-link": "^4.3",
     "symfony/asset": "^5.0",
-    "ext-dom": "*"
+    "ext-dom": "*",
+    "typo3/cms-tstemplate": "^10.4.2 || ^11.0"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.16",