Skip to content

Commit 64970d0

Browse files
committed
Merge branch 'gulp-util' of https://github.com/stevelacy/Semantic-UI into next
2 parents 46cf1e4 + b3487aa commit 64970d0

6 files changed

Lines changed: 34 additions & 16 deletions

File tree

package-lock.json

Lines changed: 22 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"gulp-replace": "*",
4242
"gulp-rtlcss": "*",
4343
"gulp-uglify": "*",
44-
"gulp-util": "*",
4544
"gulp-watch": "*",
4645
"map-stream": "*",
46+
"replace-ext": "*",
4747
"require-dot-file": "*",
4848
"run-sequence": "*",
4949
"yamljs": "*"
@@ -75,13 +75,13 @@
7575
"gulp-replace": "^1.0.0",
7676
"gulp-rtlcss": "^1.3.0",
7777
"gulp-uglify": "^3.0.1",
78-
"gulp-util": "^3.0.8",
7978
"gulp-watch": "^5.0.1",
8079
"jquery": "^3.3.1",
8180
"map-stream": "^0.1.0",
8281
"merge-stream": "^1.0.0",
8382
"mkdirp": "^0.5.1",
8483
"require-dot-file": "^0.4.0",
84+
"replace-ext": "^1.0.0",
8585
"run-sequence": "^2.2.1",
8686
"wrench-sui": "^0.0.3",
8787
"yamljs": "^0.3.0"

tasks/admin/components/create.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ var
3434
rename = require('gulp-rename'),
3535
replace = require('gulp-replace'),
3636
tap = require('gulp-tap'),
37-
util = require('gulp-util'),
3837

3938
// config
4039
config = require('../../config/user'),

tasks/docs/serve.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var
2121
rename = require('gulp-rename'),
2222
replace = require('gulp-replace'),
2323
uglify = require('gulp-uglify'),
24-
util = require('gulp-util'),
24+
replaceExt = require('replace-ext'),
2525
watch = require('gulp-watch'),
2626

2727
// user config
@@ -142,12 +142,12 @@ module.exports = function () {
142142
}
143143
else if(isPackagedTheme) {
144144
console.log('Change detected in packaged theme');
145-
lessPath = util.replaceExtension(file.path, '.less');
145+
lessPath = replaceExt(file.path, '.less');
146146
lessPath = lessPath.replace(tasks.regExp.theme, source.definitions);
147147
}
148148
else if(isSiteTheme) {
149149
console.log('Change detected in site theme');
150-
lessPath = util.replaceExtension(file.path, '.less');
150+
lessPath = replaceExt(file.path, '.less');
151151
lessPath = lessPath.replace(source.site, source.definitions);
152152
}
153153
else {

tasks/rtl/watch.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var
2222
replace = require('gulp-replace'),
2323
rtlcss = require('gulp-rtlcss'),
2424
uglify = require('gulp-uglify'),
25-
util = require('gulp-util'),
25+
replaceExt = require('replace-ext'),
2626
watch = require('gulp-watch'),
2727

2828
// user config
@@ -107,16 +107,16 @@ module.exports = function(callback) {
107107
else if(isPackagedTheme) {
108108
console.log('Change detected in packaged theme');
109109
lessPath = lessPath.replace(tasks.regExp.theme, source.definitions);
110-
lessPath = util.replaceExtension(file.path, '.less');
110+
lessPath = replaceExt(file.path, '.less');
111111
}
112112
else if(isSiteTheme) {
113113
console.log('Change detected in site theme');
114114
lessPath = lessPath.replace(source.site, source.definitions);
115-
lessPath = util.replaceExtension(file.path, '.less');
115+
lessPath = replaceExt(file.path, '.less');
116116
}
117117
else if(isDefinition) {
118118
console.log('Change detected in definition');
119-
lessPath = util.replaceExtension(file.path, '.less');
119+
lessPath = replaceExt(file.path, '.less');
120120
}
121121

122122
/*--------------

tasks/watch.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var
2121
rename = require('gulp-rename'),
2222
replace = require('gulp-replace'),
2323
uglify = require('gulp-uglify'),
24-
util = require('gulp-util'),
24+
replaceExt = require('replace-ext'),
2525
watch = require('gulp-watch'),
2626

2727
// user config
@@ -119,12 +119,12 @@ module.exports = function(callback) {
119119
}
120120
else if(isPackagedTheme) {
121121
console.log('Change detected in packaged theme');
122-
lessPath = util.replaceExtension(file.path, '.less');
122+
lessPath = replaceExt(file.path, '.less');
123123
lessPath = lessPath.replace(tasks.regExp.theme, source.definitions);
124124
}
125125
else if(isSiteTheme) {
126126
console.log('Change detected in site theme');
127-
lessPath = util.replaceExtension(file.path, '.less');
127+
lessPath = replaceExt(file.path, '.less');
128128
lessPath = lessPath.replace(source.site, source.definitions);
129129
}
130130
else {

0 commit comments

Comments
 (0)