Skip to content

Commit edee12d

Browse files
authored
fix(install): copy overrides.less file on install/update
The new file overrides.less was missing at install/update. Without that any install would miss the overrides files which in turn breaks components which rely on them like transition
1 parent 7986b3f commit edee12d

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

tasks/admin/distributions/create.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*******************************/
44

55
/*
6-
This will create individual distribution repositories for each SUI distribution
6+
This will create individual distribution repositories for each FUI distribution
77
88
* copy distribution files to release
99
* update package.json file
@@ -153,6 +153,8 @@ module.exports = function (callback) {
153153
tasks.push(function () {
154154
let
155155
definitions,
156+
overridesImport,
157+
lessImport,
156158
themeImport,
157159
themeConfig,
158160
siteTheme,
@@ -161,7 +163,10 @@ module.exports = function (callback) {
161163
definitions = gulp.src('src/definitions/**/*', { base: 'src/' })
162164
.pipe(gulp.dest(outputDirectory))
163165
;
164-
themeImport = gulp.src('src/semantic.less', { base: 'src/' })
166+
overridesImport = gulp.src('src/overrides.less', { base: 'src/' })
167+
.pipe(gulp.dest(outputDirectory))
168+
;
169+
lessImport = gulp.src('src/semantic.less', { base: 'src/' })
165170
.pipe(gulp.dest(outputDirectory))
166171
;
167172
themeImport = gulp.src('src/theme.less', { base: 'src/' })
@@ -177,7 +182,7 @@ module.exports = function (callback) {
177182
.pipe(gulp.dest(outputDirectory))
178183
;
179184

180-
return mergeStream(definitions, themeImport, themeConfig, siteTheme, themes);
185+
return mergeStream(definitions, overridesImport, lessImport, themeImport, themeConfig, siteTheme, themes);
181186
});
182187
}
183188

tasks/config/project/install.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ module.exports = {
240240
config: './semantic.json.example',
241241
definitions: './src/definitions',
242242
gulpFile: './gulpfile.js',
243+
overridesImport: './src/overrides.less',
243244
lessImport: './src/semantic.less',
244245
site: './src/_site',
245246
tasks: './tasks',
@@ -253,6 +254,7 @@ module.exports = {
253254
// expected final filenames
254255
files: {
255256
config: 'semantic.json',
257+
overridesImport: 'src/overrides.less',
256258
lessImport: 'src/semantic.less',
257259
site: 'src/site',
258260
themeConfig: 'src/theme.config',
@@ -263,6 +265,7 @@ module.exports = {
263265
folders: {
264266
config: './',
265267
definitions: 'src/definitions/',
268+
overridesImport: 'src/',
266269
lessImport: 'src/',
267270
modules: 'node_modules/',
268271
site: 'src/site/',

tasks/install.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ module.exports = function (callback) {
6969
root: path.normalize(__dirname + '/../'),
7070
}; */
7171

72-
/* Don't do end user config if SUI is a sub-module */
72+
/* Don't do end user config if FUI is a sub-module */
7373
if (install.isSubModule()) {
74-
console.info('SUI is a sub-module, skipping end-user install');
74+
console.info('FUI is a sub-module, skipping end-user install');
7575
callback();
7676

7777
return;
@@ -86,7 +86,7 @@ module.exports = function (callback) {
8686
}
8787

8888
/* -----------------
89-
Update SUI
89+
Update FUI
9090
----------------- */
9191

9292
// run update scripts if semantic.json exists
@@ -96,6 +96,7 @@ module.exports = function (callback) {
9696
updatePaths = {
9797
config: path.join(manager.root, files.config),
9898
tasks: path.join(updateFolder, folders.tasks),
99+
overridesImport: path.join(updateFolder, folders.overridesImport),
99100
themeImport: path.join(updateFolder, folders.themeImport),
100101
definition: path.join(currentConfig.paths.source.definitions),
101102
site: path.join(currentConfig.paths.source.site),
@@ -132,7 +133,11 @@ module.exports = function (callback) {
132133
.pipe(plumber())
133134
.pipe(gulp.dest(updatePaths.themeImport))
134135
;
135-
136+
console.info('Updating overrides import file');
137+
gulp.src(source.overridesImport)
138+
.pipe(plumber())
139+
.pipe(gulp.dest(updatePaths.overridesImport))
140+
;
136141
console.info('Adding new site theme files...');
137142
wrench.copyDirSyncRecursive(source.site, updatePaths.site, settings.wrench.merge);
138143

@@ -187,7 +192,7 @@ module.exports = function (callback) {
187192
}
188193

189194
/* --------------
190-
Create SUI
195+
Create FUI
191196
--------------- */
192197

193198
gulp.task('run setup', function (callback) {
@@ -263,6 +268,7 @@ module.exports = function (callback) {
263268
// special install paths only for PM install
264269
installPaths = extend(false, {}, installPaths, {
265270
definition: folders.definitions,
271+
overridesImport: folders.overridesImport,
266272
lessImport: folders.lessImport,
267273
tasks: folders.tasks,
268274
theme: folders.themes,
@@ -311,6 +317,10 @@ module.exports = function (callback) {
311317
.pipe(plumber())
312318
.pipe(gulp.dest(installPaths.themeImport))
313319
;
320+
gulp.src(source.overridesImport)
321+
.pipe(plumber())
322+
.pipe(gulp.dest(installPaths.overridesImport))
323+
;
314324
gulp.src(source.lessImport)
315325
.pipe(plumber())
316326
.pipe(gulp.dest(installPaths.lessImport))

0 commit comments

Comments
 (0)