Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing bower #126

Merged
merged 2 commits into from
Feb 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .bowerrc

This file was deleted.

2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ jobs:
- image: circleci/node:10-browsers
steps:
- checkout
- run: sudo npm install -g bower
- restore_cache:
key: v1-yarn-{{ checksum "yarn.lock" }}
- run: yarn
Expand All @@ -15,6 +14,5 @@ jobs:
paths:
- node_modules
- ~/.cache/yarn
- run: bower install
- run: COVERAGE=true yarn test
- run: bash <(curl -s https://codecov.io/bash)
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ You will need the following things properly installed on your computer.

* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/) (with NPM)
* [Bower](http://bower.io/)
* [Ember CLI](https://ember-cli.com/)
* [Google Chrome](https://google.com/chrome/)

Expand All @@ -20,7 +19,6 @@ You will need the following things properly installed on your computer.
* `git clone <repository-url>` this repository
* change into the new directory
* `npm install`
* `bower install`

## Running / Development

Expand Down
4 changes: 2 additions & 2 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "normalize";
@import "bower_components/bourbon/app/assets/stylesheets/_bourbon";
@import "bower_components/neat/app/assets/stylesheets/_neat";
@import "node_modules/bourbon/app/assets/stylesheets/_bourbon";
@import "node_modules/bourbon-neat/app/assets/stylesheets/_neat";
@import "base/base";
@import "font-icons";
@import "markdown";
Expand Down
2 changes: 1 addition & 1 deletion app/styles/base/_grid-settings.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "bower_components/neat/app/assets/stylesheets/_neat-helpers";
@import "node_modules/bourbon-neat/app/assets/stylesheets/_neat-helpers";

// Neat Overrides
// $column: 90px;
Expand Down
7 changes: 0 additions & 7 deletions bower.json

This file was deleted.

95 changes: 61 additions & 34 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,70 @@
'use strict';

const getChannelURL = require('ember-source-channel-url');

module.exports = function() {
return {
"scenarios": [
{
"name": "ember-release",
"bower": {
"dependencies": {
"ember": "release"
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then((urls) => {
return {
scenarios: [
{
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': '~2.12.0'
}
}
}
},
{
"name": "ember-beta",
"bower": {
"dependencies": {
"ember": "beta"
},
{
name: 'ember-lts-2.16',
npm: {
devDependencies: {
'ember-source': '~2.16.0'
}
}
}
},
{
"name": "ember-canary",
"bower": {
"dependencies": {
"ember": "canary"
},
{
name: 'ember-lts-2.18',
npm: {
devDependencies: {
'ember-source': '~2.18.0'
}
}
}
},
{
"name": "ember-source",
"bower": {
"dependencies": {
"ember": null
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
"npm": {
"devDependencies": {
"ember-source": "2.11.0-alpha.1"
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
}
]
};
]
};
});
};
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"test": "ember test"
},
"devDependencies": {
"bourbon": "4.2.3",
"bourbon-neat": "1.7.1",
"broccoli-asset-rev": "^2.7.0",
"dompurify": "^1.0.8",
"ember-ajax": "3.1.0",
Expand Down Expand Up @@ -62,6 +64,7 @@
"ember-resolver": "^4.5.0",
"ember-router-scroll": "^1.0.0",
"ember-source": "~3.2.0",
"ember-source-channel-url": "^1.0.1",
"emberx-select": "^3.1.1",
"eslint-plugin-ember": "^5.0.0",
"glob": "^7.1.1",
Expand Down
Loading