From e0fceea71fa10a7c9cec6e2fdddaac1daebce5ee Mon Sep 17 00:00:00 2001 From: Chris LoPresto Date: Fri, 14 Jul 2017 00:59:10 -0400 Subject: [PATCH] Remove outdated and unused cruft (#134) * Remove unused freestyle-headers example component * Remove unused service cruft * Include dummy app normalize css via cdn * Simplify dummy app scss --- addon/components/freestyle-headers.js | 13 ---- .../components/freestyle-headers.hbs | 6 -- app/components/freestyle-headers.js | 1 - app/initializers/ember-freestyle.js | 8 --- app/templates/components/freestyle-headers.js | 1 - package.json | 4 +- .../app/ember-freestyle/ember-freestyle.js | 65 ------------------- tests/dummy/app/index.html | 2 + tests/dummy/app/styles/app.scss | 27 ++++++-- tests/dummy/app/styles/components/all.scss | 1 - tests/dummy/app/styles/mixins.scss | 25 ------- tests/dummy/app/styles/palette.scss | 63 ------------------ tests/dummy/app/styles/reset.scss | 24 ------- tests/dummy/app/styles/site.scss | 3 - yarn.lock | 42 +----------- 15 files changed, 26 insertions(+), 259 deletions(-) delete mode 100644 addon/components/freestyle-headers.js delete mode 100644 addon/templates/components/freestyle-headers.hbs delete mode 100644 app/components/freestyle-headers.js delete mode 100644 app/templates/components/freestyle-headers.js delete mode 100644 tests/dummy/app/ember-freestyle/ember-freestyle.js delete mode 100644 tests/dummy/app/styles/components/all.scss delete mode 100644 tests/dummy/app/styles/mixins.scss delete mode 100644 tests/dummy/app/styles/palette.scss delete mode 100644 tests/dummy/app/styles/reset.scss delete mode 100644 tests/dummy/app/styles/site.scss diff --git a/addon/components/freestyle-headers.js b/addon/components/freestyle-headers.js deleted file mode 100644 index 081b6dfe..00000000 --- a/addon/components/freestyle-headers.js +++ /dev/null @@ -1,13 +0,0 @@ -import Ember from 'ember'; -import layout from '../templates/components/freestyle-headers'; - -export default Ember.Component.extend({ - layout, - - h1: 'Ember Freestyle Header 1', - h2: 'Ember Freestyle Header 2', - h3: 'Ember Freestyle Header 3', - h4: 'Ember Freestyle Header 4', - h5: 'Ember Freestyle Header 5', - h6: 'Ember Freestyle Header 6' -}); diff --git a/addon/templates/components/freestyle-headers.hbs b/addon/templates/components/freestyle-headers.hbs deleted file mode 100644 index 7c438a0f..00000000 --- a/addon/templates/components/freestyle-headers.hbs +++ /dev/null @@ -1,6 +0,0 @@ -

{{h1}}

-

{{h2}}

-

{{h3}}

-

{{h4}}

-
{{h5}}
-
{{h6}}
diff --git a/app/components/freestyle-headers.js b/app/components/freestyle-headers.js deleted file mode 100644 index 3358be4b..00000000 --- a/app/components/freestyle-headers.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'ember-freestyle/components/freestyle-headers'; diff --git a/app/initializers/ember-freestyle.js b/app/initializers/ember-freestyle.js index a190f248..dd5b09c8 100644 --- a/app/initializers/ember-freestyle.js +++ b/app/initializers/ember-freestyle.js @@ -9,14 +9,6 @@ function initialize() { Object.keys(requirejs.entries).filter(function(key) { return freestyleModuleRegExp.test(key); }).forEach(function(moduleName) { - if (moduleName.match(/\.jshint/)) { - // ignore autogenerated .jshint files - return; - } - - // broccoli-json-module creates a module for each json config file - // in the freestyle directory. Here we inject each module's - // exported config as a property on the ember-freestyle service. let module = require(moduleName, null, null, true); let freestyleModule = module['default']; let moduleKey = moduleName.split('/').reverse()[0]; diff --git a/app/templates/components/freestyle-headers.js b/app/templates/components/freestyle-headers.js deleted file mode 100644 index 03f952a0..00000000 --- a/app/templates/components/freestyle-headers.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'ember-freestyle/templates/components/freestyle-headers'; diff --git a/package.json b/package.json index 72268441..76b03a09 100644 --- a/package.json +++ b/package.json @@ -49,12 +49,10 @@ "ember-cli-uglify": "^1.2.0", "ember-export-application-global": "^2.0.0", "ember-load-initializers": "^1.0.0", - "ember-normalize": "1.0.0", "ember-resolver": "^4.0.0", "ember-source": "~2.13.0", "eslint-config-ember": "0.3.0", - "loader.js": "^4.2.3", - "normalize.css": "^6.0.0" + "loader.js": "^4.2.3" }, "engines": { "node": ">= 4" diff --git a/tests/dummy/app/ember-freestyle/ember-freestyle.js b/tests/dummy/app/ember-freestyle/ember-freestyle.js deleted file mode 100644 index ddf7ccd5..00000000 --- a/tests/dummy/app/ember-freestyle/ember-freestyle.js +++ /dev/null @@ -1,65 +0,0 @@ -export default { - title: 'Dummy App Styleguide', - sections: [ - 'Colors', - 'Typography', - 'Custom Foo' - ], - components: [ - { - name: 'freestyle-headers', - section: 'Typography', - attrs: { - h1: 'A Dummy App Using Ember Freestyle 1', - h2: 'A Dummy App Using Ember Freestyle 2', - h3: 'A Dummy App Using Ember Freestyle 3', - h4: 'A Dummy App Using Ember Freestyle 4', - h5: 'A Dummy App Using Ember Freestyle 5', - h6: 'A Dummy App Using Ember Freestyle 6' - } - }, - { - name: 'freestyle-palette', - section: 'Colors', - attrs: { - title: 'Color Palette', - colors: [ - { - name: 'mauve', - hex: '#dbb1bc' - }, - { - name: 'lilac', - hex: '#d3c4e3' - }, - { - name: 'periwinkle', - hex: '#8f95d3' - }, - { - name: 'sky', - hex: '#89daff' - }, - { - name: 'coffee', - hex: '#58504a' - } - ] - } - }, - { - name: 'x-foo', - section: 'Custom Foo', - attrs: { - status: 'active' - } - }, - { - name: 'x-foo', - section: 'Custom Foo', - attrs: { - status: 'most definitely not active' - } - } - ] -}; diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 3158834e..e1416ee4 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -9,6 +9,8 @@ {{content-for "head"}} + + diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss index 11251257..3029e2ef 100644 --- a/tests/dummy/app/styles/app.scss +++ b/tests/dummy/app/styles/app.scss @@ -1,6 +1,23 @@ -@import 'reset'; -@import 'mixins'; -@import 'palette'; +html, +body { + font-size: 16px; +} -@import 'site'; -@import 'components/all'; +html { + box-sizing: border-box; +} + +body { + font-family: sans-serif; +} + +* { + box-sizing: inherit; + + &::before, + &::after { + box-sizing: inherit; + } +} + +@import 'components/x-foo'; diff --git a/tests/dummy/app/styles/components/all.scss b/tests/dummy/app/styles/components/all.scss deleted file mode 100644 index 54271dbf..00000000 --- a/tests/dummy/app/styles/components/all.scss +++ /dev/null @@ -1 +0,0 @@ -@import 'x-foo'; diff --git a/tests/dummy/app/styles/mixins.scss b/tests/dummy/app/styles/mixins.scss deleted file mode 100644 index 50aca733..00000000 --- a/tests/dummy/app/styles/mixins.scss +++ /dev/null @@ -1,25 +0,0 @@ -@function map-get-deep($map, $keys...) { - @if length($keys) == 1 { - $keys: nth($keys, 1); - } - $warn: '#{nth($keys, 1)}'; - $length: length($keys); - $get: map-get($map, nth($keys, 1)); - - @if $length > 1 { - @for $i from 2 through $length { - @if $get != null and type-of($get) == 'map' { - $warn: $warn + '->#{nth($keys, $i)}'; - $get: map-get($get, nth($keys, $i)); - - @if $get == null { - @return map-get-deep-warning($warn, $get, nth($keys, $i)); - } - } @else { - @return map-get-deep-warning($warn, $get, nth($keys, $i)); - } - } - } - - @return $get; -} diff --git a/tests/dummy/app/styles/palette.scss b/tests/dummy/app/styles/palette.scss deleted file mode 100644 index 30cb2361..00000000 --- a/tests/dummy/app/styles/palette.scss +++ /dev/null @@ -1,63 +0,0 @@ -$FreestylePalette: ( - 'primary': ( - 'name': 'cyan', - 'description': 'something toply cyanish', - 'base': #00bcd4, - 'light': #b2ebf2, - 'dark': #0097a7 - ), - 'accent': ( - 'name': 'amber', - 'base': #ffc107 - ), - 'secondary': ( - 'name': 'grey-ish', - 'base': #b6b6b6 - ), - 'foreground': ( - 'name': 'black-ish', - 'base': #212121, - 'light': #727272 - ), - 'background': ( - 'name': 'white', - 'base': #fff - ) -); - -$FreestylePalette-baseKey: 'base' !default; -$FreestylePalette-opacities: ( - 'light': .8, - 'dark': .4, - 'darker': .3 -); - -@function freestyle-color( - $name: 'primary', - $variant: $FreestylePalette-baseKey, - $opacity: 1 -) { - $color: null; - - $colorVariants: map-get($FreestylePalette, $name); - - @if $colorVariants { - $color: map-get($colorVariants, $variant); - } - - $alpha: if(type-of($opacity) == 'number', $opacity, map-get($FreestylePalette-opacities, $opacity)); - - @if $alpha { - $color: rgba($color, $alpha); - } - - @return $color; -} - -// Wire up variables to provide a mechanism for consuming apps to override -// without using freestyle.json files or hash maps -$FreestyleGuide-color--primary: freestyle-color('primary') !default; -$FreestyleGuide-color--accent: freestyle-color('accent') !default; -$FreestyleGuide-color--secondary: freestyle-color('secondary') !default; -$FreestyleGuide-color--foreground: freestyle-color('foreground') !default; -$FreestyleGuide-color--background: freestyle-color('background') !default; diff --git a/tests/dummy/app/styles/reset.scss b/tests/dummy/app/styles/reset.scss deleted file mode 100644 index 6e508946..00000000 --- a/tests/dummy/app/styles/reset.scss +++ /dev/null @@ -1,24 +0,0 @@ -// $base-font-size -// - defines the root html, body (directly below) -$base-font-size: 16px; - -html, -body { - font-size: $base-font-size; -} - -html { - box-sizing: border-box; -} - -body { - font-family: sans-serif; -} - -*, -*:before, -*:after { - box-sizing: inherit; -} - -@import 'normalize'; diff --git a/tests/dummy/app/styles/site.scss b/tests/dummy/app/styles/site.scss deleted file mode 100644 index 34e7b85f..00000000 --- a/tests/dummy/app/styles/site.scss +++ /dev/null @@ -1,3 +0,0 @@ -body { - color: freestyle-color('foreground'); -} diff --git a/yarn.lock b/yarn.lock index eb7ede1c..1fe148e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1276,23 +1276,6 @@ broccoli-funnel-reducer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea" -broccoli-funnel@^0.2.3: - version "0.2.15" - resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-0.2.15.tgz#4d0c128bef746e02f91038415aac4adbfaae222d" - dependencies: - array-equal "^1.0.0" - blank-object "^1.0.1" - broccoli-plugin "^1.0.0" - debug "^2.2.0" - fast-ordered-set "^1.0.0" - fs-tree-diff "^0.3.0" - minimatch "^2.0.1" - mkdirp "^0.5.0" - path-posix "^1.0.0" - rimraf "^2.4.3" - symlink-or-copy "^1.0.0" - walk-sync "^0.2.6" - broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296" @@ -2579,14 +2562,6 @@ ember-load-initializers@^1.0.0: dependencies: ember-cli-babel "^6.0.0-beta.7" -ember-normalize@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-normalize/-/ember-normalize-1.0.0.tgz#f5a0077caa1047321a436dd4f2fa7cf944f3b587" - dependencies: - broccoli-funnel "^0.2.3" - ember-cli-babel "^5.1.6" - normalize.css "~4.1.1" - ember-qunit@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.1.3.tgz#b3d9d4ddbcdb157cbd89ce6ad9caf51e3775f282" @@ -3328,13 +3303,6 @@ fs-readdir-recursive@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059" -fs-tree-diff@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.3.1.tgz#41a84ee34994bd564c63d9852f1109c5de7f9290" - dependencies: - debug "^2.2.0" - fast-ordered-set "^1.0.2" - fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623" @@ -4988,14 +4956,6 @@ normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" -normalize.css@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-6.0.0.tgz#22188c2707c911fb3ad3c1aac0677ff68661bea8" - -normalize.css@~4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.1.1.tgz#4f0b1d5a235383252b04d8566b866cc5fcad9f0c" - npm-cache-filename@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11" @@ -6770,7 +6730,7 @@ walk-sync@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583" -walk-sync@^0.2.5, walk-sync@^0.2.6, walk-sync@^0.2.7: +walk-sync@^0.2.5, walk-sync@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969" dependencies: