diff --git a/package-lock.json b/package-lock.json index 08fe649b5..665959cd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3544,6 +3544,11 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" } } }, @@ -6064,9 +6069,9 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" }, "replace-homedir": { "version": "1.0.0", @@ -7395,6 +7400,13 @@ "clone": "^1.0.0", "clone-stats": "^0.0.1", "replace-ext": "0.0.1" + }, + "dependencies": { + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + } } }, "vinyl-file": { @@ -7436,6 +7448,13 @@ "clone": "^1.0.0", "clone-stats": "^0.0.1", "replace-ext": "0.0.1" + }, + "dependencies": { + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + } } } } diff --git a/package.json b/package.json index ac8e136c5..41d942493 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,9 @@ "gulp-replace": "*", "gulp-rtlcss": "*", "gulp-uglify": "*", - "gulp-util": "*", "gulp-watch": "*", "map-stream": "*", + "replace-ext": "*", "require-dot-file": "*", "run-sequence": "*", "yamljs": "*" @@ -75,13 +75,13 @@ "gulp-replace": "^1.0.0", "gulp-rtlcss": "^1.3.0", "gulp-uglify": "^3.0.1", - "gulp-util": "^3.0.8", "gulp-watch": "^5.0.1", "jquery": "^3.3.1", "map-stream": "^0.1.0", "merge-stream": "^1.0.0", "mkdirp": "^0.5.1", "require-dot-file": "^0.4.0", + "replace-ext": "^1.0.0", "run-sequence": "^2.2.1", "wrench-sui": "^0.0.3", "yamljs": "^0.3.0" diff --git a/tasks/admin/components/create.js b/tasks/admin/components/create.js index 3d4ed6d3b..311b17955 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 a79dddc36..5a4603fb2 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 af89922d8..0811af18d 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 21e875588..c1bf51bc2 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 {