Skip to content

Commit 7db7184

Browse files
nadnoslennadnoslen
committed
⚰️ Remove Bower
1 parent 42abfc1 commit 7db7184

File tree

11 files changed

+316
-643
lines changed

11 files changed

+316
-643
lines changed

‎.bowerrc‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 15
8+
target-branch: master
9+
reviewers:
10+
- nadnoslen
11+
labels:
12+
- dependencies

‎.github/workflows/build.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: "Build, Test, Publish Coverage"
2+
on: push
3+
4+
jobs:
5+
test:
6+
name: Test
7+
runs-on: ubuntu-latest
8+
env:
9+
CI: "true"
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v1
13+
14+
- name: Set Node.js
15+
uses: actions/setup-node@master
16+
with:
17+
node-version: 8.17.0
18+
19+
- name: Get yarn cache
20+
id: yarn-cache
21+
run: echo "::set-output name=dir::$(yarn cache dir)"
22+
23+
- uses: actions/cache@v1
24+
with:
25+
path: ${{ steps.yarn-cache.outputs.dir }}
26+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-yarn-
29+
30+
- name: Install dependencies (yarn)
31+
run: yarn --non-interactive --no-progress install
32+
# - name: Lint (hbs)
33+
# run: yarn lint:hbs
34+
# - name: Lint (js)
35+
# run: yarn lint:js
36+
# - name: Run test
37+
# run: yarn test
38+
# env:
39+
# COVERAGE: 'true'
40+
- name: Run test
41+
run: ./node_modules/.bin/ember t
42+
env:
43+
COVERAGE: "true"
44+
# Ideally, we would split up the test task into separate build and run
45+
# steps to get better CI log output (folding and timing information).
46+
# However, this is not currently possible with ember-cli-code-coverage.
47+
#
48+
# See https://github.com/kategengler/ember-cli-code-coverage/issues/210
49+
#
50+
# - name: Build
51+
# run: yarn ember build --environment test
52+
# env:
53+
# COVERAGE: 'true'
54+
# - name: Run test
55+
# run: COVERAGEyarn ember test --path dist
56+
# env:
57+
# # Due to a bug in ember-cli, running `ember test` with `--path` doesn't set `EMBER_ENV=test`
58+
# # See https://github.com/ember-cli/ember-cli/issues/8922
59+
# EMBER_ENV: test
60+
# COVERAGE: 'true'
61+
# - name: Report coverage
62+
# run: yarn codeclimate-test-reporter < coverage/lcov.info
63+
# env:
64+
# CODECLIMATE_REPO_TOKEN: 59edcfd1ffc778791af49ca594b503e7179f6bbe1991b2cc0c0a6987d103253d
65+
66+
# ember-try:
67+
# name: ember-try (${{ matrix.scenario }})
68+
# needs: test
69+
# runs-on: ubuntu-latest
70+
# env:
71+
# CI: 'true'
72+
# strategy:
73+
# matrix:
74+
# scenario:
75+
# - release
76+
# - beta
77+
# - canary
78+
# - lts-3.4
79+
# - lts-3.8
80+
# - lts-3.12
81+
# steps:
82+
# - name: Checkout
83+
# uses: actions/checkout@v1
84+
# - name: Set up Volta
85+
# uses: rwjblue/setup-volta@v1
86+
# - name: Install dependencies (yarn)
87+
# run: yarn install
88+
# - name: Setup ember-try scenario
89+
# run: yarn ember try:one ember-${{ matrix.scenario }} --skip-cleanup --- cat package.json
90+
# - name: Build
91+
# run: yarn ember build --environment test
92+
# - name: Run test
93+
# # Due to a bug in ember-cli, running `ember test` with `--path` doesn't set `EMBER_ENV=test`
94+
# # See https://github.com/ember-cli/ember-cli/issues/8922
95+
# run: EMBER_ENV=test yarn ember test --path dist --filter="Ember Debug"

‎.vscode/settings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"yaml.schemas": {
3+
"https://json.schemastore.org/github-workflow.json": "file:///Users/dnelson/Code/ember-addons/ember-cli-textarea-autosize/.github/workflows/build.yml"
4+
}
5+
}

‎bower.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎circle.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎ember-cli-build.js‎

Lines changed: 56 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,68 @@
1-
'use strict';
1+
"use strict";
22

3-
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
3+
const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
44

55
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
nodeAssets: {
88
autosize: {
99
vendor: {
10-
srcDir: 'dist',
11-
destDir: 'ember-cli-textarea-autosize',
12-
include: ['autosize.js']
13-
}
14-
}
15-
}
10+
srcDir: "dist",
11+
destDir: "ember-cli-textarea-autosize",
12+
include: ["autosize.js"],
13+
},
14+
},
15+
},
16+
sassOptions: {
17+
includePaths: [
18+
"node_modules/bootstrap-sass/assets/stylesheets",
19+
"node_modules/bootswatch/spacelab",
20+
"node_modules/font-awesome/scss",
21+
],
22+
},
1623
});
1724

18-
/*
19-
This build file specifies the options for the dummy test app of this
20-
addon, located in `/tests/dummy`
21-
This build file does *not* influence how the addon or the app using it
22-
behave. You most likely want to be modifying `./index.js` or app's build file
23-
*/
24-
app.import('vendor/ember-cli-textarea-autosize/autosize.js');
25+
// bootstrap & bootstrap-sass from node_modules
26+
app.import("node_modules/bootstrap/dist/js/bootstrap.js");
27+
app.import("node_modules/bootstrap/fonts/glyphicons-halflings-regular.eot", {
28+
destDir: "fonts/bootstrap",
29+
});
30+
app.import("node_modules/bootstrap/fonts/glyphicons-halflings-regular.svg", {
31+
destDir: "fonts/bootstrap",
32+
});
33+
app.import("node_modules/bootstrap/fonts/glyphicons-halflings-regular.ttf", {
34+
destDir: "fonts/bootstrap",
35+
});
36+
app.import("node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff", {
37+
destDir: "fonts/bootstrap",
38+
});
39+
app.import(
40+
"node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff2",
41+
{ destDir: "fonts/bootstrap" }
42+
);
43+
44+
// font-awesome from node_modules
45+
app.import("node_modules/font-awesome/fonts/FontAwesome.otf", {
46+
destDir: "assets/font-awesome/fonts",
47+
});
48+
app.import("node_modules/font-awesome/fonts/fontawesome-webfont.eot", {
49+
destDir: "assets/font-awesome/fonts",
50+
});
51+
app.import("node_modules/font-awesome/fonts/fontawesome-webfont.svg", {
52+
destDir: "assets/font-awesome/fonts",
53+
});
54+
app.import("node_modules/font-awesome/fonts/fontawesome-webfont.ttf", {
55+
destDir: "assets/font-awesome/fonts",
56+
});
57+
app.import("node_modules/font-awesome/fonts/fontawesome-webfont.woff", {
58+
destDir: "assets/font-awesome/fonts",
59+
});
60+
app.import("node_modules/font-awesome/fonts/fontawesome-webfont.woff2", {
61+
destDir: "assets/font-awesome/fonts",
62+
});
63+
64+
// autosize via `nodeAssets`
65+
app.import("vendor/ember-cli-textarea-autosize/autosize.js");
2566

2667
return app.toTree();
2768
};

‎jsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}

‎package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@
4747
},
4848
"devDependencies": {
4949
"autosize": "^4.0.2",
50+
"bootstrap": "3.4.1",
51+
"bootstrap-sass": "3.4.1",
5052
"bootswatch": "^3.3.7",
5153
"broccoli-asset-rev": "^2.4.5",
5254
"ember-ajax": "^3.0.0",
5355
"ember-cli": "~2.18.2",
54-
"ember-cli-bootstrap3-sass": "^1.0.6",
5556
"ember-cli-dependency-checker": "^2.0.0",
5657
"ember-cli-deploy": "^1.0.1",
5758
"ember-cli-deploy-build": "^1.1.0",
5859
"ember-cli-deploy-gzip": "^1.0.0",
5960
"ember-cli-deploy-s3": "^1.1.0",
6061
"ember-cli-eslint": "^4.2.1",
61-
"ember-cli-font-awesome-sass": "^1.0.4",
6262
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
6363
"ember-cli-inject-live-reload": "^1.4.1",
6464
"ember-cli-qunit": "^4.1.1",
65-
"ember-cli-sass": "^7.0.0",
65+
"ember-cli-sass": "^8.0.1",
6666
"ember-cli-shims": "^1.2.0",
6767
"ember-cli-sri": "^2.1.0",
6868
"ember-cli-text-support-mixins": "~1",
@@ -76,8 +76,10 @@
7676
"ember-welcome-page": "^3.0.0",
7777
"eslint-plugin-ember": "^5.0.0",
7878
"eslint-plugin-node": "^5.2.1",
79+
"font-awesome": "4.7",
7980
"keyevent": "^1.1.0",
80-
"loader.js": "^4.2.3"
81+
"loader.js": "^4.2.3",
82+
"sass": "~1.14.3"
8183
},
8284
"engines": {
8385
"node": "^4.5 || 6.* || >= 7.*"

‎tests/dummy/app/styles/app.scss‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
@import "../../../../node_modules/bootswatch/spacelab/variables";
1+
@import "node_modules/bootswatch/spacelab/variables";
2+
@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
3+
@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
4+
@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/theme";
5+
@import "node_modules/bootswatch/spacelab/bootswatch";
26

3-
$icon-font-path: '/assets/bootstrap/'; // TODO: this should be removed once I fix the bootstrap3-sass addon
4-
//noinspection CssUnknownTarget
5-
@import 'ember-cli-bootstrap3-sass';
6-
@import "../../../../node_modules/bootswatch/spacelab/bootswatch";
7-
//noinspection CssUnknownTarget
8-
@import "ember-cli-font-awesome-sass";
7+
$fa-font-path: "/assets/font-awesome/fonts" !default;
8+
9+
@import "node_modules/font-awesome/scss/variables";
10+
@import "node_modules/font-awesome/scss/font-awesome";
911

1012
body {
11-
padding-top: 50px; // for the fixed navbar
1213
margin-bottom: 50%; // to allow scrolling beyond the end of the last example
14+
padding-top: 50px; // for the fixed navbar
1315
}

0 commit comments

Comments
 (0)