Skip to content

Commit

Permalink
Dependencies upgraded
Browse files Browse the repository at this point in the history
  • Loading branch information
janmisek committed May 28, 2019
1 parent 9df6637 commit 51a9a6f
Show file tree
Hide file tree
Showing 19 changed files with 3,484 additions and 2,230 deletions.
1 change: 1 addition & 0 deletions .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"port": 4011,
"disableAnalytics": false
}
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/dist
/tests
/tmp
/bin
**/.gitkeep
.bowerrc
.editorconfig
Expand Down
22 changes: 13 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ Service must extend `base-listener` class.
# config/environment.js

if (environment === 'development') {
ENV['ember-error-handler'].listeners = [
'service:ember-error-handler/listener/window-listener',
'service:ember-error-handler/listener/ember-listener'
];
ENV['ember-error-handler'] = {
listeners: [
'service:ember-error-handler/listener/window-listener',
'service:ember-error-handler/listener/ember-listener'
]
};
}
```

Expand All @@ -53,10 +55,12 @@ Consumers are executed in order.
# config/environment.js

if (environment === 'development') {
ENV['ember-error-handler'].consumers = [
'service:ember-error-handler/consumer/wsod-consumer',
'service:ember-error-handler/consumer/console-consumer'
];
ENV['ember-error-handler'] = {
consumers: [
'service:ember-error-handler/consumer/wsod-consumer',
'service:ember-error-handler/consumer/console-consumer'
]
}
}
```

Expand All @@ -67,7 +71,7 @@ if (environment === 'development') {
# config/environment.js

{
ember-error-handler: {
"ember-error-handler": {
"wsod-component-production": 'my-own-component-for-wsod-screen-production'
"wsod-component-development": 'my-own-component-for-wsod-screen-development'
"wsod-component-": 'my-own-component-for-wsod-screen'
Expand Down
2 changes: 1 addition & 1 deletion addon/listener/window-listener.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default BaseListener.extend({
let error = event.reason;
if (!error) {
error = {
message: message,
message: error.message,
name: String(error),
stack: ''
};
Expand Down
15 changes: 15 additions & 0 deletions bin/activate-virtualenv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

set -e
SCRIPTPATH=`dirname $0`
. "$SCRIPTPATH/config.sh"

if test '!' -e "$virtualenvdir/bin/activate"
then
echo "Could not find virtualenv!" >&2
echo "Run prepare-virtualenv.sh first." >&2
exit 1
fi

. "$virtualenvdir/bin/activate"
npm set progress=false
18 changes: 18 additions & 0 deletions bin/config.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/sh

if [ -z "$config" ]
then

set -e

# config values
basedir="$(git rev-parse --show-toplevel)"
nodeversion=10.15.3
embercliversion=3.10.1
virtualenvdir="$basedir/virtualenv"




fi

19 changes: 19 additions & 0 deletions bin/install-dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

basedir="$(git rev-parse --show-toplevel)"
echo :::: Activating virtual env
cd $basedir
source ./virtualenv/bin/activate

echo :::::::::::::::::::: app ::::::::::::::::::::::::

echo :::: app - Cleaning environment
cd $basedir
rm -rf ./node_modules
rm -rf ./bower_components

echo :::: app - Installing the project
cd $basedir
bower install --config.interactive=false
yarn install

13 changes: 13 additions & 0 deletions bin/prepare-os.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

set -e
SCRIPTPATH=`dirname $0`
. "$SCRIPTPATH/config.sh"

echo --
echo -- INSTALL OS DEPENDENCIES
echo --

sudo apt-get install python3
sudo apt-get install python3-venv
sudo apt-get install chromium-browser
51 changes: 51 additions & 0 deletions bin/prepare-virtualenv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/bin/sh

set -e

SCRIPTPATH=`dirname $0`
. "$SCRIPTPATH/config.sh"

echo --
echo -- INSTALL VIRTUAL ENV
echo --

install_virtualenv()
{
echo "installing new virtualenv for node $nodeversion"
python3 -m venv "$virtualenvdir"

. "$virtualenvdir/bin/activate"

python3 -m pip install nodeenv
python3 -m nodeenv -p --prebuilt --node=$nodeversion
}

if [ -d "$virtualenvdir" ]; then
echo "using existing virtualenv"
. "$virtualenvdir/bin/activate"
if [ $(node --version) != "v$nodeversion" ]; then
install_virtualenv
else
echo "using existing node v$nodeversion installation"
fi
else
install_virtualenv
fi

. "$basedir/bin/activate-virtualenv.sh"


echo --
echo -- SETTING NPM / YARN CONFIGURATION
echo --
npm config set tag-version-prefix ''

echo --
echo -- INSTALL BASE TOOLING INTO VIRTUAL ENV
echo --

npm install -g yarn
npm install -g bower
npm install -g ember-cli@$embercliversion
npm install -g node-gyp

96 changes: 47 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,49 @@
{
"name": "ember-error-handler",
"version": "0.3.0",
"description": "Addon handles uncatched errors. Handled error can be displayed on customizable error page or passed through custom logic. By default addon includes consumers for local and remote logging of errors.",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember try:each"
},
"repository": "https://github.com/janmisek/ember-error-handler",
"engines": {
"node": ">= 0.12.0"
},
"author": "",
"license": "MIT",
"devDependencies": {
"ember-cli": "~3.0.0",
"ember-cli-dependency-checker": "~2.1.0",
"ember-cli-eslint": "~4.2.3",
"ember-cli-htmlbars-inline-precompile": "~1.0.2",
"ember-cli-inject-live-reload": "~1.7.0",
"ember-cli-qunit": "~4.3.2",
"ember-cli-shims": "~1.2.0",
"ember-cli-test-loader": "~2.2.0",
"ember-export-application-global": "~2.0.0",
"ember-load-initializers": "~1.0.0",
"ember-resolver": "~4.5.0",
"ember-source": "~3.0.0",
"loader.js": "~4.6.0"
},
"keywords": [
"ember-addon",
"error",
"errors",
"uncatched",
"log",
"exception"
],
"dependencies": {
"ember-cli-babel": "~6.12.0",
"ember-cli-htmlbars": "~2.0.3",
"ember-exex": "^0.1.11"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
"name": "ember-error-handler",
"version": "0.3.0",
"description": "Addon handles uncatched errors. Handled error can be displayed on customizable error page or passed through custom logic. By default addon includes consumers for local and remote logging of errors.",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build",
"start": "ember server",
"test": "ember try:each"
},
"repository": "https://github.com/janmisek/ember-error-handler",
"engines": {
"node": "8.* || >= 10.*"
},
"author": "",
"license": "MIT",
"devDependencies": {
"ember-cli": "~3.10.1",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-qunit": "^4.3.2",
"ember-export-application-global": "~2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-resolver": "^5.0.1",
"ember-source": "~3.10.0",
"loader.js": "^4.7.0"
},
"keywords": [
"ember-addon",
"error",
"errors",
"uncatched",
"log",
"exception"
],
"dependencies": {
"ember-cli-babel": "^7.7.3",
"ember-cli-htmlbars": "~2.0.3",
"ember-exex": "^0.2.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
5 changes: 0 additions & 5 deletions tests/helpers/destroy-app.js

This file was deleted.

23 changes: 0 additions & 23 deletions tests/helpers/module-for-acceptance.js

This file was deleted.

28 changes: 28 additions & 0 deletions tests/helpers/qunit-console-errors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* global QUnit */

export default function enableQUnitConsoleErrors() {

// enable enhanced errors to be printed to console
if ((typeof QUnit) !== "undefined" && typeof(console) !== "undefined") {
QUnit.log(function (details) {
if (!details.result) {

if (details.message && details.message.indexOf("\n at") > -1) {
console.error(details.message); //eslint-disable-line no-console
}

if (details.message instanceof Error) {
console.error(`Error in test: '${details.module}/${details.name}' `, details.message.message, details.message.stack); //eslint-disable-line no-console
}

else if (details.source) {
console.error(`Error in test: '${details.module}/${details.name}' `, details.source); //eslint-disable-line no-console
}
}
});
}

// Unlimited stacktrace
Error.stackTraceLimit = Infinity;
}

4 changes: 2 additions & 2 deletions tests/helpers/resolver.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Resolver from '../../resolver';
import Resolver from 'ember-resolver';
import config from '../../config/environment';

const resolver = Resolver.create();
var resolver = Resolver.create();

resolver.namespace = {
modulePrefix: config.modulePrefix,
Expand Down
8 changes: 4 additions & 4 deletions tests/helpers/start-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import Application from '../../app';
import config from '../../config/environment';

export default function startApp(attrs) {
let application;
var application;

let attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
var attributes = Object.assign({}, config.APP);
attributes = Object.assign(attributes, attrs); // use defaults, but you can override;

Ember.run(() => {
Ember.run(function() {
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
Expand Down
Loading

0 comments on commit 51a9a6f

Please sign in to comment.