Skip to content

Commit

Permalink
Merging 4.10.6 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dioslaska committed Jul 8, 2020
1 parent 2d911e5 commit 2a5afe8
Show file tree
Hide file tree
Showing 84 changed files with 17,243 additions and 22,752 deletions.
6 changes: 3 additions & 3 deletions bundles/mobiscroll.angular.min.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './mobiscroll.angular';
export { MbscAccordion as ɵo, MbscFormGroup as ɵl, MbscFormGroupContent as ɵn, MbscFormGroupTitle as ɵm, MbscRadioGroupBase as ɵk, MbscRadioService as ɵj } from '../src/js/forms.angular';
export { MbscBase as ɵc, MbscCloneBase as ɵe, MbscControlBase as ɵf, MbscInputService as ɵb, MbscOptionsService as ɵa, MbscValueBase as ɵd } from '../src/js/frameworks/angular';
export { MbscFormBase as ɵg, MbscFormValueBase as ɵh, MbscInputBase as ɵi } from '../src/js/input.angular';
export { MbscAccordion as ɵp, MbscFormGroup as ɵm, MbscFormGroupContent as ɵo, MbscFormGroupTitle as ɵn, MbscRadioGroupBase as ɵl, MbscRadioService as ɵk } from '../src/js/forms.angular';
export { MbscBase as ɵc, MbscBaseModule as ɵg, MbscCloneBase as ɵe, MbscControlBase as ɵf, MbscInputService as ɵb, MbscOptionsService as ɵa, MbscValueBase as ɵd } from '../src/js/frameworks/angular';
export { MbscFormBase as ɵh, MbscFormValueBase as ɵi, MbscInputBase as ɵj } from '../src/js/input.angular';
18 changes: 18 additions & 0 deletions examples/angular/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major version
last 2 iOS major versions
Firefox ESR
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
3 changes: 3 additions & 0 deletions examples/angular/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
4 changes: 2 additions & 2 deletions examples/angular/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
/node_modules

# profiling files
chrome-profiler-events.json
speed-measure-plugin.json
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
Expand Down
2 changes: 1 addition & 1 deletion examples/angular/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Angular

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.1.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.0.1.

## Development server

Expand Down
8 changes: 4 additions & 4 deletions examples/angular/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/angular",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
Expand All @@ -45,7 +45,6 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -57,7 +56,8 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
"maximumWarning": "6kb",
"maximumError": "10kb"
}
]
}
Expand Down Expand Up @@ -125,4 +125,4 @@
}
}},
"defaultProject": "angular"
}
}
12 changes: 0 additions & 12 deletions examples/angular/browserslist

This file was deleted.

10 changes: 7 additions & 3 deletions examples/angular/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter } = require('jasmine-spec-reporter');
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');

/**
* @type { import("protractor").Config }
Expand All @@ -13,7 +13,7 @@ exports.config = {
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
browserName: 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
Expand All @@ -27,6 +27,10 @@ exports.config = {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
jasmine.getEnv().addReporter(new SpecReporter({
spec: {
displayStacktrace: StacktraceOption.PRETTY
}
}));
}
};
2 changes: 1 addition & 1 deletion examples/angular/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('workspace-project App', () => {

it('should display welcome message', () => {
page.navigateTo();
expect(page.getTitleText()).toEqual('Welcome to angular8!');
expect(page.getTitleText()).toEqual('angular app is running!');
});

afterEach(async () => {
Expand Down
8 changes: 4 additions & 4 deletions examples/angular/e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { browser, by, element } from 'protractor';

export class AppPage {
navigateTo() {
return browser.get(browser.baseUrl) as Promise<any>;
navigateTo(): Promise<unknown> {
return browser.get(browser.baseUrl) as Promise<unknown>;
}

getTitleText() {
return element(by.css('app-root h1')).getText() as Promise<string>;
getTitleText(): Promise<string> {
return element(by.css('app-root .content span')).getText() as Promise<string>;
}
}
5 changes: 3 additions & 2 deletions examples/angular/e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down
2 changes: 1 addition & 1 deletion examples/angular/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/angular8'),
dir: require('path').join(__dirname, './coverage/angular'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
Expand Down
Loading

0 comments on commit 2a5afe8

Please sign in to comment.