Skip to content

Commit 49e6f83

Browse files
authored
Merge pull request #8 from rico-projects/updateRicoCore
fix: update to use RicoJs 1.1.0
2 parents 395ef46 + 18030d4 commit 49e6f83

File tree

8 files changed

+75
-56
lines changed

8 files changed

+75
-56
lines changed

.travis.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,26 @@
1+
dist: xenial
2+
services:
3+
- xvfb
14
language: node_js
25
cache:
36
directories:
47
- ~/.npm
58
notifications:
69
email: true
710
node_js:
8-
- '9'
11+
- '10'
912
services:
1013
- docker
1114

12-
# Set DISPLAY for Xvfb
13-
env:
14-
- DISPLAY=:99.0
15-
1615
# Use APT Addon to install Chrome
1716
addons:
18-
apt:
19-
sources:
20-
- google-chrome
21-
packages:
22-
- google-chrome-stable
23-
24-
# Start Xvfb so you can run Chrome
25-
before_install:
26-
- sh -e /etc/init.d/xvfb start
17+
chrome: stable
2718

2819
jobs:
2920
include:
3021
- stage: test
3122
script:
32-
- npm run test
23+
- xvfb-run --server-args="-screen 0 1024x768x24" npm run test
3324
- stage: build
3425
script:
3526
- npm run dist

README.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ The following steps describes how you can use Rico in your Angular application.
2020

2121
=== Step 1: Add Dependencies
2222

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

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

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

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

3333
=== Step 2: Inject library
3434

karma.conf.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ module.exports = function (config) {
3232
colors: true,
3333
logLevel: config.LOG_INFO,
3434
autoWatch: true,
35-
browsers: ['Chrome'],
35+
browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
36+
// you can define custom flags
37+
customLaunchers: {
38+
ChromeHeadlessNoSandbox: {
39+
base: 'ChromeHeadless',
40+
flags: ['--no-sandbox']
41+
}
42+
},
3643
singleRun: false
3744
});
3845
};

package-lock.json

Lines changed: 52 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"semantic-release": "semantic-release"
2626
},
2727
"peerDependencies": {
28-
"rico-js": "git+https://github.com/rico-project/rico-js.git#1.0.1",
28+
"@rico-projects/rico-js": "1.1.0",
2929
"@angular/common": "~7.1.0",
3030
"@angular/compiler": "~7.1.0",
3131
"@angular/core": "~7.1.0",
@@ -47,7 +47,7 @@
4747
"jasmine-core": "~2.99.1",
4848
"jasmine-spec-reporter": "~4.2.1",
4949
"karma": "~3.1.1",
50-
"karma-chrome-launcher": "~2.2.0",
50+
"karma-chrome-launcher": "~3.1.0",
5151
"karma-coverage-istanbul-reporter": "~2.0.1",
5252
"karma-jasmine": "~1.1.2",
5353
"karma-jasmine-html-reporter": "^0.2.2",
@@ -74,6 +74,6 @@
7474
}
7575
},
7676
"release": {
77-
"pkgRoot": "dist/"
77+
"pkgRoot": "dist/"
7878
}
7979
}

src/lib/controller-proxy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ApplicationRef } from '@angular/core';
2-
import { LoggerFactory, LogLevel } from 'rico-js';
2+
import { LoggerFactory, LogLevel } from '@rico-projects/rico-js';
33

44
export class ControllerProxy {
55

src/lib/model-maintainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ApplicationRef, Injectable } from '@angular/core';
2-
import { LoggerFactory, LogLevel } from 'rico-js';
2+
import { LoggerFactory, LogLevel } from '@rico-projects/rico-js';
33

44
export class ModelMaintainer {
55

src/lib/rico-angular.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injectable, ApplicationRef } from '@angular/core';
2-
import { getService, LoggerFactory } from 'rico-js';
2+
import { getService, LoggerFactory } from '@rico-projects/rico-js';
33
import { ControllerProxy } from './controller-proxy';
44
import { ModelMaintainer } from './model-maintainer';
55

0 commit comments

Comments
 (0)