Skip to content

Codecrew / Moya

Go to a project
Commit fb6cebf4 by Aino Leppänen
Options

ng6 update, rxjs-compat added

1 parent 3b9b25d0
Pipeline #77 failed
in 0 seconds
Inline Side-by-side
Showing with 162 additions and 86 deletions
code/moya-angular/.angular-cli.json deleted 100644 → 0
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "angular6testi"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "moya",
"styles": [
"styles.scss"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
code/moya-angular/angular.json 0 → 100644
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"angular6testi": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/favicon.ico"
],
"styles": [
"src/styles.scss"
],
"scripts": []
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "angular6testi:build"
},
"configurations": {
"production": {
"browserTarget": "angular6testi:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular6testi:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": [
"src/styles.scss"
],
"assets": [
"src/assets",
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"angular6testi-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "angular6testi:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "angular6testi",
"schematics": {
"@schematics/angular:component": {
"prefix": "moya",
"styleext": "css"
},
"@schematics/angular:directive": {
"prefix": "moya"
}
}
}
\ No newline at end of file
code/moya-angular/karma.conf.js
...@@ -4,24 +4,22 @@ ...@@ -4,24 +4,22 @@
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '', basePath: '',
frameworks: ['jasmine', '@angular/cli'], frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [ plugins: [
require('karma-jasmine'), require('karma-jasmine'),
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma') require('@angular-devkit/build-angular/plugins/karma')
], ],
client:{ client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
}, },
coverageIstanbulReporter: { coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ], dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true fixWebpackSourcePaths: true
}, },
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'], reporters: ['progress', 'kjhtml'],
port: 9876, port: 9876,
colors: true, colors: true,
......
code/moya-angular/package.json
...@@ -17,30 +17,32 @@ ...@@ -17,30 +17,32 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^5.2.9", "@angular/animations": "6.1.1",
"@angular/common": "^5.2.9", "@angular/common": "6.1.1",
"@angular/compiler": "^5.2.9", "@angular/compiler": "6.1.1",
"@angular/core": "^5.2.9", "@angular/core": "6.1.1",
"@angular/forms": "^5.2.9", "@angular/forms": "6.1.1",
"@angular/http": "^5.2.9", "@angular/http": "6.1.1",
"@angular/material": "^5.2.4", "@angular/material": "^6.4.2",
"@angular/platform-browser": "^5.2.9", "@angular/platform-browser": "6.1.1",
"@angular/platform-browser-dynamic": "^5.2.9", "@angular/platform-browser-dynamic": "6.1.1",
"@angular/router": "^5.2.9", "@angular/router": "6.1.1",
"@ngx-translate/core": "^9.0.0", "@ngx-translate/core": "^9.0.0",
"@ngx-translate/http-loader": "^2.0.0", "@ngx-translate/http-loader": "^2.0.0",
"bootstrap": "^4.0.0", "bootstrap": "^4.0.0",
"core-js": "^2.5.1", "core-js": "^2.5.1",
"ngx-bootstrap": "^2.0.2", "ngx-bootstrap": "^2.0.2",
"rxjs": "^5.5.0", "rxjs": "^6.2.2",
"rxjs-compat": "^6.2.2",
"ts-helpers": "^1.1.1", "ts-helpers": "^1.1.1",
"zone.js": "^0.8.19" "zone.js": "^0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular/cdk": "^5.2.4", "@angular-devkit/build-angular": "~0.7.0",
"@angular/cli": "^1.6.5", "@angular/cdk": "^6.4.2",
"@angular/compiler-cli": "^5.2.9", "@angular/cli": "6.1.2",
"@angular/language-service": "^5.2.9", "@angular/compiler-cli": "6.1.1",
"@angular/language-service": "6.1.1",
"@types/jasmine": "~2.8.3", "@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2", "@types/jasminewd2": "~2.0.2",
"@types/node": "~9.4.6", "@types/node": "~9.4.6",
...@@ -55,6 +57,6 @@ ...@@ -55,6 +57,6 @@
"protractor": "~5.3.0", "protractor": "~5.3.0",
"ts-node": "~5.0.0", "ts-node": "~5.0.0",
"tslint": "~5.9.1", "tslint": "~5.9.1",
"typescript": "~2.5.3" "typescript": "2.9.2"
} }
} }
code/moya-angular/src/tsconfig.spec.json
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
] ]
}, },
"files": [ "files": [
"test.ts" "test.ts",
"polyfills.ts"
], ],
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",
......
code/moya-angular/tsconfig.json
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
"lib": [ "lib": [
"es2017", "es2017",
"dom" "dom"
] ],
"module": "es2015",
"baseUrl": "./"
} }
} }
\ No newline at end of file
code/moya-angular/tslint.json
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
"forin": true, "forin": true,
"import-blacklist": [ "import-blacklist": [
true, true,
"rxjs",
"rxjs/Rx" "rxjs/Rx"
], ],
"import-spacing": true, "import-spacing": true,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!