From b3487aabc900470d56a35ee3342a69a4e7703a9b Mon Sep 17 00:00:00 2001 From: Steve Lacy Date: Thu, 5 Apr 2018 14:33:09 -0700 Subject: [PATCH] Replace deprecated module gulp-util with replace-ext - closes #6063 --- package.json | 5 ++--- tasks/admin/components/create.js | 1 - tasks/docs/serve.js | 6 +++--- tasks/rtl/watch.js | 8 ++++---- tasks/watch.js | 6 +++--- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 24bc0c95e7..f16239c038 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "gulp-replace": "*", "gulp-rtlcss": "*", "gulp-uglify": "*", - "gulp-util": "*", "gulp-watch": "*", "map-stream": "*", "require-dot-file": "*", @@ -75,7 +74,6 @@ "gulp-replace": "^0.6.1", "gulp-rtlcss": "^1.0.0", "gulp-uglify": "^3.0.0", - "gulp-util": "^3.0.8", "gulp-watch": "^4.3.11", "jquery": "^3.2.1", "map-stream": "^0.1.0", @@ -92,7 +90,8 @@ "gulp-debug": "*", "gulp-git": "*", "gulp-tap": "*", - "merge-stream": "*" + "merge-stream": "*", + "replace-ext": "^1.0.0" }, "style": "dist/semantic.css" } diff --git a/tasks/admin/components/create.js b/tasks/admin/components/create.js index 3d4ed6d3be..311b17955c 100644 --- a/tasks/admin/components/create.js +++ b/tasks/admin/components/create.js @@ -34,7 +34,6 @@ var rename = require('gulp-rename'), replace = require('gulp-replace'), tap = require('gulp-tap'), - util = require('gulp-util'), // config config = require('../../config/user'), diff --git a/tasks/docs/serve.js b/tasks/docs/serve.js index 66673130b6..e9235190b5 100644 --- a/tasks/docs/serve.js +++ b/tasks/docs/serve.js @@ -21,7 +21,7 @@ var rename = require('gulp-rename'), replace = require('gulp-replace'), uglify = require('gulp-uglify'), - util = require('gulp-util'), + replaceExt = require('replace-ext'), watch = require('gulp-watch'), // user config @@ -142,12 +142,12 @@ module.exports = function () { } else if(isPackagedTheme) { console.log('Change detected in packaged theme'); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); } else if(isSiteTheme) { console.log('Change detected in site theme'); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); lessPath = lessPath.replace(source.site, source.definitions); } else { diff --git a/tasks/rtl/watch.js b/tasks/rtl/watch.js index af89922d80..0811af18db 100644 --- a/tasks/rtl/watch.js +++ b/tasks/rtl/watch.js @@ -22,7 +22,7 @@ var replace = require('gulp-replace'), rtlcss = require('gulp-rtlcss'), uglify = require('gulp-uglify'), - util = require('gulp-util'), + replaceExt = require('replace-ext'), watch = require('gulp-watch'), // user config @@ -107,16 +107,16 @@ module.exports = function(callback) { else if(isPackagedTheme) { console.log('Change detected in packaged theme'); lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); } else if(isSiteTheme) { console.log('Change detected in site theme'); lessPath = lessPath.replace(source.site, source.definitions); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); } else if(isDefinition) { console.log('Change detected in definition'); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); } /*-------------- diff --git a/tasks/watch.js b/tasks/watch.js index fd5cb22cef..67064ecf3b 100644 --- a/tasks/watch.js +++ b/tasks/watch.js @@ -21,7 +21,7 @@ var rename = require('gulp-rename'), replace = require('gulp-replace'), uglify = require('gulp-uglify'), - util = require('gulp-util'), + replaceExt = require('replace-ext'), watch = require('gulp-watch'), // user config @@ -119,12 +119,12 @@ module.exports = function(callback) { } else if(isPackagedTheme) { console.log('Change detected in packaged theme'); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); } else if(isSiteTheme) { console.log('Change detected in site theme'); - lessPath = util.replaceExtension(file.path, '.less'); + lessPath = replaceExt(file.path, '.less'); lessPath = lessPath.replace(source.site, source.definitions); } else {