diff --git a/README.md b/README.md index 6efe99a..252ffdc 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ enb-bem-i18n npm install --save-dev enb-bem-i18n ``` -**Требования:** пакет `enb` версии `0.11.0` или выше. +**Требования:** пакет `enb` версии `0.15.0` или выше. ## Обзор документа diff --git a/lib/keysets.js b/lib/keysets.js index 3a6a969..508df69 100644 --- a/lib/keysets.js +++ b/lib/keysets.js @@ -1,5 +1,5 @@ var path = require('path'), - asyncRequire = require('enb/lib/fs/async-require'), + asyncRequire = require('enb-async-require'), clearRequire = require('clear-require'); /** diff --git a/package.json b/package.json index 831db90..7396fa8 100644 --- a/package.json +++ b/package.json @@ -30,23 +30,24 @@ "node": ">= 0.10.0" }, "peerDependencies": { - "enb": ">= 0.11.0 < 1.0.0" + "enb": ">= 0.15.0 < 2.0.0" }, "dependencies": { "clear-require": "1.0.1", "dom-js": "0.0.9", + "enb-async-require": "1.0.1", "serialize-javascript": "1.1.2", "vow": "0.4.10" }, "devDependencies": { "bower": "1.5.2", "chai": "3.2.0", - "enb": ">= 0.11.0 < 1.0.0", + "enb": ">= 0.15.0 < 2.0.0", "istanbul": "0.3.20", "jscs": "1.13.1", "jshint": "2.8.0", "mocha": "2.3.2", - "mock-enb": "0.2.0", + "mock-enb": "0.3.0", "mock-fs": "3.2.0", "must": "0.12.0" }, diff --git a/techs/i18n.js b/techs/i18n.js index 2627e70..0d2a007 100644 --- a/techs/i18n.js +++ b/techs/i18n.js @@ -1,4 +1,6 @@ var EOL = require('os').EOL, + enb = require('enb'), + buildFlow = enb.buildFlow || require('enb/lib/build-flow'), keysets = require('../lib/keysets'), compile = require('../lib/compile'); @@ -47,7 +49,7 @@ var EOL = require('os').EOL, * }); * }; */ -module.exports = require('enb/lib/build-flow').create() +module.exports = buildFlow.create() .name('i18n') .target('target', '?.lang.{lang}.js') .defineRequiredOption('lang') diff --git a/techs/keysets-xml.js b/techs/keysets-xml.js index a73357b..822b840 100644 --- a/techs/keysets-xml.js +++ b/techs/keysets-xml.js @@ -1,4 +1,6 @@ var EOL = require('os').EOL, + enb = require('enb'), + buildFlow = enb.buildFlow || require('enb/lib/build-flow'), keysets = require('../lib/keysets'), domjs = require('dom-js'); @@ -45,7 +47,7 @@ var EOL = require('os').EOL, * }); * }; */ -module.exports = require('enb/lib/build-flow').create() +module.exports = buildFlow.create() .name('keysets-xml') .target('target', '?.keysets.{lang}.xml') .defineRequiredOption('lang') diff --git a/techs/keysets.js b/techs/keysets.js index 17ecc54..afe8193 100644 --- a/techs/keysets.js +++ b/techs/keysets.js @@ -1,4 +1,6 @@ var vow = require('vow'), + enb = require('enb'), + buildFlow = enb.buildFlow || require('enb/lib/build-flow'), serialize = require('serialize-javascript'), keysets = require('../lib/keysets'); @@ -37,7 +39,7 @@ var vow = require('vow'), * }); * }; */ -module.exports = require('enb/lib/build-flow.js').create() +module.exports = buildFlow.create() .name('keysets') .target('target', '?.keysets.{lang}.js') .defineRequiredOption('lang') diff --git a/test/techs/keysets.test.js b/test/techs/keysets.test.js index 91f6592..3d6bf1b 100644 --- a/test/techs/keysets.test.js +++ b/test/techs/keysets.test.js @@ -5,6 +5,7 @@ var fs = require('fs'), serializeJS = require('serialize-javascript'), MockNode = require('mock-enb/lib/mock-node'), FileList = require('enb/lib/file-list'), + loadDirSync = require('mock-enb/utils/dir-utils').loadDirSync, clearRequire = require('clear-require'), Tech = require('../../techs/keysets'); @@ -578,7 +579,7 @@ describe('keysets', function () { fileList = new FileList(), dirList = new FileList(); - fileList.loadFromDirSync(dirname); + fileList.addFiles(loadDirSync(dirname)); bundle.provideTechData('?.files', fileList); bundle.provideTechData('?.dirs', dirList); @@ -624,7 +625,7 @@ describe('keysets', function () { fileList = new FileList(), dirList = new FileList(); - fileList.loadFromDirSync(dirname); + fileList.addFiles(loadDirSync(dirname)); bundle.provideTechData('?.files', fileList); bundle.provideTechData('?.dirs', dirList);