Skip to content

Commit

Permalink
Remove outdated and unused cruft (#134)
Browse files Browse the repository at this point in the history
* Remove unused freestyle-headers example component
* Remove unused service cruft
* Include dummy app normalize css via cdn
* Simplify dummy app scss
  • Loading branch information
chrislopresto authored Jul 14, 2017
1 parent 0c426c1 commit e0fceea
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 259 deletions.
13 changes: 0 additions & 13 deletions addon/components/freestyle-headers.js

This file was deleted.

6 changes: 0 additions & 6 deletions addon/templates/components/freestyle-headers.hbs

This file was deleted.

1 change: 0 additions & 1 deletion app/components/freestyle-headers.js

This file was deleted.

8 changes: 0 additions & 8 deletions app/initializers/ember-freestyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
1 change: 0 additions & 1 deletion app/templates/components/freestyle-headers.js

This file was deleted.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
65 changes: 0 additions & 65 deletions tests/dummy/app/ember-freestyle/ember-freestyle.js

This file was deleted.

2 changes: 2 additions & 0 deletions tests/dummy/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

{{content-for "head"}}

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/7.0.0/normalize.min.css" integrity="sha256-HxaKz5E/eBbvhGMNwhWRPrAR9i/lG1JeT4mD6hCQ7s4=" crossorigin="anonymous" />

<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/dummy.css">

Expand Down
27 changes: 22 additions & 5 deletions tests/dummy/app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -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';
1 change: 0 additions & 1 deletion tests/dummy/app/styles/components/all.scss

This file was deleted.

25 changes: 0 additions & 25 deletions tests/dummy/app/styles/mixins.scss

This file was deleted.

63 changes: 0 additions & 63 deletions tests/dummy/app/styles/palette.scss

This file was deleted.

24 changes: 0 additions & 24 deletions tests/dummy/app/styles/reset.scss

This file was deleted.

3 changes: 0 additions & 3 deletions tests/dummy/app/styles/site.scss

This file was deleted.

42 changes: 1 addition & 41 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit e0fceea

Please sign in to comment.