Skip to content

Commit

Permalink
Merge branch 'develop' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
andreaskienast committed Nov 20, 2024
2 parents f28ed8c + b589fe2 commit 770d283
Show file tree
Hide file tree
Showing 413 changed files with 6,570 additions and 7 deletions.
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
{
"name": "Susanne Moog",
"email": "[email protected]"
},
{
"name": "Benjamin Kott",
"email": "[email protected]"
}
],
"homepage": "https://get.typo3.org",
Expand All @@ -35,6 +39,7 @@
"ext-iconv": "*",
"ext-json": "*",
"ext-sqlite3": "*",
"ext-zip": "*",
"ext-zlib": "*",
"composer/semver": "^3.3",
"doctrine/collections": "^1.6",
Expand Down
9 changes: 5 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 70 additions & 0 deletions resources/packages/bootstrap_package/10.4/src/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# CSS-Files
[*.css]
indent_style = space
indent_size = 4

# HTML-Files
[*.html]
indent_style = space
indent_size = 4

# TMPL-Files
[*.tmpl]
indent_style = space
indent_size = 4

# JS-Files
[*.js]
indent_style = space
indent_size = 4

# PHP-Files
[*.php]
indent_style = space
indent_size = 4

# MD-Files
[*.md]
indent_style = space
indent_size = 4

# ReST-Files
[*.rst]
indent_style = space
indent_size = 3

# TypoScript
[*.typoscript]
indent_style = space
indent_size = 4

# YML-Files
[{*.yml,*.yaml}]
indent_style = space
indent_size = 2

# package.json
[package.json]
indent_style = space
indent_size = 2

# composer.json
[composer.json]
indent_style = space
indent_size = 4

# phpstan
[*.neon]
indent_style = tab
2 changes: 2 additions & 0 deletions resources/packages/bootstrap_package/10.4/src/Build/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Order deny,allow
Deny from all
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
module.exports = function(grunt) {

/**
* Project configuration.
*/
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
paths: {
root: '../',
resources: '<%= paths.root %>Resources/',
fonts: '<%= paths.resources %>Public/Fonts/',
img: '<%= paths.resources %>Public/Images/',
js: '<%= paths.resources %>Public/JavaScript/'
},
banner: '/*!\n' +
' * {{ package.title }} v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
' * Copyright 2017-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
' * Licensed under the <%= pkg.license %> license\n' +
' */\n',
uglify: {
all: {
options: {
banner: '<%= banner %>',
mangle: true,
compress: true,
beautify: false
},
files: {
"<%= paths.js %>/Dist/scripts.js": [
"<%= paths.js %>Src/main.js"
]
}
}
},
imagemin: {
extension: {
files: [{
expand: true,
cwd: '<%= paths.resources %>',
src: [
'**/*.{png,jpg,gif,svg}'
],
dest: '<%= paths.resources %>'
}]
}
},
watch: {
options: {
livereload: true
},
javascript: {
files: '<%= paths.js %>Src/**/*.js',
tasks: ['js']
}
}
});

/**
* Register tasks
*/
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-imagemin');

/**
* Grunt update task
*/
grunt.registerTask('js', ['uglify']);
grunt.registerTask('build', ['js', 'imagemin']);
grunt.registerTask('default', ['build']);

};
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "{{ package.vendorNameAlternative }}-{{ package.packageNameAlternative }}",
"description": "{{ package.description }}",
"repository": {
"type": "git",
"url": "{{ package.repositoryUrl }}"
},
"homepage": "{{ package.author.homepage }}",
"author": "{{ package.author.name }}",
"version": "1.0.0",
"license": "GPL-2.0-or-later",
"devDependencies": {
"grunt": "^1.0.3",
"grunt-contrib-uglify": "^4.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-contrib-imagemin": "^2.0.1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Order deny,allow
Deny from all
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Order deny,allow
Deny from all
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
imports:
- { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" }
- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" }
- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" }
- { resource: "EXT:bootstrap_package/Configuration/RTE/Default.yaml" }

editor:
config:
contentsCss: "EXT:bootstrap_package/Resources/Public/Css/bootstrap4-rte.min.css"
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
defined('TYPO3_MODE') || die('Access denied.');
call_user_func(function()
{
/**
* Temporary variables
*/
$extensionKey = '{{ package.extensionKey }}';
/**
* Default PageTS for {{ package.packageName }}
*/
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
$extensionKey,
'Configuration/TsConfig/Page/All.tsconfig',
'{{ package.title }}'
);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
defined('TYPO3_MODE') || die('Access denied.');
call_user_func(function()
{
/**
* Temporary variables
*/
$extensionKey = '{{ package.extensionKey }}';
/**
* Default TypoScript for {{ package.packageName }}
*/
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
$extensionKey,
'Configuration/TypoScript',
'{{ package.title }}'
);
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#
# PageTS for {{ package.title }}
#
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:{{ package.extensionKey }}/Configuration/TsConfig/Page/RTE.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:{{ package.extensionKey }}/Configuration/TsConfig/Page/TCEFORM.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:{{ package.extensionKey }}/Configuration/TsConfig/Page/TCEMAIN.tsconfig">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:{{ package.extensionKey }}/Configuration/TsConfig/Page/Mod/WebLayout/BackendLayouts.tsconfig">
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#
# BACKENDLAYOUTS
#
<INCLUDE_TYPOSCRIPT: source="DIR:EXT:{{ package.extensionKey }}/Configuration/TsConfig/Page/Mod/WebLayout/BackendLayouts" extensions="tsconfig">
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#
# BACKENDLAYOUT: EXAMPLE
#
mod {
web_layout {
BackendLayouts {
example {
title = LLL:EXT:{{ package.extensionKey }}/Resources/Private/Language/locallang_be.xlf:backend_layout.example
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = LLL:EXT:{{ package.extensionKey }}/Resources/Private/Language/locallang_be.xlf:backend_layout.column.normal
colPos = 0
}
}
}
}
}
}
icon = EXT:{{ package.extensionKey }}/Resources/Public/Icons/BackendLayouts/example.svg
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#############
#### RTE ####
#############
RTE {
default {
preset = {{ package.extensionKey }}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# TCEFORM
#
TCEFORM {
pages {

}
tt_content {

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# TCEMAIN
#
TCEMAIN {

}
Loading

0 comments on commit 770d283

Please sign in to comment.