From c7ccfac561c2ab4f2d94f66a01317ec79f2f892d Mon Sep 17 00:00:00 2001 From: Patrick Lawler Date: Tue, 3 Apr 2018 17:28:32 -0400 Subject: [PATCH 1/2] upgrade webpack and fix watch scss bug --- package-lock.json | 22 +++++++++++----------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 591d70d3a..39727e88b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2202,9 +2202,9 @@ } }, "browserify-aes": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", - "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { "buffer-xor": "1.0.3", @@ -2221,7 +2221,7 @@ "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", "dev": true, "requires": { - "browserify-aes": "1.1.1", + "browserify-aes": "1.2.0", "browserify-des": "1.0.0", "evp_bytestokey": "1.0.3" } @@ -10611,9 +10611,9 @@ } }, "mini-css-extract-plugin": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.3.0.tgz", - "integrity": "sha512-xWifHy3fqq0HZeEZ0WTi22tek85YQqNFlGxtvSXJXBi1O6XgqKMyK6fsupSBaaIsyBdfpr9QsG93hrWu13pruQ==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz", + "integrity": "sha512-2Zik6PhUZ/MbiboG6SDS9UTPL4XXy4qnyGjSdCIWRrr8xb6PwLtHE+AYOjkXJWdF0OG8vo/yrJ8CgS5WbMpzIg==", "dev": true, "requires": { "loader-utils": "1.1.0", @@ -11746,7 +11746,7 @@ "dev": true, "requires": { "asn1.js": "4.10.1", - "browserify-aes": "1.1.1", + "browserify-aes": "1.2.0", "create-hash": "1.1.3", "evp_bytestokey": "1.0.3", "pbkdf2": "3.0.14" @@ -16916,9 +16916,9 @@ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "webpack": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.3.0.tgz", - "integrity": "sha512-oFbYLpxz8IV44Z5o2uVhvzsdw9J8x/l7Ry9EGvckkx6PFBZo5wRvd2J4nPP9oGhkl2WtNXoU4N7LM5Pjk1MAiA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.4.1.tgz", + "integrity": "sha512-iLUJcsEAjaPKWbB32ADr29Pg9fPUVfFEMPK4VXyZGftzhSEFg2BLjHLoBYZ14wdTEA8xqG/hjpuX8qOmabRYvw==", "dev": true, "requires": { "acorn": "5.4.1", diff --git a/package.json b/package.json index b7bc85c8d..f8bac5481 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "jsonfile": "^4.0.0", "license-checker": "^15.0.0", "markdown-extract": "^1.0.2", - "mini-css-extract-plugin": "^0.3.0", + "mini-css-extract-plugin": "^0.4.0", "node-sass": "^4.5.3", "oboe": "^2.1.3", "path": "^0.12.7", @@ -96,7 +96,7 @@ "svg-url-loader": "^2.2.1", "url-loader": "^0.6.2", "vendor-copy": "^1.3.1", - "webpack": "^4.3.0", + "webpack": "^4.4.1", "webpack-cli": "^2.0.13", "webpack-shell-plugin": "^0.5.0", "whatwg-fetch": "^2.0.3" From df32e541a8b4b52d74fe65f4975373dc97902d5d Mon Sep 17 00:00:00 2001 From: Patrick Lawler Date: Tue, 3 Apr 2018 18:23:21 -0400 Subject: [PATCH 2/2] fix watch lint scss --- webpack.config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 30aef7e0c..e5e855629 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -76,7 +76,9 @@ lintOnChange.prototype.apply = function(compiler) { } compiler.plugin("done", () => { const changedTimes = compiler.watchFileSystem.watcher.mtimes; - const changedFiles = Object.keys(changedTimes); + const changedFiles = Object.keys(changedTimes).filter((file) => { + return file.indexOf('.js') !== -1; + }); if (changedFiles.length) { const args = ['run', 'lint.raw', '--', ...changedFiles]; if (process.argv.includes('--env.fix')) {