Skip to content

Commit

Permalink
Release 1.1.0: incrementing build number, vendor assets preloaded
Browse files Browse the repository at this point in the history
  • Loading branch information
Eoler committed Jul 14, 2017
1 parent 92a939d commit 617e51d
Show file tree
Hide file tree
Showing 10 changed files with 349 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -4,4 +4,4 @@

# 3rd party/vendor
node_modules/
#vendor/
!vendor/
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -17,15 +17,15 @@ php artisan theme:use f5fresh
```

## One-time Development Environment Setup
Install [NodeJS and Node Package Manager](https://nodejs.org/en/) globally (Stable version preferred).
Install [NodeJS and Node Package Manager](https://nodejs.org/en/) globally (LTS version required).
Run the following command-line instructions inside *theme root*:
```
npm install --global gulp bower
npm install && bower install
npm install
```
Alternative NPM-compatible package manager [Yarn](https://yarnpkg.com/en/) could be used:
```
yarn && bower install
yarn
```

## Using and Editing
Expand All @@ -37,9 +37,9 @@ Development changes can be automated with command-line instruction inside *theme
```
gulp watch
```
Build optimized, minified, autoprefixed assets with command-line instruction inside *theme root*:
Build versioned, optimized, minified, autoprefixed assets with command-line instruction inside *theme root*:
```
gulp --production
gulp upbuild --production
```

## Customizing Foundation
Expand Down
2 changes: 1 addition & 1 deletion assets/js/detect.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/js/foundation553.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "oc-f5fresh-theme",
"version": "1.0.2",
"version": "1.1.0",
"description": "Starter development template for building Zurb Foundation 5 themed OctoberCMS sites.",
"authors": [
"Danilo Cuculic <eoler@castus.me>"
Expand Down
10 changes: 4 additions & 6 deletions fields.yaml
@@ -1,17 +1,15 @@
fields:
site_name:
span: left
label: Site name
default: F5fresh
span: left

version:
label: Version (build)
default: 103
span: right

label: Version (build)
default: 110
brand_color:
span: full
label: Site brand color
type: colorpicker
default: '#2AA6CB'
span: full
assetVar: 'primary-color'
13 changes: 12 additions & 1 deletion gulpfile.js
Expand Up @@ -54,7 +54,7 @@ var sourcemaps = require('gulp-sourcemaps'),
sourceRoot: "../scss" } ),
gulp.dest( destdir ),
gulpif(args.production, rename( { suffix: ".min" } ) ),
gulpif(args.production, cleancss( ) ),
gulpif(args.production, cleancss() ),
gulpif(args.production, gulp.dest( destdir ) )
], cb);
});
Expand All @@ -73,6 +73,17 @@ var include = require('gulp-include'), // extend source files with Sprockets syn
], cb);
});

gulp.task('upbuild', ['styles', 'scripts'], function(cb){
var fs = require('fs'),
yaml = require('js-yaml'),
srcfile = args.src || defassets_destdir+"../fields.yaml";
if (fs.existsSync(srcfile)) {
var obyaml = yaml.safeLoad( fs.readFileSync( srcfile, "utf8" ), { json: true } );
obyaml.fields.version.default++;
fs.writeFileSync( srcfile, yaml.dump( obyaml, { indent: 4 } ) );
}
});

gulp.task('watch', function(){
gulp.watch( [defstyles_srcglb], ['styles'] );
gulp.watch( [defscripts_srcglb], ['scripts'] );
Expand Down
9 changes: 5 additions & 4 deletions package.json
@@ -1,26 +1,27 @@
{
"private": true,
"name": "oc-f5fresh-theme",
"version": "1.0.2",
"version": "1.1.0",
"description": "Starter development template for building Zurb Foundation 5 themed OctoberCMS sites.",
"author": "Danilo Cuculić <eoler@castus.me>",
"license": "MIT",
"engines": {
"node": ">=0.12.0 <7.0"
"node": ">0.12 <7.0"
},
"main": "gulpfile.js",
"devDependencies": {
"bower": "^1.8.0",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^4.0.0",
"gulp-clean-css": "^3.4.0",
"gulp-clean-css": "^3.6.0",
"gulp-if": "^2.0.2",
"gulp-include": "^2.3.1",
"gulp-rename": "^1.2.2",
"gulp-sass": "^3.1.0",
"gulp-sourcemaps": "^2.6.0",
"gulp-uglify": "^3.0.0",
"js-yaml": "^3.9.0",
"pump": "^1.0.2",
"yargs": "^8.0.1"
"yargs": "^8.0.2"
}
}
2 changes: 2 additions & 0 deletions version.yaml
Expand Up @@ -12,3 +12,5 @@
- Improved Gulp build
1.0.2:
- Added intro page, enabled Yarn package manager
1.1.0:
- Added Gulp task to increment build number, preloaded Bower vendor assets

0 comments on commit 617e51d

Please sign in to comment.