Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
4e0ad4d
Support for configuring a default pattern in config.json
geoffp Feb 26, 2016
8752652
Add glob to match ?p= pattern URLs on the main UI chrome so BrowserSync
geoffp Feb 26, 2016
276761f
add .editorconfig and .eslintrc from pattern-engines branch
Feb 27, 2016
6ad1f85
deleting the changelog in favor of https://github.com/pattern-lab/pat…
bmuenzenmeyer Feb 27, 2016
4dbe10d
Make the glob include anything with a parameter right after the leading
Feb 27, 2016
4f4b06c
Better .eslintrc with more rules
Feb 27, 2016
fae00ec
Reformatted lineage_hunter.js to pass lint
Feb 27, 2016
31b94bd
add keyword spacing rule and update lineage_hunter to match
Feb 27, 2016
6db75a9
more rule refinements
Feb 27, 2016
8f27e79
more reformatting and tweaks
Feb 27, 2016
d2ff6ea
most of the rest of the builder JS, reformatted
Feb 27, 2016
7863fef
config and task runner cleanup
Feb 27, 2016
2f57f65
more robust parameter to json conversion
Feb 27, 2016
3a4ecc2
Merge branch 'dev' into code-cleanup
bmuenzenmeyer Feb 28, 2016
bf27083
added eslint to devDependencies. removed dead function
bmuenzenmeyer Feb 28, 2016
c7609d7
loosen rules on block scope "violations" and redeclares.
bmuenzenmeyer Feb 28, 2016
0714855
shortened the eslint consecutive variable declaration indent- because…
bmuenzenmeyer Feb 28, 2016
7fab92b
missed reformatting this file
bmuenzenmeyer Feb 28, 2016
39d7df2
Merge branch 'dev' into fix-browsersync-double-badge
bmuenzenmeyer Feb 28, 2016
083238e
Merge branch 'fix-browsersync-double-badge' into dev
bmuenzenmeyer Feb 28, 2016
1d4d59a
Merge branch 'replacing-eval-with-JSON.parse' of https://github.com/e…
bmuenzenmeyer Feb 28, 2016
25d3b7f
Merge pull request #276 from e2tha-e/replacing-eval-with-JSON.parse
Feb 28, 2016
c304a78
turn off block scoped var rule
bmuenzenmeyer Feb 28, 2016
657ca99
turn off redeclare
bmuenzenmeyer Feb 28, 2016
79855cb
Added eslint tasks to build (both) and travis step (grunt only)
bmuenzenmeyer Feb 29, 2016
c638157
add note about our new standardization tools in CONTRIBUTING.md
bmuenzenmeyer Feb 29, 2016
87c5100
Merge branch 'dev' into code-cleanup
bmuenzenmeyer Feb 29, 2016
e4658cd
Merge branch 'e2tha-e-replacing-eval-with-JSON.parse' into code-cleanup
bmuenzenmeyer Feb 29, 2016
2e3236b
fix a bad merge
bmuenzenmeyer Feb 29, 2016
717e139
Merge pull request #275 from pattern-lab/code-cleanup
Feb 29, 2016
b746ff8
oops, debugger statement
geoffp Feb 29, 2016
9105c4b
Merge remote-tracking branch 'refs/remotes/upstream/dev' into default…
geoffp Feb 29, 2016
211b233
moved builder/*.js files and fixed all references
bmuenzenmeyer Mar 2, 2016
b5622af
move source/_patternlab-files/partials to core/templates
bmuenzenmeyer Mar 2, 2016
05a922c
#133
bmuenzenmeyer Mar 4, 2016
db06056
remove a debug statement
bmuenzenmeyer Mar 5, 2016
d167a97
cacheBust support
bmuenzenmeyer Mar 7, 2016
a8f83ce
Merge pull request #280 from pattern-lab/133
Mar 7, 2016
88198f0
fix some eslint warnings
bmuenzenmeyer Mar 7, 2016
848a29f
Merge branch 'default-pattern-config' of https://github.com/geoffp/pa…
bmuenzenmeyer Mar 7, 2016
6f967dc
Merge branch 'geoffp-default-pattern-config' into dev
bmuenzenmeyer Mar 7, 2016
31a5b11
renamed config.json to patternlab-config.json for better consumption
bmuenzenmeyer Mar 7, 2016
029ac93
Merge pull request #282 from pattern-lab/192-namespaceconfig
Mar 7, 2016
32d00c4
Updating `.gitignore` to just say `public`
zautumnz Mar 9, 2016
5ad8344
Updating gitignore for Thumbs.db
zautumnz Mar 9, 2016
03e85a7
Implement pattern state lowest common denominator
bmuenzenmeyer Mar 9, 2016
5090a26
futher clarify pattern states
bmuenzenmeyer Mar 10, 2016
9ceb4ed
fix an errant typo in a unit test
bmuenzenmeyer Mar 10, 2016
baf7b94
Merge pull request #284 from pattern-lab/203-patternstates-inheritance
Mar 10, 2016
7ab342c
Merge pull request #283 from zacanger/patch-1
geoffp Mar 10, 2016
f7e0a79
update package.json with version bump
bmuenzenmeyer Mar 11, 2016
c53440a
add js directory to watch:all grunt task
bmuenzenmeyer Mar 11, 2016
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
Prev Previous commit
Next Next commit
moved builder/*.js files and fixed all references
passing unit tests and building frontend

#133
  • Loading branch information
bmuenzenmeyer committed Mar 2, 2016
commit 211b2334c8443b6923772902ecf0dc2a358e1a1a
52 changes: 26 additions & 26 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,52 +15,52 @@ module.exports = function (grunt) {
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',
},
patternlab: {
src: './builder/patternlab.js',
dest: './builder/patternlab.js'
src: './core/lib/patternlab.js',
dest: './core/lib/patternlab.js'
},
object_factory: {
src: './builder/object_factory.js',
dest: './builder/object_factory.js'
src: './core/lib/object_factory.js',
dest: './core/lib/object_factory.js'
},
lineage: {
src: './builder/lineage_hunter.js',
dest: './builder/lineage_hunter.js'
src: './core/lib/lineage_hunter.js',
dest: './core/lib/lineage_hunter.js'
},
media_hunter: {
src: './builder/media_hunter.js',
dest: './builder/media_hunter.js'
src: './core/lib/media_hunter.js',
dest: './core/lib/media_hunter.js'
},
patternlab_grunt: {
src: './builder/patternlab_grunt.js',
dest: './builder/patternlab_grunt.js'
src: './core/lib/patternlab_grunt.js',
dest: './core/lib/patternlab_grunt.js'
},
patternlab_gulp: {
src: './builder/patternlab_gulp.js',
dest: './builder/patternlab_gulp.js'
src: './core/lib/patternlab_gulp.js',
dest: './core/lib/patternlab_gulp.js'
},
parameter_hunter: {
src: './builder/parameter_hunter.js',
dest: './builder/parameter_hunter.js'
src: './core/lib/parameter_hunter.js',
dest: './core/lib/parameter_hunter.js'
},
pattern_exporter: {
src: './builder/pattern_exporter.js',
dest: './builder/pattern_exporter.js'
src: './core/lib/pattern_exporter.js',
dest: './core/lib/pattern_exporter.js'
},
pattern_assembler: {
src: './builder/pattern_assembler.js',
dest: './builder/pattern_assembler.js'
src: './core/lib/pattern_assembler.js',
dest: './core/lib/pattern_assembler.js'
},
pseudopattern_hunter: {
src: './builder/pseudopattern_hunter.js',
dest: './builder/pseudopattern_hunter.js'
src: './core/lib/pseudopattern_hunter.js',
dest: './core/lib/pseudopattern_hunter.js'
},
list_item_hunter: {
src: './builder/list_item_hunter.js',
dest: './builder/list_item_hunter.js'
src: './core/lib/list_item_hunter.js',
dest: './core/lib/list_item_hunter.js'
},
style_modifier_hunter: {
src: './builder/style_modifier_hunter.js',
dest: './builder/style_modifier_hunter.js'
src: './core/lib/style_modifier_hunter.js',
dest: './core/lib/style_modifier_hunter.js'
}
},
copy: {
Expand Down Expand Up @@ -142,7 +142,7 @@ module.exports = function (grunt) {
options: {
configFile: './.eslintrc'
},
target: ['./builder/*']
target: ['./core/lib/*']
},
bsReload: {
css: path.resolve(paths().public.root + '**/*.css')
Expand All @@ -153,7 +153,7 @@ module.exports = function (grunt) {
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);

//load the patternlab task
grunt.task.loadTasks('./builder/');
grunt.task.loadTasks('./core/lib/');

grunt.registerTask('default', ['patternlab', 'copy:main', 'copy:styleguide']);

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ This repository ships with two `package.json` files, a `Gruntfile.js`, and a `gu
To run patternlab-node using grunt, do the following in the directory you downloaded and extracted the zipped release:

1. Run `npm install` from the command line
2. Optionally, delete `package.gulp.json`, `gulpfile.js`, and `builder/patternlab_gulp.js` files if you are certain you don't need it.
* Not deleting `builder/patternlab_gulp.js` may cause a harmless error when running grunt. Delete it.
2. Optionally, delete `package.gulp.json`, `gulpfile.js`, and `core/lib/patternlab_gulp.js` files if you are certain you don't need it.
* Not deleting `core/lib/patternlab_gulp.js` may cause a harmless error when running grunt. Delete it.
3. Run `grunt` or `grunt serve` from the command line

This creates all patterns, the styleguide, and the pattern lab site. It's strongly recommended to run `grunt serve` to have BrowserSync spin up and serve the files to you.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion builder/patternlab.js → core/lib/patternlab.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var patternlab_engine = function (config) {
patternlab = {};

patternlab.package = fs.readJSONSync('./package.json');
patternlab.config = config || fs.readJSONSync(path.resolve(__dirname, '../config.json'));
patternlab.config = config || fs.readJSONSync(path.resolve(__dirname, '../../config.json'));

var paths = patternlab.config.paths;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
30 changes: 15 additions & 15 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function paths() {
}

//load patternlab-node tasks
gulp.loadTasks(__dirname + '/builder/patternlab_gulp.js');
gulp.loadTasks(__dirname + '/core/lib/patternlab_gulp.js');

//clean patterns dir
gulp.task('clean', function (cb) {
Expand All @@ -38,25 +38,25 @@ gulp.task('clean', function (cb) {
//build the banner
gulp.task('banner', function () {
return gulp.src([
'./builder/patternlab.js',
'./builder/object_factory.js',
'./builder/lineage_hunter.js',
'./builder/media_hunter.js',
'./builder/patternlab_grunt.js',
'./builder/patternlab_gulp.js',
'./builder/parameter_hunter.js',
'./builder/pattern_exporter.js',
'./builder/pattern_assembler.js',
'./builder/pseudopattern_hunter.js',
'./builder/list_item_hunter.js',
'./builder/style_modifier_hunter.js'
'./core/lib/patternlab.js',
'./core/lib/object_factory.js',
'./core/lib/lineage_hunter.js',
'./core/lib/media_hunter.js',
'./core/lib/patternlab_grunt.js',
'./core/lib/patternlab_gulp.js',
'./core/lib/parameter_hunter.js',
'./core/lib/pattern_exporter.js',
'./core/lib/pattern_assembler.js',
'./core/lib/pseudopattern_hunter.js',
'./core/lib/list_item_hunter.js',
'./core/lib/style_modifier_hunter.js'
])
.pipe(strip_banner())
.pipe(header(banner, {
pkg : pkg,
today : new Date().getFullYear() }
))
.pipe(gulp.dest('./builder'));
.pipe(gulp.dest('./core/lib'));
});


Expand Down Expand Up @@ -154,7 +154,7 @@ gulp.task('connect', ['lab'], function () {

//lint
gulp.task('eslint', function () {
return gulp.src(['./builder/*.js', '!node_modules/**'])
return gulp.src(['./core/lib/*.js', '!node_modules/**'])
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
Expand Down
2 changes: 1 addition & 1 deletion package.gulp.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "patternlab-node",
"description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
"version": "1.1.3",
"main": "./builder/patternlab.js",
"main": "./core/lib/patternlab.js",
"dependencies": {
"del": "^2.2.0",
"diveSync": "^0.3.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "patternlab-node",
"description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
"version": "1.1.3",
"main": "./builder/patternlab.js",
"main": "./core/lib/patternlab.js",
"dependencies": {
"diveSync": "^0.3.0",
"fs-extra": "^0.26.2",
Expand Down
2 changes: 1 addition & 1 deletion test/lineage_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function () {
"use strict";

var lh = require('../builder/lineage_hunter');
var lh = require('../core/lib/lineage_hunter');

exports['lineage hunter '] = {
'find_lineage - finds lineage' : function(test){
Expand Down
6 changes: 3 additions & 3 deletions test/list_item_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(function () {
"use strict";

var lih = require('../builder/list_item_hunter');
var pa = require('../builder/pattern_assembler');
var object_factory = require('../builder/object_factory');
var lih = require('../core/lib/list_item_hunter');
var pa = require('../core/lib/pattern_assembler');
var object_factory = require('../core/lib/object_factory');

exports['list_item_hunter'] = {
'process_list_item_partials finds and outputs basic repeating blocks' : function(test){
Expand Down
2 changes: 1 addition & 1 deletion test/media_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function () {
"use strict";

var MediaHunter = require('../builder/media_hunter');
var MediaHunter = require('../core/lib/media_hunter');

exports['media_query hunter basic support '] = {
'test media hunter finds query' : function(test){
Expand Down
2 changes: 1 addition & 1 deletion test/object_factory_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function () {
"use strict";

var of = require('../builder/object_factory');
var of = require('../core/lib/object_factory');

exports['oPattern initialization'] = {
'test oPattern initializes correctly' : function(test){
Expand Down
2 changes: 1 addition & 1 deletion test/parameter_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function () {
"use strict";

var ph = require('../builder/parameter_hunter');
var ph = require('../core/lib/parameter_hunter');

//setup current pattern from what we would have during execution
function currentPatternClosure() {
Expand Down
14 changes: 7 additions & 7 deletions test/pattern_assembler_tests.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(function () {
"use strict";

var pa = require('../builder/pattern_assembler');
var object_factory = require('../builder/object_factory');
var pa = require('../core/lib/pattern_assembler');
var object_factory = require('../core/lib/object_factory');
var path = require('path');

exports['pattern_assembler'] = {
Expand Down Expand Up @@ -193,7 +193,7 @@
//prepare to diveSync
var diveSync = require('diveSync');
var fs = require('fs-extra');
var pa = require('../builder/pattern_assembler');
var pa = require('../core/lib/pattern_assembler');
var pattern_assembler = new pa();
var patterns_dir = './test/files/_patterns';
var patternlab = {};
Expand Down Expand Up @@ -520,7 +520,7 @@
//arrange
var diveSync = require('diveSync');
var fs = require('fs-extra');
var pa = require('../builder/pattern_assembler');
var pa = require('../core/lib/pattern_assembler');
var pattern_assembler = new pa();
var patterns_dir = './test/files/_patterns';
var patternlab = {};
Expand Down Expand Up @@ -571,7 +571,7 @@
},
'setState - applies any patternState matching the pattern' : function(test){
//arrange
var pa = require('../builder/pattern_assembler');
var pa = require('../core/lib/pattern_assembler');
var pattern_assembler = new pa();
var patternlab = {};
patternlab.config = {};
Expand All @@ -591,7 +591,7 @@
},
'setState - does not apply any patternState if nothing matches the pattern' : function(test){
//arrange
var pa = require('../builder/pattern_assembler');
var pa = require('../core/lib/pattern_assembler');
var pattern_assembler = new pa();
var patternlab = {};
patternlab.config = {};
Expand All @@ -613,7 +613,7 @@
//arrange
var diveSync = require('diveSync');
var fs = require('fs-extra');
var pa = require('../builder/pattern_assembler');
var pa = require('../core/lib/pattern_assembler');
var pattern_assembler = new pa();
var patterns_dir = './test/files/_patterns/';
var patternlab = {};
Expand Down
6 changes: 3 additions & 3 deletions test/pseudopattern_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(function () {
"use strict";

var pha = require('../builder/pseudopattern_hunter');
var pa = require('../builder/pattern_assembler');
var object_factory = require('../builder/object_factory');
var pha = require('../core/lib/pseudopattern_hunter');
var pa = require('../core/lib/pattern_assembler');
var object_factory = require('../core/lib/object_factory');

exports['pseudopattern_hunter'] = {
'pseudpattern found and added as a pattern' : function(test){
Expand Down
2 changes: 1 addition & 1 deletion test/style_modifier_hunter_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(function () {
"use strict";

var smh = require('../builder/style_modifier_hunter');
var smh = require('../core/lib/style_modifier_hunter');

exports['consume_style_modifier'] = {
'uses the partial stylemodifer to modify the patterns extendedTemplate' : function(test){
Expand Down