Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows compatible #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Windows compatible #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6acfdd
rm build
pahaz Jan 9, 2015
45cdcbf
change description and name
pahaz Jan 9, 2015
0b2edfe
up form stub
pahaz Jan 10, 2015
a28eb4c
up blocks and pages form stub
pahaz Jan 10, 2015
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
76 changes: 0 additions & 76 deletions .enb/lib/i18n.js
View file
Open in desktop

This file was deleted.

121 changes: 28 additions & 93 deletions .enb/make.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,101 +1,36 @@
var fs = require('fs');
var path = require('path');

module.exports = function (config) {
config.setLanguages(['ru', 'en']);

config.nodes('build/*');
config.setLanguages(['ru']);

config.nodeMask(/^build\/.*$/, function (nodeConfig) {
nodeConfig.addTechs([
[require('enb/techs/file-provider'), {target: '?.bemdecl.js'}],
[require('enb/techs/levels'), {levels: getLevels()}],
require('enb-modules/techs/deps-with-modules'),
require('enb/techs/files'),
require('enb-stylus/techs/css-stylus-with-autoprefixer'),
[require('enb/techs/browser-js'), {target: '?.pre.js'}],
require('enb-bt/techs/bt-server'),
[require('enb-bt/techs/bt-client-module'), {target: '?.client.bt.js'}],
[require('enb/techs/pub-js-i18n') , {
target: '?.pre.{lang}.js',
jsTarget: '?.pre.js',
bemhtmlTarget: '?.client.bt.js',
lang: '{lang}'
}],
[require('enb-modules/techs/prepend-modules'), {source : '?.pre.{lang}.js', target: '?.{lang}.js'}],
[require('enb/techs/i18n-merge-keysets'), {lang: 'all'}],
[require('enb/techs/i18n-merge-keysets'), {lang: '{lang}'}],
[require('./techs/i18n-lang-js'), {lang: 'all' }],
[require('./techs/i18n-lang-js'), {lang: '{lang}'}],
[require('./techs/page')]
]);
nodeConfig.addTargets(['_?.{lang}.js', '_?.css']);
config.includeConfig('enb-bevis-helper');

nodeConfig.mode('development', function(nodeConfig) {
nodeConfig.addTechs([
[require('enb/techs/file-copy'), {sourceTarget: '?.{lang}.js', destTarget: '_?.{lang}.js'}],
[require('enb/techs/file-copy'), {sourceTarget: '?.css', destTarget: '_?.css'}]
]);
});
nodeConfig.mode('production', function(nodeConfig) {
nodeConfig.addTechs([
[require('enb/techs/borschik'), {sourceTarget: '?.{lang}.js', destTarget: '_?.{lang}.js'}],
[require('enb/techs/borschik'), {sourceTarget: '?.css', destTarget: '_?.css', freeze: 'yes'}]
]);
});
});
var bevisHelper = config.module('enb-bevis-helper')
.browserSupport([
'IE >= 9',
'Safari >= 5',
'Chrome >= 33',
'Opera >= 12.16',
'Firefox >= 28'
])
.useAutopolyfiller();

config.node('test', function (nodeConfig) {
nodeConfig.addTechs([
[require('enb/techs/files')],
[require('enb/techs/levels'), {levels: getLevels()}],
[require('enb/techs/bemdecl-test'), {target: 'test.bemdecl.js'}],
[require('enb/techs/js-test'), {fileMask: getTestFileMask()}],
require('enb-modules/techs/deps-with-modules'),
[require('enb/techs/i18n-merge-keysets'), {lang: 'all'}],
[require('enb/techs/i18n-merge-keysets'), {lang: 'ru'}],
[require('./techs/i18n-lang-js'), {lang: 'all' }],
[require('./techs/i18n-lang-js'), {lang: 'ru'}],
[require('enb/techs/js'), {target: '?.source.js'}],
[require('enb-bt/techs/bt-client-module'), {target: '?.bt.client.js'}],
[require('enb/techs/pub-js-i18n'), {
target: '?.pre.js',
jsTarget: '?.source.js',
bemhtmlTarget: '?.bt.client.js',
lang: 'ru'
}],
[require('enb-modules/techs/prepend-modules'), {source: '?.pre.js', target: '?.js'}],
[require('enb/techs/file-provider'), {target: 'test.html'}],
[require('enb/techs/file-provider'), {target: 'mocha.js'}],
[require('enb/techs/file-provider'), {target: 'mocha.css'}],
[require('enb/techs/file-provider'), {target: 'chai.js'}],
[require('enb/techs/file-provider'), {target: 'sinon.js'}]
]);
fs.readdirSync('pages').forEach(function(pageName) {
var nodeName = pageName.replace(/(.*?)\-page/, path.join('build', '$1'));

nodeConfig.addTargets([
'?.js',
'?.test.js'
]);
});
config.node(nodeName, function (nodeConfig) {

function getLevels() {
return [
'core',
'blocks',
'pages'
].map(config.resolvePath.bind(config));
}
bevisHelper
.sourceDeps(pageName)
.forServerPage()
.configureNode(nodeConfig);

nodeConfig.addTech(require('./techs/page'));
nodeConfig.addTarget('?.page.js');
});

});

function getTestFileMask() {
var tests = process.env.TEST_CASES;
if (tests) {
var filesForMask = tests.split(' ')
.map(function (test) {
return test
.replace(/\//g, '\\/')
.replace(/\./g, '\\.') +
'$';
})
.join('|');
var fileMask = new RegExp(filesForMask);
}
return fileMask || /^((?!vendors).)*$/;
}
};
};
105 changes: 0 additions & 105 deletions .enb/techs/i18n-lang-js.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .enb/techs/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = require('enb/lib/build-flow').create()
.useFileList(['page.js'])
.needRebuild(function (cache) {
this._pagesFile = this._pagesFile || '.enb/lib/pages.js';
this._pagesFile = this.node._root + '/' + this._pagesFile;
this._pagesFile = path.join(this.node._root, this._pagesFile);
return cache.needRebuildFile('page-file', this._pagesFile);
})
.saveCache(function (cache) {
Expand Down
17 changes: 7 additions & 10 deletions blocks/layout/layout.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
.layout {
&__aside {
position: absolute;
left: 0px;
top: 0px;
}

&__content {
margin-left: 300px;
}
.layout__aside {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you speak russian?

Почему вы хотите писать именно так? Нам нравится использовать возможности Stylus.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

К сожалению, я не нашел списка используемых в ваших проектах соглашений и рекомендаций.
Для начинающих разработчиков явный синтаксис будет более понятен. (+ https://github.com/bevis-ui/bevis-stub/blob/master/blocks/layout/layout.styl#L1-L9 использует подобный синтаксис)
Я посчитал, что project-stub имеет больший приоритет в данном случае.

Должен быть какой-то канонический пример или список рекомендаций (в данном случае я использовал project-stub).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Согласен с вами. Я сам виноват, что ввожу в заблуждение разношёрстным кодом :)

position: absolute;
left: 0px;
top: 0px;
}

.layout__content {
margin-left: 300px;
}
9 changes: 5 additions & 4 deletions blocks/page/page.bt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ module.exports = function (bt) {
};
});
}

return [
ctx.getParam('doctype') || '<!DOCTYPE html>',
{raw: ctx.getParam('doctype') || '<!DOCTYPE html>'},
{
elem: 'html',
content: [
Expand Down Expand Up @@ -137,11 +138,11 @@ module.exports = function (bt) {
var ie = ctx.getParam('ie');
if (ie !== undefined) {
if (ie === true) {
return ['<!--[if IE]>', ctx.getJson(), '<![endif]-->'];
return [{raw: '<!--[if IE]>'}, ctx.getJson(), {raw: '<![endif]-->'}];
} else if (ie === false) {
return ['<!--[if !IE]> -->', ctx.getJson(), '<!-- <![endif]-->'];
return [{raw: '<!--[if !IE]> -->'}, ctx.getJson(), {raw: '<!-- <![endif]-->'}];
} else {
return ['<!--[if ' + ie + ']>', ctx.getJson(), '<![endif]-->'];
return [{raw: '<!--[if ' + ie + ']>'}, ctx.getJson(), {raw: '<![endif]-->'}];
}
}
});
Expand Down
Loading