ember-freestyle 0.12.9 → 0.13.2

package/addon/components/freestyle-usage/index.js

@@ -1,9 +1,8 @@
 /* eslint-disable ember/no-component-lifecycle-hooks */
 import { inject as service } from '@ember/service';
-import { and, readOnly } from '@ember/object/computed';
+import { and, or, readOnly } from '@ember/object/computed';
 import Component from '@ember/component';
-import { computed } from '@ember/object';
-import { action } from '@ember/object';
+import { action, computed } from '@ember/object';
 
 let FreestyleUsage = Component.extend({
   tagName: '',
@@ -22,7 +21,7 @@ let FreestyleUsage = Component.extend({
   }),
   defaultTheme: readOnly('emberFreestyle.defaultTheme'),
   // highlightJsTheme - passed in
-  computedTheme: computed.or('defaultTheme', 'highlightJsTheme'),
+  computedTheme: or('defaultTheme', 'highlightJsTheme'),
 
   hasLabels: and('showLabels', 'title'),
   hasCode: computed('showCode', 'slug', 'source', function () {

package/addon/components/freestyle-usage-controls/index.hbs

@@ -39,8 +39,8 @@
   {{#if this.showFocus}}
     <div class="FreestyleUsageControls-item FreestyleUsageControls-item--focus">
       <div class="FreestyleUsageControls-itemControl">
-        <label for="focus" class="FreestyleUsageControls-label--focus">Focus a section
-          <Input class="FreestyleUsageControls-input--focus" @value={{this.focus}} @name="focus" @enter={{this.setFocus}} />
+        <label class="FreestyleUsageControls-label--focus">Focus a section
+          <Input class="FreestyleUsageControls-input--focus" @value={{this.focus}} @enter={{this.setFocus}} />
         </label>
         <button class="FreestyleUsageControls-button" onclick={{this.setFocus}} type="button">Focus</button>
       </div>

package/addon/components/freestyle-variant-list/index.hbs

@@ -1,7 +1,7 @@
 <ul class='FreestyleCollection-variantList'>
   {{#each @variants as |variantKey|}}
     <li
-      class='FreestyleCollection-variantListItem {{if (variant-eq @activeKey variantKey) 'FreestyleCollection-variantListItem--active'}}'
+      class='FreestyleCollection-variantListItem {{if (eq @activeKey variantKey) 'FreestyleCollection-variantListItem--active'}}'
       role="button"
       onclick={{fn this.onClickItem variantKey}}
     >

package/addon/services/ember-freestyle.js

@@ -1,11 +1,11 @@
 /* global hljs */
 import Service from '@ember/service';
-import { isPresent } from '@ember/utils';
+import { isBlank, isPresent } from '@ember/utils';
 import { A } from '@ember/array';
 import { Promise } from 'rsvp';
 import { tracked } from '@glimmer/tracking';
-import { isBlank } from '@ember/utils';
 import { action } from '@ember/object';
+
 export default class EmberFreestyleService extends Service {
   @tracked showLabels = true;
   @tracked showNotes = true;

package/{addon → app}/styles/components/freestyle/usage.scss

@@ -15,7 +15,7 @@
     margin-top: 1.5rem;
   }
   &-description {
-    margin: .5rem 0;
+    margin: 0.5rem 0;
     font-size: 1.1rem;
     color: #666;
   }
@@ -40,7 +40,7 @@
 
     &:after {
       content: 'Preview';
-      font-size: .7rem;
+      font-size: 0.7rem;
       position: absolute;
       right: 0;
       top: 0;
@@ -78,7 +78,7 @@
     }
     th,
     td {
-      padding: .5rem 1rem;
+      padding: 0.5rem 1rem;
     }
   }
 
@@ -87,12 +87,11 @@
   }
 }
 
-
 /*
   FreestyleUsageArgument
 */
 .FreestyleUsageArgument {
-  font-size: .8rem;
+  font-size: 0.8rem;
 
   &-name {
     font-weight: bold;
@@ -103,7 +102,7 @@
   }
 
   &-required {
-    color: #D81C38;
+    color: #d81c38;
     font-style: oblique;
   }
   &-default {
@@ -111,8 +110,9 @@
   }
 
   &-jsonViewer {
-    font-size: 0.8rem;
+    background-color: #222;
     min-width: 300px;
+    padding: 1rem;
   }
 }
 
@@ -121,7 +121,7 @@
   display: flex;
 
   &:after {
-    content: "False";
+    content: 'False';
     display: block;
     position: absolute;
     top: 2px;
@@ -130,7 +130,7 @@
     color: #999;
   }
   &.is-checked:after {
-    content: "True";
+    content: 'True';
     color: #333;
     font-weight: 700;
   }
@@ -138,7 +138,7 @@
 
 .FreestyleUsageArray {
   &-item {
-    margin: 0 0 .5em 0;
+    margin: 0 0 0.5em 0;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -151,14 +151,14 @@
     cursor: pointer;
     padding: 2px 4px;
     text-transform: uppercase;
-    letter-spacing: .5px;
-    font-size: .8em;
+    letter-spacing: 0.5px;
+    font-size: 0.8em;
     border-radius: 4px;
   }
 
   &-removeItem {
     color: #999;
-    opacity: .5;
+    opacity: 0.5;
   }
 
   &-addItem {
@@ -179,6 +179,6 @@
   color: #777;
   display: inline-block;
   font-family: monospace;
-  margin-right: .2em;
+  margin-right: 0.2em;
   padding: 1px 7px;
 }

package/{addon → app}/styles/components/freestyle-annotation.scss

@@ -1,4 +1,4 @@
 .FreestyleAnnotation {
-  font-size: .9rem;
+  font-size: 0.9rem;
   padding: 0 1rem;
 }

package/{addon → app}/styles/components/freestyle-collection.scss

@@ -1,7 +1,8 @@
 $FreestyleCollection-maxWidth: $FreestyleGuide-maxWidth !default;
-$FreestyleCollection-shadow1: rgba(0, 0, 0, .16);
-$FreestyleCollection-shadow2: rgba(0, 0, 0, .12);
-$FreestyleCollection-boxShadow: 0 2px 5px 0 $FreestyleCollection-shadow1, 0 2px 10px 0 $FreestyleCollection-shadow2;
+$FreestyleCollection-shadow1: rgba(0, 0, 0, 0.16);
+$FreestyleCollection-shadow2: rgba(0, 0, 0, 0.12);
+$FreestyleCollection-boxShadow: 0 2px 5px 0 $FreestyleCollection-shadow1,
+  0 2px 10px 0 $FreestyleCollection-shadow2;
 
 .FreestyleCollection {
   max-width: $FreestyleCollection-maxWidth;
@@ -34,7 +35,7 @@ $FreestyleCollection-boxShadow: 0 2px 5px 0 $FreestyleCollection-shadow1, 0 2px
     float: left;
     font-size: 14px;
     height: 48px;
-    letter-spacing: .8px;
+    letter-spacing: 0.8px;
     line-height: 48px;
     margin: 0;
     min-width: 120px;

package/{addon → app}/styles/components/freestyle-dynamic.scss

@@ -2,7 +2,8 @@
   &-input {
     margin-bottom: 10px;
 
-    input[type=text], textarea {
+    input[type='text'],
+    textarea {
       display: block;
     }
   }

package/{addon → app}/styles/components/freestyle-guide.scss

@@ -6,9 +6,10 @@
 
 $FreestyleGuide-maxWidth: 1200px !default;
 $FreestyleGuide-asideBackgroundColor: #fff !default;
-$FreestyleGuide-shadow1: rgba(0, 0, 0, .16);
-$FreestyleGuide-shadow2: rgba(0, 0, 0, .12);
-$FreestyleGuide-boxShadow: 0 2px 5px 0 $FreestyleGuide-shadow1, 0 2px 10px 0 $FreestyleGuide-shadow2;
+$FreestyleGuide-shadow1: rgba(0, 0, 0, 0.16);
+$FreestyleGuide-shadow2: rgba(0, 0, 0, 0.12);
+$FreestyleGuide-boxShadow: 0 2px 5px 0 $FreestyleGuide-shadow1,
+  0 2px 10px 0 $FreestyleGuide-shadow2;
 
 .FreestyleGuide {
   display: flex;
@@ -27,7 +28,7 @@ $FreestyleGuide-boxShadow: 0 2px 5px 0 $FreestyleGuide-shadow1, 0 2px 10px 0 $Fr
     align-items: center;
     justify-content: space-between;
     border-bottom: solid 1px $FreestyleGuide-color--secondary;
-    padding: .5rem 1rem;
+    padding: 0.5rem 1rem;
   }
 
   &-cta {
@@ -97,10 +98,10 @@ $FreestyleGuide-boxShadow: 0 2px 5px 0 $FreestyleGuide-shadow1, 0 2px 10px 0 $Fr
   &-aside {
     background: $FreestyleGuide-asideBackgroundColor;
     box-shadow: $FreestyleGuide-boxShadow;
-    margin-right: .5rem;
+    margin-right: 0.5rem;
     order: -2;
     position: fixed;
-    right: .5rem;
+    right: 0.5rem;
 
     @include freestyle-breakpoint(large) {
       border-left: solid 1px $FreestyleGuide-color--secondary;

package/{addon → app}/styles/components/freestyle-menu.scss

@@ -5,7 +5,7 @@
 
   &-item,
   &-submenuItem {
-    padding-top: .6rem;
+    padding-top: 0.6rem;
     text-transform: uppercase;
   }
 

package/{addon → app}/styles/components/freestyle-palette-item.scss

@@ -40,6 +40,5 @@ $FreestylePaletteItem-color: #2f4f4f !default;
     font-size: 11px;
     margin-top: 0;
   }
-
 }
 // END-FREESTYLE-USAGE

package/{addon → app}/styles/components/freestyle-palette.scss

@@ -7,7 +7,7 @@
   }
 
   &-description {
-    font-size: .8rem;
+    font-size: 0.8rem;
     padding-bottom: 5px;
   }
 }

package/{addon → app}/styles/components/freestyle-section.scss

@@ -8,7 +8,7 @@ $FreestyleSection-borderColor: #ccc !default;
     font-weight: bold;
     margin: 0 1rem;
     max-width: calc(1200px - 1rem);
-    padding: 1rem 0 .4rem;
+    padding: 1rem 0 0.4rem;
     text-transform: uppercase;
   }
 

package/{addon → app}/styles/components/freestyle-source.scss

@@ -1,8 +1,8 @@
 .FreestyleSource {
   &-title {
-    font-size: .7rem;
+    font-size: 0.7rem;
     font-weight: bold;
-    padding: .5rem 1rem .2rem;
+    padding: 0.5rem 1rem 0.2rem;
     text-transform: uppercase;
   }
 }

package/{addon → app}/styles/components/freestyle-subsection.scss

@@ -1,12 +1,12 @@
 .FreestyleSubsection {
   &.is-hidden {
-    display:none;
+    display: none;
   }
 
   &-name {
     font-size: 1.3rem;
     margin: 0 1rem;
-    padding: .8rem 0 .4rem;
+    padding: 0.8rem 0 0.4rem;
     text-transform: uppercase;
   }
 }

package/{addon → app}/styles/components/freestyle-usage-controls.scss

@@ -1,11 +1,12 @@
 $FreestyleUsageControls-backgroundColor: #fff !default;
-$FreestyleUsageControls-shadow1: rgba(0, 0, 0, .16);
-$FreestyleUsageControls-shadow2: rgba(0, 0, 0, .12);
-$FreestyleUsageControls-boxShadow: 0 2px 5px 0 $FreestyleUsageControls-shadow1, 0 2px 10px 0 $FreestyleUsageControls-shadow2;
+$FreestyleUsageControls-shadow1: rgba(0, 0, 0, 0.16);
+$FreestyleUsageControls-shadow2: rgba(0, 0, 0, 0.12);
+$FreestyleUsageControls-boxShadow: 0 2px 5px 0 $FreestyleUsageControls-shadow1,
+  0 2px 10px 0 $FreestyleUsageControls-shadow2;
 
 .FreestyleUsageControls {
   background: $FreestyleUsageControls-backgroundColor;
-  font-size: .9rem;
+  font-size: 0.9rem;
   padding: 1rem;
   text-align: left;
   width: 200px;
@@ -13,7 +14,7 @@ $FreestyleUsageControls-boxShadow: 0 2px 5px 0 $FreestyleUsageControls-shadow1,
   &-header {
     color: $FreestyleGuide-color--primary;
     font-weight: bold;
-    margin-bottom: .3rem;
+    margin-bottom: 0.3rem;
     text-transform: uppercase;
   }
 
@@ -22,22 +23,22 @@ $FreestyleUsageControls-boxShadow: 0 2px 5px 0 $FreestyleUsageControls-shadow1,
     display: flex;
 
     &--focus {
-      padding-top: .6rem;
+      padding-top: 0.6rem;
     }
   }
 
   &-itemControl {
     cursor: pointer;
-    padding-right: .1rem;
+    padding-right: 0.1rem;
   }
 
   &-itemLabel {
-    font-size: .8rem;
+    font-size: 0.8rem;
   }
 
   &-input {
     &--focus {
-      margin-bottom: .2rem;
+      margin-bottom: 0.2rem;
     }
   }
 
@@ -47,8 +48,8 @@ $FreestyleUsageControls-boxShadow: 0 2px 5px 0 $FreestyleUsageControls-shadow1,
     box-shadow: $FreestyleUsageControls-boxShadow;
     color: $FreestyleGuide-color--background;
     cursor: pointer;
-    font-size: .6rem;
-    padding: .4rem 1rem;
+    font-size: 0.6rem;
+    padding: 0.4rem 1rem;
     text-transform: uppercase;
   }
 }

package/{addon → app}/styles/components/freestyle-usage.scss

@@ -10,10 +10,6 @@ $FreestyleUsage-maxWidth: $FreestyleGuide-maxWidth !default;
     text-transform: uppercase;
   }
 
-  &-notes {
-    font-size: .9rem;
-  }
-
   &-rendered {
     padding: 1rem;
   }
@@ -24,11 +20,11 @@ $FreestyleUsage-maxWidth: $FreestyleGuide-maxWidth !default;
 
   &-sourceContainer {
     pre {
-      font-size: .8rem;
+      font-size: 0.8rem;
       margin-top: 0;
 
       &.hljs {
-        padding: .5rem 1rem;
+        padding: 0.5rem 1rem;
       }
     }
   }

package/{addon/styles/addon.scss → app/styles/ember-freestyle.scss}

@@ -1,13 +1,13 @@
 // TODO: Replace with actual breakpoint system
 $FreestyleBreakpoints: (
-  large: 600px
+  large: 600px,
 );
 
 @mixin freestyle-breakpoint($name: 'large') {
   @media (min-width: map-get($FreestyleBreakpoints, $name)) {
-    @content
+    @content;
   }
-};
+}
 
 // Default Ember Freestyle Palette
 $FreestyleGuide-color--primary: #00bcd4 !default;

package/blueprints/ember-freestyle/files/__root__/app/controllers/freestyle.js

@@ -1,60 +1,29 @@
-import Ember from 'ember';
 import BaseFreestyleController from 'ember-freestyle/controllers/freestyle';
 import { inject as service } from '@ember/service';
 
 export default class FreestyleController extends BaseFreestyleController {
   @service emberFreestyle;
 
-  /* BEGIN-FREESTYLE-USAGE fp--notes
-### A few notes regarding freestyle-palette
-
-- Accepts a colorPalette POJO like the one found in the freestyle.js blueprint controller
-- Looks very nice
-
-And another thing...
-
-###### Markdown note demonstrating prettified code
-
-```
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-  // ...
-  colorPalette: {
-    'primary': {
-      'name': 'cyan',
-      'base': '#00bcd4'
-    },
-    'accent': {
-      'name': 'amber',
-      'base': '#ffc107'
-    }
-  }
-  // ...
-});
-```
-  END-FREESTYLE-USAGE */
-
   colorPalette = {
-    'primary': {
-      'name': 'cyan',
-      'base': '#00bcd4'
+    primary: {
+      name: 'cyan',
+      base: '#00bcd4',
+    },
+    accent: {
+      name: 'amber',
+      base: '#ffc107',
     },
-    'accent': {
-      'name': 'amber',
-      'base': '#ffc107'
+    secondary: {
+      name: 'greyish',
+      base: '#b6b6b6',
     },
-    'secondary': {
-      'name': 'greyish',
-      'base': '#b6b6b6'
+    foreground: {
+      name: 'blackish',
+      base: '#212121',
     },
-    'foreground': {
-      'name': 'blackish',
-      'base': '#212121'
+    background: {
+      name: 'white',
+      base: '#ffffff',
     },
-    'background': {
-      'name': 'white',
-      'base': '#ffffff'
-    }
   };
 }

package/blueprints/ember-freestyle/files/__root__/app/templates/freestyle.hbs

@@ -1,32 +1,26 @@
 <FreestyleGuide
-  @title='Ember Freestyle'
-  @subtitle='Living Style Guide'
+  @title="Ember Freestyle"
+  @subtitle="Living Style Guide"
 >
-  <FreestyleSection @name='Visual Style' as |Section|>
-    <Section.Subsection @name='Typography'>
-
-      <FreestyleUsage @slug='typography-times' @title='Times New Roman'>
-        <FreestyleTypeface @fontFamily='Times New Roman' />
+  <FreestyleSection @name="Visual Style" as |Section|>
+    <Section.subsection @name="Typography">
+      <FreestyleUsage @slug="typography-times" @title="Times New Roman">
+        <FreestyleTypeface @fontFamily="Times New Roman" />
       </FreestyleUsage>
 
-      <FreestyleUsage @slug='typography-helvetica' @title='Helvetica'>
-        <FreestyleTypeface @fontFamily='Helvetica' />
+      <FreestyleUsage @slug="typography-helvetica" @title="Helvetica">
+        <FreestyleTypeface @fontFamily="Helvetica" />
       </FreestyleUsage>
+    </Section.subsection>
 
-    </Section.Subsection>
-
-    <Section.Subsection @name='Color'>
-
-      <FreestyleUsage @slug='fp' @title='Freestyle Palette' @usageTitle='Usage'>
-
+    <Section.subsection @name="Color">
+      <FreestyleUsage @slug="fp" @title="Freestyle Palette" @usageTitle="Usage">
         <FreestylePalette
           @colorPalette={{this.colorPalette}}
-          @title='Dummy App Color Palette'
-          @description='This component displays the color palette specified in freestyle/palette.json'
+          @title="Dummy App Color Palette"
+          @description="This component displays the color palette specified in app/controllers/freestyle.js"
         />
       </FreestyleUsage>
-
-    </Section.Subsection>
-
+    </Section.subsection>
   </FreestyleSection>
 </FreestyleGuide>

package/blueprints/ember-freestyle/index.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 var path = require('path');
 
 module.exports = {

package/index.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const DEFAULT_OPTIONS = {
+  includeStyles: true,
+};
+
 module.exports = {
   name: require('./package').name,
 
@@ -11,10 +15,20 @@ module.exports = {
     this._super.included.apply(this, arguments);
     // support for nested addon
     // see: https://github.com/ember-cli/ember-cli/issues/3718
-    var target = parentAddon || app;
+    const target = parentAddon || app;
+
     if (!this.app && target.app) {
       this.app = target.app;
     }
+
+    const options = {
+      ...DEFAULT_OPTIONS,
+      ...this.app.options[this.name],
+    };
+
+    if (options.includeStyles === true) {
+      this.app.import('vendor/ember-freestyle.css');
+    }
   },
 
   setupPreprocessorRegistry(type, registry) {