Skip to content

Commit 985c466

Browse files
author
Brian Muenzenmeyer
committed
Merge pull request #334 from pattern-lab/package-update
updating dependencies
2 parents 6695c2c + a6d419f commit 985c466

16 files changed

+36
-283
lines changed

‎Gruntfile.js

Lines changed: 9 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,41 @@
11
module.exports = function (grunt) {
22

3-
var path = require('path');
4-
5-
function paths() {
6-
return require('./patternlab-config.json').paths;
7-
}
8-
9-
// Project configuration.
3+
/******************************
4+
* Project configuration.
5+
* Should only be needed if you are developing against core, running tests, linting and want to run tests or increment package numbers
6+
*****************************/
107
grunt.initConfig({
118
pkg: grunt.file.readJSON('package.json'),
129
concat: {
1310
options: {
1411
stripBanners: true,
15-
banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n',
12+
banner: '/* \n * <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy") %> \n * \n * <%= pkg.author.name %>, <%= pkg.contributors[0].name %>, and the web community.\n * Licensed under the <%= pkg.license %> license. \n * \n * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. \n *\n */\n\n',
1613
},
1714
patternlab: {
1815
src: './core/lib/patternlab.js',
1916
dest: './core/lib/patternlab.js'
20-
},
21-
object_factory: {
22-
src: './core/lib/object_factory.js',
23-
dest: './core/lib/object_factory.js'
24-
},
25-
lineage: {
26-
src: './core/lib/lineage_hunter.js',
27-
dest: './core/lib/lineage_hunter.js'
28-
},
29-
media_hunter: {
30-
src: './core/lib/media_hunter.js',
31-
dest: './core/lib/media_hunter.js'
32-
},
33-
patternlab_grunt: {
34-
src: './core/lib/patternlab_grunt.js',
35-
dest: './core/lib/patternlab_grunt.js'
36-
},
37-
patternlab_gulp: {
38-
src: './core/lib/patternlab_gulp.js',
39-
dest: './core/lib/patternlab_gulp.js'
40-
},
41-
parameter_hunter: {
42-
src: './core/lib/parameter_hunter.js',
43-
dest: './core/lib/parameter_hunter.js'
44-
},
45-
pattern_exporter: {
46-
src: './core/lib/pattern_exporter.js',
47-
dest: './core/lib/pattern_exporter.js'
48-
},
49-
pattern_assembler: {
50-
src: './core/lib/pattern_assembler.js',
51-
dest: './core/lib/pattern_assembler.js'
52-
},
53-
pseudopattern_hunter: {
54-
src: './core/lib/pseudopattern_hunter.js',
55-
dest: './core/lib/pseudopattern_hunter.js'
56-
},
57-
list_item_hunter: {
58-
src: './core/lib/list_item_hunter.js',
59-
dest: './core/lib/list_item_hunter.js'
60-
},
61-
style_modifier_hunter: {
62-
src: './core/lib/style_modifier_hunter.js',
63-
dest: './core/lib/style_modifier_hunter.js'
64-
}
65-
},
66-
copy: {
67-
main: {
68-
files: [
69-
{ expand: true, cwd: path.resolve(paths().source.js), src: '*.js', dest: path.resolve(paths().public.js) },
70-
{ expand: true, cwd: path.resolve(paths().source.css), src: '*.css', dest: path.resolve(paths().public.css) },
71-
{ expand: true, cwd: path.resolve(paths().source.images), src: ['**/*.png', '**/*.jpg', '**/*.gif', '**/*.jpeg'], dest: path.resolve(paths().public.images) },
72-
{ expand: true, cwd: path.resolve(paths().source.fonts), src: '*', dest: path.resolve(paths().public.fonts) },
73-
{ expand: true, cwd: path.resolve(paths().source.data), src: 'annotations.js', dest: path.resolve(paths().public.data) }
74-
]
75-
},
76-
styleguide: {
77-
files: [
78-
{ expand: true, cwd: path.resolve(paths().source.styleguide), src: ['*.*', '**/*.*'], dest: path.resolve(paths().public.styleguide) }
79-
]
80-
}
81-
},
82-
watch: {
83-
all: {
84-
files: [
85-
path.resolve(paths().source.css + '**/*.css'),
86-
path.resolve(paths().source.styleguide + 'css/*.css'),
87-
path.resolve(paths().source.patterns + '**/*'),
88-
path.resolve(paths().source.fonts + '/*'),
89-
path.resolve(paths().source.images + '/*'),
90-
path.resolve(paths().source.data + '*.json'),
91-
path.resolve(paths().source.js + '/*.js')
92-
],
93-
tasks: ['default', 'bsReload:css']
9417
}
9518
},
9619
nodeunit: {
9720
all: ['test/*_tests.js']
9821
},
99-
browserSync: {
100-
dev: {
101-
options: {
102-
server: path.resolve(paths().public.root),
103-
watchTask: true,
104-
watchOptions: {
105-
ignoreInitial: true,
106-
ignored: '*.html'
107-
},
108-
snippetOptions: {
109-
// Ignore all HTML files within the templates folder
110-
blacklist: ['/index.html', '/', '/?*']
111-
},
112-
plugins: [
113-
{
114-
module: 'bs-html-injector',
115-
options: {
116-
files: [path.resolve(paths().public.root + '/index.html'), path.resolve(paths().public.styleguide + '/styleguide.html')]
117-
}
118-
}
119-
],
120-
notify: {
121-
styles: [
122-
'display: none',
123-
'padding: 15px',
124-
'font-family: sans-serif',
125-
'position: fixed',
126-
'font-size: 1em',
127-
'z-index: 9999',
128-
'bottom: 0px',
129-
'right: 0px',
130-
'border-top-left-radius: 5px',
131-
'background-color: #1B2032',
132-
'opacity: 0.4',
133-
'margin: 0',
134-
'color: white',
135-
'text-align: center'
136-
]
137-
}
138-
}
139-
}
140-
},
14122
eslint: {
14223
options: {
14324
configFile: './.eslintrc'
14425
},
14526
target: ['./core/lib/*']
146-
},
147-
bsReload: {
148-
css: path.resolve(paths().public.root + '**/*.css')
14927
}
15028
});
15129

15230
// load all grunt tasks
153-
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
154-
155-
//load the patternlab task
156-
require('./core/lib/patternlab_grunt')(grunt);
157-
158-
grunt.registerTask('default', ['patternlab', 'copy:main', 'copy:styleguide']);
31+
grunt.loadNpmTasks('grunt-contrib-concat');
32+
grunt.loadNpmTasks('grunt-eslint');
33+
grunt.loadNpmTasks('grunt-contrib-nodeunit');
15934

16035
//travis CI task
16136
grunt.registerTask('travis', ['nodeunit', 'eslint']);
16237

163-
grunt.registerTask('serve', ['patternlab', 'copy:main', 'copy:styleguide', 'browserSync', 'watch:all']);
164-
38+
//to be run prior to releasing a version
16539
grunt.registerTask('build', ['nodeunit', 'eslint', 'concat']);
16640

16741
};

‎core/lib/lineage_hunter.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
111
"use strict";
122

133
var lineage_hunter = function () {

‎core/lib/list_item_hunter.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
111
"use strict";
122

133
var list_item_hunter = function () {

‎core/lib/media_hunter.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
111
"use strict";
122

133
var diveSync = require('diveSync'),

‎core/lib/object_factory.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
111
"use strict";
122

133
var patternEngines = require('./pattern_engines/pattern_engines');

‎core/lib/parameter_hunter.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
111
"use strict";
122

133
var parameter_hunter = function () {

‎core/lib/pattern_assembler.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
11-
121
"use strict";
132

143
var pattern_assembler = function () {

‎core/lib/pattern_exporter.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
10-
111
"use strict";
122

133
var fs = require('fs-extra');

‎core/lib/patternlab.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
1+
/*
2+
* patternlab-node - v2.0.0 - 2016
3+
*
4+
* Brian Muenzenmeyer, Geoff Pursell, and the web community.
5+
* Licensed under the MIT license.
6+
*
7+
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
88
*
99
*/
1010

11+
"use strict";
12+
1113
var diveSync = require('diveSync'),
1214
path = require('path');
1315

‎core/lib/patternlab_grunt.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
/*
2-
* patternlab-node - v1.3.0 - 2016
3-
*
4-
* Brian Muenzenmeyer, and the web community.
5-
* Licensed under the MIT license.
6-
*
7-
* Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
8-
*
9-
*/
1+
"use strict";
102

113
var patternlab_engine = require('./patternlab.js');
124

0 commit comments

Comments
 (0)