Skip to content

Commit e736dd6

Browse files
committed
chore: pull in updates added in #904 to make sure deps + build tasks are all in working order
1 parent b3a889a commit e736dd6

File tree

2 files changed

+47
-27
lines changed

2 files changed

+47
-27
lines changed

packages/uikit-workshop/gulpfile.js

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/* load command line arguments */
2-
var args = require('yargs').argv;
2+
const args = require('yargs').argv;
33

44
/* load gulp */
5-
var gulp = require('gulp');
5+
const gulp = require('gulp');
6+
const cleanCSS = require('gulp-clean-css');
67
const inlinesource = require('gulp-inline-source');
78
const path = require('path');
89
const { buildCriticalCSS } = require('./penthouse');
910

1011
/* load the plugins */
11-
var gulpLoadPlugins = require('gulp-load-plugins');
12-
var plugins = gulpLoadPlugins({ scope: ['devDependencies'] });
12+
const gulpLoadPlugins = require('gulp-load-plugins');
13+
const plugins = gulpLoadPlugins({ scope: ['devDependencies'] });
1314
plugins.del = require('del');
1415
plugins.mainBowerFiles = require('main-bower-files');
1516

@@ -37,16 +38,20 @@ gulp.task('build:bower', ['clean'], function() {
3738
.pipe(copyPublic('styleguide/bower_components'));
3839
});
3940

40-
return plugins
41-
.rubySass('src/sass/pattern-lab.scss', {
42-
style: 'expanded',
43-
'sourcemap=none': true,
44-
})
4541
gulp.task('build:css', ['clean'], function() {
42+
return gulp
4643
.src([
4744
'src/sass/pattern-lab.scss',
4845
'src/sass/pattern-lab--iframe-loader.scss',
4946
])
47+
.pipe(
48+
plugins
49+
.sass({
50+
outputStyle: 'expanded',
51+
sourceMap: false,
52+
})
53+
.on('error', plugins.sass.logError)
54+
)
5055
.pipe(
5156
plugins.autoprefixer(
5257
{
@@ -62,6 +67,13 @@ gulp.task('build:css', ['clean'], function() {
6267
{ map: false }
6368
)
6469
)
70+
.pipe(
71+
cleanCSS({
72+
compatibility: 'ie9',
73+
level: 1,
74+
inline: ['remote'],
75+
})
76+
)
6577
.pipe(gulp.dest('dist/styleguide/css'))
6678
.pipe(copyPublic('styleguide/css'));
6779
});

packages/uikit-workshop/package.json

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
"version": "1.0.0-alpha.7",
44
"description": "Front-end assets and templates for the default Pattern Lab workshop view",
55
"main": "gulpfile.js",
6-
"scripts": {},
6+
"scripts": {
7+
"setup": "npx bower install",
8+
"build": "gulp",
9+
"watch": "gulp --watch"
10+
},
711
"authors": [
812
{
913
"name": "Brad Frost",
@@ -19,31 +23,35 @@
1923
"license": "MIT",
2024
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop",
2125
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
26+
"peerDependencies": {
27+
"jshint": "^2.9.5"
28+
},
2229
"devDependencies": {
23-
"del": "1.1.1",
24-
"gulp": "3.8.6",
25-
"gulp-autoprefixer": "2.1",
26-
"gulp-concat": "2.3.4",
27-
"gulp-file-include": "0.13.7",
28-
"gulp-imagemin": "0.6.1",
29-
"gulp-jshint": "1.8.0",
30-
"gulp-load-plugins": "0.5.3",
31-
"gulp-minify-css": "0.3.7",
32-
"gulp-rename": "1.2.0",
33-
"gulp-resolve-dependencies": "1.0.1",
34-
"gulp-ruby-sass": "3.0.0",
35-
"gulp-uglify": "1.1.0",
36-
"gulp-util": "3.0.0",
37-
"imagemin-pngcrush": "0.1.0",
38-
"main-bower-files": "1.0.2",
39-
"yargs": "1.2.6"
30+
"del": "^3.0.0",
31+
"gulp-autoprefixer": "^5.0.0",
32+
"gulp-clean-css": "^3.9.4",
33+
"gulp-concat": "^2.6.1",
34+
"gulp-file-include": "^2.0.1",
35+
"gulp-imagemin": "^4.1.0",
4036
"gulp-inline-source": "^3.2.0",
37+
"gulp-jshint": "^2.1.0",
38+
"gulp-load-plugins": "^1.5.0",
39+
"gulp-rename": "^1.3.0",
40+
"gulp-resolve-dependencies": "^2.2.0",
41+
"gulp-sass": "^4.0.1",
42+
"gulp-uglify": "^3.0.0",
43+
"gulp-util": "^3.0.8",
44+
"gulp": "^3.9.1",
45+
"imagemin-pngcrush": "^5.1.0",
46+
"main-bower-files": "^2.13.1",
4147
"penthouse": "^1.6.2",
48+
"yargs": "^12.0.1"
4249
},
4350
"publishConfig": {
4451
"access": "public"
4552
},
4653
"dependencies": {
54+
"jshint": "^2.9.5",
4755
"fg-loadcss": "^2.0.1",
4856
"fg-loadjs": "^1.0.0",
4957
"whendefined": "^0.0.1",

0 commit comments

Comments
 (0)