From 3b576e607f3c11a10a9306366c5f112957173f07 Mon Sep 17 00:00:00 2001 From: m-e-h Date: Mon, 3 Jul 2017 17:14:21 -0400 Subject: [PATCH 1/5] Add package.json --- .gitignore | 3 +++ package.json | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 .gitignore create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..72a137caf3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# Dependency directories +node_modules/ +yarn.lock diff --git a/package.json b/package.json new file mode 100644 index 0000000000..271c8f357b --- /dev/null +++ b/package.json @@ -0,0 +1,46 @@ +{ + "name": "_s", + "version": "1.0.0", + "scripts": { + "css-build": "npm run css-lint && npm run css-compile && npm run css-prefix && npm run css-format && npm run css-fix", + "css-lint": "stylelint style.css", + "css-compile": "node-sass sass/style.scss style.css --output-style expanded --indent-type tab --indent-width 1", + "css-prefix": "postcss style.css -u autoprefixer -o style.css --no-map", + "css-format": "stylefmt style.css", + "css-fix": "stylelint style.css --fix", + "scss-lint": "stylelint sass/**/*.scss", + "js-lint": "eslint js/**", + "js-fix": "eslint js/** --fix" + }, + "devDependencies": { + "autoprefixer": "^7.1.2", + "browserslist": "^2.1.5", + "eslint": "^4.1.1", + "eslint-config-wordpress": "^2.0.0", + "node-sass": "^4.5.3", + "postcss-cli": "^4.1.0", + "stylefmt": "^6.0.0", + "stylelint": "^7.12.0", + "stylelint-config-wordpress": "^11.0.0" + }, + "stylelint": { + "defaultSeverity": "warning", + "extends": "stylelint-config-wordpress", + "rules": { + "max-line-length": [ 80, { + "ignorePattern": ["/\b(Description:).*\n/", "/https?:\/\/[0-9,a-z]*.*/"] + } ] + } + }, + "eslintConfig": { + "extends": "wordpress" + }, + "eslintIgnore": [ + "js/**.min.js" + ], + "browserslist": [ + "> 1%", + "last 2 versions", + "IE 11" + ] + } From aaf2c8b98425ea647c2b440efc7d7f34e800c4ea Mon Sep 17 00:00:00 2001 From: m-e-h Date: Sun, 17 Sep 2017 15:45:21 -0400 Subject: [PATCH 2/5] Remove JS stuff, update deps and browser versions --- package.json | 50 +++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 271c8f357b..92dae3e989 100644 --- a/package.json +++ b/package.json @@ -8,39 +8,31 @@ "css-prefix": "postcss style.css -u autoprefixer -o style.css --no-map", "css-format": "stylefmt style.css", "css-fix": "stylelint style.css --fix", - "scss-lint": "stylelint sass/**/*.scss", - "js-lint": "eslint js/**", - "js-fix": "eslint js/** --fix" + "scss-lint": "stylelint sass/**/*.scss --syntax scss" }, "devDependencies": { - "autoprefixer": "^7.1.2", - "browserslist": "^2.1.5", - "eslint": "^4.1.1", - "eslint-config-wordpress": "^2.0.0", + "autoprefixer": "^7.1.4", + "browserslist": "^2.4.0", "node-sass": "^4.5.3", - "postcss-cli": "^4.1.0", + "postcss-cli": "^4.1.1", "stylefmt": "^6.0.0", - "stylelint": "^7.12.0", - "stylelint-config-wordpress": "^11.0.0" + "stylelint": "^8.1.1", + "stylelint-config-wordpress": "^12.0.0" }, "stylelint": { "defaultSeverity": "warning", - "extends": "stylelint-config-wordpress", - "rules": { - "max-line-length": [ 80, { - "ignorePattern": ["/\b(Description:).*\n/", "/https?:\/\/[0-9,a-z]*.*/"] - } ] - } - }, - "eslintConfig": { - "extends": "wordpress" - }, - "eslintIgnore": [ - "js/**.min.js" - ], - "browserslist": [ - "> 1%", - "last 2 versions", - "IE 11" - ] - } + "extends": "stylelint-config-wordpress" + }, + "browserslist": [ + "> 1%", + "ie >= 11", + "last 1 Android versions", + "last 1 ChromeAndroid versions", + "last 2 Chrome versions", + "last 2 Firefox versions", + "last 2 Safari versions", + "last 2 iOS versions", + "last 2 Edge versions", + "last 2 Opera versions" + ] +} From 561302f62235ef0e31cdd7124f7c15072f3fd726 Mon Sep 17 00:00:00 2001 From: m-e-h Date: Mon, 18 Sep 2017 00:32:39 -0400 Subject: [PATCH 3/5] load scss config for stylelint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92dae3e989..1d3c30b7ab 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "css-prefix": "postcss style.css -u autoprefixer -o style.css --no-map", "css-format": "stylefmt style.css", "css-fix": "stylelint style.css --fix", - "scss-lint": "stylelint sass/**/*.scss --syntax scss" + "scss-lint": "stylelint 'sass/**/*.scss' --syntax scss --config node_modules/stylelint-config-wordpress/scss.js" }, "devDependencies": { "autoprefixer": "^7.1.4", From 275dcbbd37d79a85dd3111da76722a5856b040dc Mon Sep 17 00:00:00 2001 From: m-e-h Date: Tue, 14 Nov 2017 17:29:59 -0500 Subject: [PATCH 4/5] update added package-lock.json to .gitignore added license updated script naming convention reordered scripts updated deps --- .gitignore | 1 + package.json | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 72a137caf3..9b40c13215 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Dependency directories node_modules/ yarn.lock +package-lock.json diff --git a/package.json b/package.json index 1d3c30b7ab..0b5da1b251 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,23 @@ { "name": "_s", "version": "1.0.0", + "license": "GPL-2.0+", "scripts": { - "css-build": "npm run css-lint && npm run css-compile && npm run css-prefix && npm run css-format && npm run css-fix", - "css-lint": "stylelint style.css", - "css-compile": "node-sass sass/style.scss style.css --output-style expanded --indent-type tab --indent-width 1", - "css-prefix": "postcss style.css -u autoprefixer -o style.css --no-map", - "css-format": "stylefmt style.css", - "css-fix": "stylelint style.css --fix", - "scss-lint": "stylelint 'sass/**/*.scss' --syntax scss --config node_modules/stylelint-config-wordpress/scss.js" + "build:css": "npm run css-compile && npm run css-prefix && npm run css-format && npm run css-fix", + "compile:css": "node-sass sass/style.scss style.css --output-style expanded --indent-type tab --indent-width 1", + "prefix:css": "postcss style.css -u autoprefixer -o style.css --no-map", + "lint:css": "stylelint style.css", + "lint:css": "stylelint 'sass/**/*.scss' --syntax scss --config node_modules/stylelint-config-wordpress/scss.js", + "format:css": "stylefmt style.css", + "fix:css": "stylelint style.css --fix" }, "devDependencies": { - "autoprefixer": "^7.1.4", - "browserslist": "^2.4.0", - "node-sass": "^4.5.3", + "autoprefixer": "^7.1.6", + "browserslist": "^2.9.0", + "node-sass": "^4.6.1", "postcss-cli": "^4.1.1", "stylefmt": "^6.0.0", - "stylelint": "^8.1.1", + "stylelint": "^8.2.0", "stylelint-config-wordpress": "^12.0.0" }, "stylelint": { From baf9ec0d97f5c7da9609aea7b664463a0c404ccb Mon Sep 17 00:00:00 2001 From: m-e-h Date: Wed, 15 Nov 2017 10:51:45 -0500 Subject: [PATCH 5/5] fix typos --- package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0b5da1b251..4c31415a76 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,14 @@ "version": "1.0.0", "license": "GPL-2.0+", "scripts": { - "build:css": "npm run css-compile && npm run css-prefix && npm run css-format && npm run css-fix", + "build:css": "npm run compile:css && npm run prefix:css && npm run format:css && npm run fix:css", "compile:css": "node-sass sass/style.scss style.css --output-style expanded --indent-type tab --indent-width 1", "prefix:css": "postcss style.css -u autoprefixer -o style.css --no-map", + "lint:scss": "stylelint 'sass/**/*.scss' --syntax scss --config node_modules/stylelint-config-wordpress/scss.js", "lint:css": "stylelint style.css", - "lint:css": "stylelint 'sass/**/*.scss' --syntax scss --config node_modules/stylelint-config-wordpress/scss.js", - "format:css": "stylefmt style.css", - "fix:css": "stylelint style.css --fix" + "fix:scss": "stylelint 'sass/**/*.scss' --syntax scss --fix --config node_modules/stylelint-config-wordpress/scss.js", + "fix:css": "stylelint style.css --fix", + "format:css": "stylefmt style.css" }, "devDependencies": { "autoprefixer": "^7.1.6",