diff --git a/Build/Sources/TypeScript/recycler/recycler.ts b/Build/Sources/TypeScript/recycler/recycler.ts
index 827c2bbdba49a16c4592fc18fbcbeb4ca029ddee..82eee62014a3b95cdb176a556515267172469012 100644
--- a/Build/Sources/TypeScript/recycler/recycler.ts
+++ b/Build/Sources/TypeScript/recycler/recycler.ts
@@ -50,7 +50,7 @@ type RecordToDelete = string;
/**
* Module: @typo3/recycler/recycler
- * RequireJS module for Recycler
+ * JavaScript module for Recycler
*/
class Recycler {
public elements: { [key: string]: JQuery } = {}; // filled in getElements()
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
index cf269ca4e8278001240fec3770d43955342eb4fd..baf035df63ba7b3d9bc24a8ca93f3bb84138f1b0 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
@@ -243,7 +243,7 @@ class SelectCheckBoxElement extends AbstractFormElement
$html[] = '</tr>';
$html[] = '</thead>';
- // Add RequireJS module. This is only needed, in case the element
+ // Add JavaScript module. This is only needed, in case the element
// is not readOnly, since otherwise no checkbox changes take place.
$resultArray['javaScriptModules'][] = JavaScriptModuleInstruction::create(
'@typo3/backend/form-engine/element/select-check-box-element.js'
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
index f99c0763abf2b9b2d72b433f1f12fdedf2db206d..668bf36d74d82a65e6fc519404e1f9ad45cca9ee 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
@@ -119,7 +119,7 @@ class BackendUserController extends ActionController
'dateFormat' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'],
'timeFormat' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'],
]);
- // Load requireJS modules
+ // Load JavaScript modules
$this->pageRenderer->loadJavaScriptModule('@typo3/backend/context-menu.js');
$this->pageRenderer->loadJavaScriptModule('@typo3/backend/modal.js');
$this->pageRenderer->loadJavaScriptModule('@typo3/beuser/backend-user-listing.js');
diff --git a/typo3/sysext/core/Resources/Public/JavaScript/Contrib/README.txt b/typo3/sysext/core/Resources/Public/JavaScript/Contrib/README.txt
index 171227f60568e2910230e4e84ad29bf8871e07fc..02988db72a7e3d63c3a4e8555ca5304f001f78d4 100644
--- a/typo3/sysext/core/Resources/Public/JavaScript/Contrib/README.txt
+++ b/typo3/sysext/core/Resources/Public/JavaScript/Contrib/README.txt
@@ -3,8 +3,8 @@ for the TYPO3 CMS Core. They are mostly managed via Grunt or have been adapted
to fit our needs.
Please make sure to never reference any file directly here, rather copy
-a file needed in your own extension or reference it via RequireJS instead of
-using the Path to this Contrib/ directory.
+a file needed in your own extension or reference it via JavaScript import
+statments instead of using the Path to this Contrib/ directory.
Libraries not handled by bower/Grunt:
diff --git a/typo3/sysext/dashboard/Documentation/Developer/GraphWidgetImplementation.rst b/typo3/sysext/dashboard/Documentation/Developer/GraphWidgetImplementation.rst
index d253c4a5b609c2ff7d71a2562058ed40dc1990e8..75630d1bee19fc5e24bbdf2674548ceebea753a0 100644
--- a/typo3/sysext/dashboard/Documentation/Developer/GraphWidgetImplementation.rst
+++ b/typo3/sysext/dashboard/Documentation/Developer/GraphWidgetImplementation.rst
@@ -16,7 +16,7 @@ Implement graph widget
.. php:namespace:: TYPO3\CMS\Dashboard\Widgets
First of all a new data provider is required, which will provide the data for the chart.
-Next the data will be provided to the widget instance, which will be rendered with RequireJS modules and Css.
+Next the data will be provided to the widget instance, which will be rendered with JavaScript modules and Css.
To make the dashboard aware of this workflow, some interfaces come together:
diff --git a/typo3/sysext/dashboard/Documentation/Developer/WidgetImplementation.rst b/typo3/sysext/dashboard/Documentation/Developer/WidgetImplementation.rst
index 2ff48d6e1f5d3b993c403e82d87fbee1f9a9aba6..1b2742694ca086f0e196faa7ff5d741094ce6e23 100644
--- a/typo3/sysext/dashboard/Documentation/Developer/WidgetImplementation.rst
+++ b/typo3/sysext/dashboard/Documentation/Developer/WidgetImplementation.rst
@@ -103,7 +103,7 @@ Providing custom JS
There are two ways to add JavaScript for an widget:
-RequireJS AMD module
+JavaScript module
Implement :php:class:`\TYPO3\CMS\Dashboard\Widgets\JavaScriptInterface`:
.. code-block:: php
@@ -114,11 +114,11 @@ RequireJS AMD module
public function getJavaScriptModuleInstructions(): array
{
return [
- JavaScriptModuleInstruction::forRequireJS(
- 'TYPO3/CMS/MyExtension/ModuleName'
+ JavaScriptModuleInstruction::create(
+ '@myvendor/my-extension/module-name.js'
)->invoke('initialize'),
- JavaScriptModuleInstruction::forRequireJS(
- 'TYPO3/CMS/MyExtension/ModuleName2'
+ JavaScriptModuleInstruction::create(
+ '@myvendor/my-extension/module-name2.js'
)->invoke('initialize'),
];
}
@@ -126,7 +126,7 @@ RequireJS AMD module
.. seealso::
- :ref:`t3coreapi:requirejs` for more info about RequireJS in TYPO3 Backend.
+ :ref:`t3coreapi:backend-javascript-es6` for more info about JavaScript in TYPO3 Backend.
Plain JS files
Implement :php:class:`AdditionalJavaScriptInterface`:
@@ -144,7 +144,7 @@ Plain JS files
}
}
-RequireJS
+JavaScript
Implement :php:class:`\TYPO3\CMS\Dashboard\Widgets\JavaScriptInterface`:
.. code-block:: php
@@ -155,8 +155,8 @@ RequireJS
public function getJavaScriptModuleInstructions(): array
{
return [
- JavaScriptModuleInstruction::forRequireJS(
- 'TYPO3/CMS/Dashboard/ChartInitializer'
+ JavaScriptModuleInstruction::create(
+ '@typo3/dashboard/chart-initializer.js'
)->invoke('initialize'),
];
}
diff --git a/typo3/sysext/redirects/Classes/Evaluation/SourceHost.php b/typo3/sysext/redirects/Classes/Evaluation/SourceHost.php
index 14f2a4573ba1320eb92bb5cd2f4d37d645e6b0f1..30444e6601e1e17c06eba5931797c46b3ac63632 100644
--- a/typo3/sysext/redirects/Classes/Evaluation/SourceHost.php
+++ b/typo3/sysext/redirects/Classes/Evaluation/SourceHost.php
@@ -33,7 +33,7 @@ class SourceHost
* (invoked by FormEngine when editing redirect entities).
*
* Returned `JavaScriptModuleInstruction` delegates handling to corresponding
- * RequireJS module, having a method `evaluateSourceHost` that deals with that
+ * JavaScript module, having a method `evaluateSourceHost` that deals with that
* evaluation request.
*/
public function returnFieldJS(): JavaScriptModuleInstruction
diff --git a/typo3/sysext/t3editor/Documentation/Developer/Extend.rst b/typo3/sysext/t3editor/Documentation/Developer/Extend.rst
index c5a432e04c07b26b0fd892e29c1abc927651bcb6..7947c12089bc056d5f9eff4e17718df0edc633a2 100644
--- a/typo3/sysext/t3editor/Documentation/Developer/Extend.rst
+++ b/typo3/sysext/t3editor/Documentation/Developer/Extend.rst
@@ -38,7 +38,7 @@ To register an addon, the following code may be used:
return [
'my/addon' => [
- 'module' => 'cm/addon/my/addon',
+ 'module' => JavaScriptModuleInstruction::create('@codemirror/addon', 'addon')->invoke()
'cssFiles' => [
'EXT:my_extension/Resources/Public/Css/MyAddon.css',
],
@@ -61,9 +61,7 @@ To register an addon, the following code may be used:
:type: string
:Required: true
- Holds the RequireJS namespace of the CodeMirror module. For custom
- modules placed in an extension, the known
- `TYPO3/CMS/Extension/Module` namespace must be used.
+ Holds the JavaScriptModuleInstruction of the CodeMirror module.
.. confval:: cssFiles
@@ -122,9 +120,7 @@ To register a mode, the following code may be used:
:type: string
:Required: true
- Holds the RequireJS namespace of the CodeMirror module. For custom
- modules placed in an extension, the known
- `TYPO3/CMS/Extension/Module` namespace must be used.
+ Holds the JavaScriptModuleInstruction of the CodeMirror module.
.. confval:: extensions