diff --git a/client/src/components-renderer.js b/client/src/components-renderer.js index 959838d4b..3748892a0 100644 --- a/client/src/components-renderer.js +++ b/client/src/components-renderer.js @@ -10,10 +10,10 @@ const _ = require('./utils/helpers'); module.exports = function(config, renderTemplate){ - let cache = new Cache(config.cache), - getComponentsData = new GetComponentsData(config), - renderComponents = new RenderComponents(cache, renderTemplate), - processClientReponses = new ProcessClientResponse(cache, config); + const cache = new Cache(config.cache), + getComponentsData = new GetComponentsData(config), + renderComponents = new RenderComponents(cache, renderTemplate), + processClientReponses = new ProcessClientResponse(cache, config); return function(components, options, callback){ @@ -35,9 +35,9 @@ module.exports = function(config, renderTemplate){ getComponentsData(toDo, options, function(){ renderComponents(toDo, options, function(){ processClientReponses(toDo, options, function(){ - let errors = [], - results = [], - hasErrors = false; + const errors = [], + results = []; + let hasErrors = false; _.each(toDo, function(action){ if(action.result.error) { diff --git a/client/src/get-components-data.js b/client/src/get-components-data.js index 21df4d157..2a32b2a20 100644 --- a/client/src/get-components-data.js +++ b/client/src/get-components-data.js @@ -87,9 +87,9 @@ module.exports = function(config){ }; return function(toDo, options, cb){ - let serverRenderingFail = settings.serverSideRenderingFail, - serverRendering = { components: [], positions: [] }, - serverRenderingEndpoint = hrefBuilder.server(options); + const serverRenderingFail = settings.serverSideRenderingFail, + serverRendering = { components: [], positions: [] }, + serverRenderingEndpoint = hrefBuilder.server(options); _.each(toDo, function(action){ if(action.render === 'server'){ diff --git a/client/src/href-builder.js b/client/src/href-builder.js index 496537f9e..7b1bee8bf 100644 --- a/client/src/href-builder.js +++ b/client/src/href-builder.js @@ -22,8 +22,8 @@ module.exports = function(config){ throw settings.missingComponentName; } - let lang = options.headers['accept-language'], - forwardLang = config.forwardAcceptLanguageToClient === true; + const lang = options.headers['accept-language']; + let forwardLang = config.forwardAcceptLanguageToClient === true; if(!forwardLang && options.forwardAcceptLanguageToClient === true){ forwardLang = true; @@ -34,10 +34,10 @@ module.exports = function(config){ component.parameters['__ocAcceptLanguage'] = lang; } - let versionSegment = component.version ? ('/' + component.version) : '', - registryUrl = clientRenderingEndpoint, - registrySegment = registryUrl.slice(-1) === '/' ? registryUrl : (registryUrl + '/'), - qs = component.parameters ? ('/?' + querystring.stringify(component.parameters)) : ''; + const versionSegment = component.version ? ('/' + component.version) : '', + registryUrl = clientRenderingEndpoint, + registrySegment = registryUrl.slice(-1) === '/' ? registryUrl : (registryUrl + '/'), + qs = component.parameters ? ('/?' + querystring.stringify(component.parameters)) : ''; return url.resolve(registrySegment, component.name) + versionSegment + qs; }, diff --git a/client/src/index.js b/client/src/index.js index 801782b5c..6c5804855 100644 --- a/client/src/index.js +++ b/client/src/index.js @@ -11,11 +11,11 @@ const _ = require('./utils/helpers'); module.exports = function(conf){ - let config = sanitiser.sanitiseConfiguration(conf), - validationResult = validator.validateConfiguration(config), - renderTemplate = new TemplateRenderer(), - renderComponents = new ComponentsRenderer(config, renderTemplate), - getComponentsInfo = new GetComponentsInfo(config); + const config = sanitiser.sanitiseConfiguration(conf), + validationResult = validator.validateConfiguration(config), + renderTemplate = new TemplateRenderer(), + renderComponents = new ComponentsRenderer(config, renderTemplate), + getComponentsInfo = new GetComponentsInfo(config); if(!validationResult.isValid){ throw new Error(validationResult.error); diff --git a/client/src/process-client-responses.js b/client/src/process-client-responses.js index 63def42aa..a24a70f73 100644 --- a/client/src/process-client-responses.js +++ b/client/src/process-client-responses.js @@ -11,8 +11,8 @@ const _ = require('./utils/helpers'); module.exports = function(cache, config){ - let getOCClientScript = new GetOCClientScript(cache), - buildHref = new HrefBuilder(config); + const getOCClientScript = new GetOCClientScript(cache), + buildHref = new HrefBuilder(config); return function(toDo, options, cb){ const toProcess = []; diff --git a/client/src/render-components.js b/client/src/render-components.js index e436a89d0..c92c423cf 100644 --- a/client/src/render-components.js +++ b/client/src/render-components.js @@ -12,9 +12,9 @@ module.exports = function(cache, renderTemplate){ const fetchTemplateAndRender = function(component, options, cb){ - let data = component.data, - isLocal = component.type === 'oc-component-local', - useCache = !isLocal; + const data = component.data, + isLocal = component.type === 'oc-component-local', + useCache = !isLocal; getCompiledTemplate(component.template, useCache, options.timeout, function(err, template){ if(err){ return cb(err); } diff --git a/client/src/utils/helpers.js b/client/src/utils/helpers.js index 9fd049ef6..07d10579d 100644 --- a/client/src/utils/helpers.js +++ b/client/src/utils/helpers.js @@ -1,6 +1,6 @@ 'use strict'; -var _ = { +const _ = { each: function(obj, fn){ if(_.isArray(obj)){ for(let i = 0; i < obj.length; i++){ diff --git a/client/src/warmup.js b/client/src/warmup.js index 18489abeb..0d052d3c5 100644 --- a/client/src/warmup.js +++ b/client/src/warmup.js @@ -25,8 +25,8 @@ module.exports = function(config, renderComponents){ options.timeout = options.timeout || 5; options.headers = options.headers || {}; - let urls = [], - toWarmup = []; + const urls = [], + toWarmup = []; _.each(config.components, function(version, name){ const versionSegment = version ? (version + '/') : ''; @@ -48,12 +48,12 @@ module.exports = function(config, renderComponents){ return next(new Error(format(settings.warmupFailed, JSON.stringify(requestDetails), err))); } - let parameters = componentInfo.oc.parameters, - componentToWarmup = { - name: componentInfo.name, - version: componentInfo.version, - parameters: {} - }; + const parameters = componentInfo.oc.parameters, + componentToWarmup = { + name: componentInfo.name, + version: componentInfo.version, + parameters: {} + }; if(parameters){ _.each(parameters, function(value, parameter){ diff --git a/src/cli/domain/get-components-by-dir.js b/src/cli/domain/get-components-by-dir.js index e2d53cea1..de6d2ea97 100644 --- a/src/cli/domain/get-components-by-dir.js +++ b/src/cli/domain/get-components-by-dir.js @@ -10,9 +10,9 @@ module.exports = function(){ const isOcComponent = function(file){ - let filePath = path.resolve(componentsDir, file), - packagePath = path.join(filePath, 'package.json'), - content; + const filePath = path.resolve(componentsDir, file), + packagePath = path.join(filePath, 'package.json'); + let content; try { content = fs.readJsonSync(packagePath); diff --git a/src/cli/domain/get-local-npm-modules.js b/src/cli/domain/get-local-npm-modules.js index a3b9300a1..116124f07 100644 --- a/src/cli/domain/get-local-npm-modules.js +++ b/src/cli/domain/get-local-npm-modules.js @@ -14,9 +14,9 @@ module.exports = function(){ return fs.readdirSync(nodeFolder).filter(function(file){ - let filePath = path.resolve(nodeFolder, file), - isBin = file === '.bin', - isDir = fs.lstatSync(filePath).isDirectory(); + const filePath = path.resolve(nodeFolder, file), + isBin = file === '.bin', + isDir = fs.lstatSync(filePath).isDirectory(); return isDir && !isBin; }); diff --git a/src/cli/domain/get-missing-deps.js b/src/cli/domain/get-missing-deps.js index 6ebd6fe93..15be9185a 100644 --- a/src/cli/domain/get-missing-deps.js +++ b/src/cli/domain/get-missing-deps.js @@ -9,8 +9,8 @@ module.exports = function(dependencies){ _.forEach(dependencies, function(npmModule){ - let index = npmModule.indexOf('@'), - moduleName = npmModule; + const index = npmModule.indexOf('@'); + let moduleName = npmModule; if (index > 0) { moduleName = npmModule.substr(0, index); diff --git a/src/cli/domain/get-mocked-plugins.js b/src/cli/domain/get-mocked-plugins.js index 66ace1182..0204a15e0 100644 --- a/src/cli/domain/get-mocked-plugins.js +++ b/src/cli/domain/get-mocked-plugins.js @@ -54,17 +54,17 @@ const registerDynamicMocks = function(ocJsonLocation, mocks, logger){ }).filter(function(p){ return p; }); }; -var findPath = function(pathToResolve, fileName) { +const findPath = function(pathToResolve, fileName) { - let rootDir = fs.realpathSync('.'), - fileToResolve = path.join(pathToResolve, fileName); + const rootDir = fs.realpathSync('.'), + fileToResolve = path.join(pathToResolve, fileName); if (!fs.existsSync(fileToResolve)) { if (pathToResolve === rootDir) { return undefined; } else { - let getParent = function(x){ return x.split('/').slice(0, -1).join('/'); }, - parentDir = pathToResolve ? getParent(pathToResolve) : rootDir; + const getParent = function(x){ return x.split('/').slice(0, -1).join('/'); }, + parentDir = pathToResolve ? getParent(pathToResolve) : rootDir; return findPath(parentDir, fileName); } @@ -76,16 +76,16 @@ var findPath = function(pathToResolve, fileName) { module.exports = function(logger, componentsDir){ componentsDir = path.resolve(componentsDir || '.'); - let plugins = [], - ocJsonFileName = settings.configFile.src.replace('./', ''), - ocJsonPath = findPath(componentsDir, ocJsonFileName); + let plugins = []; + const ocJsonFileName = settings.configFile.src.replace('./', ''), + ocJsonPath = findPath(componentsDir, ocJsonFileName); if(!ocJsonPath){ return plugins; } - let content = fs.readJsonSync(ocJsonPath), - ocJsonLocation = ocJsonPath.slice(0, -ocJsonFileName.length); + const content = fs.readJsonSync(ocJsonPath), + ocJsonLocation = ocJsonPath.slice(0, -ocJsonFileName.length); if(!content.mocks || !content.mocks.plugins){ return plugins; diff --git a/src/cli/domain/local.js b/src/cli/domain/local.js index fa8f87dbe..386c77346 100644 --- a/src/cli/domain/local.js +++ b/src/cli/domain/local.js @@ -44,15 +44,15 @@ module.exports = function(){ try { - let pathDir = '../../components/base-component-' + templateType, - baseComponentDir = path.resolve(__dirname, pathDir), - npmIgnorePath = path.resolve(__dirname, pathDir + '/.npmignore'); + const pathDir = '../../components/base-component-' + templateType, + baseComponentDir = path.resolve(__dirname, pathDir), + npmIgnorePath = path.resolve(__dirname, pathDir + '/.npmignore'); fs.ensureDirSync(componentName); fs.copySync(baseComponentDir, componentName); fs.copySync(npmIgnorePath, componentName + '/.gitignore'); - let componentPath = path.resolve(componentName, 'package.json'), + const componentPath = path.resolve(componentName, 'package.json'), component = _.extend(fs.readJsonSync(componentPath), { name: componentName }); diff --git a/src/cli/domain/package-components.js b/src/cli/domain/package-components.js index 5ccba0028..93ef4258a 100644 --- a/src/cli/domain/package-components.js +++ b/src/cli/domain/package-components.js @@ -17,8 +17,8 @@ module.exports = function(){ const componentPath = options.componentPath; const minify = options.minify === true; - let files = fs.readdirSync(componentPath), - publishPath = path.join(componentPath, '_package'); + const files = fs.readdirSync(componentPath), + publishPath = path.join(componentPath, '_package'); if(_.contains(files, '_package')){ fs.removeSync(publishPath); @@ -26,8 +26,8 @@ module.exports = function(){ fs.mkdirSync(publishPath); - let componentPackagePath = path.join(componentPath, 'package.json'), - ocPackagePath = path.join(__dirname, '../../../package.json'); + const componentPackagePath = path.join(componentPath, 'package.json'), + ocPackagePath = path.join(__dirname, '../../../package.json'); if(!fs.existsSync(componentPackagePath)){ return callback(new Error('component does not contain package.json')); @@ -35,8 +35,8 @@ module.exports = function(){ return callback(new Error('error resolving oc internal dependencies')); } - let component = fs.readJsonSync(componentPackagePath), - ocInfo = fs.readJsonSync(ocPackagePath); + const component = fs.readJsonSync(componentPackagePath), + ocInfo = fs.readJsonSync(ocPackagePath); if(!validator.validateComponentName(component.name)){ return callback(new Error('name not valid')); diff --git a/src/cli/domain/package-static-files/index.js b/src/cli/domain/package-static-files/index.js index 0d211b817..5d8728ade 100644 --- a/src/cli/domain/package-static-files/index.js +++ b/src/cli/domain/package-static-files/index.js @@ -11,9 +11,9 @@ const _ = require('underscore'); const strings = require('../../../resources'); const copyDir = function(params, cb){ - let staticPath = path.join(params.componentPath, params.staticDir), - exists = fs.existsSync(staticPath), - isDir = exists && fs.lstatSync(staticPath).isDirectory(); + const staticPath = path.join(params.componentPath, params.staticDir), + exists = fs.existsSync(staticPath), + isDir = exists && fs.lstatSync(staticPath).isDirectory(); if(!exists){ return cb(format(strings.errors.cli.FOLDER_NOT_FOUND, staticPath)); @@ -24,17 +24,17 @@ const copyDir = function(params, cb){ nodeDir.paths(staticPath, function(err, res){ _.forEach(res.files, function(filePath){ - let fileName = path.basename(filePath), - fileExt = path.extname(filePath).toLowerCase(), - fileRelativePath = path.relative(staticPath, path.dirname(filePath)), - fileDestinationPath = path.join(params.publishPath, params.staticDir, fileRelativePath), - fileDestination = path.join(fileDestinationPath, fileName); + const fileName = path.basename(filePath), + fileExt = path.extname(filePath).toLowerCase(), + fileRelativePath = path.relative(staticPath, path.dirname(filePath)), + fileDestinationPath = path.join(params.publishPath, params.staticDir, fileRelativePath), + fileDestination = path.join(fileDestinationPath, fileName); fs.ensureDirSync(fileDestinationPath); if(params.minify && params.ocOptions.minify !== false && (fileExt === '.js' || fileExt === '.css')){ - let fileContent = fs.readFileSync(filePath).toString(), - minified = minifyFile(fileExt, fileContent); + const fileContent = fs.readFileSync(filePath).toString(), + minified = minifyFile(fileExt, fileContent); fs.writeFileSync(fileDestination, minified); } else { diff --git a/src/cli/domain/package-static-files/minify-file.js b/src/cli/domain/package-static-files/minify-file.js index 1af846612..87c63042b 100644 --- a/src/cli/domain/package-static-files/minify-file.js +++ b/src/cli/domain/package-static-files/minify-file.js @@ -18,8 +18,8 @@ module.exports = function(fileExt, fileContent){ modules: false }; - let babelOptions = { presets: [[babelPresetEnv, presetOptions]] }, - es5 = babel.transform(fileContent, babelOptions).code; + const babelOptions = { presets: [[babelPresetEnv, presetOptions]] }, + es5 = babel.transform(fileContent, babelOptions).code; return uglifyJs.minify(es5, { fromString: true }).code; diff --git a/src/cli/domain/package-template.js b/src/cli/domain/package-template.js index 0fd1b5689..9450b98a7 100644 --- a/src/cli/domain/package-template.js +++ b/src/cli/domain/package-template.js @@ -30,8 +30,8 @@ const compileView = function(viewPath, type, cb) { ocTemplate.compile({ template, viewPath }, function(err, compiledView){ if (err) { return cb(err);} - let hashView = hashBuilder.fromString(compiledView.toString()), - javaScriptizedView = javaScriptizeTemplate(hashView, compiledView); + const hashView = hashBuilder.fromString(compiledView.toString()), + javaScriptizedView = javaScriptizeTemplate(hashView, compiledView); return cb(null, { hash: hashView, @@ -42,8 +42,8 @@ const compileView = function(viewPath, type, cb) { module.exports = function(params, callback){ - let viewSrc = params.ocOptions.files.template.src, - viewPath = path.join(params.componentPath, viewSrc); + const viewSrc = params.ocOptions.files.template.src, + viewPath = path.join(params.componentPath, viewSrc); if(!fs.existsSync(viewPath)){ return callback(format(strings.errors.cli.TEMPLATE_NOT_FOUND, viewSrc)); diff --git a/src/cli/domain/registry.js b/src/cli/domain/registry.js index 4de090510..c0b886c3f 100644 --- a/src/cli/domain/registry.js +++ b/src/cli/domain/registry.js @@ -13,8 +13,8 @@ const urlParser = require('../domain/url-parser'); const getOcVersion = function(){ - let ocPackagePath = path.join(__dirname, '../../../package.json'), - ocInfo = fs.readJsonSync(ocPackagePath); + const ocPackagePath = path.join(__dirname, '../../../package.json'), + ocInfo = fs.readJsonSync(ocPackagePath); return ocInfo.version; }; diff --git a/src/cli/domain/url-parser.js b/src/cli/domain/url-parser.js index 2542f25db..b73ebdaa7 100644 --- a/src/cli/domain/url-parser.js +++ b/src/cli/domain/url-parser.js @@ -13,13 +13,13 @@ const removeFinalSlashes = function(s){ module.exports = { parse: function(parsed){ - let requestedVersion = parsed.requestVersion, - href = url.parse(parsed.href), - relativePath = removeFinalSlashes(href.pathname), - withoutVersion = removeFinalSlashes(relativePath.replace(requestedVersion, '')), - componentName = withoutVersion.substr(withoutVersion.lastIndexOf('/') + 1), - withoutComponent = removeFinalSlashes(withoutVersion.replace(componentName, '')), - registryUrl = href.protocol + '//' + href.host + withoutComponent + '/'; + const requestedVersion = parsed.requestVersion, + href = url.parse(parsed.href), + relativePath = removeFinalSlashes(href.pathname), + withoutVersion = removeFinalSlashes(relativePath.replace(requestedVersion, '')), + componentName = withoutVersion.substr(withoutVersion.lastIndexOf('/') + 1), + withoutComponent = removeFinalSlashes(withoutVersion.replace(componentName, '')), + registryUrl = href.protocol + '//' + href.host + withoutComponent + '/'; return { clientHref: registryUrl + 'oc-client/client.js', diff --git a/src/cli/facade/dev.js b/src/cli/facade/dev.js index 74284f744..02bb5b9e0 100644 --- a/src/cli/facade/dev.js +++ b/src/cli/facade/dev.js @@ -16,8 +16,8 @@ const watch = require('../domain/watch'); const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let local = dependencies.local, - logger = dependencies.logger; + const local = dependencies.local, + logger = dependencies.logger; const log = { err: function(msg){ return logger.log(colors.red(msg)); }, @@ -27,13 +27,13 @@ module.exports = function(dependencies){ return function(opts, callback){ - let componentsDir = opts.dirPath, - port = opts.port || 3000, - baseUrl = opts.baseUrl || format('http://localhost:{0}/', port), - packaging = false, - errors = strings.errors.cli, - fallbackRegistryUrl = opts.fallbackRegistryUrl, - hotReloading = _.isUndefined(opts.hotReloading) ? true : opts.hotReloading; + const componentsDir = opts.dirPath, + port = opts.port || 3000, + baseUrl = opts.baseUrl || format('http://localhost:{0}/', port), + errors = strings.errors.cli, + fallbackRegistryUrl = opts.fallbackRegistryUrl, + hotReloading = _.isUndefined(opts.hotReloading) ? true : opts.hotReloading; + let packaging = false; callback = wrapCliCallback(callback); @@ -65,7 +65,7 @@ module.exports = function(dependencies){ }); }; - var packageComponents = function(componentsDirs, cb){ + const packageComponents = function(componentsDirs, cb){ cb = _.isFunction(cb) ? cb : _.noop; let i = 0; @@ -104,11 +104,11 @@ module.exports = function(dependencies){ } }; - var loadDependencies = function(components, cb){ + const loadDependencies = function(components, cb){ log.warn(strings.messages.cli.CHECKING_DEPENDENCIES, true); - let dependencies = getComponentsDependencies(components), - missing = getMissingDeps(dependencies.withVersions, components); + const dependencies = getComponentsDependencies(components), + missing = getMissingDeps(dependencies.withVersions, components); if(_.isEmpty(missing)){ log.ok('OK'); diff --git a/src/cli/facade/init.js b/src/cli/facade/init.js index 595219b84..38e96b464 100644 --- a/src/cli/facade/init.js +++ b/src/cli/facade/init.js @@ -9,14 +9,14 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let local = dependencies.local, - logger = dependencies.logger; + const local = dependencies.local, + logger = dependencies.logger; return function(opts, callback){ - let componentName = opts.componentName, - templateType = _.isUndefined(opts.templateType) ? 'handlebars' : opts.templateType, - errors = strings.errors.cli; + const componentName = opts.componentName, + templateType = _.isUndefined(opts.templateType) ? 'handlebars' : opts.templateType, + errors = strings.errors.cli; callback = wrapCliCallback(callback); diff --git a/src/cli/facade/mock.js b/src/cli/facade/mock.js index ba441b40b..d1e4c405c 100644 --- a/src/cli/facade/mock.js +++ b/src/cli/facade/mock.js @@ -8,8 +8,8 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let local = dependencies.local, - logger = dependencies.logger; + const local = dependencies.local, + logger = dependencies.logger; return function(opts, callback){ diff --git a/src/cli/facade/package.js b/src/cli/facade/package.js index 9158b5904..896bedd9d 100644 --- a/src/cli/facade/package.js +++ b/src/cli/facade/package.js @@ -7,8 +7,8 @@ const format = require('stringformat'); const path = require('path'); module.exports = function(dependencies) { - let local = dependencies.local, - logger = dependencies.logger; + const local = dependencies.local, + logger = dependencies.logger; const log = { err: function(msg){ return logger.log(colors.red(msg)); }, @@ -17,9 +17,9 @@ module.exports = function(dependencies) { }; return function(opts, callback) { - let componentPath = opts.componentPath, - packageDir = path.resolve(componentPath, '_package'), - compressedPackagePath = path.resolve(componentPath, 'package.tar.gz'); + const componentPath = opts.componentPath, + packageDir = path.resolve(componentPath, '_package'), + compressedPackagePath = path.resolve(componentPath, 'package.tar.gz'); callback = wrapCliCallback(callback); diff --git a/src/cli/facade/preview.js b/src/cli/facade/preview.js index 708fc4f17..c278705f4 100644 --- a/src/cli/facade/preview.js +++ b/src/cli/facade/preview.js @@ -8,8 +8,8 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let logger = dependencies.logger, - registry = dependencies.registry; + const logger = dependencies.logger, + registry = dependencies.registry; return function(opts, callback){ diff --git a/src/cli/facade/publish.js b/src/cli/facade/publish.js index d137cd2bc..a4f05485a 100644 --- a/src/cli/facade/publish.js +++ b/src/cli/facade/publish.js @@ -12,9 +12,9 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let registry = dependencies.registry, - local = dependencies.local, - logger = dependencies.logger; + const registry = dependencies.registry, + local = dependencies.local, + logger = dependencies.logger; const log = { err: function(msg){ return logger.log(colors.red(msg)); }, @@ -24,10 +24,11 @@ module.exports = function(dependencies){ return function(opts, callback){ - let componentPath = opts.componentPath, - packageDir = path.resolve(componentPath, '_package'), - compressedPackagePath = path.resolve(componentPath, 'package.tar.gz'), - errorMessage; + const componentPath = opts.componentPath, + packageDir = path.resolve(componentPath, '_package'), + compressedPackagePath = path.resolve(componentPath, 'package.tar.gz'); + + let errorMessage; callback = wrapCliCallback(callback); @@ -65,7 +66,7 @@ module.exports = function(dependencies){ }); }; - var putComponentToRegistry = function(options, cb){ + const putComponentToRegistry = function(options, cb){ log.warn(format(strings.messages.cli.PUBLISHING, options.route)); registry.putComponent(options, function(err){ @@ -84,8 +85,8 @@ module.exports = function(dependencies){ }); } else if(err.code === 'cli_version_not_valid') { - let upgradeCommand = format(strings.commands.cli.UPGRADE, err.details.suggestedVersion), - errorDetails = format(strings.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE, colors.blue(upgradeCommand)); + const upgradeCommand = format(strings.commands.cli.UPGRADE, err.details.suggestedVersion), + errorDetails = format(strings.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE, colors.blue(upgradeCommand)); errorMessage = format(strings.errors.cli.PUBLISHING_FAIL, errorDetails); log.err(errorMessage); @@ -122,9 +123,9 @@ module.exports = function(dependencies){ } async.eachSeries(registryLocations, function(registryUrl, next){ - let registryLength = registryUrl.length, - registryNormalised = registryUrl.slice(registryLength - 1) === '/' ? registryUrl.slice(0, registryLength - 1) : registryUrl, - componentRoute = format('{0}/{1}/{2}', registryNormalised, component.name, component.version); + const registryLength = registryUrl.length, + registryNormalised = registryUrl.slice(registryLength - 1) === '/' ? registryUrl.slice(0, registryLength - 1) : registryUrl, + componentRoute = format('{0}/{1}/{2}', registryNormalised, component.name, component.version); putComponentToRegistry({ route: componentRoute, path: compressedPackagePath}, next); }, function(err){ diff --git a/src/cli/facade/registry-add.js b/src/cli/facade/registry-add.js index 1d431006c..52058c5e1 100644 --- a/src/cli/facade/registry-add.js +++ b/src/cli/facade/registry-add.js @@ -7,8 +7,8 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let registry = dependencies.registry, - logger = dependencies.logger; + const registry = dependencies.registry, + logger = dependencies.logger; const log = { err: function(msg){ return logger.log(colors.red(msg)); }, diff --git a/src/cli/facade/registry-ls.js b/src/cli/facade/registry-ls.js index e8f166d82..7f5d6bdc8 100644 --- a/src/cli/facade/registry-ls.js +++ b/src/cli/facade/registry-ls.js @@ -9,8 +9,8 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let registry = dependencies.registry, - logger = dependencies.logger; + const registry = dependencies.registry, + logger = dependencies.logger; const log = { err: function(msg){ return logger.log(colors.red(msg)); }, diff --git a/src/cli/facade/registry-remove.js b/src/cli/facade/registry-remove.js index 4a8096499..0ee7b900c 100644 --- a/src/cli/facade/registry-remove.js +++ b/src/cli/facade/registry-remove.js @@ -7,8 +7,8 @@ const wrapCliCallback = require('../wrap-cli-callback'); module.exports = function(dependencies){ - let registry = dependencies.registry, - logger = dependencies.logger; + const registry = dependencies.registry, + logger = dependencies.logger; const log = { err: function(msg){ return logger.log(colors.red(msg)); }, diff --git a/src/registry/domain/components-cache.js b/src/registry/domain/components-cache.js index 6a3da6617..5a9643134 100644 --- a/src/registry/domain/components-cache.js +++ b/src/registry/domain/components-cache.js @@ -35,7 +35,7 @@ module.exports = function(conf, cdn){ } }; - var refreshCachedData = function(){ + const refreshCachedData = function(){ refreshLoop = setTimeout(function(){ getFromJson(function(err, data){ if(err){ diff --git a/src/registry/domain/extract-package.js b/src/registry/domain/extract-package.js index db8a79dcb..590f3ed08 100644 --- a/src/registry/domain/extract-package.js +++ b/src/registry/domain/extract-package.js @@ -8,10 +8,10 @@ const getPackageJsonFromTempDir = require('./get-package-json-from-temp-dir'); module.exports = function(files, callback){ - let packageFile = files[_.keys(files)[0]], - packagePath = path.resolve(packageFile.path), - packageUntarOutput = path.resolve(packageFile.path, '..', packageFile.name.replace('.tar.gz', '')), - packageOutput = path.resolve(packageUntarOutput, '_package'); + const packageFile = files[_.keys(files)[0]], + packagePath = path.resolve(packageFile.path), + packageUntarOutput = path.resolve(packageFile.path, '..', packageFile.name.replace('.tar.gz', '')), + packageOutput = path.resolve(packageUntarOutput, '_package'); targz.decompress({ src: packagePath, diff --git a/src/registry/domain/nested-renderer.js b/src/registry/domain/nested-renderer.js index a94e48ade..fb0a60b6c 100644 --- a/src/registry/domain/nested-renderer.js +++ b/src/registry/domain/nested-renderer.js @@ -6,7 +6,7 @@ const _ = require('underscore'); const settings = require('../../resources/settings'); const strings = require('../../resources'); -var sanitise = { +const sanitise = { componentParams: function(component, options, callback){ return _.extend(sanitise.options(options, callback), { componentName: component @@ -33,7 +33,7 @@ var sanitise = { } }; -var validate = { +const validate = { callback: function(c){ if(!c || !_.isFunction(c)){ throw new Error(strings.errors.registry.NESTED_RENDERER_CALLBACK_IS_NOT_VALID); diff --git a/src/registry/domain/plugins-detective.js b/src/registry/domain/plugins-detective.js index 26f231d6a..ed84f7fc4 100644 --- a/src/registry/domain/plugins-detective.js +++ b/src/registry/domain/plugins-detective.js @@ -14,9 +14,9 @@ module.exports.parse = function(code){ return []; } - let context = contexts[0], - search = new RegExp(context+'\\.plugins\\.\\w+', 'gi'), - repl = new RegExp(context+'\\.plugins\\.', 'gi'); + const context = contexts[0], + search = new RegExp(context+'\\.plugins\\.\\w+', 'gi'), + repl = new RegExp(context+'\\.plugins\\.', 'gi'); return _.map(code.match(search), function(match){ return match.replace(repl, ''); diff --git a/src/registry/domain/plugins-initialiser.js b/src/registry/domain/plugins-initialiser.js index 8c0600ddd..6a11d1507 100644 --- a/src/registry/domain/plugins-initialiser.js +++ b/src/registry/domain/plugins-initialiser.js @@ -98,7 +98,7 @@ module.exports.init = function(pluginsToRegister, callback){ cb(); }; - var terminator = function(err){ + const terminator = function(err){ if(deferredLoads.length > 0){ const deferredPlugins = _.clone(deferredLoads); deferredLoads = []; diff --git a/src/registry/domain/repository.js b/src/registry/domain/repository.js index b85d33f28..b7dfdc0c0 100644 --- a/src/registry/domain/repository.js +++ b/src/registry/domain/repository.js @@ -16,9 +16,9 @@ const requireTemplate = require('../../utils/require-template'); module.exports = function(conf){ - let cdn = !conf.local && new S3(conf), - repositorySource = conf.local ? 'local repository' : 's3 cdn', - componentsCache = new ComponentsCache(conf, cdn); + const cdn = !conf.local && new S3(conf), + repositorySource = conf.local ? 'local repository' : 's3 cdn', + componentsCache = new ComponentsCache(conf, cdn); const getFilePath = function(component, version, filePath){ return format('{0}/{1}/{2}/{3}', conf.s3.componentsDir, component, version, filePath); @@ -40,7 +40,7 @@ module.exports = function(conf){ } }); - var local = { + const local = { getCompiledView: function(componentName){ if(componentName === 'oc-client'){ return fs.readFileSync(path.join(__dirname, '../../components/oc-client/_package/template.js')).toString(); @@ -51,10 +51,10 @@ module.exports = function(conf){ getComponents: function(){ const validComponents = fs.readdirSync(conf.path).filter(function(file){ - let isDir = fs.lstatSync(path.join(conf.path, file)).isDirectory(), - isValidComponent = isDir ? (fs.readdirSync(path.join(conf.path, file)).filter(function(file){ - return file === '_package'; - }).length === 1) : false; + const isDir = fs.lstatSync(path.join(conf.path, file)).isDirectory(), + isValidComponent = isDir ? (fs.readdirSync(path.join(conf.path, file)).filter(function(file){ + return file === '_package'; + }).length === 1) : false; return isValidComponent; }); diff --git a/src/registry/domain/s3.js b/src/registry/domain/s3.js index 8f76b564c..d548891d1 100644 --- a/src/registry/domain/s3.js +++ b/src/registry/domain/s3.js @@ -21,11 +21,11 @@ module.exports = function(conf){ httpOptions: { timeout: conf.s3.timeout || 10000 } }); - let bucket = conf.s3.bucket, - cache = new Cache({ - verbose: !!conf.verbosity, - refreshInterval: conf.refreshInterval - }); + const bucket = conf.s3.bucket, + cache = new Cache({ + verbose: !!conf.verbosity, + refreshInterval: conf.refreshInterval + }); return { listSubDirectories: function(dir, callback){ @@ -108,8 +108,8 @@ module.exports = function(conf){ const files = paths.files; async.each(files, function(file, cb){ - let relativeFile = file.substr(dirInput.length), - url = (dirOutput + relativeFile).replace(/\\/g, '/'); + const relativeFile = file.substr(dirInput.length), + url = (dirOutput + relativeFile).replace(/\\/g, '/'); self.putFile(file, url, relativeFile === '/server.js', cb); }, function(errors){ @@ -131,15 +131,15 @@ module.exports = function(conf){ }, putFileContent: function(fileContent, fileName, isPrivate, callback){ - let fileInfo = getFileInfo(fileName), - obj = { - Bucket: bucket, - Key: fileName, - Body: fileContent, - ACL: isPrivate ? 'authenticated-read' : 'public-read', - ServerSideEncryption: 'AES256', - Expires: getNextYear() - }; + const fileInfo = getFileInfo(fileName), + obj = { + Bucket: bucket, + Key: fileName, + Body: fileContent, + ACL: isPrivate ? 'authenticated-read' : 'public-read', + ServerSideEncryption: 'AES256', + Expires: getNextYear() + }; if(fileInfo.mimeType){ obj.ContentType = fileInfo.mimeType; diff --git a/src/registry/domain/sanitiser.js b/src/registry/domain/sanitiser.js index 318183c4c..36c85ea30 100644 --- a/src/registry/domain/sanitiser.js +++ b/src/registry/domain/sanitiser.js @@ -2,7 +2,7 @@ const _ = require('underscore'); -var sanitise = { +const sanitise = { booleanParameter: function(variable){ if(_.isString(variable)){ if(variable === 'true'){ @@ -43,8 +43,8 @@ module.exports = { _.forEach(requestParameters, function(requestParameter, requestParameterName){ if(_.has(expectedParameters, requestParameterName)){ - let expectedType = expectedParameters[requestParameterName].type, - sanitised = sanitise.parameter(requestParameter, expectedType); + const expectedType = expectedParameters[requestParameterName].type, + sanitised = sanitise.parameter(requestParameter, expectedType); result[requestParameterName] = sanitised; } else if(!_.contains(toRemove, requestParameterName)){ diff --git a/src/registry/domain/url-builder.js b/src/registry/domain/url-builder.js index fd17546e6..df01728cc 100644 --- a/src/registry/domain/url-builder.js +++ b/src/registry/domain/url-builder.js @@ -20,7 +20,7 @@ function componentForType(component, baseUrl, type) { return href; } -var build = { +const build = { component: function (component, baseUrl) { if (_.isString(component)) { component = {name: component}; diff --git a/src/registry/domain/validators/component-parameters.js b/src/registry/domain/validators/component-parameters.js index 3c5af73bf..fd59166a2 100644 --- a/src/registry/domain/validators/component-parameters.js +++ b/src/registry/domain/validators/component-parameters.js @@ -21,8 +21,8 @@ const validateParameter = function(parameter, expectedType){ module.exports = function(requestParameters, expectedParameters){ - let result = { isValid: true, errors: {} }, - mandatoryParameters = []; + const result = { isValid: true, errors: {} }, + mandatoryParameters = []; _.forEach(expectedParameters, function(expectedParameter, expectedParameterName){ if(expectedParameter.mandatory){ diff --git a/src/registry/domain/validators/plugins-requirements.js b/src/registry/domain/validators/plugins-requirements.js index eeea693d1..bcd00d6ab 100644 --- a/src/registry/domain/validators/plugins-requirements.js +++ b/src/registry/domain/validators/plugins-requirements.js @@ -3,8 +3,8 @@ const _ = require('underscore'); module.exports = function(componentRequirements, registryPlugins){ - let result = { isValid: true }, - missing = []; + const result = { isValid: true }, + missing = []; _.forEach(componentRequirements || [], function(requiredPlugin){ if(!registryPlugins || _.isEmpty(registryPlugins) || !_.contains(_.keys(registryPlugins), requiredPlugin)){ diff --git a/src/registry/index.js b/src/registry/index.js index 58dd932e0..9e9cb8126 100644 --- a/src/registry/index.js +++ b/src/registry/index.js @@ -19,10 +19,11 @@ const validator = require('./domain/validators'); module.exports = function(options){ let repository, - self = this, - server, - validationResult = validator.validateRegistryConfiguration(options), - plugins = []; + server; + + const self = this, + validationResult = validator.validateRegistryConfiguration(options), + plugins = []; if(!validationResult.isValid){ throw validationResult.message; @@ -87,10 +88,10 @@ module.exports = function(options){ if(_.isObject(componentsInfo)){ - let componentsNumber = _.keys(componentsInfo.components).length, - componentsReleases = _.reduce(componentsInfo.components, function(memo, component){ - return (parseInt(memo, 10) + component.length); - }); + const componentsNumber = _.keys(componentsInfo.components).length, + componentsReleases = _.reduce(componentsInfo.components, function(memo, component){ + return (parseInt(memo, 10) + component.length); + }); console.log(format(colors.green('Registry serving {0} components for a total of {1} releases.', componentsNumber, componentsReleases))); } diff --git a/src/registry/routes/components.js b/src/registry/routes/components.js index 89a77f7c6..ce9f82958 100644 --- a/src/registry/routes/components.js +++ b/src/registry/routes/components.js @@ -13,8 +13,8 @@ module.exports = function(conf, repository){ return function(req, res){ - let components = req.body.components, - registryErrors = strings.errors.registry; + const components = req.body.components, + registryErrors = strings.errors.registry; const returnError = function(message){ return res.status(400).json({ diff --git a/src/registry/routes/helpers/get-component-retrieving-info.js b/src/registry/routes/helpers/get-component-retrieving-info.js index 021fe3c67..3b8ac3b0f 100644 --- a/src/registry/routes/helpers/get-component-retrieving-info.js +++ b/src/registry/routes/helpers/get-component-retrieving-info.js @@ -19,8 +19,8 @@ module.exports = function(options){ }, getData: function(){ - let delta = process.hrtime(start), - nanosec = delta[0] * 1e9 + delta[1]; + const delta = process.hrtime(start), + nanosec = delta[0] * 1e9 + delta[1]; eventData.duration = nanosec / 1e3; diff --git a/src/registry/routes/helpers/get-component.js b/src/registry/routes/helpers/get-component.js index feceb8af1..7c23dd9f6 100644 --- a/src/registry/routes/helpers/get-component.js +++ b/src/registry/routes/helpers/get-component.js @@ -23,16 +23,16 @@ const validator = require('../../domain/validators'); const requireTemplate = require('../../../utils/require-template'); module.exports = function(conf, repository){ - let client = new Client(), - cache = new Cache({ - verbose: !!conf.verbosity, - refreshInterval: conf.refreshInterval - }); + const client = new Client(), + cache = new Cache({ + verbose: !!conf.verbosity, + refreshInterval: conf.refreshInterval + }); - var renderer = function(options, cb){ - let nestedRenderer = new NestedRenderer(renderer, options.conf), - retrievingInfo = new GetComponentRetrievingInfo(options), - responseHeaders = {}; + const renderer = function(options, cb){ + const nestedRenderer = new NestedRenderer(renderer, options.conf), + retrievingInfo = new GetComponentRetrievingInfo(options); + let responseHeaders = {}; const getLanguage = function(){ const paramOverride = !!options.parameters && options.parameters['__ocAcceptLanguage']; @@ -53,14 +53,14 @@ module.exports = function(conf, repository){ return cb(result); }; - let conf = options.conf, - acceptLanguage = getLanguage(), - componentCallbackDone = false, - requestedComponent = { - name: options.name, - version: options.version || '', - parameters: options.parameters - }; + let componentCallbackDone = false; + const conf = options.conf, + acceptLanguage = getLanguage(), + requestedComponent = { + name: options.name, + version: options.version || '', + parameters: options.parameters + }; repository.getComponent(requestedComponent.name, requestedComponent.version, function(err, component){ @@ -107,7 +107,7 @@ module.exports = function(conf, repository){ } // sanitise and check params - let appliedParams = applyDefaultValues(requestedComponent.parameters, component.oc.parameters), + const appliedParams = applyDefaultValues(requestedComponent.parameters, component.oc.parameters), params = sanitiser.sanitiseComponentParameters(appliedParams, component.oc.parameters), validationResult = validator.validateComponentParameters(params, component.oc.parameters); @@ -153,8 +153,8 @@ module.exports = function(conf, repository){ parameters: params }, conf.baseUrl); - let isUnrendered = options.headers.accept === settings.registry.acceptUnrenderedHeader, - renderMode = isUnrendered ? 'unrendered' : 'rendered'; + const isUnrendered = options.headers.accept === settings.registry.acceptUnrenderedHeader, + renderMode = isUnrendered ? 'unrendered' : 'rendered'; const response = { type: conf.local ? 'oc-component-local' : 'oc-component', @@ -191,18 +191,18 @@ module.exports = function(conf, repository){ }); } else { - let cacheKey = format('{0}/{1}/template.js', component.name, component.version), - cached = cache.get('file-contents', cacheKey), - key = component.oc.files.template.hashKey, - renderOptions = { - href: componentHref, - key: key, - version: component.version, - name: component.name, - templateType: component.oc.files.template.type, - container: component.oc.container, - renderInfo: component.oc.renderInfo - }; + const cacheKey = format('{0}/{1}/template.js', component.name, component.version), + cached = cache.get('file-contents', cacheKey), + key = component.oc.files.template.hashKey, + renderOptions = { + href: componentHref, + key: key, + version: component.version, + name: component.name, + templateType: component.oc.files.template.type, + container: component.oc.container, + renderInfo: component.oc.renderInfo + }; const returnResult = function(template){ client.renderTemplate(template, data, renderOptions, function(err, html){ @@ -252,31 +252,31 @@ module.exports = function(conf, repository){ returnComponent(null, {}); } else { - let cacheKey = format('{0}/{1}/server.js', component.name, component.version), - cached = cache.get('file-contents', cacheKey), - domain = Domain.create(), - contextObj = { - acceptLanguage: acceptLanguageParser.parse(acceptLanguage), - baseUrl: conf.baseUrl, - env: conf.env, - params: params, - plugins: conf.plugins, - renderComponent: nestedRenderer.renderComponent, - renderComponents: nestedRenderer.renderComponents, - requestHeaders: options.headers, - staticPath: repository.getStaticFilePath(component.name, component.version, '').replace('https:', ''), - setHeader: function(header, value) { - if (!(typeof(header) === 'string' && typeof(value) === 'string')) { - throw strings.errors.registry.COMPONENT_SET_HEADER_PARAMETERS_NOT_VALID; - } + const cacheKey = format('{0}/{1}/server.js', component.name, component.version), + cached = cache.get('file-contents', cacheKey), + domain = Domain.create(), + contextObj = { + acceptLanguage: acceptLanguageParser.parse(acceptLanguage), + baseUrl: conf.baseUrl, + env: conf.env, + params: params, + plugins: conf.plugins, + renderComponent: nestedRenderer.renderComponent, + renderComponents: nestedRenderer.renderComponents, + requestHeaders: options.headers, + staticPath: repository.getStaticFilePath(component.name, component.version, '').replace('https:', ''), + setHeader: function(header, value) { + if (!(typeof(header) === 'string' && typeof(value) === 'string')) { + throw strings.errors.registry.COMPONENT_SET_HEADER_PARAMETERS_NOT_VALID; + } - if (header && value) { - responseHeaders = responseHeaders || {}; - responseHeaders[header.toLowerCase()] = value; - } - }, - templates: repository.getTemplates() - }; + if (header && value) { + responseHeaders = responseHeaders || {}; + responseHeaders[header.toLowerCase()] = value; + } + }, + templates: repository.getTemplates() + }; const setCallbackTimeout = function(){ if(conf.executionTimeout){ @@ -338,8 +338,8 @@ module.exports = function(conf, repository){ }); } - let usedPlugins = detective.parse(dataProcessorJs), - unRegisteredPlugins = _.difference(usedPlugins, _.keys(conf.plugins)); + const usedPlugins = detective.parse(dataProcessorJs), + unRegisteredPlugins = _.difference(usedPlugins, _.keys(conf.plugins)); if(!_.isEmpty(unRegisteredPlugins)){ componentCallbackDone = true; diff --git a/src/registry/routes/list-components.js b/src/registry/routes/list-components.js index e2a910aad..ab3fab013 100644 --- a/src/registry/routes/list-components.js +++ b/src/registry/routes/list-components.js @@ -16,18 +16,18 @@ module.exports = function(repository){ return res.status(404).json({ error: res.errorDetails }); } - let isHtmlRequest = !!req.headers.accept && req.headers.accept.indexOf('text/html') >= 0, - baseResponse = { - href: res.conf.baseUrl, - ocVersion: packageInfo.version, - type: res.conf.local ? 'oc-registry-local' : 'oc-registry' - }; + const isHtmlRequest = !!req.headers.accept && req.headers.accept.indexOf('text/html') >= 0, + baseResponse = { + href: res.conf.baseUrl, + ocVersion: packageInfo.version, + type: res.conf.local ? 'oc-registry-local' : 'oc-registry' + }; if(isHtmlRequest && !!res.conf.discovery){ let componentsInfo = [], - componentsReleases = 0, - stateCounts = {}; + componentsReleases = 0; + const stateCounts = {}; async.each(components, function(component, callback){ return repository.getComponent(component, function(err, result){ diff --git a/src/registry/routes/static-redirector.js b/src/registry/routes/static-redirector.js index 5f9631c19..e0d08efa0 100644 --- a/src/registry/routes/static-redirector.js +++ b/src/registry/routes/static-redirector.js @@ -9,9 +9,9 @@ const getFileInfo = require('../../utils/get-file-info'); module.exports = function(repository){ return function(req, res){ - let filePath, - clientPath = (res.conf.prefix ? res.conf.prefix : '/') + 'oc-client/client.js', - clientMapPath = (res.conf.prefix ? res.conf.prefix : '/') + 'oc-client/oc-client.min.map'; + let filePath; + const clientPath = (res.conf.prefix ? res.conf.prefix : '/') + 'oc-client/client.js', + clientMapPath = (res.conf.prefix ? res.conf.prefix : '/') + 'oc-client/oc-client.min.map'; if(req.route.path === clientPath){ if(res.conf.local){ @@ -36,8 +36,8 @@ module.exports = function(repository){ return res.status(404).json({ err: res.errorDetails }); } - let fileStream = fs.createReadStream(filePath), - fileInfo = getFileInfo(filePath); + const fileStream = fs.createReadStream(filePath), + fileInfo = getFileInfo(filePath); if(fileInfo.mimeType){ res.set('Content-Type', fileInfo.mimeType); diff --git a/src/registry/views/static/component-info.js b/src/registry/views/static/component-info.js index 831e4b330..737d8159a 100644 --- a/src/registry/views/static/component-info.js +++ b/src/registry/views/static/component-info.js @@ -1,6 +1,6 @@ 'use strict'; -var oc = oc || {}; +const oc = oc || {}; oc.cmd = oc.cmd || []; oc.cmd.push(function(){ @@ -11,9 +11,9 @@ oc.cmd.push(function(){ $('.refresh-preview').click(function(){ - let splitted = $('#href').val().split('?'), - url = splitted[0], - lang = $('#lang').val(); + let url = splitted[0]; + const splitted = $('#href').val().split('?'), + lang = $('#lang').val(); if(url.slice(-1) !== '/'){ url += '/'; diff --git a/src/registry/views/static/list-components.js b/src/registry/views/static/list-components.js index 7db268e9e..bd65cfaa4 100644 --- a/src/registry/views/static/list-components.js +++ b/src/registry/views/static/list-components.js @@ -1,27 +1,27 @@ 'use strict'; -var oc = oc || {}; +const oc = oc || {}; oc.cmd = oc.cmd || []; oc.cmd.push(function(){ const componentsListChanged = function(){ $('.componentRow').removeClass('hide'); - let s = $('.search').val(), - r = new RegExp(s), - selectedCheckboxes = $('input[type=checkbox]:checked'), - hiddenStates = [], - hidden = 0, - i; + const s = $('.search').val(), + r = new RegExp(s), + selectedCheckboxes = $('input[type=checkbox]:checked'), + hiddenStates = []; + let hidden = 0, + i; for(i = 0; i < selectedCheckboxes.length; i++){ hiddenStates.push($(selectedCheckboxes[i]).attr('name')); } for(i = 0; i < componentsList.length; i++){ - let matches = !s || !!componentsList[i].name.match(r), - selector = $('#component-' + componentsList[i].name), - isHidden = false; + const matches = !s || !!componentsList[i].name.match(r), + selector = $('#component-' + componentsList[i].name); + let isHidden = false; for(let j = 0; j < hiddenStates.length; j++){ if(componentsList[i].state.toLowerCase() === hiddenStates[j]){ @@ -36,8 +36,8 @@ oc.cmd.push(function(){ } } - let totalShowing = componentsList.length - hidden, - result = 'Showing ' + totalShowing + ' components'; + const totalShowing = componentsList.length - hidden; + let result = 'Showing ' + totalShowing + ' components'; if(s){ result += ' matching search query: ' + s; diff --git a/src/utils/get-unix-utc-timestamp.js b/src/utils/get-unix-utc-timestamp.js index 9b3c1c556..678f6564e 100644 --- a/src/utils/get-unix-utc-timestamp.js +++ b/src/utils/get-unix-utc-timestamp.js @@ -1,8 +1,8 @@ 'use strict'; module.exports = function(){ - let d1 = new Date(), - d2 = new Date(d1.getUTCFullYear(), d1.getUTCMonth(), d1.getUTCDate(), d1.getUTCHours(), d1.getUTCMinutes(), d1.getUTCSeconds(), d1.getUTCMilliseconds()); + const d1 = new Date(), + d2 = new Date(d1.getUTCFullYear(), d1.getUTCMonth(), d1.getUTCDate(), d1.getUTCHours(), d1.getUTCMinutes(), d1.getUTCSeconds(), d1.getUTCMilliseconds()); return Math.floor(d2.getTime()); }; \ No newline at end of file diff --git a/src/utils/put.js b/src/utils/put.js index aefd15458..ff89313bc 100644 --- a/src/utils/put.js +++ b/src/utils/put.js @@ -13,10 +13,10 @@ module.exports = function(urlPath, files, headers, callback) { headers = {}; } - let form = new FormData(), - body = '', - callbackDone = false, - options = _.extend(url.parse(urlPath), { method: 'PUT' }); + const form = new FormData(), + options = _.extend(url.parse(urlPath), { method: 'PUT' }); + let body = '', + callbackDone = false; if(!_.isArray(files)){ files = [files]; diff --git a/tasks/build.js b/tasks/build.js index b3672b37f..a5444ba4b 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -11,18 +11,18 @@ module.exports = function(grunt){ grunt.registerTask('build', 'Builds and minifies the oc-client component', function(){ - let done = this.async(), - version = packageJson.version, - clientComponentDir = '../src/components/oc-client/', - licenseRow = '/*! OpenComponents client v{0} | (c) 2015-{1} OpenTable, Inc. | {2} */', - licenseLink = 'https://github.com/opentable/oc/tree/master/src/components/oc-client/LICENSES', - license = format(licenseRow, version, new Date().getFullYear(), licenseLink), - headLoad = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/head.load.js')).toString(), - ocClient = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.js')).toString(), - bundle = format('{0}\n;\n{1}\n;\noc.clientVersion=\'{2}\';', headLoad, ocClient, version), - ocClientPackageInfo = require(clientComponentDir + 'package.json'), - shrinkwrap = require('../npm-shrinkwrap'), - jsonConfig = {spaces: 2}; + const done = this.async(), + version = packageJson.version, + clientComponentDir = '../src/components/oc-client/', + licenseRow = '/*! OpenComponents client v{0} | (c) 2015-{1} OpenTable, Inc. | {2} */', + licenseLink = 'https://github.com/opentable/oc/tree/master/src/components/oc-client/LICENSES', + license = format(licenseRow, version, new Date().getFullYear(), licenseLink), + headLoad = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/head.load.js')).toString(), + ocClient = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.js')).toString(), + bundle = format('{0}\n;\n{1}\n;\noc.clientVersion=\'{2}\';', headLoad, ocClient, version), + ocClientPackageInfo = require(clientComponentDir + 'package.json'), + shrinkwrap = require('../npm-shrinkwrap'), + jsonConfig = {spaces: 2}; ocClientPackageInfo.version = version; shrinkwrap.version = version; @@ -40,12 +40,12 @@ module.exports = function(grunt){ fs.writeFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.min.map'), compressed.map); fs.writeFileSync(path.join(__dirname, '../client/src/oc-client.min.js'), compressedCode); - let Local = require('../src/cli/domain/local'), - local = new Local(), - packageOptions = { - componentPath: path.join(__dirname, clientComponentDir), - verbose: false - }; + const Local = require('../src/cli/domain/local'), + local = new Local(), + packageOptions = { + componentPath: path.join(__dirname, clientComponentDir), + verbose: false + }; local.package(packageOptions, function(err){ grunt.log[err ? 'error' : 'ok'](err ? err : 'Client has been built and packaged'); diff --git a/tasks/changelog.js b/tasks/changelog.js index 13188ce35..169fdd9cd 100644 --- a/tasks/changelog.js +++ b/tasks/changelog.js @@ -9,36 +9,36 @@ const _ = require('underscore'); module.exports = function(grunt){ - var get = { + const get = { prs: function(versions, callback){ grunt.util.spawn({ cmd: 'git', args: ['log', versions] }, function(err, res){ if(err){ return callback(err); } - let commits = res.stdout.split('commit '), - result = []; + const commits = res.stdout.split('commit '), + result = []; _.forEach(commits, function(commit){ - let commitMessages = commit.split('Merge pull request'), - isPr = commitMessages.length > 1, - isSquashedPr = !!commit.match(/(.*?)\(#(.*?)\)\n(.*?)/g), - commitMessage, - prNumber; + const commitMessages = commit.split('Merge pull request'), + isPr = commitMessages.length > 1, + isSquashedPr = !!commit.match(/(.*?)\(#(.*?)\)\n(.*?)/g); + let commitMessage, + prNumber; if(isPr){ - let split = commitMessages[1].split('from'), - branchName = split[1].trim().split(' ')[0].trim(); + const split = commitMessages[1].split('from'), + branchName = split[1].trim().split(' ')[0].trim(); prNumber = split[0].trim().replace('#', ''); commitMessage = split[1].replace(branchName, '').trim(); result.push(format('- [#{0}](https://github.com/opentable/oc/pull/{0}) {1}', prNumber, commitMessage)); } else if(isSquashedPr){ - let lines = commit.split('\n'), - commitLine = lines[4], - prNumberStartIndex = commitLine.lastIndexOf(' ('), - prNumberEndIndex = commitLine.lastIndexOf(')'); + const lines = commit.split('\n'), + commitLine = lines[4], + prNumberStartIndex = commitLine.lastIndexOf(' ('), + prNumberEndIndex = commitLine.lastIndexOf(')'); prNumber = commitLine.substr(prNumberStartIndex + 3, prNumberEndIndex - prNumberStartIndex - 3); commitMessage = commitLine.substr(0, prNumberStartIndex).trim(); @@ -51,8 +51,8 @@ module.exports = function(grunt){ }); }, allPrs: function(tags, callback){ - let logIntervals = [], - results = []; + const logIntervals = [], + results = []; for(let i = tags.length; i > 0; i--){ let logInterval = tags[i - 1]; @@ -84,8 +84,8 @@ module.exports = function(grunt){ grunt.registerTask('changelog', 'generates the changelog', function(){ - let done = this.async(), - result = '## Change Log'; + const done = this.async(); + let result = '## Change Log'; get.tags(function(err, tags){ if(err){ return grunt.fatal(err); } diff --git a/test/acceptance/client.js b/test/acceptance/client.js index 7159c29fa..86d88ae39 100644 --- a/test/acceptance/client.js +++ b/test/acceptance/client.js @@ -7,19 +7,20 @@ const path = require('path'); describe('The node.js OC client', function(){ let registry, - client, - clientOfflineRegistry, - result, - oc = require('../../src/index'), - $component, - conf = { - local: true, - path: path.resolve('test/fixtures/components'), - port: 3030, - baseUrl: 'http://localhost:3030/', - env: { name: 'local' }, - verbosity: 0 - }; + client, + clientOfflineRegistry, + result, + $component; + + const oc = require('../../src/index'), + conf = { + local: true, + path: path.resolve('test/fixtures/components'), + port: 3030, + baseUrl: 'http://localhost:3030/', + env: { name: 'local' }, + verbosity: 0 + }; const getClientConfig = function(port){ return { @@ -226,8 +227,8 @@ describe('The node.js OC client', function(){ expect(error).to.be.Array; expect(error.length).to.be.equal(2); - let exp = getRegExpFromJson(expectedRequest), - expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\' + + const exp = getRegExpFromJson(expectedRequest), + expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\' + '(400 The request body is malformed: component 0 must have name property, ' + 'component 1 must have name property\\)'); @@ -571,8 +572,8 @@ describe('The node.js OC client', function(){ it('should contain the error details', function(){ - let exp = getRegExpFromJson(expectedRequest), - expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(Error: connect ECONNREFUSED(.*?)\\)'); + const exp = getRegExpFromJson(expectedRequest), + expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(Error: connect ECONNREFUSED(.*?)\\)'); const actual = error.toString(); expect(actual).to.match(expected); @@ -609,7 +610,7 @@ describe('The node.js OC client', function(){ it('should contain the error details', function(){ - let exp = getRegExpFromJson(expectedRequest), + const exp = getRegExpFromJson(expectedRequest), expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(Error: connect ECONNREFUSED(.*?)\\)'); expect(error.toString()).to.match(expected); @@ -619,16 +620,16 @@ describe('The node.js OC client', function(){ describe('when client-side failover rendering enabled with forwardAcceptLanguageToClient=true', function(){ let $clientScript, - error, - options = { - forwardAcceptLanguageToClient: true, - parameters: { - hi: 'john' - }, - headers: { - 'accept-language': 'da, en-gb;q=0.8, en;q=0.7' - } - }; + error; + const options = { + forwardAcceptLanguageToClient: true, + parameters: { + hi: 'john' + }, + headers: { + 'accept-language': 'da, en-gb;q=0.8, en;q=0.7' + } + }; before(function(done){ clientOfflineRegistry.renderComponent('hello-world', options, function(err, html){ @@ -663,8 +664,8 @@ describe('The node.js OC client', function(){ json: true }; - let exp = getRegExpFromJson(expectedRequestWithExtraParams), - expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(Error: connect ECONNREFUSED(.*?)\\)'); + const exp = getRegExpFromJson(expectedRequestWithExtraParams), + expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(Error: connect ECONNREFUSED(.*?)\\)'); expect(error.toString()).to.match(expected); }); @@ -702,8 +703,8 @@ describe('The node.js OC client', function(){ }); it('should contain the error details', function(){ - let exp = getRegExpFromJson(expectedRequest), - expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed ' + + const exp = getRegExpFromJson(expectedRequest), + expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed ' + '\\(404 Component "non-existing-component" not found on local repository\\)'); expect(error.toString()).to.match(expected); @@ -743,8 +744,8 @@ describe('The node.js OC client', function(){ it('should contain the error details', function(){ - let exp = getRegExpFromJson(expectedRequest), - expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(timeout\\)'); + const exp = getRegExpFromJson(expectedRequest), + expected = new RegExp('Error: Server-side rendering failed: request ' + exp + ' failed \\(timeout\\)'); expect(error.toString()).to.match(expected); }); diff --git a/test/acceptance/registry.js b/test/acceptance/registry.js index d7fe6c384..c9a3c0a8f 100644 --- a/test/acceptance/registry.js +++ b/test/acceptance/registry.js @@ -8,10 +8,11 @@ const _ = require('underscore'); describe('registry', function(){ let registry, - result, - error, - headers, - oc = require('../../src/index'); + result, + error, + headers; + + const oc = require('../../src/index'); const next = function(done){ return function(e, r, d){ diff --git a/test/integration/targz.js b/test/integration/targz.js index 3e472195c..2d7e0ab9a 100644 --- a/test/integration/targz.js +++ b/test/integration/targz.js @@ -33,8 +33,8 @@ describe('The targz dependency', function(){ describe('when decompressing the created file', function(){ - let error, - to = path.resolve(__dirname, '../fixtures/targz-test'); + let error; + const to = path.resolve(__dirname, '../fixtures/targz-test'); beforeEach(function(done){ targz.decompress({ diff --git a/test/unit/cli-domain-get-mocked-plugins.js b/test/unit/cli-domain-get-mocked-plugins.js index bcd3b2d95..54a6142f7 100644 --- a/test/unit/cli-domain-get-mocked-plugins.js +++ b/test/unit/cli-domain-get-mocked-plugins.js @@ -7,10 +7,11 @@ const _ = require('underscore'); describe('cli : domain : get-mocked-plugins', function(){ - let dynamicPluginModule = function(a){ return a ? 'blarg' : 'flarg'; }, - notAFunctionModule = { 'foo' : 'bar' }, - fsMock, - getMockedPlugins; + const dynamicPluginModule = function(a){ return a ? 'blarg' : 'flarg'; }, + notAFunctionModule = { 'foo' : 'bar' }; + + let fsMock, + getMockedPlugins; const initialise = function(fs, pathJoinStub){ @@ -120,8 +121,8 @@ describe('cli : domain : get-mocked-plugins', function(){ } }; - let readMock = sinon.stub(), - existsMock = sinon.stub(); + const readMock = sinon.stub(), + existsMock = sinon.stub(); readMock.withArgs('/root/components/oc.json').returns(ocJsonComponent); readMock.withArgs('/root/oc.json').returns(ocJsonRoot); diff --git a/test/unit/cli-domain-registry.js b/test/unit/cli-domain-registry.js index 3e3a8a8b2..e900c005f 100644 --- a/test/unit/cli-domain-registry.js +++ b/test/unit/cli-domain-registry.js @@ -57,11 +57,11 @@ describe('cli : domain : registry', function(){ }); it('should save the file with slashed url', function(){ - let requestStub = sinon.stub(), - fsStub = { - readJson: sinon.stub(), - writeJson: sinon.spy() - }; + const requestStub = sinon.stub(), + fsStub = { + readJson: sinon.stub(), + writeJson: sinon.spy() + }; requestStub.yields(null, { type: 'oc-registry' }); diff --git a/test/unit/cli-facade-dev.js b/test/unit/cli-facade-dev.js index 28f422ce4..3fa0c1210 100644 --- a/test/unit/cli-facade-dev.js +++ b/test/unit/cli-facade-dev.js @@ -6,12 +6,12 @@ const sinon = require('sinon'); describe('cli : facade : dev', function(){ - let logSpy = {}, - DevFacade = require('../../src/cli/facade/dev'), - Local = require('../../src/cli/domain/local'), - local = new Local(), - npm = require('npm'), - devFacade = new DevFacade({ local: local, logger: logSpy }); + const logSpy = {}, + DevFacade = require('../../src/cli/facade/dev'), + Local = require('../../src/cli/domain/local'), + local = new Local(), + npm = require('npm'), + devFacade = new DevFacade({ local: local, logger: logSpy }); const execute = function(dirName, port){ logSpy.logNoNewLine = sinon.spy(); diff --git a/test/unit/cli-facade-init.js b/test/unit/cli-facade-init.js index 3934078f7..f8d33574d 100644 --- a/test/unit/cli-facade-init.js +++ b/test/unit/cli-facade-init.js @@ -6,11 +6,11 @@ const sinon = require('sinon'); describe('cli : facade : init', function(){ - let logSpy = {}, - InitFacade = require('../../src/cli/facade/init'), - Local = require('../../src/cli/domain/local'), - local = new Local(), - initFacade = new InitFacade({ local: local, logger: logSpy }); + const logSpy = {}, + InitFacade = require('../../src/cli/facade/init'), + Local = require('../../src/cli/domain/local'), + local = new Local(), + initFacade = new InitFacade({ local: local, logger: logSpy }); const execute = function(componentName, templateType){ logSpy.log = sinon.spy(); diff --git a/test/unit/cli-facade-mock.js b/test/unit/cli-facade-mock.js index a93ad35ea..940e17916 100644 --- a/test/unit/cli-facade-mock.js +++ b/test/unit/cli-facade-mock.js @@ -6,11 +6,11 @@ const sinon = require('sinon'); describe('cli : facade : mock', function(){ - let logSpy = {}, - MockFacade = require('../../src/cli/facade/mock'), - Local = require('../../src/cli/domain/local'), - local = new Local(), - mockFacade = new MockFacade({ local: local, logger: logSpy }); + const logSpy = {}, + MockFacade = require('../../src/cli/facade/mock'), + Local = require('../../src/cli/domain/local'), + local = new Local(), + mockFacade = new MockFacade({ local: local, logger: logSpy }); const execute = function(){ logSpy.log = sinon.spy(); diff --git a/test/unit/cli-facade-package.js b/test/unit/cli-facade-package.js index 55fb3d171..f337e9fbf 100644 --- a/test/unit/cli-facade-package.js +++ b/test/unit/cli-facade-package.js @@ -7,11 +7,11 @@ const sinon = require('sinon'); describe('cli : facade : package', function(){ - let logSpy = {}, - Local = require('../../src/cli/domain/local'), - local = new Local(), - PackageFacade = require('../../src/cli/facade/package.js'), - packageFacade = new PackageFacade({ local: local, logger: logSpy }); + const logSpy = {}, + Local = require('../../src/cli/domain/local'), + local = new Local(), + PackageFacade = require('../../src/cli/facade/package.js'), + packageFacade = new PackageFacade({ local: local, logger: logSpy }); const execute = function(compress, cb){ logSpy.log = sinon.stub(); @@ -30,9 +30,9 @@ describe('cli : facade : package', function(){ execute(false, function(){ local.package.restore(); - let message = logSpy.log.args[0][0], - re = new RegExp('\\' + path.sep, 'g'), - messageWithSlashesOnPath = message.replace(re, '/'); + const message = logSpy.log.args[0][0], + re = new RegExp('\\' + path.sep, 'g'), + messageWithSlashesOnPath = message.replace(re, '/'); expect(messageWithSlashesOnPath).to.include('Packaging -> '); expect(messageWithSlashesOnPath).to.include('components/hello-world/_package'); @@ -73,11 +73,11 @@ describe('cli : facade : package', function(){ it('should package and show success message', function(done){ execute(false, function(){ - let warnMessage = logSpy.log.args[0][0], - okMessage = logSpy.log.args[1][0], - re = new RegExp('\\' + path.sep, 'g'), - warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), - okMessageWithSlashesOnPath = okMessage.replace(re, '/'); + const warnMessage = logSpy.log.args[0][0], + okMessage = logSpy.log.args[1][0], + re = new RegExp('\\' + path.sep, 'g'), + warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), + okMessageWithSlashesOnPath = okMessage.replace(re, '/'); expect(warnMessageWithSlashesOnPath).to.include('Packaging -> '); expect(warnMessageWithSlashesOnPath).to.include('components/hello-world/_package'); @@ -96,11 +96,11 @@ describe('cli : facade : package', function(){ execute(false, function(){ local.compress.restore(); - let warnMessage = logSpy.log.args[0][0], - okMessage = logSpy.log.args[1][0], - re = new RegExp('\\' + path.sep, 'g'), - warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), - okMessageWithSlashesOnPath = okMessage.replace(re, '/'); + const warnMessage = logSpy.log.args[0][0], + okMessage = logSpy.log.args[1][0], + re = new RegExp('\\' + path.sep, 'g'), + warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), + okMessageWithSlashesOnPath = okMessage.replace(re, '/'); expect(warnMessageWithSlashesOnPath).to.include('Packaging -> '); expect(okMessageWithSlashesOnPath).to.include('Packaged -> '); @@ -121,7 +121,7 @@ describe('cli : facade : package', function(){ it('should show a message for success', function(done){ execute(true, function(){ - let warnMessage = logSpy.log.args[2][0], + const warnMessage = logSpy.log.args[2][0], okMessage = logSpy.log.args[3][0], re = new RegExp('\\' + path.sep, 'g'), warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'), @@ -149,7 +149,7 @@ describe('cli : facade : package', function(){ it('should show a message for failure', function(done){ execute(true, function(){ - let warnMessage = logSpy.log.args[2][0], + const warnMessage = logSpy.log.args[2][0], errorMessage = logSpy.log.args[3][0], re = new RegExp('\\' + path.sep, 'g'), warnMessageWithSlashesOnPath = warnMessage.replace(re, '/'); diff --git a/test/unit/cli-facade-preview.js b/test/unit/cli-facade-preview.js index c80f2abd0..3f2c08eac 100644 --- a/test/unit/cli-facade-preview.js +++ b/test/unit/cli-facade-preview.js @@ -15,8 +15,8 @@ describe('cli : facade : preview', function(){ registryStub = { getComponentPreviewUrlByUrl: sinon.stub().yields(error, url)}; logSpy = { log: sinon.spy()}; - let PreviewFacade = injectr('../../src/cli/facade/preview.js', { opn: opnSpy }), - previewFacade = new PreviewFacade({ logger: logSpy, registry: registryStub }); + const PreviewFacade = injectr('../../src/cli/facade/preview.js', { opn: opnSpy }), + previewFacade = new PreviewFacade({ logger: logSpy, registry: registryStub }); previewFacade({ componentHref: 'http://components.com/component' }, function(){}); }; diff --git a/test/unit/cli-facade-publish.js b/test/unit/cli-facade-publish.js index ca1a88147..76d927dbd 100644 --- a/test/unit/cli-facade-publish.js +++ b/test/unit/cli-facade-publish.js @@ -8,14 +8,14 @@ const sinon = require('sinon'); describe('cli : facade : publish', function(){ - let logSpy = {}, - Registry = require('../../src/cli/domain/registry'), - registry = new Registry(), - Local = require('../../src/cli/domain/local'), - local = new Local(), - readStub = sinon.stub().yields(null, 'test'), - PublishFacade = injectr('../../src/cli/facade/publish.js', { read: readStub }), - publishFacade = new PublishFacade({ registry: registry, local: local, logger: logSpy }); + const logSpy = {}, + Registry = require('../../src/cli/domain/registry'), + registry = new Registry(), + Local = require('../../src/cli/domain/local'), + local = new Local(), + readStub = sinon.stub().yields(null, 'test'), + PublishFacade = injectr('../../src/cli/facade/publish.js', { read: readStub }), + publishFacade = new PublishFacade({ registry: registry, local: local, logger: logSpy }); const execute = function(cb, creds){ creds = creds || {}; @@ -62,9 +62,9 @@ describe('cli : facade : publish', function(){ execute(function(){ local.package.restore(); - let message = logSpy.log.args[0][0], - re = new RegExp('\\' + path.sep, 'g'), - messageWithSlashesOnPath = message.replace(re, '/'); + const message = logSpy.log.args[0][0], + re = new RegExp('\\' + path.sep, 'g'), + messageWithSlashesOnPath = message.replace(re, '/'); expect(messageWithSlashesOnPath).to.include('Packaging -> '); expect(messageWithSlashesOnPath).to.include('components/hello-world/_package'); @@ -118,9 +118,9 @@ describe('cli : facade : publish', function(){ execute(function(){ registry.putComponent.restore(); - let message = logSpy.log.args[1][0], - re = new RegExp('\\' + path.sep, 'g'), - messageWithSlashesOnPath = message.replace(re, '/'); + const message = logSpy.log.args[1][0], + re = new RegExp('\\' + path.sep, 'g'), + messageWithSlashesOnPath = message.replace(re, '/'); expect(messageWithSlashesOnPath).to.include('Compressing -> '); expect(messageWithSlashesOnPath).to.include('components/hello-world/package.tar.gz'); diff --git a/test/unit/cli-facade-registry-add.js b/test/unit/cli-facade-registry-add.js index 2208b9dee..773538247 100644 --- a/test/unit/cli-facade-registry-add.js +++ b/test/unit/cli-facade-registry-add.js @@ -6,11 +6,11 @@ const sinon = require('sinon'); describe('cli : facade : registry : add', function(){ - let logSpy = {}, - Registry = require('../../src/cli/domain/registry'), - registry = new Registry(), - RegistryFacade = require('../../src/cli/facade/registry-add'), - registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); + const logSpy = {}, + Registry = require('../../src/cli/domain/registry'), + registry = new Registry(), + RegistryFacade = require('../../src/cli/facade/registry-add'), + registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); const execute = function(){ logSpy.log = sinon.spy(); diff --git a/test/unit/cli-facade-registry-ls.js b/test/unit/cli-facade-registry-ls.js index 3a466cea3..7dd7f2533 100644 --- a/test/unit/cli-facade-registry-ls.js +++ b/test/unit/cli-facade-registry-ls.js @@ -6,11 +6,11 @@ const sinon = require('sinon'); describe('cli : facade : registry : ls', function(){ - let logSpy = {}, - Registry = require('../../src/cli/domain/registry'), - registry = new Registry(), - RegistryFacade = require('../../src/cli/facade/registry-ls'), - registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); + const logSpy = {}, + Registry = require('../../src/cli/domain/registry'), + registry = new Registry(), + RegistryFacade = require('../../src/cli/facade/registry-ls'), + registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); const execute = function(){ logSpy.log = sinon.spy(); diff --git a/test/unit/cli-facade-registry-remove.js b/test/unit/cli-facade-registry-remove.js index 3018e753d..051038fdb 100644 --- a/test/unit/cli-facade-registry-remove.js +++ b/test/unit/cli-facade-registry-remove.js @@ -6,11 +6,11 @@ const sinon = require('sinon'); describe('cli : facade : registry : remove', function(){ - let logSpy = {}, - Registry = require('../../src/cli/domain/registry'), - registry = new Registry(), - RegistryFacade = require('../../src/cli/facade/registry-remove'), - registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); + const logSpy = {}, + Registry = require('../../src/cli/domain/registry'), + registry = new Registry(), + RegistryFacade = require('../../src/cli/facade/registry-remove'), + registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); const execute = function(){ logSpy.log = sinon.spy(); diff --git a/test/unit/client-get-compiled-template.js b/test/unit/client-get-compiled-template.js index 26f354843..2c45e7dc4 100644 --- a/test/unit/client-get-compiled-template.js +++ b/test/unit/client-get-compiled-template.js @@ -23,8 +23,8 @@ describe('client : get-compiled-template', function(){ const errorExample = 'AccessDenied' + 'Access Denied1234567890asdfghjklqwertyuiop'; - let requestStub = sinon.stub().yields(403, errorExample), - error; + const requestStub = sinon.stub().yields(403, errorExample); + let error; before(function(done){ initialise(requestStub); diff --git a/test/unit/registry-domain-components-cache.js b/test/unit/registry-domain-components-cache.js index 7d5487555..af8aa6408 100644 --- a/test/unit/registry-domain-components-cache.js +++ b/test/unit/registry-domain-components-cache.js @@ -11,20 +11,20 @@ describe('registry : domain : components-cache', function(){ getFile: sinon.stub(), listSubDirectories: sinon.stub(), putFileContent: sinon.stub() - }; + }, + baseOptions = { pollingInterval: 5, s3: { componentsDir: 'component'}}, + baseResponse = JSON.stringify({ + lastEdit: 12345678, + components: { + 'hello-world': ['1.0.0', '1.0.2'] + } + }); let setTimeoutStub, - clearTimeoutStub, - componentsCache, - eventsHandlerStub, - baseOptions = { pollingInterval: 5, s3: { componentsDir: 'component'}}, - response, - baseResponse = JSON.stringify({ - lastEdit: 12345678, - components: { - 'hello-world': ['1.0.0', '1.0.2'] - } - }); + clearTimeoutStub, + componentsCache, + eventsHandlerStub, + response; const initialise = function(){ clearTimeoutStub = sinon.stub(); diff --git a/test/unit/registry-domain-extract-package.js b/test/unit/registry-domain-extract-package.js index db27f9b3b..fbb4cd9c5 100644 --- a/test/unit/registry-domain-extract-package.js +++ b/test/unit/registry-domain-extract-package.js @@ -6,8 +6,8 @@ const sinon = require('sinon'); describe('registry : domain : extract-package', function(){ - let decompressStub = sinon.stub(), - pathResolveStub = sinon.stub(); + const decompressStub = sinon.stub(), + pathResolveStub = sinon.stub(); const extractPackage = injectr('../../src/registry/domain/extract-package.js', { targz: { decompress: decompressStub }, diff --git a/test/unit/registry-domain-nested-renderer.js b/test/unit/registry-domain-nested-renderer.js index 3b28f16d2..50da39012 100644 --- a/test/unit/registry-domain-nested-renderer.js +++ b/test/unit/registry-domain-nested-renderer.js @@ -6,9 +6,10 @@ const _ = require('underscore'); describe('registry : routes : helpers : nested-renderer', function(){ - let NestedRenderer = require('../../src/registry/domain/nested-renderer'), - nestedRenderer, - renderer; + const NestedRenderer = require('../../src/registry/domain/nested-renderer'); + + let nestedRenderer, + renderer; const initialise = function(rendererMocks, conf){ diff --git a/test/unit/registry-domain-plugins-initialiser.js b/test/unit/registry-domain-plugins-initialiser.js index 2bb8d7bec..5fb7170bc 100644 --- a/test/unit/registry-domain-plugins-initialiser.js +++ b/test/unit/registry-domain-plugins-initialiser.js @@ -144,8 +144,8 @@ describe('registry : domain : plugins-initialiser', function(){ }); it('should be make the functionality usable', function(){ - let a = result.getValue('a'), - flagged = result.isFlagged(); + const a = result.getValue('a'), + flagged = result.isFlagged(); expect(a).to.equal(123); expect(flagged).to.equal(true); diff --git a/test/unit/registry-domain-sanitiser.js b/test/unit/registry-domain-sanitiser.js index ee3c5a77a..fc4e2e3e6 100644 --- a/test/unit/registry-domain-sanitiser.js +++ b/test/unit/registry-domain-sanitiser.js @@ -22,8 +22,8 @@ describe('registry : domain : sanitiser', function(){ } }; - let requestParameters = { isTrue: 'true' }, - sanitisedParameters = sanitise(requestParameters, componentParameters); + const requestParameters = { isTrue: 'true' }, + sanitisedParameters = sanitise(requestParameters, componentParameters); expect(sanitisedParameters).to.eql({ isTrue: true }); }); @@ -38,8 +38,8 @@ describe('registry : domain : sanitiser', function(){ } }; - let requestParameters = { isTrue: 'false' }, - sanitisedParameters = sanitise(requestParameters, componentParameters); + const requestParameters = { isTrue: 'false' }, + sanitisedParameters = sanitise(requestParameters, componentParameters); expect(sanitisedParameters).to.eql({ isTrue: false }); }); @@ -57,8 +57,8 @@ describe('registry : domain : sanitiser', function(){ } }; - let requestParameters = { myString: null }, - sanitisedParameters = sanitise(requestParameters, componentParameters); + const requestParameters = { myString: null }, + sanitisedParameters = sanitise(requestParameters, componentParameters); expect(sanitisedParameters).to.eql({ myString: '' }); }); @@ -76,8 +76,8 @@ describe('registry : domain : sanitiser', function(){ } }; - let requestParameters = { age: '123' }, - sanitisedParameters = sanitise(requestParameters, componentParameters); + const requestParameters = { age: '123' }, + sanitisedParameters = sanitise(requestParameters, componentParameters); expect(sanitisedParameters).to.eql({ age: 123 }); }); @@ -87,7 +87,7 @@ describe('registry : domain : sanitiser', function(){ it('should keep the parameter as it is', function(){ - let componentParameters = {}, + const componentParameters = {}, requestParameters = { age: 123 }, sanitisedParameters = sanitise(requestParameters, componentParameters); diff --git a/test/unit/registry-domain-validator.js b/test/unit/registry-domain-validator.js index 5617b3d80..4f5d9d5d8 100644 --- a/test/unit/registry-domain-validator.js +++ b/test/unit/registry-domain-validator.js @@ -5,13 +5,13 @@ const injectr = require('injectr'); describe('registry : domain : validator', function(){ - let validator = require('../../src/registry/domain/validators'), - baseS3Conf = { - bucket: 'oc-components', - key: 's3-key', - region: 'us-west2', - secret: 's3-secret' - }; + const validator = require('../../src/registry/domain/validators'), + baseS3Conf = { + bucket: 'oc-components', + key: 's3-key', + region: 'us-west2', + secret: 's3-secret' + }; describe('when validating registry configuration', function(){ @@ -354,8 +354,8 @@ describe('registry : domain : validator', function(){ const validate = function(a,b){ return validator.validateComponentParameters(a,b); }; describe('when component have not parameters', function(){ - let componentParameters = {}, - requestParameters = { hello: 'world' }; + const componentParameters = {}, + requestParameters = { hello: 'world' }; it('should be valid', function(){ expect(validate(requestParameters, componentParameters).isValid).to.be.true; @@ -692,8 +692,8 @@ describe('registry : domain : validator', function(){ describe('when validating component version for new candidate', function(){ - let existingVersions = ['1.0.0', '1.0.1', '2.0.0', '2.1.0'], - isValid = function(a,b){ return validator.validateVersion(a, b); }; + const existingVersions = ['1.0.0', '1.0.1', '2.0.0', '2.1.0'], + isValid = function(a,b){ return validator.validateVersion(a, b); }; describe('when version already exists', function(){ it('should not be valid', function(){ @@ -820,10 +820,10 @@ describe('registry : domain : validator', function(){ describe('when component does not require any plugin', function(){ - let requirements = null, - supportedPlugins = { - log: function(){} - }; + const requirements = null, + supportedPlugins = { + log: function(){} + }; it('should be valid', function(){ expect(validate(requirements, supportedPlugins).isValid).to.be.true; diff --git a/test/unit/registry-domain-version-handler.js b/test/unit/registry-domain-version-handler.js index a0b091690..dc2e34513 100644 --- a/test/unit/registry-domain-version-handler.js +++ b/test/unit/registry-domain-version-handler.js @@ -108,8 +108,8 @@ describe('registry : domain : version-handler', function(){ describe('when publishing component', function(){ - let existingVersions = ['1.0.0', '1.0.1', '1.0.3', '1.1.0', '2.0.0'], - validate = function(a, b){ return versionHandler.validateNewVersion(a, b); }; + const existingVersions = ['1.0.0', '1.0.1', '1.0.3', '1.1.0', '2.0.0'], + validate = function(a, b){ return versionHandler.validateNewVersion(a, b); }; describe('when version already exists', function(){ it('shouldn\'t be valid', function(){ diff --git a/test/unit/registry-events-handler.js b/test/unit/registry-events-handler.js index 84fc5c350..dd94e8192 100644 --- a/test/unit/registry-events-handler.js +++ b/test/unit/registry-events-handler.js @@ -9,8 +9,8 @@ describe('registry : events-handler', function(){ describe('when requiring it multiple times', function(){ - let spy = sinon.spy(), - handler2; + const spy = sinon.spy(); + let handler2; before(function(){ eventsHandler.on('eventName', spy); @@ -29,8 +29,8 @@ describe('registry : events-handler', function(){ describe('when firing an event that has multiple subscribers', function(){ - let spy = sinon.spy(), - c = 0; + const spy = sinon.spy(); + let c = 0; before(function(){ eventsHandler.on('fire', function(payload){ spy(++c, payload); }); diff --git a/test/unit/registry-routes-component.js b/test/unit/registry-routes-component.js index 3f63470cc..022e09420 100644 --- a/test/unit/registry-routes-component.js +++ b/test/unit/registry-routes-component.js @@ -6,9 +6,9 @@ const _ = require('underscore'); describe('registry : routes : component', function(){ - let ComponentRoute = require('../../src/registry/routes/component'), - mockedComponents = require('../fixtures/mocked-components'), - mockedRepository, resJsonStub, resSetStub, statusStub, componentRoute; + const ComponentRoute = require('../../src/registry/routes/component'), + mockedComponents = require('../fixtures/mocked-components'); + let mockedRepository, resJsonStub, resSetStub, statusStub, componentRoute; const initialise = function(params){ resJsonStub = sinon.stub(); diff --git a/test/unit/registry-routes-components.js b/test/unit/registry-routes-components.js index d00143c67..a925d62c8 100644 --- a/test/unit/registry-routes-components.js +++ b/test/unit/registry-routes-components.js @@ -5,9 +5,10 @@ const sinon = require('sinon'); describe('registry : routes : components', function(){ - let ComponentsRoute = require('../../src/registry/routes/components'), - mockedComponents = require('../fixtures/mocked-components'), - mockedRepository, + const ComponentsRoute = require('../../src/registry/routes/components'), + mockedComponents = require('../fixtures/mocked-components'); + + let mockedRepository, componentsRoute, code, response; diff --git a/test/unit/registry-routes-helpers-get-component.js b/test/unit/registry-routes-helpers-get-component.js index 41171d8f8..d41a5c96d 100644 --- a/test/unit/registry-routes-helpers-get-component.js +++ b/test/unit/registry-routes-helpers-get-component.js @@ -6,17 +6,18 @@ const sinon = require('sinon'); const _ = require('underscore'); describe('registry : routes : helpers : get-component', function(){ - - let fireStub = sinon.stub(), - mockedComponents = require('../fixtures/mocked-components'), - mockedRepository, - getComponent, - GetComponent = injectr('../../src/registry/routes/helpers/get-component.js', { + const fireStub = sinon.stub(), + mockedComponents = require('../fixtures/mocked-components'), + GetComponent = injectr('../../src/registry/routes/helpers/get-component.js', { '../../domain/events-handler': { on: _.noop, fire: fireStub } - }, { console: console, Buffer: Buffer, setTimeout: setTimeout }); + }, { console: console, Buffer: Buffer, setTimeout: setTimeout } + ); + + let mockedRepository, + getComponent; const initialise = function(params){ mockedRepository = {