Merge pull request #72 from sitegeist/task/tailwind3

TASK: Use tailwind 3
sitegeist · Jan 19, 2022 · a71d362 · a71d362
2 parents c54f0a9 + 29d4d8d
commit a71d362
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 176 deletions.
diff --git a/.ecrc b/.ecrc
@@ -1,3 +1,3 @@
 {
-    "Exclude": ["node_modules", "^Packages", "^Data", "^Web", "^Build", "Configuration/README", ".yaml.example", ".ddev", "bin"]
+    "Exclude": [".ddev", ".git", "bin", "node_modules", "^Packages", "^Data", "^Web", "Build", "Configuration/README", ".yaml.example", ".css.fusion", ".js.fusion" ]
 }
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -1,6 +1,12 @@
 name: QA
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   fe-build:

diff --git a/DistributionPackages/Vendor.Site/package.json b/DistributionPackages/Vendor.Site/package.json
@@ -17,7 +17,7 @@
     "@types/node": "^14.14.36",
     "@types/terser-webpack-plugin": "^5.0.3",
     "autoprefixer": "^10.2.5",
-    "concurrently": "^6.2.0",
+    "concurrently": "^6.2.1",
     "css-loader": "^5.2.0",
     "css-minimizer-webpack-plugin": "^1.3.0",
     "eslint": "^7.22.0",

diff --git a/...eelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.alpine.ts b/...eelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.alpine.ts
diff --git a/...heelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.entry.ts b/...heelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.entry.ts
@@ -0,0 +1,3 @@
+export default (el: HTMLElement): void => {
+	el.addEventListener("click", (e) => (console.log("to implement")));
+};
diff --git a/....WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.fusion b/....WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.fusion
@@ -15,17 +15,17 @@ prototype(Vendor.WheelInventor:Block.ScrollToTop) < prototype(Neos.Fusion:Compon
     @propTypes {
         id = ${PropTypes.string.isRequired}
         title = ${PropTypes.string.isRequired}
+        content = ${PropTypes.string.isRequired}
     }
 
     renderer = afx`
         <button
             id={props.id}
-            class="min-h-[48px] min-w-[48px] opacity-0 pointer-events-none cursor-pointer fixed right-0 bottom-0 bg-info transition-opacity"
+            class="cursor-pointer bg-info"
             type="button"
             title={props.title}
-            x-data="{...ScrollToTop()}"
-            x-spread="button"
         >
+            {props.content}
         </button>
     `
 }
diff --git a/...ibutionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Resource/BodyScripts.fusion b/...ibutionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Resource/BodyScripts.fusion
@@ -13,6 +13,4 @@ prototype(Vendor.WheelInventor:Resource.BodyScripts) < prototype(Neos.Fusion:Arr
             @process.addCacheBuster = ${value + '?cb=' + SitegeistKlarSchiffCacheBuster.get()}
         }
     }
-
-    alpine = '<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.min.js" defer></script>'
 }
diff --git a/DistributionPackages/Vendor.WheelInventor/package.json b/DistributionPackages/Vendor.WheelInventor/package.json
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@sitegeist/eslint-config-es-neos-eslint": "^2.0.2",
-    "@tailwindcss/typography": "^0.4.1",
+    "@tailwindcss/typography": "^0.5.0",
     "@types/classnames": "^2.3.1",
     "@types/final-form-focus": "^1.1.1",
     "@types/react": "^17.0.34",
@@ -44,7 +44,7 @@
     "postcss-cli": "^8.3.1",
     "postcss-discard-duplicates": "^5.0.1",
     "postcss-selector-parser": "^6.0.6",
-    "tailwindcss": "^2.2.9",
+    "tailwindcss": "^3.0.0",
     "ts-loader": "^9.2.5",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.2",

diff --git a/DistributionPackages/Vendor.WheelInventor/tailwind.config.js b/DistributionPackages/Vendor.WheelInventor/tailwind.config.js
@@ -1,11 +1,9 @@
 const theme = require('tailwindcss/defaultTheme');
-
+const colors = require('tailwindcss/colors')
 module.exports = {
-	mode: 'jit',
-	purge: [
+	content: [
 		'./Resources/Private/Fusion/**/*'
 	],
-	darkMode: false,
 	theme: {
 		colors: {
 			brand: {
@@ -17,9 +15,9 @@ module.exports = {
 				contrast: '#000'
 			},
 			neutral: {
-				lighter: theme.colors.gray[200],
-				DEFAULT: theme.colors.gray[500],
-				darker: theme.colors.gray[900]
+				lighter: colors.gray[200],
+				DEFAULT: colors.gray[500],
+				darker: colors.gray[900]
 			},
 			info: {
 				DEFAULT: '#76bed0',
@@ -40,9 +38,6 @@ module.exports = {
 		},
 		extend: {},
 	},
-	variants: {
-		extend: {},
-	},
 	plugins: [
 		require('@tailwindcss/typography'),
 	],
-Original file line number
+Diff line change
@@ Expand Up @@
                 @process.addCacheBuster = ${value + '?cb=' + SitegeistKlarSchiffCacheBuster.get()}
             }
         }
-        alpine = '<script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.min.js" defer></script>'
     }