Skip to content
This repository was archived by the owner on Sep 10, 2022. It is now read-only.

Commit 5d7c8f1

Browse files
author
Matt Gaunt
committed
Having a look at the license stuff
1 parent 2d01a33 commit 5d7c8f1

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

gulp-tasks/scripts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function compileES6Bundles(browserifyBundles, minify) {
5252

5353
// If this is a production build - minify JS
5454
.pipe(gulpif(GLOBAL.config.env == 'prod', streamify(uglify())))
55-
.pipe(gulpif((typeof GLOBAL.config.license) !== 'undefined', license(GLOBAL.config.license, GLOBAL.config.licenseOptions)))
55+
.pipe(license(GLOBAL.config.license, GLOBAL.config.licenseOptions))
5656
.pipe(gulp.dest(bundle.dest));
5757
});
5858
}

gulp-tasks/styles.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ var runSequence = require('run-sequence');
2222
var minifyCSS = require('gulp-minify-css');
2323
var autoprefixer = require('gulp-autoprefixer');
2424
var sass = require('gulp-sass');
25-
var license = require('gulp-license');
2625
var sourcemaps = require('gulp-sourcemaps');
26+
var license = require('gulp-license');
2727

2828
var AUTOPREFIXER_BROWSERS = [
2929
'ie >= 10',
@@ -50,16 +50,18 @@ gulp.task('styles:clean', function(cb) {
5050
});
5151

5252
gulp.task('styles:sass', function() {
53-
return gulp.src(GLOBAL.config.src + '/**/*.scss')
53+
var stream = gulp.src(GLOBAL.config.src + '/**/*.scss')
5454

5555
// Only create sourcemaps for dev
5656
.pipe(gulpif(GLOBAL.config.env != 'prod', sourcemaps.init()))
5757
.pipe(sass())
5858
.pipe(autoprefixer(AUTOPREFIXER_BROWSERS))
5959
.pipe(minifyCSS())
60-
.pipe(gulpif((typeof GLOBAL.config.license) !== 'undefined', license(GLOBAL.config.license, GLOBAL.config.licenseOptions)))
60+
.pipe(license(GLOBAL.config.license, GLOBAL.config.licenseOptions))
6161
.pipe(gulpif(GLOBAL.config.env != 'prod', sourcemaps.write()))
6262
.pipe(gulp.dest(GLOBAL.config.dest));
63+
64+
return stream;
6365
});
6466

6567
gulp.task('styles', function(cb) {

gulpfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ GLOBAL.config = {
2828
src: 'src',
2929
dest: 'dist',
3030
version: projectPackage.version,
31-
license: projectPackage.license,
31+
license: 'Apache',
3232
licenseOptions: {
33-
organization: 'Google Inc. All rights reserved.',
34-
},
33+
organization: 'Google Inc. All rights reserved.',
34+
},
3535
};
3636

3737
var allTasks = ['styles', 'scripts', 'copy', 'html', 'images', 'third_party'];

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "app-shell",
3-
"version": "0.1.106",
3+
"version": "0.1.120",
44
"private": true,
55
"license": "Apache",
66
"engines": {

0 commit comments

Comments
 (0)