From ca22b7e4b6e8e15972c89890f875a35707ac8cc9 Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Sat, 22 Feb 2020 01:03:59 +0100
Subject: [PATCH] [TASK] Use new syntax to import PageTSconfig
This replaces all left-overs in some `ext_localconf.php` files.
Resolves: #90482
Releases: master, 9.5
Change-Id: Ie2e2ace313a4756b382a6f247c6e2c17903c9357
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63363
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Susanne Moog <look@susi.dev>
---
typo3/sysext/backend/ext_localconf.php | 4 +++-
typo3/sysext/form/ext_localconf.php | 2 +-
typo3/sysext/frontend/ext_localconf.php | 4 ++--
typo3/sysext/linkvalidator/ext_localconf.php | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/typo3/sysext/backend/ext_localconf.php b/typo3/sysext/backend/ext_localconf.php
index 897060824c94..d3c15687601b 100644
--- a/typo3/sysext/backend/ext_localconf.php
+++ b/typo3/sysext/backend/ext_localconf.php
@@ -29,7 +29,9 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeRegistry'][1460321142] = [
$GLOBALS['TYPO3_CONF_VARS']['SYS']['livesearch']['page'] = 'pages';
// Include base TSconfig setup
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig">');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
+ "@import 'EXT:backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'"
+);
// Register BackendLayoutDataProvider for PageTs
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['BackendLayoutDataProvider']['pagets'] = \TYPO3\CMS\Backend\Provider\PageTsBackendLayoutDataProvider::class;
diff --git a/typo3/sysext/form/ext_localconf.php b/typo3/sysext/form/ext_localconf.php
index b9cda2f07234..963c793cb43c 100644
--- a/typo3/sysext/form/ext_localconf.php
+++ b/typo3/sysext/form/ext_localconf.php
@@ -36,7 +36,7 @@ call_user_func(function () {
// Add new content element wizard entry
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
- '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/PageTS/modWizards.tsconfig">'
+ "@import 'EXT:form/Configuration/PageTS/modWizards.tsconfig'"
);
// Add module configuration
diff --git a/typo3/sysext/frontend/ext_localconf.php b/typo3/sysext/frontend/ext_localconf.php
index c24c140c2220..2e07efb00156 100644
--- a/typo3/sysext/frontend/ext_localconf.php
+++ b/typo3/sysext/frontend/ext_localconf.php
@@ -95,9 +95,9 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['livesearch']['content'] = 'tt_content';
// Include new content elements to modWizards
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
- '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig">'
+ "@import 'EXT:frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'"
);
// Include FormEngine adjustments
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
- '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:frontend/Configuration/TSconfig/Page/TCEFORM.tsconfig">'
+ "@import 'EXT:frontend/Configuration/TSconfig/Page/TCEFORM.tsconfig'"
);
diff --git a/typo3/sysext/linkvalidator/ext_localconf.php b/typo3/sysext/linkvalidator/ext_localconf.php
index 8f039aa29c9c..63418231a29d 100644
--- a/typo3/sysext/linkvalidator/ext_localconf.php
+++ b/typo3/sysext/linkvalidator/ext_localconf.php
@@ -2,7 +2,7 @@
defined('TYPO3_MODE') or die();
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
- '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:linkvalidator/Configuration/TsConfig/Page/pagetsconfig.tsconfig">'
+ "@import 'EXT:linkvalidator/Configuration/TsConfig/Page/pagetsconfig.tsconfig'"
);
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\TYPO3\CMS\Linkvalidator\Task\ValidatorTask::class] = [
--
GitLab