Merge pull request #5542 from hanakin/ticket/15980

[ticket/15980] update and move all npm dependencies to dev

.stylelintrc

@@ -3,7 +3,7 @@
 		"stylelint-order"
 	],
 	"ignoreFiles": [
-		"./phpBB/styles/prosilver/theme/normalize.css",
+		"./phpBB/styles/prosilver/theme/normalize.css"
 	],
 	"rules": {
 		"at-rule-name-case": "lower",
@@ -180,21 +180,27 @@
 		"value-list-comma-newline-before": "never-multi-line",
 		"value-list-comma-space-after": "always-single-line",
 		"value-list-comma-space-before": "never",
-		"order/declaration-block-order": [
+		"order/order": [
 			"custom-properties",
 			"dollar-variables",
 			{
 				"type": "at-rule",
-				"name": "include"
+				"name": "include",
+				"parameter": "type"
 			},
 			"declarations",
 			"rules",
+			{
+				"type": "at-rule",
+				"name": "include",
+				"parameter": "fluid"
+			},
 			{
 				"type": "at-rule",
 				"name": "media"
 			}
 		],
-		"order/declaration-block-properties-specified-order": [
+		"order/properties-order": [
 			[
 				"font",
 				"font-family",
@@ -385,7 +391,7 @@
 				"animation-direction",
 				"pointer-events"
 			],
-			{ unspecified: "bottomAlphabetical" }
+			{ "unspecified": "bottomAlphabetical" }
 		]
 	}
 }

package.json

@@ -6,6 +6,20 @@
 	"directories": {
 		"doc": "docs"
 	},
+	"xo": {
+		"rules": {
+			"quote-props": [
+				"error",
+				"always"
+			]
+		},
+		"env": {
+			"es6": true,
+			"browser": true,
+			"node": true,
+			"jquery": true
+		}
+	},
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
@@ -32,12 +46,10 @@
 	},
 	"homepage": "https://www.phpbb.com",
 	"devDependencies": {
-    "stylelint": "8.0.0",
-    "stylelint-order": "0.3.0"
-  },
-  "dependencies": {
+		"acorn": "^6.1.1",
+		"braces": "^2.3.1",
 		"del": "^3.0.0",
-    "gulp": "^3.9.1",
+		"gulp": "^4.0.0",
 		"gulp-autoprefixer": "^4.0.0",
 		"gulp-cssnano": "^2.1.2",
 		"gulp-postcss": "^7.0.0",
@@ -47,6 +59,9 @@
 		"gulp-stylefmt": "^1.1.0",
 		"postcss-import": "^11.0.0",
 		"postcss-pxtorem": "^4.0.1",
-    "postcss-sorting": "^3.0.2"
+		"postcss-sorting": "^3.0.2",
+		"stylelint": "^9.10.1",
+		"stylelint-order": "^2.0.0",
+		"xo": "^0.24.0"
 	}
 }

phpBB/styles/prosilver/theme/icons.css

@@ -20,10 +20,10 @@ blockquote cite:before,
 	font-variant: normal;
 	line-height: 1;
 	display: inline-block;
-	/* stylelint-disable order/declaration-block-properties-specified-order */
+	/* stylelint-disable order/properties-order */
 	-moz-osx-font-smoothing: grayscale;
 	-webkit-font-smoothing: antialiased;
-	/* stylelint-enable order/declaration-block-properties-specified-order */
+	/* stylelint-enable order/properties-order */
 	text-rendering: auto; /* optimizelegibility throws things off #1094 */
 }
 

phpBB/styles/prosilver/theme/plupload.css

@@ -49,7 +49,7 @@
 	position: relative;
 	display: block;
 	height: 2px;
-	margin: 4px -10px -6px -10px;
+	margin: 4px -10px -6px;
 }
 
 .file-progress {