From c4f66b8e56af4f644fcfae8030f10ba755b9e182 Mon Sep 17 00:00:00 2001 From: Patrick Gatterdam Date: Wed, 30 Sep 2020 09:37:03 +0200 Subject: [PATCH 1/3] move browserslist to package.json, use more modern default browsers --- .../fluid_styled_content/Build/Gruntfile.js.twig | 8 +------- .../fluid_styled_content/Build/package.json.twig | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig index 0f8c2ce..0607f61 100644 --- a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig +++ b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig @@ -53,13 +53,7 @@ module.exports = function(grunt) { options: { map: false, processors: [ - require('autoprefixer')({ - browsers: [ - 'Last 2 versions', - 'Firefox ESR', - 'IE 9' - ] - }) + require('autoprefixer')() ] }, layout: { diff --git a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig index a870947..eea3eaa 100644 --- a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig +++ b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig @@ -25,4 +25,7 @@ "css": "./node_modules/.bin/grunt css", "watch": "./node_modules/.bin/grunt watch" } + "browserslist": [ + "defaults" + ], } From dab7c8e030058bf37118cfd596bffab2210cc1ae Mon Sep 17 00:00:00 2001 From: Patrick Gatterdam Date: Wed, 30 Sep 2020 10:49:21 +0200 Subject: [PATCH 2/3] add missing comma --- .../BaseExtension/fluid_styled_content/Build/package.json.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig index eea3eaa..a44e582 100644 --- a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig +++ b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig @@ -24,7 +24,7 @@ "build": "./node_modules/.bin/grunt", "css": "./node_modules/.bin/grunt css", "watch": "./node_modules/.bin/grunt watch" - } + }, "browserslist": [ "defaults" ], From 3c9a3cd4b9acf1504f48bd5ae29aa66de5fe8c22 Mon Sep 17 00:00:00 2001 From: Patrick Gatterdam Date: Fri, 8 Jan 2021 13:52:40 +0100 Subject: [PATCH 3/3] move browserslist to .browserslistrc, replace node-sass (deprecated) with sass --- .../fluid_styled_content/Build/.browserslistrc | 3 +++ .../fluid_styled_content/Build/Gruntfile.js.twig | 2 +- .../fluid_styled_content/Build/package.json.twig | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/.browserslistrc diff --git a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/.browserslistrc b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/.browserslistrc new file mode 100644 index 0000000..d505588 --- /dev/null +++ b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/.browserslistrc @@ -0,0 +1,3 @@ +"browserslist": [ + "defaults" +] diff --git a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig index 0607f61..8b655f8 100644 --- a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig +++ b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/Gruntfile.js.twig @@ -1,4 +1,4 @@ -const sass = require('node-sass'); +const sass = require('sass'); module.exports = function(grunt) { diff --git a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig index a44e582..f80964f 100644 --- a/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig +++ b/src/Resources/skeletons/BaseExtension/fluid_styled_content/Build/package.json.twig @@ -18,14 +18,11 @@ "grunt-postcss": "^0.9.0", "grunt-sass": "^3.0.2", "autoprefixer": "^9.5.0", - "node-sass": "^4.11.0" + "sass": "^1.32.2" }, "scripts": { "build": "./node_modules/.bin/grunt", "css": "./node_modules/.bin/grunt css", "watch": "./node_modules/.bin/grunt watch" - }, - "browserslist": [ - "defaults" - ], + } }