From 3672101d5ff89be2e00ffd6f171b216d7848de21 Mon Sep 17 00:00:00 2001 From: Brian Runnells Date: Sat, 17 Mar 2018 14:42:43 -0700 Subject: [PATCH] support for scoped packages * Ensures that we can correctly create a nested directory * Ensures that we don't rely on matching names to be at the start of a package's name to allow for a scope --- addon/components/docs-viewer/x-nav/component.js | 6 +++--- lib/broccoli/docs-compiler.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addon/components/docs-viewer/x-nav/component.js b/addon/components/docs-viewer/x-nav/component.js index 42e822b10..ca34dede7 100644 --- a/addon/components/docs-viewer/x-nav/component.js +++ b/addon/components/docs-viewer/x-nav/component.js @@ -20,11 +20,11 @@ export default Component.extend({ addonLogo: computed(function() { let name = packageJson.name; let logo; - if (name.match(/^ember-cli/)) { + if (name.match(/ember-cli/)) { logo = 'ember-cli'; - } else if (name.match(/^ember-data/)) { + } else if (name.match(/ember-data/)) { logo = 'ember-data'; - } else if (name.match(/^ember/)) { + } else { logo = 'ember'; } diff --git a/lib/broccoli/docs-compiler.js b/lib/broccoli/docs-compiler.js index 590f8fac3..0d15f9e31 100644 --- a/lib/broccoli/docs-compiler.js +++ b/lib/broccoli/docs-compiler.js @@ -276,9 +276,9 @@ module.exports = class DocsCompiler extends CachingWriter { modules } - let baseDir = path.join(this.outputPath, 'docs'); + let baseDir = path.join(this.outputPath, 'docs', name); fs.ensureDirSync(baseDir); - fs.writeJsonSync(path.join(baseDir, name + '.json'), Serializer.serialize('project', project)); + fs.writeJsonSync(path.join(baseDir + '.json'), Serializer.serialize('project', project)); } }