From a777a5fa01ad11d5330a7164ef55301571d7b38d Mon Sep 17 00:00:00 2001 From: cexbrayat Date: Thu, 7 Mar 2019 11:53:29 +0000 Subject: [PATCH] chore: version 8.0.0-beta.5 --- ponyracer/angular.json | 39 ++++++------------- ponyracer/{src => }/browserslist | 0 ponyracer/e2e/protractor.conf.js | 2 +- .../e2e/{tsconfig.e2e.json => tsconfig.json} | 4 +- ponyracer/{src => }/karma.conf.js | 2 +- ponyracer/package.json | 28 ++++++------- ponyracer/src/tsconfig.app.json | 11 ------ ponyracer/src/tsconfig.spec.json | 18 --------- ponyracer/src/tslint.json | 17 -------- ponyracer/tsconfig.app.json | 14 +++++++ ponyracer/tsconfig.json | 2 +- ponyracer/tsconfig.spec.json | 18 +++++++++ ponyracer/tslint.json | 28 +++++++++---- 13 files changed, 83 insertions(+), 100 deletions(-) rename ponyracer/{src => }/browserslist (100%) rename ponyracer/e2e/{tsconfig.e2e.json => tsconfig.json} (84%) rename ponyracer/{src => }/karma.conf.js (93%) delete mode 100644 ponyracer/src/tsconfig.app.json delete mode 100644 ponyracer/src/tsconfig.spec.json delete mode 100644 ponyracer/src/tslint.json create mode 100644 ponyracer/tsconfig.app.json create mode 100644 ponyracer/tsconfig.spec.json diff --git a/ponyracer/angular.json b/ponyracer/angular.json index 38afba365..1eab1607c 100644 --- a/ponyracer/angular.json +++ b/ponyracer/angular.json @@ -17,7 +17,7 @@ "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", + "tsConfig": "tsconfig.app.json", "assets": [ "src/favicon.ico", "src/assets" @@ -77,37 +77,31 @@ "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "karmaConfig": "src/karma.conf.js", - "styles": [ - "src/styles.css" - ], - "scripts": [], + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.ico", "src/assets" - ] + ], + "styles": [ + "src/styles.css" + ], + "scripts": [] } }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" + "tsconfig.app.json", + "tsconfig.spec.json", + "e2e/tsconfig.json" ], "exclude": [ "**/node_modules/**" ] } - } - } - }, - "ponyracer-e2e": { - "root": "e2e/", - "projectType": "application", - "prefix": "", - "architect": { + }, "e2e": { "builder": "@angular-devkit/build-angular:protractor", "options": { @@ -119,15 +113,6 @@ "devServerTarget": "ponyracer:serve:production" } } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] - } } } } diff --git a/ponyracer/src/browserslist b/ponyracer/browserslist similarity index 100% rename from ponyracer/src/browserslist rename to ponyracer/browserslist diff --git a/ponyracer/e2e/protractor.conf.js b/ponyracer/e2e/protractor.conf.js index 86776a391..9748e3d29 100644 --- a/ponyracer/e2e/protractor.conf.js +++ b/ponyracer/e2e/protractor.conf.js @@ -21,7 +21,7 @@ exports.config = { }, onPrepare() { require('ts-node').register({ - project: require('path').join(__dirname, './tsconfig.e2e.json') + project: require('path').join(__dirname, './tsconfig.json') }); jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); } diff --git a/ponyracer/e2e/tsconfig.e2e.json b/ponyracer/e2e/tsconfig.json similarity index 84% rename from ponyracer/e2e/tsconfig.e2e.json rename to ponyracer/e2e/tsconfig.json index a6dd62202..39b800f78 100644 --- a/ponyracer/e2e/tsconfig.e2e.json +++ b/ponyracer/e2e/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "../out-tsc/app", + "outDir": "../out-tsc/e2e", "module": "commonjs", "target": "es5", "types": [ @@ -10,4 +10,4 @@ "node" ] } -} \ No newline at end of file +} diff --git a/ponyracer/src/karma.conf.js b/ponyracer/karma.conf.js similarity index 93% rename from ponyracer/src/karma.conf.js rename to ponyracer/karma.conf.js index 861a6e1da..10cae88ca 100644 --- a/ponyracer/src/karma.conf.js +++ b/ponyracer/karma.conf.js @@ -16,7 +16,7 @@ module.exports = function (config) { clearContext: false // leave Jasmine Spec Runner output visible in browser }, coverageIstanbulReporter: { - dir: require('path').join(__dirname, '../coverage/ponyracer'), + dir: require('path').join(__dirname, './coverage/ponyracer'), reports: ['html', 'lcovonly', 'text-summary'], fixWebpackSourcePaths: true }, diff --git a/ponyracer/package.json b/ponyracer/package.json index 565a7b1cf..3eec9c155 100644 --- a/ponyracer/package.json +++ b/ponyracer/package.json @@ -11,38 +11,38 @@ }, "private": true, "dependencies": { - "@angular/animations": "~8.0.0-beta.5", - "@angular/common": "~8.0.0-beta.5", - "@angular/compiler": "~8.0.0-beta.5", - "@angular/core": "~8.0.0-beta.5", - "@angular/forms": "~8.0.0-beta.5", - "@angular/platform-browser": "~8.0.0-beta.5", - "@angular/platform-browser-dynamic": "~8.0.0-beta.5", - "@angular/router": "~8.0.0-beta.5", + "@angular/animations": "~8.0.0-beta.7", + "@angular/common": "~8.0.0-beta.7", + "@angular/compiler": "~8.0.0-beta.7", + "@angular/core": "~8.0.0-beta.7", + "@angular/forms": "~8.0.0-beta.7", + "@angular/platform-browser": "~8.0.0-beta.7", + "@angular/platform-browser-dynamic": "~8.0.0-beta.7", + "@angular/router": "~8.0.0-beta.7", "core-js": "^2.5.4", "rxjs": "~6.4.0", "tslib": "^1.9.0", "zone.js": "~0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.14.0-beta.4", - "@angular/cli": "~8.0.0-beta.4", - "@angular/compiler-cli": "~8.0.0-beta.5", - "@angular/language-service": "~8.0.0-beta.5", + "@angular-devkit/build-angular": "~0.14.0-beta.5", + "@angular/cli": "~8.0.0-beta.5", + "@angular/compiler-cli": "~8.0.0-beta.7", + "@angular/language-service": "~8.0.0-beta.7", "@types/node": "~8.9.4", "@types/jasmine": "~3.3.8", "@types/jasminewd2": "~2.0.3", "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", - "karma": "~4.0.0", + "karma": "~4.0.1", "karma-chrome-launcher": "~2.2.0", "karma-coverage-istanbul-reporter": "~2.0.1", "karma-jasmine": "~2.0.1", "karma-jasmine-html-reporter": "^1.4.0", "protractor": "~5.4.0", "ts-node": "~7.0.0", - "tslint": "~5.11.0", + "tslint": "~5.13.1", "typescript": "~3.2.2" } } diff --git a/ponyracer/src/tsconfig.app.json b/ponyracer/src/tsconfig.app.json deleted file mode 100644 index 190fd300b..000000000 --- a/ponyracer/src/tsconfig.app.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "types": [] - }, - "exclude": [ - "test.ts", - "**/*.spec.ts" - ] -} diff --git a/ponyracer/src/tsconfig.spec.json b/ponyracer/src/tsconfig.spec.json deleted file mode 100644 index de7733630..000000000 --- a/ponyracer/src/tsconfig.spec.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/spec", - "types": [ - "jasmine", - "node" - ] - }, - "files": [ - "test.ts", - "polyfills.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ] -} diff --git a/ponyracer/src/tslint.json b/ponyracer/src/tslint.json deleted file mode 100644 index aa7c3eeb7..000000000 --- a/ponyracer/src/tslint.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../tslint.json", - "rules": { - "directive-selector": [ - true, - "attribute", - "app", - "camelCase" - ], - "component-selector": [ - true, - "element", - "app", - "kebab-case" - ] - } -} diff --git a/ponyracer/tsconfig.app.json b/ponyracer/tsconfig.app.json new file mode 100644 index 000000000..31f8397ac --- /dev/null +++ b/ponyracer/tsconfig.app.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/test.ts", + "src/**/*.spec.ts" + ] +} diff --git a/ponyracer/tsconfig.json b/ponyracer/tsconfig.json index b271fd9f3..9fcb8f7b9 100644 --- a/ponyracer/tsconfig.json +++ b/ponyracer/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "module": "es2015", + "module": "esnext", "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, diff --git a/ponyracer/tsconfig.spec.json b/ponyracer/tsconfig.spec.json new file mode 100644 index 000000000..6400fde7d --- /dev/null +++ b/ponyracer/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/spec", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "src/test.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/ponyracer/tslint.json b/ponyracer/tslint.json index 868ecba0d..367c7b6fc 100644 --- a/ponyracer/tslint.json +++ b/ponyracer/tslint.json @@ -1,14 +1,25 @@ { "extends": "tslint:recommended", - "rulesDirectory": [ - "codelyzer" - ], "rules": { "array-type": false, "arrow-parens": false, "deprecation": { "severity": "warn" }, + "component-class-suffix": true, + "directive-class-suffix": true, + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ], "import-blacklist": [ true, "rxjs/Rx" @@ -68,8 +79,9 @@ "no-input-rename": true, "no-output-rename": true, "use-life-cycle-interface": true, - "use-pipe-transform-interface": true, - "component-class-suffix": true, - "directive-class-suffix": true - } -} + "use-pipe-transform-interface": true + }, + "rulesDirectory": [ + "codelyzer" + ] +} \ No newline at end of file