Skip to content

Commit

Permalink
Merge pull request #8 from rico-projects/updateRicoCore
Browse files Browse the repository at this point in the history
fix: update to use RicoJs 1.1.0
  • Loading branch information
timo0 authored May 5, 2020
2 parents 395ef46 + 18030d4 commit 49e6f83
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 56 deletions.
21 changes: 6 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,26 @@
dist: xenial
services:
- xvfb
language: node_js
cache:
directories:
- ~/.npm
notifications:
email: true
node_js:
- '9'
- '10'
services:
- docker

# Set DISPLAY for Xvfb
env:
- DISPLAY=:99.0

# Use APT Addon to install Chrome
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable

# Start Xvfb so you can run Chrome
before_install:
- sh -e /etc/init.d/xvfb start
chrome: stable

jobs:
include:
- stage: test
script:
- npm run test
- xvfb-run --server-args="-screen 0 1024x768x24" npm run test
- stage: build
script:
- npm run dist
Expand Down
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ The following steps describes how you can use Rico in your Angular application.

=== Step 1: Add Dependencies

Add dependencies to `rico-js` and `rico-angular` to your project:
Add dependencies to `@rico-projects/rico-js` and `rico-angular` to your project:

npm install git+https://github.com/rico-project/rico-js.git#1.0.1
npm install @rico-projects/rico-js
npm install rico-angular

So that these lines end up in your `package.json`:

"rico-angular": "^1.0.3",
"rico-js": "git+https://github.com/rico-project/rico-js.git#1.0.1",
"@rico-projects/rico-js`": "1.1.0",

=== Step 2: Inject library

Expand Down
9 changes: 8 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,14 @@ module.exports = function (config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
// you can define custom flags
customLaunchers: {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
singleRun: false
});
};
83 changes: 52 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"semantic-release": "semantic-release"
},
"peerDependencies": {
"rico-js": "git+https://github.com/rico-project/rico-js.git#1.0.1",
"@rico-projects/rico-js": "1.1.0",
"@angular/common": "~7.1.0",
"@angular/compiler": "~7.1.0",
"@angular/core": "~7.1.0",
Expand All @@ -47,7 +47,7 @@
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.1.1",
"karma-chrome-launcher": "~2.2.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
Expand All @@ -74,6 +74,6 @@
}
},
"release": {
"pkgRoot": "dist/"
"pkgRoot": "dist/"
}
}
2 changes: 1 addition & 1 deletion src/lib/controller-proxy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationRef } from '@angular/core';
import { LoggerFactory, LogLevel } from 'rico-js';
import { LoggerFactory, LogLevel } from '@rico-projects/rico-js';

export class ControllerProxy {

Expand Down
2 changes: 1 addition & 1 deletion src/lib/model-maintainer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ApplicationRef, Injectable } from '@angular/core';
import { LoggerFactory, LogLevel } from 'rico-js';
import { LoggerFactory, LogLevel } from '@rico-projects/rico-js';

export class ModelMaintainer {

Expand Down
2 changes: 1 addition & 1 deletion src/lib/rico-angular.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Injectable, ApplicationRef } from '@angular/core';
import { getService, LoggerFactory } from 'rico-js';
import { getService, LoggerFactory } from '@rico-projects/rico-js';
import { ControllerProxy } from './controller-proxy';
import { ModelMaintainer } from './model-maintainer';

Expand Down

0 comments on commit 49e6f83

Please sign in to comment.