MOBILE-3947 ng: Fix build errors

Target in app tsconfig is set to es2022 by the Angular CLI, so we must
set it as well to be consistent in the rest of the tooling. Angular
compilation later uses browserslist for further transpilations.

Target in unit tests is kept at es2016 because of a known bug in
Angular: https://github.com/angular/angular/issues/31730
main
Noel De Martin 2023-11-29 12:18:36 +01:00
parent 7f630b287a
commit 2449aca781
17 changed files with 235 additions and 135 deletions

97
package-lock.json generated
View File

@ -142,7 +142,7 @@
"jest-preset-angular": "^13.1.4",
"jsonc-parser": "^2.3.1",
"keytar": "^7.2.0",
"minimatch": "^5.1.0",
"minimatch": "^9.0.3",
"native-run": "^2.0.0",
"patch-package": "^6.5.0",
"ts-jest": "^29.1.1",
@ -6058,21 +6058,6 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
"node_modules/@tufjs/models/node_modules/minimatch": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=16 || 14 >=14.17"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/@types/babel__core": {
"version": "7.20.5",
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@ -8701,21 +8686,6 @@
"node": ">=12"
}
},
"node_modules/cacache/node_modules/minimatch": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=16 || 14 >=14.17"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/cacache/node_modules/minipass": {
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
@ -13756,6 +13726,18 @@
"minimatch": "^5.0.1"
}
},
"node_modules/filelist/node_modules/minimatch": {
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=10"
}
},
"node_modules/fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@ -16040,21 +16022,6 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
"node_modules/ignore-walk/node_modules/minimatch": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=16 || 14 >=14.17"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/image-size": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@ -20756,6 +20723,18 @@
"node": ">=12"
}
},
"node_modules/make-fetch-happen/node_modules/minimatch": {
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=10"
}
},
"node_modules/make-fetch-happen/node_modules/minipass": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
@ -21237,15 +21216,18 @@
"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
},
"node_modules/minimatch": {
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=10"
"node": ">=16 || 14 >=14.17"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/minimist": {
@ -23193,21 +23175,6 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
"node_modules/pacote/node_modules/minimatch": {
"version": "9.0.3",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
"integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
"dev": true,
"dependencies": {
"brace-expansion": "^2.0.1"
},
"engines": {
"node": ">=16 || 14 >=14.17"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/pacote/node_modules/normalize-package-data": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",

View File

@ -177,7 +177,7 @@
"jest-preset-angular": "^13.1.4",
"jsonc-parser": "^2.3.1",
"keytar": "^7.2.0",
"minimatch": "^5.1.0",
"minimatch": "^9.0.3",
"native-run": "^2.0.0",
"patch-package": "^6.5.0",
"ts-jest": "^29.1.1",

View File

@ -218,7 +218,7 @@ export class AddonModLessonUserRetakePage implements OnInit {
* @returns Formatted data.
*/
protected formatRetake(retakeData: AddonModLessonGetUserAttemptWSResponse): RetakeToDisplay {
const formattedData = <RetakeToDisplay> retakeData;
const formattedData = retakeData;
if (formattedData.userstats.gradeinfo) {
// Completed.
@ -229,19 +229,23 @@ export class AddonModLessonUserRetakePage implements OnInit {
// Format pages data.
formattedData.answerpages.forEach((page) => {
if (AddonModLesson.answerPageIsContent(page)) {
page.isContent = true;
const contentPage = page as AnswerPage;
if (page.answerdata?.answers) {
page.answerdata.answers.forEach((answer) => {
contentPage.isContent = true;
if (contentPage.answerdata?.answers) {
contentPage.answerdata.answers.forEach((answer) => {
// Content pages only have 1 valid field in the answer array.
answer[0] = AddonModLessonHelper.getContentPageAnswerDataFromHtml(answer[0]);
});
}
} else if (AddonModLesson.answerPageIsQuestion(page)) {
page.isQuestion = true;
const questionPage = page as AnswerPage;
if (page.answerdata?.answers) {
page.answerdata.answers.forEach((answer) => {
questionPage.isQuestion = true;
if (questionPage.answerdata?.answers) {
questionPage.answerdata.answers.forEach((answer) => {
// Only the first field of the answer array requires to be parsed.
answer[0] = AddonModLessonHelper.getQuestionPageAnswerDataFromHtml(answer[0]);
});

View File

@ -270,7 +270,7 @@ export class AddonModLessonHelperProvider {
if (option.checked || multiChoiceQuestion.multi) {
// Add the control.
const value = multiChoiceQuestion.multi ?
{ value: option.checked, disabled: option.disabled } : option.value;
{ value: option.checked, disabled: option.disabled } : option.checked;
questionForm.addControl(option.name, this.formBuilder.control(value));
controlAdded = true;
}

View File

@ -337,7 +337,7 @@ export class AddonModScormProvider {
const re = /^(\d+)\*\{(.+)\}$/; // Sets like 3*{S34, S36, S37, S39}.
const reOther = /^(.+)(=|<>)(.+)$/; // Other symbols.
let matches = element.match(re);
const matches = element.match(re);
if (matches) {
const repeat = Number(matches[1]);
@ -363,18 +363,18 @@ export class AddonModScormProvider {
element = '!';
} else if (reOther.test(element)) {
// Other symbols = | <> .
matches = element.match(reOther) ?? [];
element = matches[1]?.trim();
const otherMatches = element.match(reOther) ?? [];
element = otherMatches[1]?.trim();
if (trackData[element] !== undefined) {
let value = matches[3].trim().replace(/('|")/gi, '');
let value = otherMatches[3].trim().replace(/('|")/gi, '');
let oper: string;
if (STATUSES[value] !== undefined) {
value = STATUSES[value];
}
if (matches[2] == '<>') {
if (otherMatches[2] == '<>') {
oper = '!=';
} else {
oper = '==';

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { InjectionToken, Injector, ModuleWithProviders, NgModule } from '@angular/core';
import { InjectionToken, Injector, ModuleWithProviders, NgModule, Type } from '@angular/core';
import {
PreloadAllModules,
RouterModule,
@ -97,6 +97,12 @@ function buildConditionalUrlMatcher(pathOrMatcher: string | UrlMatcher, conditio
};
}
/**
* Type to declare lazy route modules.
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type LazyRoutesModule = Type<any>;
/**
* Build url matcher using a regular expression.
*

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { ApplicationInitStatus, APP_INITIALIZER, Injectable, Injector } from '@angular/core';
import { ApplicationInitStatus, Injectable, Injector } from '@angular/core';
import { setSingletonsInjector } from '@singletons';
@Injectable()
@ -21,7 +21,7 @@ export class CoreApplicationInitStatus extends ApplicationInitStatus {
constructor(injector: Injector) {
setSingletonsInjector(injector);
super(injector.get(APP_INITIALIZER, []));
super();
}
whenDone(callback: () => unknown): void {

View File

@ -75,6 +75,7 @@ import { CoreRemindersPushNotificationData } from '@features/reminders/services/
import { CoreLocalNotifications } from '@services/local-notifications';
import { CoreEnrol } from '@features/enrol/services/enrol';
import { CoreEnrolAction, CoreEnrolDelegate } from '@features/enrol/services/enrol-delegate';
import { LazyRoutesModule } from '@/app/app-routing.module';
/**
* Prefetch info of a module.
@ -1990,7 +1991,7 @@ export class CoreCourseHelperProvider {
*
* @returns Course summary page module.
*/
async getCourseSummaryRouteModule(): Promise<unknown> {
async getCourseSummaryRouteModule(): Promise<LazyRoutesModule> {
return import('../course-summary-lazy.module').then(m => m.CoreCourseSummaryLazyModule);
}

View File

@ -30,6 +30,7 @@ import { of, firstValueFrom } from 'rxjs';
import { zipIncludingComplete } from '@/core/utils/rxjs';
import { catchError, map } from 'rxjs/operators';
import { chainRequests, WSObservable } from '@classes/sites/authenticated-site';
import { LazyRoutesModule } from '@/app/app-routing.module';
// Id for a course item representing all courses (for example, for course filters).
export const ALL_COURSES_ID = -1;
@ -432,7 +433,7 @@ export class CoreCoursesHelperProvider {
*
* @returns My courses page module.
*/
async getMyRouteModule(): Promise<unknown> {
async getMyRouteModule(): Promise<LazyRoutesModule> {
return import('../courses-my-lazy.module').then(m => m.CoreCoursesMyLazyModule);
}

View File

@ -12,8 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
/* eslint-disable deprecation/deprecation */
import { Injectable } from '@angular/core';
import { File, Entry, DirectoryEntry, FileEntry, IWriteOptions, RemoveResult } from '@awesome-cordova-plugins/file/ngx';
import {
File,
Entry,
FileEntry,
FileSystem,
IWriteOptions,
RemoveResult,
DirectoryEntry,
DirectoryReader,
} from '@awesome-cordova-plugins/file/ngx';
import { CorePath } from '@singletons/path';
/**
@ -42,6 +53,82 @@ class FileError {
}
/**
* Native APIs used in webkit window.
*/
interface WebkitWindow {
/**
* @deprecated
* @see https://www.w3.org/TR/2012/WD-file-system-api-20120417/
*/
// eslint-disable-next-line @typescript-eslint/naming-convention
LocalFileSystem: {
readonly TEMPORARY: number;
readonly PERSISTENT: number;
};
/**
* @deprecated
* @see https://developer.mozilla.org/en-US/docs/Web/API/Window/requestFileSystem
*/
requestFileSystem(
type: LocalFileSystem,
size: number,
successCallback: (fileSystem: FileSystem) => void,
errorCallback?: (fileError: FileError) => void,
): void;
/**
* @deprecated
*/
webkitRequestFileSystem(
type: LocalFileSystem,
size: number,
successCallback: (fileSystem: FileSystem) => void,
errorCallback?: (fileError: FileError) => void,
): void;
/**
* @deprecated
* @see https://www.w3.org/TR/2012/WD-file-system-api-20120417/
*/
resolveLocalFileSystemURL(
url: string,
successCallback: (entry: Entry) => void,
errorCallback?: (fileError: FileError) => void,
): void;
/**
* @deprecated
*/
webkitResolveLocalFileSystemURL(
url: string,
successCallback: (entry: Entry) => void,
errorCallback?: (fileError: FileError) => void,
): void;
}
/**
* Native APIs used in webkit navigator.
*/
interface WebkitNavigator {
/**
* @deprecated
* @see https://developer.chrome.com/docs/apps/offline_storage/
*/
webkitPersistentStorage: {
requestQuota(
newQuotaInBytes: number,
successCallback?: (bytesGranted: number) => void,
errorCallback?: (error: Error) => void,
): void;
};
}
/**
* Emulates the Cordova File plugin in browser.
* Most of the code is extracted from the File class of Ionic Native.
@ -285,39 +372,40 @@ export class FileMock extends File {
*/
async getFreeDiskSpace(): Promise<number> {
// Request a file system instance with a minimum size until we get an error.
if (window.requestFileSystem) {
let iterations = 0;
let maxIterations = 50;
const calculateByRequest = (size: number, ratio: number): Promise<number> =>
new Promise((resolve): void => {
window.requestFileSystem(LocalFileSystem.PERSISTENT, size, () => {
iterations++;
if (iterations > maxIterations) {
resolve(size);
const window = this.getEmulatorWindow();
return;
}
// eslint-disable-next-line promise/catch-or-return
calculateByRequest(size * ratio, ratio).then(resolve);
}, () => {
resolve(size / ratio);
});
});
// General calculation, base 1MB and increasing factor 1.3.
let size = await calculateByRequest(1048576, 1.3);
// More accurate. Factor is 1.1.
iterations = 0;
maxIterations = 10;
size = await calculateByRequest(size, 1.1);
return size / 1024; // Return size in KB.
} else {
if (!window.requestFileSystem) {
throw new Error('File system not available.');
}
let iterations = 0;
let maxIterations = 50;
const calculateByRequest = (size: number, ratio: number): Promise<number> =>
new Promise((resolve): void => {
window.requestFileSystem(LocalFileSystem.PERSISTENT, size, () => {
iterations++;
if (iterations > maxIterations) {
resolve(size);
return;
}
// eslint-disable-next-line promise/catch-or-return
calculateByRequest(size * ratio, ratio).then(resolve);
}, () => {
resolve(size / ratio);
});
});
// General calculation, base 1MB and increasing factor 1.3.
let size = await calculateByRequest(1048576, 1.3);
// More accurate. Factor is 1.1.
iterations = 0;
maxIterations = 10;
size = await calculateByRequest(size, 1.1);
return size / 1024; // Return size in KB.
}
/**
@ -342,24 +430,23 @@ export class FileMock extends File {
*/
load(): Promise<string> {
return new Promise((resolve, reject): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const win = <any> window; // Convert to <any> to be able to use non-standard properties.
const window = this.getEmulatorWindow();
if (win.requestFileSystem === undefined) {
win.requestFileSystem = win.webkitRequestFileSystem;
if (window.requestFileSystem === undefined) {
window.requestFileSystem = window.webkitRequestFileSystem;
}
if (win.resolveLocalFileSystemURL === undefined) {
win.resolveLocalFileSystemURL = win.webkitResolveLocalFileSystemURL;
if (window.resolveLocalFileSystemURL === undefined) {
window.resolveLocalFileSystemURL = window.webkitResolveLocalFileSystemURL;
}
win.LocalFileSystem = {
window.LocalFileSystem = {
TEMPORARY: 0, // eslint-disable-line @typescript-eslint/naming-convention
PERSISTENT: 1, // eslint-disable-line @typescript-eslint/naming-convention
};
// Request a quota to use. Request 500MB.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(<any> navigator).webkitPersistentStorage.requestQuota(500 * 1024 * 1024, (granted) => {
window.requestFileSystem(LocalFileSystem.PERSISTENT, granted, (entry) => {
resolve(entry.root.toURL());
this.getEmulatorNavigator().webkitPersistentStorage.requestQuota(500 * 1024 * 1024, (granted) => {
window.requestFileSystem(LocalFileSystem.PERSISTENT, granted, (fileSystem: FileSystem) => {
resolve(fileSystem.root.toURL());
}, reject);
}, reject);
});
@ -642,7 +729,7 @@ export class FileMock extends File {
resolveLocalFilesystemUrl(fileUrl: string): Promise<Entry> {
return new Promise<Entry>((resolve, reject): void => {
try {
window.resolveLocalFileSystemURL(fileUrl, (entry: Entry) => {
this.getEmulatorWindow().resolveLocalFileSystemURL(fileUrl, (entry: Entry) => {
resolve(entry);
}, (error: FileError) => {
this.fillErrorMessageMock(error);
@ -799,4 +886,22 @@ export class FileMock extends File {
});
}
/**
* Get emulator window.
*
* @returns Emulator window.
*/
private getEmulatorWindow(): WebkitWindow {
return window as unknown as WebkitWindow;
}
/**
* Get emulator navigator.
*
* @returns Emulator navigator.
*/
private getEmulatorNavigator(): WebkitNavigator {
return navigator as unknown as WebkitNavigator;
}
}

View File

@ -50,10 +50,11 @@ export class ZipMock extends Zip {
*
* @param source Path to the source ZIP file.
* @param destination Destination folder.
* @param onProgress Optional callback to be called on progress update
* @param onProgressFunction Optional callback to be called on progress update
* @returns Promise that resolves with a number. 0 is success, -1 is error.
*/
async unzip(source: string, destination: string, onProgress?: (ev: {loaded: number; total: number}) => void): Promise<number> {
async unzip(source: string, destination: string, onProgressFunction?: Function): Promise<number> {
const onProgress = onProgressFunction as (ev: {loaded: number; total: number}) => void;
// Replace all %20 with spaces.
source = source.replace(/%20/g, ' ');

View File

@ -56,6 +56,7 @@ import {
IDENTITY_PROVIDERS_FEATURE_NAME,
IDENTITY_PROVIDER_FEATURE_NAME_PREFIX,
} from '../constants';
import { LazyRoutesModule } from '@/app/app-routing.module';
/**
* Helper provider that provides some common features regarding authentication.
@ -1440,7 +1441,7 @@ export class CoreLoginHelperProvider {
*
* @returns Reconnect page route module.
*/
async getReconnectRouteModule(): Promise<unknown> {
async getReconnectRouteModule(): Promise<LazyRoutesModule> {
return import('@features/login/login-reconnect-lazy.module').then(m => m.CoreLoginReconnectLazyModule);
}
@ -1449,7 +1450,7 @@ export class CoreLoginHelperProvider {
*
* @returns Credentials page route module.
*/
async getCredentialsRouteModule(): Promise<unknown> {
async getCredentialsRouteModule(): Promise<LazyRoutesModule> {
return import('@features/login/login-credentials-lazy.module').then(m => m.CoreLoginCredentialsLazyModule);
}

View File

@ -246,7 +246,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
cssClass: 'core-modal-lateral core-modal-lateral-sm',
});
if (closeAll) {
if (thisModal && closeAll) {
await ModalController.dismiss(undefined, undefined, thisModal.id);
}
}

View File

@ -235,7 +235,8 @@ export class CoreSitePluginsPluginContentComponent implements OnInit, DoCheck {
this.args = args;
this.dataLoaded = false;
this.preSets = preSets || this.preSets;
if (jsData) {
if (this.data && jsData) {
Object.assign(this.data, jsData);
}

View File

@ -14,6 +14,17 @@
import { CorePlatform } from '@services/platform';
import { CoreIframeUtils } from '@services/utils/iframe';
import { WKUserScriptWindow } from 'cordova-plugin-wkuserscript';
/**
* Check Whether the window object has WKUserScript set.
*
* @param window Window object.
* @returns Whether the window object has WKUserScript set.
*/
function isWKUserScriptWindow(window: object): window is WKUserScriptWindow {
return CorePlatform.isIOS() && 'WKUserScript' in window;
}
/**
* Inject some scripts for iOS iframes.
@ -21,7 +32,7 @@ import { CoreIframeUtils } from '@services/utils/iframe';
export default async function(): Promise<void> {
await CorePlatform.ready();
if (!CorePlatform.isIOS() || !('WKUserScript' in window)) {
if (!isWKUserScriptWindow(window)) {
return;
}

View File

@ -5,6 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"skipLibCheck": true,
"downlevelIteration": true,
"experimentalDecorators": true,
"strictNullChecks": true,
@ -14,7 +15,7 @@
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"target": "es2022",
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"lib": [

View File

@ -2,6 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/tests",
"target": "es2016",
"allowJs": true,
"esModuleInterop": true,
"emitDecoratorMetadata": true,