Skip to content

Commit

Permalink
Get rid of leading underscore for built files. Closes #1647
Browse files Browse the repository at this point in the history
  • Loading branch information
@tadatuta
tadatuta committed Apr 19, 2016
1 parent 14593ae commit 18f80ea
Show file tree
Hide file tree
Showing 50 changed files with 163 additions and 151 deletions.
92 changes: 52 additions & 40 deletions .enb/make.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,91 +209,103 @@ module.exports = function(config) {

// Base techs
nodeConfig.addTechs([
[techs.bem.bemjsonToBemdecl],
[techs.bem.depsOld],
[techs.bem.files]
[techs.bem.bemjsonToBemdecl, { target : '.tmp.bemdecl.js' }],
[techs.bem.depsOld, {
target : '.tmp.deps.js',
bemdeclFile : '.tmp.bemdecl.js'
}],
[techs.bem.files, {
depsFile : '.tmp.deps.js'
}]
]);

// Client techs
nodeConfig.addTechs([
[techs.stylus, {
target : '.tmp.css',
autoprefixer : {
browsers : getBrowsers(platform)
}
}],
[techs.stylus, { target : '?.ie.css', sourceSuffixes : ['styl', 'ie.styl'] }],
[techs.stylus, { target : '.tmp.ie.css', sourceSuffixes : ['styl', 'ie.styl'] }],
[techs.js, {
target : '?.browser.js',
target : '.tmp.browser.js',
sourceSuffixes : ['vanilla.js', 'browser.js', 'js'],
filesTarget : '?.js.files'
filesTarget : '.tmp.js.files'
}],
[techs.files.merge, {
target : '?.pre.js',
sources : [BEM_TEMPLATE_ENGINE === 'BH'? '?.browser.bh.js' : '?.browser.bemhtml.js', '?.browser.js']
target : '.tmp.pre.js',
sources : [BEM_TEMPLATE_ENGINE === 'BH'? '.tmp.browser.bh.js' : '.tmp.browser.bemhtml.js', '.tmp.browser.js']
}],
[techs.ym, {
source : '?.pre.js',
target : '?.js'
source : '.tmp.pre.js',
target : '.tmp.js'
}]
]);

// js techs
nodeConfig.addTechs([
[techs.bem.depsByTechToBemdecl, {
target : '?.js-js.bemdecl.js',
target : '.tmp.js-js.bemdecl.js',
sourceTech : 'js',
destTech : 'js'
}],
[techs.bem.mergeBemdecl, {
sources : ['?.bemdecl.js', '?.js-js.bemdecl.js'],
target : '?.js.bemdecl.js'
sources : ['.tmp.bemdecl.js', '.tmp.js-js.bemdecl.js'],
target : '.tmp.js.bemdecl.js'
}],
[techs.bem.depsOld, {
target : '?.js.deps.js',
bemdeclFile : '?.js.bemdecl.js'
target : '.tmp.js.deps.js',
bemdeclFile : '.tmp.js.bemdecl.js'
}],
[techs.bem.files, {
depsFile : '?.js.deps.js',
filesTarget : '?.js.files',
dirsTarget : '?.js.dirs'
depsFile : '.tmp.js.deps.js',
filesTarget : '.tmp.js.files',
dirsTarget : '.tmp.js.dirs'
}]
]);

// Client Template Engine
nodeConfig.addTechs([
[techs.bem.depsByTechToBemdecl, {
target : '?.template.bemdecl.js',
target : '.tmp.template.bemdecl.js',
sourceTech : 'js',
destTech : 'bemhtml'
}],
[techs.bem.depsOld, {
target : '?.template.deps.js',
bemdeclFile : '?.template.bemdecl.js'
target : '.tmp.template.deps.js',
bemdeclFile : '.tmp.template.bemdecl.js'
}],
[techs.bem.files, {
depsFile : '?.template.deps.js',
filesTarget : '?.template.files',
dirsTarget : '?.template.dirs'
depsFile : '.tmp.template.deps.js',
filesTarget : '.tmp.template.files',
dirsTarget : '.tmp.template.dirs'
}],
BEM_TEMPLATE_ENGINE === 'BH'? [techs.engines.bhBundle, {
target : '?.browser.bh.js',
filesTarget : '?.template.files',
target : '.tmp.browser.bh.js',
filesTarget : '.tmp.template.files',
mimic : 'BEMHTML',
bhOptions : bhOptions
}] : [techs.engines.bemhtml, {
target : '?.browser.bemhtml.js',
filesTarget : '?.template.files',
target : '.tmp.browser.bemhtml.js',
filesTarget : '.tmp.template.files',
sourceSuffixes : ['bemhtml.js', 'bemhtml']
}]
]);

// Build htmls
nodeConfig.addTechs(BEM_TEMPLATE_ENGINE === 'BH'? [
[techs.engines.bhCommonJS, { bhOptions : bhOptions }],
[techs.html.bh]
[techs.engines.bhCommonJS, {
target : '.tmp.bh.js',
bhOptions : bhOptions
}],
[techs.html.bh, { bhFile : '.tmp.bh.js' }]
] : [
[techs.engines.bemhtml, { sourceSuffixes : ['bemhtml.js', 'bemhtml'] }],
[techs.html.bemhtml]
[techs.engines.bemhtml, {
target : '.tmp.bemhtml.js',
sourceSuffixes : ['bemhtml.js', 'bemhtml']
}],
[techs.html.bemhtml, { bemhtmlFile : '.tmp.bemhtml.js' }]
]);

langs.forEach(function(lang) {
Expand All @@ -304,26 +316,26 @@ module.exports = function(config) {
});

nodeConfig.addTargets([
'_?.css', '_?.ie.css', '_?.js', '?.html'
'?.css', '?.ie.css', '?.js', '?.html'
]);
});

config.mode('development', function() {
config.nodes(nodes, function(nodeConfig) {
nodeConfig.addTechs([
[techs.borschik, { source : '?.css', target : '_?.css', minify : false }],
[techs.borschik, { source : '?.ie.css', target : '_?.ie.css', minify : false }],
[techs.borschik, { source : '?.js', target : '_?.js', minify : false }]
[techs.borschik, { source : '.tmp.css', target : '?.css', minify : false }],
[techs.borschik, { source : '.tmp.ie.css', target : '?.ie.css', minify : false }],
[techs.borschik, { source : '.tmp.js', target : '?.js', minify : false }]
]);
});
});

config.mode('production', function() {
config.nodes(nodes, function(nodeConfig) {
nodeConfig.addTechs([
[techs.borschik, { source : '?.css', target : '_?.css', tech : 'cleancss', minify : true }],
[techs.borschik, { source : '?.ie.css', target : '_?.ie.css', tech : 'cleancss', minify : true }],
[techs.borschik, { source : '?.js', target : '_?.js', minify : true }]
[techs.borschik, { source : '.tmp.css', target : '?.css', tech : 'cleancss', minify : true }],
[techs.borschik, { source : '.tmp.ie.css', target : '?.ie.css', tech : 'cleancss', minify : true }],
[techs.borschik, { source : '.tmp.js', target : '?.js', minify : true }]
]);
});
});
Expand Down Expand Up @@ -492,7 +504,7 @@ function getBrowsers(platform) {
}

function wrapInPage(bemjson, meta) {
var basename = '_' + path.basename(meta.filename, '.bemjson.js');
var basename = path.basename(meta.filename, '.bemjson.js');
return {
block : 'page',
title : naming.stringify(meta.notation),
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/attach/attach.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: attach',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : ['s', 'm', 'l', 'xl'].map(function(size) {
var cls = 'islands-size' + size.toUpperCase();
Expand Down
6 changes: 3 additions & 3 deletions common.blocks/attach/attach.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
elem : 'conditional-comment',
condition : '> IE 8',
msieOnly : false,
content : { elem : 'css', url : '_simple.css' }
content : { elem : 'css', url : 'simple.css' }
},
{
elem : 'conditional-comment',
condition : '<= IE 8',
content : { elem : 'css', url : '_simple.ie.css' }
content : { elem : 'css', url : 'simple.ie.css' }
}
],
scripts : [{ elem : 'js', url : '_simple.js' }],
scripts : [{ elem : 'js', url : 'simple.js' }],
content : [

{ tag : 'h2', content : 'default' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/button/button.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: button',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : [
{ tag : 'h2', content : 'islands' },
Expand Down
6 changes: 3 additions & 3 deletions common.blocks/button/button.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
elem : 'conditional-comment',
condition : '> IE 8',
msieOnly : false,
content : { elem : 'css', url : '_simple.css' }
content : { elem : 'css', url : 'simple.css' }
},
{
elem : 'conditional-comment',
condition : '<= IE 8',
content : { elem : 'css', url : '_simple.ie.css' }
content : { elem : 'css', url : 'simple.ie.css' }
}
],
scripts : [{ elem : 'js', url : '_simple.js' }],
scripts : [{ elem : 'js', url : 'simple.js' }],
content : [

{ tag : 'h2', content : 'default' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/checkbox-group/checkbox-group.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: checkbox-group',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : [
{ tag : 'h2', content : 'islands' },
Expand Down
6 changes: 3 additions & 3 deletions common.blocks/checkbox-group/checkbox-group.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
elem : 'conditional-comment',
condition : '> IE 8',
msieOnly : false,
content : { elem : 'css', url : '_simple.css' }
content : { elem : 'css', url : 'simple.css' }
},
{
elem : 'conditional-comment',
condition : '<= IE 8',
content : { elem : 'css', url : '_simple.ie.css' }
content : { elem : 'css', url : 'simple.ie.css' }
}
],
scripts : [{ elem : 'js', url : '_simple.js' }],
scripts : [{ elem : 'js', url : 'simple.js' }],
content : [

{ tag : 'h2', content : 'default' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/checkbox/checkbox.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: checkbox',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : [
{ tag : 'h2', content : 'islands' },
Expand Down
6 changes: 3 additions & 3 deletions common.blocks/checkbox/checkbox.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
elem : 'conditional-comment',
condition : '> IE 8',
msieOnly : false,
content : { elem : 'css', url : '_simple.css' }
content : { elem : 'css', url : 'simple.css' }
},
{
elem : 'conditional-comment',
condition : '<= IE 8',
content : { elem : 'css', url : '_simple.ie.css' }
content : { elem : 'css', url : 'simple.ie.css' }
}
],
scripts : [{ elem : 'js', url : '_simple.js' }],
scripts : [{ elem : 'js', url : 'simple.js' }],
content : [

{ tag : 'h2', content : 'default' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/control-group/control-group.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: control-group',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : [
{ tag : 'h3', content : 'search form' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/control-group/control-group.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: control-group',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_simple.css' },
{ elem : 'js', url : '_simple.js' }
{ elem : 'css', url : 'simple.css' },
{ elem : 'js', url : 'simple.js' }
],
content : [
{ tag : 'h2', content : 'islands' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/dropdown/dropdown.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: dropdown',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : [
{ tag : 'h2', content : 'islands' },
Expand Down
6 changes: 3 additions & 3 deletions common.blocks/dropdown/dropdown.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
elem : 'conditional-comment',
condition : '> IE 8',
msieOnly : false,
content : { elem : 'css', url : '_simple.css' }
content : { elem : 'css', url : 'simple.css' }
},
{
elem : 'conditional-comment',
condition : '<= IE 8',
content : { elem : 'css', url : '_simple.ie.css' }
content : { elem : 'css', url : 'simple.ie.css' }
}
],
scripts : [{ elem : 'js', url : '_simple.js' }],
scripts : [{ elem : 'js', url : 'simple.js' }],
content : [

{ tag : 'h2', content : 'default' },
Expand Down
2 changes: 1 addition & 1 deletion common.blocks/icon/icon.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title : 'bem-components: icon',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' }
{ elem : 'css', url : 'gemini.css' }
],
content : [
{ tag : 'h2', content : 'icon' },
Expand Down
2 changes: 1 addition & 1 deletion common.blocks/icon/icon.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title : 'bem-components: icon',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_simple.css' }
{ elem : 'css', url : 'simple.css' }
],
content : [
{ tag : 'h2', content : 'icon' },
Expand Down
2 changes: 1 addition & 1 deletion common.blocks/image/image.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title : 'bem-components: image',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' }
{ elem : 'css', url : 'gemini.css' }
],
content : [
{
Expand Down
2 changes: 1 addition & 1 deletion common.blocks/image/image.tests/simple.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title : 'bem-components: image',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_simple.css' }
{ elem : 'css', url : 'simple.css' }
],
content : [
{ tag : 'h2', content : 'image' },
Expand Down
4 changes: 2 additions & 2 deletions common.blocks/input/input.tests/gemini.bemjson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
title : 'bem-components: input',
mods : { theme : 'islands' },
head : [
{ elem : 'css', url : '_gemini.css' },
{ elem : 'js', url : '_gemini.js' }
{ elem : 'css', url : 'gemini.css' },
{ elem : 'js', url : 'gemini.js' }
],
content : [
{ tag : 'h2', content : 'islands' },
Expand Down

0 comments on commit 18f80ea

Please sign in to comment.