Skip to content

[uikit-workshop] Remove copy-dist flag and logic from UIKit-Workshop #919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2018
Merged

[uikit-workshop] Remove copy-dist flag and logic from UIKit-Workshop #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07d2b6e
chore: updated uikit-workshop/.github/CONTRIBUTING.md
joshbatley Aug 8, 2018
0dfb218
chore: removed copyPublic function and calls from uikit-workshop's gu…
joshbatley Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/uikit-workshop/.github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ The best way to make changes to this repo and test them is through your existing

To make changes **always edit files in `src/`**. To make sure that these changes are reflected in the front-end and `dist/` folder run the following:

gulp --copy-dist=../../../public
npm run build

To watch for changes you can use:

gulp --watch --copy-dist=../../../public
npm run watch

At this point changes to the static assets should compile to the correct locations in the project as well as `dist/`.

Expand Down
34 changes: 8 additions & 26 deletions packages/uikit-workshop/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,12 @@ const { buildCriticalCSS } = require('./penthouse');
// @todo: uncomment once cache-busting strategy in place.
// const workboxBuild = require('workbox-build');


/* load the plugins */
const gulpLoadPlugins = require('gulp-load-plugins');
const plugins = gulpLoadPlugins({ scope: ['devDependencies'] });
plugins.del = require('del');
plugins.mainBowerFiles = require('main-bower-files');

/* copy the dist folder into the designated public folder */
function copyPublic(suffix) {
if (args['copy-dist'] !== undefined) {
return gulp.dest(args['copy-dist'] + '/' + suffix);
} else {
return plugins.util.noop();
}
}

/* clean tasks */
gulp.task('clean', function(cb) {
return plugins.del(['dist'], cb);
Expand All @@ -38,8 +28,7 @@ gulp.task('build:bower', ['clean'], function() {
.src(plugins.mainBowerFiles())
.pipe(plugins.rename({ suffix: '.min' }))
.pipe(plugins.uglify())
.pipe(gulp.dest('dist/styleguide/bower_components'))
.pipe(copyPublic('styleguide/bower_components'));
.pipe(gulp.dest('dist/styleguide/bower_components'));
});

gulp.task('build:css', ['clean'], function() {
Expand Down Expand Up @@ -79,8 +68,7 @@ gulp.task('build:css', ['clean'], function() {
inline: ['remote'],
})
)
.pipe(gulp.dest('dist/styleguide/css'))
.pipe(copyPublic('styleguide/css'));
.pipe(gulp.dest('dist/styleguide/css'));
});

gulp.task(
Expand All @@ -99,8 +87,7 @@ gulp.task('copy:js', ['clean'], function() {
'node_modules/whendefined/dist/whendefined.min.js',
'node_modules/fg-loadjs/loadJS.js',
])
.pipe(gulp.dest('dist/styleguide/js'))
.pipe(copyPublic(''));
.pipe(gulp.dest('dist/styleguide/js'));
});

gulp.task(
Expand All @@ -110,8 +97,7 @@ gulp.task(
return gulp
.src('src/html/index.html')
.pipe(plugins.fileInclude({ prefix: '@@', basepath: '@file' }))
.pipe(gulp.dest('dist'))
.pipe(copyPublic(''));
.pipe(gulp.dest('dist'));
}
);

Expand All @@ -124,8 +110,7 @@ gulp.task('build:html', ['clean', 'criticalcss', 'prebuild:html'], function() {
compress: true,
})
)
.pipe(gulp.dest('dist'))
.pipe(copyPublic(''));
.pipe(gulp.dest('dist'));
});

gulp.task('build:images', ['clean'], function() {
Expand All @@ -138,8 +123,7 @@ gulp.task('build:images', ['clean'], function() {
use: [plugins.pngcrush()],
})
)
.pipe(gulp.dest('dist/styleguide/images'))
.pipe(copyPublic('styleguide/images'));
.pipe(gulp.dest('dist/styleguide/images'));
});

gulp.task('build:js-viewer', ['clean'], function() {
Expand All @@ -157,8 +141,7 @@ gulp.task('build:js-viewer', ['clean'], function() {
.pipe(gulp.dest('dist/styleguide/js'))
.pipe(plugins.rename({ suffix: '.min' }))
.pipe(plugins.uglify())
.pipe(gulp.dest('dist/styleguide/js'))
.pipe(copyPublic('styleguide/js'));
.pipe(gulp.dest('dist/styleguide/js'));
});

gulp.task('build:js-pattern', ['clean', 'build:js-viewer'], function() {
Expand All @@ -182,8 +165,7 @@ gulp.task('build:js-pattern', ['clean', 'build:js-viewer'], function() {
.pipe(gulp.dest('dist/styleguide/js'))
.pipe(plugins.rename({ suffix: '.min' }))
.pipe(plugins.uglify())
.pipe(gulp.dest('dist/styleguide/js'))
.pipe(copyPublic('styleguide/js'));
.pipe(gulp.dest('dist/styleguide/js'));
});

// @todo: re-enable once cache busting strategy in place
Expand Down