Skip to content

Commit 551a001

Browse files
committed
update dependences test ionic 4
1 parent 664a42c commit 551a001

File tree

10 files changed

+227
-166
lines changed

10 files changed

+227
-166
lines changed

.angular-cli.json

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

angular.json

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ionic-database-builder": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {},
12+
"architect": {
13+
"build": {
14+
"builder": "@angular-devkit/build-angular:browser",
15+
"options": {
16+
"outputPath": "dist/ionic-database-builder",
17+
"index": "src/index.html",
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
20+
"tsConfig": "src/tsconfig.app.json",
21+
"assets": [
22+
"src/favicon.ico",
23+
"src/assets"
24+
],
25+
"styles": [
26+
"src/styles.css"
27+
],
28+
"scripts": []
29+
},
30+
"configurations": {
31+
"production": {
32+
"fileReplacements": [
33+
{
34+
"replace": "src/environments/environment.ts",
35+
"with": "src/environments/environment.prod.ts"
36+
}
37+
],
38+
"optimization": true,
39+
"outputHashing": "all",
40+
"sourceMap": false,
41+
"extractCss": true,
42+
"namedChunks": false,
43+
"aot": true,
44+
"extractLicenses": true,
45+
"vendorChunk": false,
46+
"buildOptimizer": true
47+
}
48+
}
49+
},
50+
"serve": {
51+
"builder": "@angular-devkit/build-angular:dev-server",
52+
"options": {
53+
"browserTarget": "ionic-database-builder:build"
54+
},
55+
"configurations": {
56+
"production": {
57+
"browserTarget": "ionic-database-builder:build:production"
58+
}
59+
}
60+
},
61+
"extract-i18n": {
62+
"builder": "@angular-devkit/build-angular:extract-i18n",
63+
"options": {
64+
"browserTarget": "ionic-database-builder:build"
65+
}
66+
},
67+
"test": {
68+
"builder": "@angular-devkit/build-angular:karma",
69+
"options": {
70+
"main": "src/test.ts",
71+
"polyfills": "src/polyfills.ts",
72+
"tsConfig": "src/tsconfig.spec.json",
73+
"karmaConfig": "src/karma.conf.js",
74+
"styles": [],
75+
"scripts": [],
76+
"assets": [
77+
"src/favicon.ico",
78+
"src/assets"
79+
]
80+
}
81+
},
82+
"lint": {
83+
"builder": "@angular-devkit/build-angular:tslint",
84+
"options": {
85+
"tsConfig": [
86+
"src/tsconfig.app.json",
87+
"src/tsconfig.spec.json"
88+
],
89+
"exclude": [
90+
"**/node_modules/**"
91+
]
92+
}
93+
}
94+
}
95+
},
96+
"ionic-database-builder-e2e": {
97+
"root": "e2e/",
98+
"projectType": "application",
99+
"architect": {
100+
"e2e": {
101+
"builder": "@angular-devkit/build-angular:protractor",
102+
"options": {
103+
"protractorConfig": "e2e/protractor.conf.js",
104+
"devServerTarget": "ionic-database-builder:serve"
105+
},
106+
"configurations": {
107+
"production": {
108+
"devServerTarget": "ionic-database-builder:serve:production"
109+
}
110+
}
111+
},
112+
"lint": {
113+
"builder": "@angular-devkit/build-angular:tslint",
114+
"options": {
115+
"tsConfig": "e2e/tsconfig.e2e.json",
116+
"exclude": [
117+
"**/node_modules/**"
118+
]
119+
}
120+
}
121+
}
122+
}
123+
},
124+
"defaultProject": "ionic-database-builder"
125+
}

karma.conf.js

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

package.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,37 +44,39 @@
4444
},
4545
"homepage": "https://github.com/fernandocode/ionic-database-builder#readme",
4646
"dependencies": {
47-
"@angular/core": "~6.1.1",
48-
"database-builder": ">=0.1.0-beta.4"
47+
"@angular/core": "^6.1.0",
48+
"database-builder": ">=0.1.0-beta.5"
4949
},
5050
"devDependencies": {
51-
"@angular/cli": "~6.1.1",
52-
"@angular/core": "~6.1.1",
53-
"@angular/common": "~6.1.1",
54-
"@angular/compiler": "~6.1.1",
55-
"@angular/compiler-cli": "~6.1.1",
56-
"@angular/language-service": "~6.1.1",
57-
"@angular/platform-browser": "~6.1.1",
58-
"@angular/platform-browser-dynamic": "~6.1.1",
59-
"@types/jasmine": "~2.8.3",
60-
"@types/jasminewd2": "~2.0.2",
61-
"@types/node": "~6.0.60",
62-
"codelyzer": "^4.0.1",
63-
"jasmine-core": "~2.8.0",
51+
"@angular-devkit/build-angular": "~0.7.0",
52+
"@angular/cli": "~6.1.5",
53+
"@angular/core": "^6.1.0",
54+
"@angular/common": "^6.1.0",
55+
"@angular/compiler": "^6.1.0",
56+
"@angular/compiler-cli": "^6.1.0",
57+
"@angular/language-service": "^6.1.0",
58+
"@angular/platform-browser": "^6.1.0",
59+
"@angular/platform-browser-dynamic": "^6.1.0",
60+
"@types/jasmine": "~2.8.6",
61+
"@types/jasminewd2": "~2.0.3",
62+
"@types/node": "~8.9.4",
63+
"codelyzer": "~4.2.1",
64+
"jasmine-core": "~2.99.1",
6465
"jasmine-spec-reporter": "~4.2.1",
65-
"karma": "~2.0.0",
66+
"karma": "~1.7.1",
6667
"karma-chrome-launcher": "~2.2.0",
67-
"karma-coverage-istanbul-reporter": "^1.2.1",
68-
"karma-jasmine": "~1.1.0",
68+
"karma-coverage-istanbul-reporter": "~2.0.0",
69+
"karma-jasmine": "~1.1.1",
6970
"karma-jasmine-html-reporter": "^0.2.2",
70-
"ng-packagr": "4.1.1",
7171
"protractor": "~5.4.0",
72-
"ts-node": "~4.1.0",
73-
"tsickle": "0.27.5",
72+
"ts-node": "~5.0.1",
7473
"tslint": "~5.9.1",
75-
"typescript": "~2.9.2",
76-
"rxjs": "6.2.2",
77-
"zone.js": "^0.8.26"
74+
"typescript": "~2.7.2",
75+
"ng-packagr": "4.1.1",
76+
"tsickle": "0.27.5",
77+
"rxjs": "^6.0.0",
78+
"zone.js": "~0.8.26",
79+
"core-js": "^2.5.4"
7880
},
7981
"tsconfig": "./tsconfig.json"
8082
}

protractor.conf.js

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

src/karma.conf.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Karma configuration file, see link for more information
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
3+
4+
module.exports = function (config) {
5+
config.set({
6+
basePath: '',
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
8+
plugins: [
9+
require('karma-jasmine'),
10+
require('karma-chrome-launcher'),
11+
require('karma-jasmine-html-reporter'),
12+
require('karma-coverage-istanbul-reporter'),
13+
require('@angular-devkit/build-angular/plugins/karma')
14+
],
15+
client: {
16+
clearContext: false // leave Jasmine Spec Runner output visible in browser
17+
},
18+
coverageIstanbulReporter: {
19+
dir: require('path').join(__dirname, '../coverage'),
20+
reports: ['html', 'lcovonly'],
21+
fixWebpackSourcePaths: true
22+
},
23+
reporters: ['progress', 'kjhtml'],
24+
port: 9876,
25+
colors: true,
26+
logLevel: config.LOG_INFO,
27+
autoWatch: true,
28+
browsers: ['Chrome'],
29+
singleRun: false
30+
});
31+
};

src/test/provider/database-migration-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { GetMapper } from 'database-builder';
2-
import { Observable } from 'rxjs/Observable';
32
import { Injectable } from '@angular/core';
43
import { DatabaseTransaction } from 'database-builder';
54
import { DatabaseMigrationContract, Version } from '../..';
5+
import { Observable } from 'rxjs';
66

77
@Injectable()
88
export class DatabaseMigrationService extends DatabaseMigrationContract {

src/tsconfig.app.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "../out-tsc/app",
5+
"types": []
6+
},
7+
"exclude": [
8+
"test.ts",
9+
"**/*.spec.ts"
10+
]
11+
}

0 commit comments

Comments
 (0)