EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2921 from crazyserver/MOBILE-3833 

Mobile 3833: Revert to Angular 10
main
Noel De Martin 2021-08-09 12:46:47 +02:00 committed by GitHub
parent edaeb05b4d d3593dc817
commit 99517e8f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 19523 additions and 18333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/testing.yml vendored
View File

@ -58,4 +58,4 @@ jobs:
- name: Production builds
run: npm run build:prod
- name: JavaScript code compatibility
run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 1
run: result=$(npx check-es-compat www/*.js 2> /dev/null | grep -v -E "Array\.prototype\.includes|Promise\.prototype\.finally|String\.prototype\.(matchAll|trimRight)|globalThis" | grep -Po "(?<=error).*?(?=\s+ecmascript)" | wc -l); test $result -eq 0

1
.gitignore vendored
View File

@ -22,7 +22,6 @@ npm-debug.log*
/.sass-cache
/.sourcemaps
/.versions
/.vscode
/coverage
/dist
/node_modules

4
.travis.yml
View File

@ -40,8 +40,8 @@ jobs:
components:
- tools
- platform-tools
- build-tools-30.0.2
- android-30
- build-tools-29.0.3
- android-29
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository

1
angular.json
View File

@ -49,6 +49,7 @@
},
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,

2
jest.config.js
View File

@ -16,7 +16,7 @@ module.exports = {
moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/src/' }),
globals: {
'ts-jest': {
tsconfig: './tsconfig.test.json',
tsConfig: './tsconfig.test.json',
},
},
};

37743
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

95
package.json
View File

@ -37,40 +37,40 @@
"ionic:build:before": "gulp"
},
"dependencies": {
"@angular/animations": "~11.2.14",
"@angular/common": "~11.2.14",
"@angular/core": "~11.2.14",
"@angular/forms": "~11.2.14",
"@angular/platform-browser": "~11.2.14",
"@angular/platform-browser-dynamic": "~11.2.14",
"@angular/router": "~11.2.14",
"@ionic-native/badge": "^5.34.0",
"@ionic-native/camera": "^5.34.0",
"@ionic-native/chooser": "^5.34.0",
"@ionic-native/clipboard": "^5.34.0",
"@ionic-native/core": "^5.34.0",
"@ionic-native/device": "^5.34.0",
"@ionic-native/diagnostic": "^5.34.0",
"@ionic-native/file": "^5.34.0",
"@ionic-native/file-opener": "^5.34.0",
"@ionic-native/file-transfer": "^5.34.0",
"@ionic-native/geolocation": "^5.34.0",
"@ionic-native/http": "^5.34.0",
"@ionic-native/in-app-browser": "^5.34.0",
"@ionic-native/ionic-webview": "^5.34.0",
"@ionic-native/keyboard": "^5.34.0",
"@ionic-native/local-notifications": "^5.34.0",
"@ionic-native/media": "^5.34.0",
"@ionic-native/media-capture": "^5.34.0",
"@ionic-native/network": "^5.34.0",
"@ionic-native/push": "^5.34.0",
"@ionic-native/qr-scanner": "^5.34.0",
"@ionic-native/splash-screen": "^5.34.0",
"@ionic-native/sqlite": "^5.34.0",
"@ionic-native/status-bar": "^5.34.0",
"@ionic-native/web-intent": "^5.34.0",
"@ionic-native/zip": "^5.34.0",
"@ionic/angular": "^5.6.13",
"@angular/animations": "~10.0.14",
"@angular/common": "~10.0.14",
"@angular/core": "~10.0.14",
"@angular/forms": "~10.0.14",
"@angular/platform-browser": "~10.0.14",
"@angular/platform-browser-dynamic": "~10.0.14",
"@angular/router": "~10.0.14",
"@ionic-native/badge": "^5.33.0",
"@ionic-native/camera": "^5.33.0",
"@ionic-native/chooser": "^5.33.0",
"@ionic-native/clipboard": "^5.33.0",
"@ionic-native/core": "^5.33.0",
"@ionic-native/device": "^5.33.0",
"@ionic-native/diagnostic": "^5.33.0",
"@ionic-native/file": "^5.33.0",
"@ionic-native/file-opener": "^5.33.0",
"@ionic-native/file-transfer": "^5.33.0",
"@ionic-native/geolocation": "^5.33.0",
"@ionic-native/http": "^5.33.0",
"@ionic-native/in-app-browser": "^5.33.0",
"@ionic-native/ionic-webview": "^5.33.0",
"@ionic-native/keyboard": "^5.33.0",
"@ionic-native/local-notifications": "^5.33.0",
"@ionic-native/media": "^5.33.0",
"@ionic-native/media-capture": "^5.33.0",
"@ionic-native/network": "^5.33.0",
"@ionic-native/push": "^5.33.0",
"@ionic-native/qr-scanner": "^5.33.0",
"@ionic-native/splash-screen": "^5.33.0",
"@ionic-native/sqlite": "^5.33.0",
"@ionic-native/status-bar": "^5.33.0",
"@ionic-native/web-intent": "^5.33.0",
"@ionic-native/zip": "^5.33.0",
"@ionic/angular": "^5.6.6",
"@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
"@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.2",
"@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.2",
@ -80,11 +80,11 @@
"@ngx-translate/http-loader": "^6.0.0",
"@types/chart.js": "^2.9.31",
"@types/cordova": "0.0.34",
"@types/dom-mediacapture-record": "^1.0.10",
"@types/dom-mediacapture-record": "^1.0.7",
"chart.js": "^2.9.4",
"com-darryncampbell-cordova-plugin-intent": "^1.3.0",
"cordova": "^10.0.0",
"cordova-android": "^10.0.1",
"cordova-android": "^9.1.0",
"cordova-android-support-gradle-release": "^3.0.1",
"cordova-clipboard": "^1.3.0",
"cordova-ios": "^6.2.0",
@ -128,32 +128,31 @@
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1102.14",
"@angular-devkit/build-angular": "~0.1000.8",
"@angular-eslint/builder": "^4.2.0",
"@angular-eslint/eslint-plugin": "^4.2.0",
"@angular-eslint/eslint-plugin-template": "^4.2.0",
"@angular-eslint/schematics": "^4.2.0",
"@angular-eslint/template-parser": "^4.2.0",
"@angular/cli": "~11.2.14",
"@angular/compiler": "~11.2.14",
"@angular/compiler-cli": "~11.2.14",
"@angular/language-service": "~11.2.14",
"@ionic/angular-toolkit": "^3.1.1",
"@angular/cli": "~10.0.8",
"@angular/compiler": "~10.0.14",
"@angular/compiler-cli": "~10.0.14",
"@angular/language-service": "~10.0.14",
"@ionic/angular-toolkit": "^2.3.3",
"@ionic/cli": "^6.14.1",
"@types/faker": "^5.1.3",
"@types/jest": "^26.0.24",
"@types/node": "^12.12.64",
"@types/resize-observer-browser": "^0.1.5",
"@types/webpack-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"check-es-compat": "^1.1.1",
"eslint": "^7.31.0",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^24.4.0",
"eslint-plugin-jsdoc": "^36.0.3",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-jsdoc": "^32.3.3",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-promise": "^5.1.0",
"faker": "^5.1.0",
@ -171,7 +170,7 @@
"native-run": "^1.4.0",
"ts-jest": "^26.4.1",
"ts-node": "~8.3.0",
"typescript": "^4.1.6"
"typescript": "^3.9.9"
},
"engines": {
"node": ">=12.x"

2
src/testing/setup.ts
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import 'jest-preset-angular/setup-jest';
import 'jest-preset-angular';
import { setCreateSingletonMethodProxy } from '@singletons';

6
tsconfig.json
View File

@ -9,7 +9,7 @@
"experimentalDecorators": true,
"strictNullChecks": true,
"strictPropertyInitialization": true,
"module": "es2020",
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
@ -46,8 +46,6 @@
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"enableI18nLegacyMessageIdFormat": false,
"strictInjectionParameters": true,
"strictInputAccessModifiers": true
"strictInjectionParameters": true
}
}