EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement ext:typo3_encore, update webpack

Browse Source
This commit is contained in:
Björn Fromme
2020-02-04 16:47:06 +01:00
parent 3a600d4e01
commit 05328bff6e
14 changed files with 4398 additions and 2787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1
View File
@@ -25,6 +25,7 @@
"league/period": "^4.9",
"lochmueller/staticfilecache": "^10.2",
"pixelant/pxa-social-feed": "^2.0",
"ssch/typo3-encore": "^2.0",
"symfony/http-client": "^4.3",
"symfony/options-resolver": "^4.2",
"symfony/property-access": "^4.3",
composer.lock
Generated
+246 -1
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "8d24d6aa5cf407f4ae9811bc6a781623",
"content-hash": "9e1be2cab97408fbcbe09fa4a4286a55",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -1905,6 +1905,55 @@
],
"time": "2018-10-30T17:12:04+00:00"
},
{
"name": "psr/link",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/link.git",
"reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/link/zipball/eea8e8662d5cd3ae4517c9b864493f59fca95562",
"reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Link\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interfaces for HTTP links",
"keywords": [
"http",
"http-link",
"link",
"psr",
"psr-13",
"rest"
],
"time": "2016-10-28T16:06:13+00:00"
},
{
"name": "psr/log",
"version": "1.0.2",
@@ -1992,6 +2041,70 @@
"description": "A polyfill for getallheaders.",
"time": "2019-03-08T08:55:37+00:00"
},
{
"name": "ssch/typo3-encore",
"version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sabbelasichon/typo3_encore.git",
"reference": "b7c734ddbb81295813ecb08627dd57a597067ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabbelasichon/typo3_encore/zipball/b7c734ddbb81295813ecb08627dd57a597067ae1",
"reference": "b7c734ddbb81295813ecb08627dd57a597067ae1",
"shasum": ""
},
"require": {
"php": ">=7.2.0 <7.4",
"symfony/asset": "^5.0",
"symfony/web-link": "^4.3",
"typo3/cms-core": "^9.5 || ^10.2"
},
"replace": {
"typo3-ter/typo3-encore": "self.version"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.0",
"nimut/testing-framework": "^4.0 || dev-master",
"phpstan/phpstan": "^0.9 || ^0.10"
},
"type": "typo3-cms-extension",
"extra": {
"branch-alias": {
"dev-master": "2.0.0-dev"
},
"typo3/cms": {
"extension-key": "typo3_encore",
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web"
}
},
"autoload": {
"psr-4": {
"Ssch\\Typo3Encore\\": "Classes"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Sebastian Schreiber",
"email": "[email protected]",
"homepage": "http://www.schreibersebastian.de",
"role": "Developer"
}
],
"description": "Use Webpack Encore in TYPO3 Context",
"homepage": "http://www.schreibersebastian.de",
"keywords": [
"encore",
"webpack"
],
"time": "2020-01-21T12:51:46+00:00"
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.12",
@@ -2046,6 +2159,62 @@
],
"time": "2018-07-31T09:26:32+00:00"
},
{
"name": "symfony/asset",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/asset.git",
"reference": "447190a24309da88f816313824d85c303035f86b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/asset/zipball/447190a24309da88f816313824d85c303035f86b",
"reference": "447190a24309da88f816313824d85c303035f86b",
"shasum": ""
},
"require": {
"php": "^7.2.5"
},
"require-dev": {
"symfony/http-foundation": "^4.4|^5.0",
"symfony/http-kernel": "^4.4|^5.0"
},
"suggest": {
"symfony/http-foundation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Asset\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "[email protected]"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Asset Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T14:08:26+00:00"
},
{
"name": "symfony/cache",
"version": "v5.0.3",
@@ -3412,6 +3581,82 @@
],
"time": "2020-01-04T14:08:26+00:00"
},
{
"name": "symfony/web-link",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/web-link.git",
"reference": "dad60d94b2e7f16e1a7d0ebd0f1f460f45a51386"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/web-link/zipball/dad60d94b2e7f16e1a7d0ebd0f1f460f45a51386",
"reference": "dad60d94b2e7f16e1a7d0ebd0f1f460f45a51386",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/link": "^1.0",
"symfony/polyfill-php72": "^1.5"
},
"conflict": {
"symfony/http-kernel": "<4.3"
},
"provide": {
"psr/link-implementation": "1.0"
},
"require-dev": {
"symfony/http-foundation": "^4.4|^5.0",
"symfony/http-kernel": "^4.3|^5.0"
},
"suggest": {
"symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\WebLink\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kévin Dunglas",
"email": "[email protected]"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony WebLink Component",
"homepage": "https://symfony.com",
"keywords": [
"dns-prefetch",
"http",
"http2",
"link",
"performance",
"prefetch",
"preload",
"prerender",
"psr13",
"push"
],
"time": "2020-01-04T13:00:46+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.4.3",
package-lock.json
Generated
+4113 -2757
View File
File diff suppressed because it is too large Load Diff
package.json
+6 -7
View File
@@ -6,7 +6,7 @@
"license": "WTFPL",
"repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
"scripts": {
"dev": "./node_modules/.bin/encore dev --watch --watch-poll 1000",
"dev": "./node_modules/.bin/encore dev --watch --watch-poll 500",
"build": "./node_modules/.bin/encore production"
},
"dependencies": {
@@ -33,16 +33,15 @@
"vuex": "^3.1.0"
},
"devDependencies": {
"@symfony/webpack-encore": "^0.19.0",
"@symfony/webpack-encore": "^0.28.2",
"autoprefixer": "^8.6.5",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"node-sass": "^4.11.0",
"postcss-loader": "^2.1.6",
"sass-loader": "^6.0.7",
"vue-loader": "^14.2.4",
"vue-template-compiler": "^2.6.10",
"webpack-notifier": "^1.7.0"
"postcss-loader": "^3.0.0",
"sass-loader": "^7.3.1",
"vue-loader": "^15.8.3",
"vue-template-compiler": "^2.6.10"
},
"browserslist": [
"last 2 versions",
public/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ editor:
config:
disableNativeSpellChecker: false
contentsCss:
- "EXT:ep_events/Resources/Public/css/rte.css?v=2019.09-06"
- "EXT:ep_events/Resources/Public/css/rte.css?v=2020.02-01"
stylesSet:
- { name: "Icon", element: "a", attributes: { 'class': 'button button--icon' } }
public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Typo3Encore.typoscript
+9
View File
@@ -0,0 +1,9 @@
@import 'EXT:typo3_encore/Configuration/TypoScript/setup.typoscript'
plugin.tx_typo3encore {
settings {
builds {
EpEventsConfig = EXT:ep_events/Resources/Public
}
}
}
public/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript
+2 -2
View File
@@ -8,7 +8,7 @@ page {
shortcutIcon = EXT:ep_events/Resources/Public/images/favicon.ico
includeCSS {
main = EXT:ep_events/Resources/Public/css/main.css
main = typo3_encore:EpEventsConfig:main
}
includeJS {
@@ -18,7 +18,7 @@ page {
}
includeJSFooter {
main = EXT:ep_events/Resources/Public/js/main.js
main = typo3_encore:EpEventsConfig:main
}
jsFooterInline {
public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -2,6 +2,7 @@
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Form.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/News.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Seo.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript"
public/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ editor:
config:
disableNativeSpellChecker: false
contentsCss:
- "EXT:ep_theme/Resources/Public/css/rte.css?v=2019.09-06"
- "EXT:ep_theme/Resources/Public/css/rte.css?v=2020.02-01"
stylesSet:
- { name: "Button", element: "a", attributes: { 'class': 'button' } }
public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Typo3Encore.typoscript
+9
View File
@@ -0,0 +1,9 @@
@import 'EXT:typo3_encore/Configuration/TypoScript/setup.typoscript'
plugin.tx_typo3encore {
settings {
builds {
EpThemeConfig = EXT:ep_theme/Resources/Public
}
}
}
public/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
+2 -7
View File
@@ -38,16 +38,11 @@ page {
)
includeCSS {
main = EXT:ep_theme/Resources/Public/css/main.css
}
includeJSFooterlibs {
manifest = EXT:ep_theme/Resources/Public/js/manifest.js
vendor = EXT:ep_theme/Resources/Public/js/vendor.js
main = typo3_encore:EpThemeConfig:main
}
includeJSFooter {
main = EXT:ep_theme/Resources/Public/js/main.js
main = typo3_encore:EpThemeConfig:main
}
jsFooterInline {
public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -1,6 +1,7 @@
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Form.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/News.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/GridElements.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/EpProducts.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss
+1 -4
View File
@@ -1,10 +1,7 @@
$output-bourbon-deprecation-warnings: false;
@import "~bourbon/app/assets/stylesheets/bourbon";
@include font-face('Lato', '../fonts/lato-v14-latin-300', 300);
@include font-face('Lato', '../fonts/lato-v14-latin-regular', 400);
@include font-face('Lato', '../fonts/lato-v14-latin-700', 700);
@include font-face('Lato', '../fonts/lato-v14-latin-900', 900);
@import "fonts";
body {
font-family: "Lato", $helvetica;
webpack.config.js
+5 -7
View File
@@ -9,11 +9,8 @@ Encore
.addEntry('snowzone', './public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js')
.addEntry('unichamp', './public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js')
.addStyleEntry('rte', './public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss')
.createSharedEntry('vendor', [
'jquery', 'vue', 'vuex', 'vue-router', 'axios', 'flatpickr', 'lazysizes',
'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
'dayjs', 'cookieconsent', 'picturefill', '@fancyapps/fancybox', 'leaflet'
])
.splitEntryChunks()
.enableSingleRuntimeChunk()
.enableSassLoader()
.enableVueLoader()
.autoProvidejQuery()
@@ -27,8 +24,7 @@ Encore
})
.configureBabel(function (babelConfig) {
babelConfig.plugins = [ 'transform-object-rest-spread', 'syntax-dynamic-import' ]
})
;
});
const EpThemeConfig = Encore.getWebpackConfig();
@@ -43,6 +39,8 @@ Encore
.setPublicPath('/typo3conf/ext/ep_events/Resources/Public/')
.addEntry('main', './public/typo3conf/ext/ep_events/Resources/Private/Assets/js/main.js')
.addStyleEntry('rte', './public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/rte.scss')
.enableSingleRuntimeChunk()
.splitEntryChunks()
.enableSassLoader()
.enableVueLoader()
.autoProvidejQuery()