Skip to content

Commit

Permalink
#27 Stop using bower for dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Dec 30, 2019
1 parent da304d2 commit 967d40b
Show file tree
Hide file tree
Showing 11 changed files with 3,883 additions and 68 deletions.
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 8.17.0
11 changes: 4 additions & 7 deletions addon/components/set-links-target.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* globals s */
import Ember from 'ember';
import startsWith from 'lodash.startswith';
import layout from '../templates/components/set-links-target';

export default Ember.Component.extend({
Expand All @@ -19,7 +19,7 @@ export default Ember.Component.extend({
/**
* Determines the `window.document.location.origin` because PhantomJS does not have a notion of the location object.
*/
_origin: Ember.computed(function () {
_origin: Ember.computed(function() {
if (Ember.isPresent(document)) {
return document.location.origin;
}
Expand All @@ -28,18 +28,15 @@ export default Ember.Component.extend({
/**
* Sets any `<a>` (link) `target` attributes to whatever we've specified in the `targetValue` property.
*/
_setTarget: Ember.on('didInsertElement', function () {
_setTarget: Ember.on('didInsertElement', function() {
const excludeSelfLinks = this.get('excludeSelfLinks?');
const origin = this.get('_origin');
const targetValue = this.get('targetValue');
// for each anchor check if we should set the target
this.$('a').each((index, element) => {
const link = Ember.$(element);
// are we excluding links to self?
if (Ember.isPresent(link.attr('href')) &&
// because startsWith is ES6 and not supported by some browsers...using underscore.string
s.startsWith(link.attr('href'), origin) &&
excludeSelfLinks) {
if (Ember.isPresent(link.attr('href')) && startsWith(link.attr('href'), origin) && excludeSelfLinks) {
return;
}
// got this far, then apply a target if it hasn't already got one
Expand Down
2 changes: 1 addition & 1 deletion addon/helpers/marked-down.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global showdown */
import Ember from 'ember';
import showdown from 'showdown';

export function markedDown(src, hash) {
if (Ember.isEmpty(src) || Ember.isBlank(src[0])) {
Expand Down
2 changes: 1 addition & 1 deletion addon/services/showdown-converter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global showdown */
import Ember from 'ember';
import showdown from 'showdown';

export default Ember.Service.extend({
/**
Expand Down
29 changes: 17 additions & 12 deletions blueprints/ember-cli-marked-down/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
/* eslint-env node */
module.exports = {
description: "The blueprint that installs this addon's required bower dependencies.",
normalizeEntityName: function () {
},
afterInstall: function (/*options*/) {
var self = this;
return self.addAddonToProject('ember-getowner-polyfill')
.then(function () {
return self.addBowerPackagesToProject([
{name: 'showdown'},
{name: 'underscore.string'}
]);
});
description: 'Ember `marked-down` helper blueprint.',

normalizeEntityName() {
}, // no-op since we're just adding dependencies

afterInstall(/* options*/) {
return this.addAddonsToProject({
packages: [
{ name: 'ember-auto-import' },
{ name: 'ember-getowner-polyfill' }
]
}).then(() => {
return this.addPackagesToProject([
{ name: 'lodash.startswith' },
{ name: 'showdown' }
]);
});
}
};
2 changes: 0 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "ember-cli-marked-down",
"dependencies": {
"showdown": "^1.4.3",
"underscore.string": "^3.3.4",
"bootstrap-sass": "^3.3.7",
"font-awesome": "^4.7.0"
}
Expand Down
12 changes: 1 addition & 11 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,5 @@
'use strict';

module.exports = {
name: 'ember-cli-marked-down',
/**
* TODO: need to move to node inclusion of assets
* @param app
*/
included: function (app) {
this._super.included(app);
app.import(app.bowerDirectory + '/showdown/dist/showdown.js');
app.import(app.bowerDirectory + '/underscore.string/dist/underscore.string.js');
}

name: 'ember-cli-marked-down'
};
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli-marked-down",
"version": "1.2.0-rc.2",
"version": "2.0.0-rc.0",
"description": "This addon provides a means to generate html formatted markup from markdown source.",
"keywords": [
"ember-addon",
Expand Down Expand Up @@ -38,8 +38,11 @@
"test": "ember try:each"
},
"dependencies": {
"ember-auto-import": "^1.5.3",
"ember-cli-babel": "^6.3.0",
"ember-cli-htmlbars": "^2.0.1"
"ember-cli-htmlbars": "^2.0.1",
"lodash.startswith": "^4.2.1",
"showdown": "^1.9.1"
},
"devDependencies": {
"bootswatch": "^3.3.7",
Expand Down
19 changes: 12 additions & 7 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
module.exports = {
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
Expand All @@ -8,12 +7,18 @@ module.exports = {
launch_in_dev: [
'Chrome'
],
browser_start_timeout: 60,
browser_args: {
Chrome: [
'--headless',
'--window-size=1440,900',
'--disable-gpu',
'--remote-debugging-port=9222'
]
Chrome: {
mode: 'ci',
args: [
'--disable-web-security',
'--disable-gpu',
'--headless',
'--no-sandbox',
'--remote-debugging-port=0',
'--window-size=1440,900'
].filter(Boolean)
}
}
};
2 changes: 1 addition & 1 deletion tests/unit/services/showdown-converter-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global showdown */
import { moduleFor, test } from 'ember-qunit';
import showdown from 'showdown';

moduleFor('service:showdown-converter', 'Unit | Service | showdown converter', {
// Specify the other units that are required for this test.
Expand Down
Loading

0 comments on commit 967d40b

Please sign in to comment.