diff --git a/.bem/nodeConfigSetup.js b/.bem/nodeConfigSetup.js index 263b43d..522bfca 100644 --- a/.bem/nodeConfigSetup.js +++ b/.bem/nodeConfigSetup.js @@ -95,11 +95,8 @@ module.exports = function (levels, isProd, naming) { // js [techs.browserJs, { - includeYM: false - }], - [techs.fileMerge, { target: '?.js', - sources: ['?.browser.js', '?.browser.bemhtml.js'] + includeYM: false }], // optimize diff --git a/bundles/demo/demo.bemjson.js b/bundles/demo/demo.bemjson.js new file mode 100644 index 0000000..215d52a --- /dev/null +++ b/bundles/demo/demo.bemjson.js @@ -0,0 +1,5 @@ +module.exports = [ + { + block: 'example', + }, +]; diff --git a/bundles/index/index.bemjson.js b/bundles/index/index.bemjson.js index d9984ea..919dc01 100644 --- a/bundles/index/index.bemjson.js +++ b/bundles/index/index.bemjson.js @@ -1,12 +1,19 @@ module.exports = { block: 'page', - title: 'Title of the page', + title: 'Alerts ยท Bootstrap', favicon: '/favicon.ico', head: [ - { elem: 'meta', attrs: { name: 'viewport', content: 'width=device-width, initial-scale=1' } }, - { elem: 'css', url: 'index.min.css' } + { elem: 'meta', attrs: { name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' } }, + { elem: 'css', url: 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css' }, + { elem: 'css', url: 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css' }, + { elem: 'css', url: '/bundles/demo/demo.min.css' } + ], + scripts: [ + { elem: 'js', url: 'https://code.jquery.com/jquery-3.2.1.slim.min.js' }, + { elem: 'js', url: 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js' }, + { elem: 'js', url: 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js' }, + { elem: 'js', url: '/bundles/demo/demo.min.js' } ], - scripts: [{ elem: 'js', url: 'index.min.js' }], content: [ { tag: 'ul', diff --git a/components/alert/alert.js b/components/alert/alert.js deleted file mode 100644 index 50f8610..0000000 --- a/components/alert/alert.js +++ /dev/null @@ -1 +0,0 @@ -/* borschik:include:../../node_modules/bootstrap/js/dist/alert.js */ diff --git a/components/bootstrap/bootstrap.css b/components/bootstrap/bootstrap.css deleted file mode 100644 index 70a14c3..0000000 --- a/components/bootstrap/bootstrap.css +++ /dev/null @@ -1,3 +0,0 @@ -@import "../../node_modules/bootstrap/dist/css/bootstrap-reboot.css"; -@import "../../node_modules/bootstrap/dist/css/bootstrap-grid.css"; -@import "../../node_modules/bootstrap/dist/css/bootstrap.css"; diff --git a/components/bootstrap/bootstrap.js b/components/bootstrap/bootstrap.js deleted file mode 100644 index ce507d6..0000000 --- a/components/bootstrap/bootstrap.js +++ /dev/null @@ -1 +0,0 @@ -/* borschik:include:../../node_modules/jquery/dist/jquery.js */ diff --git a/components/jquery/jquery.deps.js b/components/jquery/jquery.deps.js deleted file mode 100644 index 63c5fef..0000000 --- a/components/jquery/jquery.deps.js +++ /dev/null @@ -1,7 +0,0 @@ -({ - noDeps : [ - 'jquery', - { block : 'loader', mods : { type : 'js' } }, - { elem : 'config' } - ] -}) diff --git a/components/jquery/jquery.js b/components/jquery/jquery.js deleted file mode 100644 index b9f07a7..0000000 --- a/components/jquery/jquery.js +++ /dev/null @@ -1,4 +0,0 @@ -modules.define('jquery', function (provide) { - /* borschik:include:../../node_modules/jquery/dist/jquery.js */ - provide(jQuery); -}); diff --git a/components/page/page.deps.js b/components/page/page.deps.js deleted file mode 100644 index 5aab0e3..0000000 --- a/components/page/page.deps.js +++ /dev/null @@ -1,7 +0,0 @@ -({ - noDeps : [ - { block : 'i-bem-dom', elems : { elem : 'init', mods : { auto : true } } }, - 'ua', - { elems : ['css', 'js'] } - ] -}) diff --git a/components/util/util.js b/components/util/util.js deleted file mode 100644 index 9086c79..0000000 --- a/components/util/util.js +++ /dev/null @@ -1 +0,0 @@ -/* borschik:include:../../node_modules/bootstrap/js/dist/util.js */ diff --git a/package.json b/package.json index c8d076d..7092c28 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "bem": "github:ilyar/bem-tools", "bem-config": "^3.2.3", "bem-core": "^4.2.1", - "bootstrap": "^4.0.0-beta", "enb": "^1.5.1", "enb-bem-techs": "^2.2.2", "enb-bemxjst": "^8.6.7", @@ -52,8 +51,6 @@ "enb-html-to-bemjson": "^0.3.0", "enb-js": "^1.1.1", "enb-postcss": "^2.0.0", - "jquery": "^3", - "popper.js": "^1", "postcss-cssnext": "^3.0.2", "ym": "^0.1.2" }