Compare commits

..

12 Commits

Author SHA1 Message Date
Rainer Killinger
f2e1a6ddd5 docs: update changelogs for release
ci: publish release
2024-08-02 10:19:44 +02:00
Rainer Killinger
ccacfbf710 fix: publish-packages script 2024-08-02 10:18:57 +02:00
Rainer Killinger
b249b329f7 refactor: use development backend for non production environment 2024-08-01 17:44:21 +02:00
Jovan Krunić
7afc24f1bc fix: use major version config from storage when offline
Closes #218
2024-08-01 17:44:20 +02:00
Rainer Killinger
7276525dfa fix: app-builder image build due to nodejs versions <18.19 not being supported by angular 17 2024-08-01 15:24:59 +02:00
Jovan Krunić
c9e881582f refactor: set production version of the backend 2024-07-19 15:20:06 +02:00
Jovan Krunić
df681de083 feat: show title if available on library account profile
Closes #215
2024-07-19 15:20:06 +02:00
802a7a3fa7 fix: docs generation 2024-07-19 15:20:06 +02:00
Jovan Krunić
343d03e647 feat: library account adjustments
Closes #214
2024-07-19 15:20:06 +02:00
727b92911e fix: list item layout broken 2024-07-19 15:20:06 +02:00
11bc987807 fix: elasticsearch integration spams errors 2024-07-19 15:20:06 +02:00
Rainer Killinger
b8faae5988 docs: update changelogs for release
ci: publish release
2024-06-28 17:39:39 +02:00
67 changed files with 1171 additions and 1141 deletions

View File

@@ -1,5 +0,0 @@
---
"@openstapps/easy-ast": patch
---
Fixed docs generation

View File

@@ -1,5 +0,0 @@
---
"@openstapps/backend": patch
---
fix for geo.point mapping

View File

@@ -26,7 +26,6 @@ const config = {
'types',
'bin',
'files',
'builders',
'engines',
'scripts',
'dependencies',

View File

@@ -1,5 +1,18 @@
# @openstapps/backend
## 3.3.2
### Patch Changes
- @openstapps/core@3.3.2
- @openstapps/core-tools@3.3.2
## 3.3.1
### Patch Changes
- 67ab1fd6: fix for geo.point mapping
## 3.3.0
### Minor Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/backend",
"description": "A reference implementation for a StApps backend",
"version": "3.3.0",
"version": "3.3.2",
"private": true,
"type": "module",
"license": "AGPL-3.0-only",

View File

@@ -1,5 +1,12 @@
# @openstapps/minimal-connector
## 3.3.2
### Patch Changes
- @openstapps/core@3.3.2
- @openstapps/api@3.3.2
## 3.3.0
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/minimal-connector",
"description": "This is a minimal connector which serves as an example",
"version": "3.3.0",
"version": "3.3.2",
"private": true,
"type": "module",
"license": "GPL-3.0-only",

View File

@@ -1,5 +1,14 @@
# @openstapps/minimal-plugin
## 3.3.2
### Patch Changes
- @openstapps/core@3.3.2
- @openstapps/core-tools@3.3.2
- @openstapps/api-plugin@3.3.2
- @openstapps/api@3.3.2
## 3.3.0
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/minimal-plugin",
"description": "Minimal Plugin",
"version": "3.3.0",
"version": "3.3.2",
"private": true,
"type": "module",
"license": "GPL-3.0-only",

View File

@@ -1,25 +0,0 @@
{
"inputPath": "node_modules/material-symbols/material-symbols-rounded.woff2",
"outputPath": "src/assets/icons.min.woff2",
"htmlGlob": "src/**/*.html",
"scriptGlob": "src/**/*.ts",
"additionalIcons": {
"about": ["copyright", "campaign", "policy", "description", "text_snippet"],
"navigation": [
"home",
"newspaper",
"search",
"calendar_month",
"local_cafe",
"local_library",
"inventory_2",
"map",
"grade",
"account_circle",
"settings",
"info",
"rate_review",
"work"
]
}
}

View File

@@ -1,5 +1,13 @@
# @openstapps/app
## 3.3.2
### Patch Changes
- 7afc24f1: fixed config version comparison
- @openstapps/core@3.3.2
- @openstapps/api@3.3.2
## 3.3.0
### Minor Changes

View File

@@ -16,32 +16,11 @@ android {
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
}
}
flavorDimensions 'uni'
productFlavors {
file('../../config').eachDir {
def config = new groovy.json.JsonSlurper().parseText(file("$it/default.json").text)
"${it.name}" {
dimension 'uni'
applicationId config.android.packageName
versionName config.appMarketingVersion
resValue 'string', 'app_name', config.appName
resValue 'string', 'title_activity_main', config.appName
resValue 'string', 'package_name', config.android.packageName
resValue 'string', 'custom_url_scheme', config.appUrlScheme
resValue 'string', 'app_host', config.appLinkHost
}
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
applicationIdSuffix ".debug"
}
}
}

View File

@@ -11,7 +11,7 @@
"schematics": {},
"architect": {
"build": {
"builder": "@openstapps/angular-builder:application",
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "www",
"index": "src/index.html",

View File

@@ -1,17 +1,9 @@
import {CapacitorConfig} from '@capacitor/cli';
const variant = process.env.APP_VARIANT ?? 'default';
// eslint-disable-next-line unicorn/prefer-module, @typescript-eslint/no-var-requires
const uniConfig = require(`./config/${variant}/default.json`);
const config: CapacitorConfig = {
appId: uniConfig.android.packageName, // TODO: iOS bundle ID
appName: uniConfig.appName,
appId: 'de.anyschool.app',
appName: 'StApps',
webDir: 'www',
android: {
flavor: variant,
},
// TODO: iOS scheme
cordova: {
preferences: {
'AndroidXEnabled': 'true',

View File

@@ -1,67 +0,0 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "App Config",
"type": "object",
"properties": {
"$schema": {
"type": "string"
},
"appName": {
"type": "string",
"description": "Full app name",
"examples": ["Open StApps"]
},
"appDisplayName": {
"type": "string",
"description": "App name on mobile device homescreen (Not much space)",
"examples": ["StApps"]
},
"backendUrl": {
"type": "string",
"description": "Publicly available backend url",
"examples": ["https://your.backend.server.tld"]
},
"backendVersion": {
"type": "string",
"description": "Minimum backend version the app will request",
"examples": ["3.0.0"]
},
"appLinkHost": {
"type": "string",
"description": "Your host used for universal (deep) links",
"examples": ["your.deep.link.host.tdl"]
},
"appUrlScheme": {
"type": "string",
"description": "Custom url scheme for native app versions",
"examples": ["de.anyschool.app"]
},
"appMarketingVersion": {
"type": "string",
"description": "App marketing version used in Stores (preferably SemVer or CalVer)",
"examples": ["1.0.0"]
},
"android": {
"type": "object",
"properties": {
"packageName": {
"type": "string",
"description": "Android package name",
"examples": ["de.anyschool.app"]
}
},
"required": ["packageName"]
}
},
"required": [
"$schema",
"appName",
"appDisplayName",
"backendUrl",
"backendVersion",
"appLinkHost",
"appUrlScheme",
"appMarketingVersion",
"android"
]
}

View File

@@ -1,13 +0,0 @@
{
"$schema": "./config.schema.json",
"appName": "Open StApps",
"appDisplayName": "StApps",
"backendUrl": "http://localhost:3000",
"backendVersion": "3.0.0",
"appLinkHost": "localhost:3000",
"appUrlScheme": "de.anyschool.app",
"appMarketingVersion": "1.0.0",
"android": {
"packageName": "de.anyschool.app"
}
}

View File

@@ -1,13 +0,0 @@
{
"$schema": "../config.schema.json",
"appName": "Uni Frankfurt",
"appDisplayName": "Uni Frankfurt",
"backendUrl": "https://mobile.server.uni-frankfurt.de",
"backendVersion": "3.1.0",
"appLinkHost": "mobile.app.uni-frankfurt.de",
"appUrlScheme": "de.unifrankfurt.app",
"appMarketingVersion": "2.3.0",
"android": {
"packageName": "de.unifrankfurt.app"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

View File

@@ -0,0 +1,43 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
/** @type {import('./scripts/icon-config').IconConfig} */
const config = {
inputPath: 'node_modules/material-symbols/material-symbols-rounded.woff2',
outputPath: 'src/assets/icons.min.woff2',
htmlGlob: 'src/**/*.html',
scriptGlob: 'src/**/*.ts',
additionalIcons: {
about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet'],
navigation: [
'home',
'newspaper',
'search',
'calendar_month',
'local_cafe',
'local_library',
'inventory_2',
'map',
'grade',
'account_circle',
'settings',
'info',
'rate_review',
'work',
],
},
};
export default config;

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/app",
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
"version": "3.3.0",
"version": "3.3.2",
"private": true,
"license": "GPL-3.0-only",
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
@@ -14,10 +14,14 @@
"Thea Schöbl <dev@theaninova.de>"
],
"scripts": {
"build": "ng build --configuration=production",
"analyze": "webpack-bundle-analyzer www/stats.json",
"build": "pnpm check-icons && ng build --configuration=production --stats-json && webpack-bundle-analyzer www/stats.json --mode static --report www/bundle-info.html --no-open",
"build:analyze": "npm run build:stats && npm run analyze",
"build:android": "ionic capacitor build android --no-open && cd android && ./gradlew clean assemble && cd ..",
"build:prod": "ng build --configuration=production",
"build:stats": "ng build --configuration=production --stats-json",
"changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0",
"check-icons": "node scripts/check-icon-correctness.mjs",
"chromium:no-cors": "chromium --disable-web-security --user-data-dir=\".browser-data/chromium\"",
"chromium:virtual-host": "chromium --host-resolver-rules=\"MAP mobile.app.uni-frankfurt.de:* localhost:8100\" --ignore-certificate-errors",
"cypress:open": "cypress open",
@@ -135,7 +139,6 @@
"@ionic/cli": "7.2.0",
"@openstapps/prettier-config": "workspace:*",
"@openstapps/tsconfig": "workspace:*",
"@openstapps/angular-builder": "workspace:*",
"@types/fontkit": "2.0.7",
"@types/geojson": "1.0.6",
"@types/glob": "8.1.0",

View File

@@ -0,0 +1,65 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {openSync} from 'fontkit';
import config from '../icons.config.mjs';
import {existsSync} from 'fs';
import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
import {fetchCodePointMap} from './get-code-points.mjs';
const commandName = '"npm run minify-icons"';
if (!existsSync(config.outputPath)) {
console.error(`Minified font not found. Run ${commandName} first.`);
process.exit(-1);
}
/** @type {import('fontkit').Font} */
const modifiedFont = openSync(config.outputPath);
let success = true;
// eslint-disable-next-line unicorn/prefer-top-level-await
checkAll().then(() => {
console.log();
if (success) {
console.log('All icons are present in both fonts.');
} else {
console.error('Errors occurred.');
process.exit(-1);
}
});
/**
*
*/
async function checkAll() {
check(config.additionalIcons || {});
check(await getUsedIconsTS(config.scriptGlob));
check(await getUsedIconsHtml(config.htmlGlob));
}
/**
* @param {Record<string, string[]>} icons
*/
async function check(icons) {
const codePoints = await fetchCodePointMap();
for (const icon of Object.values(icons).flat()) {
const codePoint = codePoints.get(icon);
if (!codePoint) throw new Error(`"${icon}" is not a valid icon`);
if (!modifiedFont.getGlyph(Number.parseInt(codePoint, 16))) {
throw new Error(`"${icon}" (code point ${codePoint}) is missing`);
}
}
}

View File

@@ -14,10 +14,16 @@
*/
import {glob} from 'glob';
import {readFileSync} from 'fs';
import {matchPropertyAccess, matchPropertyContent, matchTagProperties} from './icon-match.js';
import {IconConfig} from '../index.js';
import {
matchPropertyAccess,
matchPropertyContent,
matchTagProperties,
} from '../src/app/util/ion-icon/icon-match.mjs';
export async function getUsedIconsHtml(pattern = 'src/**/*.html'): Promise<Record<string, string[]>> {
/**
* @returns {Promise<Record<string, string[]>>}
*/
export async function getUsedIconsHtml(pattern = 'src/**/*.html') {
return Object.fromEntries(
(await glob(pattern))
.map(file => [
@@ -33,7 +39,10 @@ export async function getUsedIconsHtml(pattern = 'src/**/*.html'): Promise<Recor
);
}
export async function getUsedIconsTS(pattern = 'src/**/*.ts'): Promise<Record<string, string[]>> {
/**
* @returns {Promise<Record<string, string[]>>}
*/
export async function getUsedIconsTS(pattern = 'src/**/*.ts') {
const regex = matchPropertyAccess('SCIcon');
return Object.fromEntries(
(await glob(pattern))
@@ -41,15 +50,3 @@ export async function getUsedIconsTS(pattern = 'src/**/*.ts'): Promise<Record<st
.filter(([, values]) => values && values.length > 0),
);
}
export async function getUsedIcons(config: IconConfig) {
return new Set(
[
config.additionalIcons ?? {},
await getUsedIconsTS(config.scriptGlob),
await getUsedIconsHtml(config.htmlGlob),
]
.map(Object.values)
.flat(2),
);
}

View File

@@ -5,12 +5,15 @@ const url =
export async function fetchCodePointMap() {
const icons = await fetch(url)
.then(it => it.text())
.then(it => new Map(it.split('\n').map(it => it.split(' ') as [string, string])));
.then(it => new Map(it.split('\n').map(it => /** @type {[string, string]} */ (it.split(' ')))));
if (icons.size < 100) throw new Error(`Code point map is very small, is the URL incorrect? ${url}`);
return icons;
}
export async function getCodePoints(icons: string[]) {
/**
* @param {string[]} icons
*/
export async function getCodePoints(icons) {
const codePoints = await fetchCodePointMap();
return icons.map(icon => {
const code = codePoints.get(icon);

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 StApps
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
@@ -20,9 +20,3 @@ export interface IconConfig {
outputPath: string;
additionalIcons?: {[purpose: string]: string[]};
}
export function defineIconConfig(config: IconConfig): IconConfig {
return config;
}
export * from './icons/icon-match.js';

View File

@@ -0,0 +1,7 @@
{
"extends": "@openstapps/tsconfig",
"compilerOptions": {
"module": "CommonJS",
"moduleResolution": "Node"
}
}

View File

@@ -17,7 +17,7 @@ import {ActivatedRoute} from '@angular/router';
import {SCAboutPage, SCAppConfiguration} from '@openstapps/core';
import {ConfigProvider} from '../../config/config.provider';
import packageJson from '../../../../../package.json';
import config from '../../../../../config/default.json';
import config from 'capacitor.config';
import {App} from '@capacitor/app';
import {Capacitor} from '@capacitor/core';

View File

@@ -132,6 +132,8 @@ describe('ConfigProvider', () => {
wrongConfig.backend.SCVersion = '0.1.0';
storageProviderSpy.get.and.returnValue(Promise.resolve(wrongConfig));
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
// sets StApps core version which has a different major version
configProvider.scVersion = '1.0.0';
await configProvider.init();
expect(ngxLogger.warn).toHaveBeenCalledWith(
@@ -139,6 +141,19 @@ describe('ConfigProvider', () => {
);
});
it('should load from storage if offline and same major version stored', async () => {
internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(true)};
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
const configInStorage = structuredClone(sampleIndexResponse);
configInStorage.backend.SCVersion = '1.0.0';
storageProviderSpy.get.and.returnValue(Promise.resolve(configInStorage));
// sets StApps core version which has the same major version
configProvider.scVersion = '1.1.1';
await configProvider.init();
expect(configProvider.getAnyValue('app')).toEqual(configInStorage.app);
});
it('should throw error on saved app configuration not available', async () => {
storageProviderSpy.has.and.returnValue(Promise.resolve(false));
// eslint-disable-next-line unicorn/error-message

View File

@@ -132,7 +132,7 @@ export class ConfigProvider {
this.config = await this.loadLocal();
this.firstSession = false;
this.logger.log(`initialised configuration from storage`);
if (this.config.backend.SCVersion !== this.scVersion) {
if (this.config.backend.SCVersion.split('.')[0] !== this.scVersion.split('.')[0]) {
loadError = new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
}
} catch (error) {

View File

@@ -25,8 +25,6 @@ import {PAIAPatron} from '../../types';
export class ProfilePageComponent {
patron?: PAIAPatron;
propertiesToShow: (keyof PAIAPatron)[] = ['id', 'name', 'email', 'address', 'expires'];
constructor(private readonly libraryAccountService: LibraryAccountService) {}
async ionViewWillEnter(): Promise<void> {

View File

@@ -26,27 +26,45 @@
<ion-card>
<ion-card-content>
<ion-grid>
@for (property of propertiesToShow; track property) {
@if (patron[property]) {
<ion-row>
<ion-col>
{{ 'library.account.pages.profile.labels' + '.' + property | translate }}:
</ion-col>
<ion-col>
@if (!['expires'].includes(property)) {
{{ patron[property] }}
} @else {
@if (isUnlimitedExpiry(patron['expires'])) {
{{ 'library.account.pages.profile.values.unlimited' | translate }}
} @else {
{{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
patron['expires'] | amDateFormat: 'll'
}}
}
}
</ion-col>
</ion-row>
}
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.id' | translate }}: </ion-col>
<ion-col>
{{ patron.id }}
</ion-col>
</ion-row>
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.name' | translate }}: </ion-col>
<ion-col> {{ patron.name_details?.title ?? '' }} {{ patron.name }} </ion-col>
</ion-row>
@if (patron.email) {
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.email' | translate }}: </ion-col>
<ion-col>
{{ patron.email }}
</ion-col>
</ion-row>
}
@if (patron.address) {
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.address' | translate }}: </ion-col>
<ion-col>
{{ patron.address }}
</ion-col>
</ion-row>
}
@if (patron.expires) {
<ion-row>
<ion-col> {{ 'library.account.pages.profile.labels.expires' | translate }}: </ion-col>
<ion-col>
@if (isUnlimitedExpiry(patron.expires)) {
{{ 'library.account.pages.profile.values.unlimited' | translate }}
} @else {
{{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
patron.expires | amDateFormat: 'll'
}}
}
</ion-col>
</ion-row>
}
</ion-grid>
</ion-card-content>

View File

@@ -22,6 +22,13 @@ export interface PAIAPatron {
status?: PAIAPatronStatus;
type?: string;
note?: string;
// HeBIS specific property (not in PAIA documentation)
name_details?: {
firstname?: string;
lastname?: string;
gender?: string;
title?: string;
};
}
export enum PAIAPatronStatus {

View File

@@ -21,9 +21,9 @@ import {
SCTranslations,
} from '@openstapps/core';
import {NavigationService} from './navigation.service';
import config from 'capacitor.config';
import {SettingsProvider} from '../../settings/settings.provider';
import {BreakpointObserver} from '@angular/cdk/layout';
import config from '../../../../../config/default.json';
/**
* Generated class for the MenuPage page.

View File

@@ -0,0 +1,5 @@
export function matchTagProperties(tag: string): RegExp;
export function matchPropertyContent(properties: string[]): RegExp;
export function matchPropertyAccess(objectName: string): RegExp;

View File

@@ -13,16 +13,25 @@
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
export function matchTagProperties(tag: string) {
/**
* @param {string} tag
*/
export function matchTagProperties(tag) {
return new RegExp(`(?<=<${tag})[\\s\\S]*?(?=>\\s*<\\/${tag}\\s*>)`, 'g');
}
export function matchPropertyContent(properties: string[]) {
/**
* @param {string[]} properties
*/
export function matchPropertyContent(properties) {
const names = properties.join('|');
return new RegExp(`((?<=(${names})=")[\\w-]+(?="))|((?<=\\[(${names})]="')[\\w-]+(?='"))`, 'g');
}
export function matchPropertyAccess(objectName: string) {
/**
* @param {string} objectName
*/
export function matchPropertyAccess(objectName) {
return new RegExp(`(?<=${objectName}\\s*\\.\\s*)\\w+`, 'g');
}

View File

@@ -13,26 +13,21 @@
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
/* eslint-disable unicorn/no-null */
import {expect} from 'chai';
import {matchPropertyAccess, matchPropertyContent, matchTagProperties} from './icon-match.js';
import {describe} from 'mocha';
import {matchPropertyAccess, matchPropertyContent, matchTagProperties} from './icon-match.mjs';
describe('matchTagProperties', function () {
const regex = matchTagProperties('test');
it('should match html tag content', function () {
expect('<test content></test>'.match(regex)).to.deep.equal([' content']);
expect('<test content></test>'.match(regex)).toEqual([' content']);
});
it('should match all tags', function () {
expect('<test content1></test> <test content2></test>'.match(regex)).to.deep.equal([
' content1',
' content2',
]);
expect('<test content1></test> <test content2></test>'.match(regex)).toEqual([' content1', ' content2']);
});
it('should not match wrong tags', function () {
expect('<no content></no>'.match(regex)).to.deep.equal(null);
expect('<no content></no>'.match(regex)).toEqual(null);
});
it('should accept valid html whitespaces', function () {
@@ -44,7 +39,7 @@ describe('matchTagProperties', function () {
</test
>
`.match(regex),
).to.deep.equal(['\n content\n ']);
).toEqual(['\n content\n ']);
});
});
@@ -52,15 +47,15 @@ describe('matchPropertyContent', function () {
const regex = matchPropertyContent(['test1', 'test2']);
it('should match bare literals', function () {
expect(`test1="content" test2="content1"`.match(regex)).to.deep.equal(['content', 'content1']);
expect(`test1="content" test2="content1"`.match(regex)).toEqual(['content', 'content1']);
});
it('should match angular literals', function () {
expect(`[test1]="'content'" [test2]="'content1'"`.match(regex)).to.deep.equal(['content', 'content1']);
expect(`[test1]="'content'" [test2]="'content1'"`.match(regex)).toEqual(['content', 'content1']);
});
it('should not match wrong literals', function () {
expect(`no="content" [no]="'content'"`.match(regex)).to.deep.equal(null);
expect(`no="content" [no]="'content'"`.match(regex)).toEqual(null);
});
});
@@ -70,23 +65,23 @@ describe('matchPropertyAccess', function () {
const regex = matchPropertyAccess(object);
it('should match property access', function () {
expect(`${object}.${property}`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}`.match(regex)).toEqual([property]);
});
it('should respect whitespace', function () {
expect(`${object}. ${property}`.match(regex)).to.deep.equal([property]);
expect(`${object} .${property}`.match(regex)).to.deep.equal([property]);
expect(`${object} . ${property}`.match(regex)).to.deep.equal([property]);
expect(`${object} \n . \n ${property}`.match(regex)).to.deep.equal([property]);
expect(`${object}. ${property}`.match(regex)).toEqual([property]);
expect(`${object} .${property}`.match(regex)).toEqual([property]);
expect(`${object} . ${property}`.match(regex)).toEqual([property]);
expect(`${object} \n . \n ${property}`.match(regex)).toEqual([property]);
});
it('should not include invalid trailing stuff', function () {
expect(`${object}.${property}!`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}.`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}-`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}]`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}}`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property};`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}:`.match(regex)).to.deep.equal([property]);
expect(`${object}.${property}!`.match(regex)).toEqual([property]);
expect(`${object}.${property}.`.match(regex)).toEqual([property]);
expect(`${object}.${property}-`.match(regex)).toEqual([property]);
expect(`${object}.${property}]`.match(regex)).toEqual([property]);
expect(`${object}.${property}}`.match(regex)).toEqual([property]);
expect(`${object}.${property};`.match(regex)).toEqual([property]);
expect(`${object}.${property}:`.match(regex)).toEqual([property]);
});
});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -16,13 +16,12 @@
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
// `ng build --env=prod` then `environment.production.ts` will be used instead.
// The list of which env maps to which file can be found in `.angular-cli.json`.
import config from '../../config/default.json';
export const environment = {
backend_url: config.backendUrl,
app_host: config.appLinkHost,
custom_url_scheme: config.appUrlScheme,
backend_version: config.backendVersion,
backend_url: 'https://mobile.server.uni-frankfurt.de',
app_host: 'mobile.app.uni-frankfurt.de',
custom_url_scheme: 'de.anyschool.app',
backend_version: '3.3.0',
production: true,
};

View File

@@ -16,13 +16,12 @@
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
// `ng build --env=prod` then `environment.production.ts` will be used instead.
// The list of which env maps to which file can be found in `.angular-cli.json`.
import config from '../../config/default.json';
export const environment = {
backend_url: config.backendUrl,
app_host: config.appLinkHost,
custom_url_scheme: config.appUrlScheme,
backend_version: config.backendVersion,
backend_url: 'https://mobile.server.uni-frankfurt.de',
app_host: 'mobile.app.uni-frankfurt.de',
custom_url_scheme: 'de.anyschool.app',
backend_version: '999.0.0',
production: false,
};

View File

@@ -8,7 +8,7 @@ LABEL version="2.0.0" \
### Configure versions to install
ENV ANDROID_APIS="android-33" \
ANDROID_BUILD_TOOLS_VERSION="30.0.2" \
NPM_VERSION="^9.0.0" \
NPM_VERSION="^10.0.0" \
IONIC_VERSION="^6.0.0" \
CORDOVA_RES_VERSION="latest" \
### Configure download URLs

View File

@@ -1,372 +1,108 @@
#!/bin/bash
# Discussion, issues and change requests at:
# https://github.com/nodesource/distributions
#
# Script to install the NodeSource Node.js 18.x repo onto a
# Debian or Ubuntu system.
#
# Run as root or insert `sudo -E` before `bash`:
#
# curl -sL https://deb.nodesource.com/setup_18.x | bash -
# or
# wget -qO- https://deb.nodesource.com/setup_18.x | bash -
#
# CONTRIBUTIONS TO THIS SCRIPT
#
# This script is built from a template in
# https://github.com/nodesource/distributions/tree/master/deb/src
# please don't submit pull requests against the built scripts.
#
# Logger Function
log() {
local message="$1"
local type="$2"
local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
local color
local endcolor="\033[0m"
case "$type" in
"info") color="\033[38;5;79m" ;;
"success") color="\033[1;32m" ;;
"error") color="\033[1;31m" ;;
*) color="\033[1;34m" ;;
esac
export DEBIAN_FRONTEND=noninteractive
SCRSUFFIX="_18.x"
NODENAME="Node.js 18.x"
NODEREPO="node_18.x"
NODEPKG="nodejs"
print_status() {
echo
echo "## $1"
echo
echo -e "${color}${timestamp} - ${message}${endcolor}"
}
if test -t 1; then # if terminal
ncolors=$(which tput > /dev/null && tput colors) # supports color
if test -n "$ncolors" && test $ncolors -ge 8; then
termcols=$(tput cols)
bold="$(tput bold)"
underline="$(tput smul)"
standout="$(tput smso)"
normal="$(tput sgr0)"
black="$(tput setaf 0)"
red="$(tput setaf 1)"
green="$(tput setaf 2)"
yellow="$(tput setaf 3)"
blue="$(tput setaf 4)"
magenta="$(tput setaf 5)"
cyan="$(tput setaf 6)"
white="$(tput setaf 7)"
fi
fi
print_bold() {
title="$1"
text="$2"
echo
echo "${red}================================================================================${normal}"
echo "${red}================================================================================${normal}"
echo
echo -e " ${bold}${yellow}${title}${normal}"
echo
echo -en " ${text}"
echo
echo "${red}================================================================================${normal}"
echo "${red}================================================================================${normal}"
# Error handler function
handle_error() {
local exit_code=$1
local error_message="$2"
log "Error: $error_message (Exit Code: $exit_code)" "error"
exit $exit_code
}
bail() {
echo 'Error executing command, exiting'
exit 1
# Function to check for command availability
command_exists() {
command -v "$1" &> /dev/null
}
exec_cmd_nobail() {
echo "+ $1"
bash -c "$1"
}
exec_cmd() {
exec_cmd_nobail "$1" || bail
}
node_deprecation_warning() {
if [[ "X${NODENAME}" == "Xio.js 1.x" ||
"X${NODENAME}" == "Xio.js 2.x" ||
"X${NODENAME}" == "Xio.js 3.x" ||
"X${NODENAME}" == "XNode.js 0.10" ||
"X${NODENAME}" == "XNode.js 0.12" ||
"X${NODENAME}" == "XNode.js 4.x LTS Argon" ||
"X${NODENAME}" == "XNode.js 5.x" ||
"X${NODENAME}" == "XNode.js 6.x LTS Boron" ||
"X${NODENAME}" == "XNode.js 7.x" ||
"X${NODENAME}" == "XNode.js 8.x LTS Carbon" ||
"X${NODENAME}" == "XNode.js 9.x" ||
"X${NODENAME}" == "XNode.js 10.x" ||
"X${NODENAME}" == "XNode.js 11.x" ||
"X${NODENAME}" == "XNode.js 12.x" ||
"X${NODENAME}" == "XNode.js 13.x" ||
"X${NODENAME}" == "XNode.js 14.x" ||
"X${NODENAME}" == "XNode.js 15.x" ||
"X${NODENAME}" == "XNode.js 17.x" ]]; then
print_bold \
" DEPRECATION WARNING " "\
${bold}${NODENAME} is no longer actively supported!${normal}
${bold}You will not receive security or critical stability updates${normal} for this version.
You should migrate to a supported version of Node.js as soon as possible.
Use the installation script that corresponds to the version of Node.js you
wish to install. e.g.
* ${green}https://deb.nodesource.com/setup_16.x — Node.js 16 \"Gallium\"${normal}
* ${green}https://deb.nodesource.com/setup_18.x — Node.js 18 LTS \"Hydrogen\"${normal} (recommended)
* ${green}https://deb.nodesource.com/setup_19.x — Node.js 19 \"Nineteen\"${normal}
* ${green}https://deb.nodesource.com/setup_20.x — Node.js 20 \"Iron\"${normal} (current)
Please see ${bold}https://github.com/nodejs/Release${normal} for details about which
version may be appropriate for you.
The ${bold}NodeSource${normal} Node.js distributions repository contains
information both about supported versions of Node.js and supported Linux
distributions. To learn more about usage, see the repository:
${bold}https://github.com/nodesource/distributions${normal}
"
echo
echo "Continuing in 20 seconds ..."
echo
sleep 20
check_os() {
if ! [ -f "/etc/debian_version" ]; then
echo "Error: This script is only supported on Debian-based systems."
exit 1
fi
}
script_deprecation_warning() {
if [ "X${SCRSUFFIX}" == "X" ]; then
print_bold \
" SCRIPT DEPRECATION WARNING " "\
This script, located at ${bold}https://deb.nodesource.com/setup${normal}, used to
install Node.js 0.10, is deprecated and will eventually be made inactive.
# Function to Install the script pre-requisites
install_pre_reqs() {
log "Installing pre-requisites" "info"
You should use the script that corresponds to the version of Node.js you
wish to install. e.g.
# Run 'apt-get update'
if ! apt-get update -y; then
handle_error "$?" "Failed to run 'apt-get update'"
fi
* ${green}https://deb.nodesource.com/setup_16.x — Node.js 16 \"Gallium\"${normal}
* ${green}https://deb.nodesource.com/setup_18.x — Node.js 18 LTS \"Hydrogen\"${normal} (recommended)
* ${green}https://deb.nodesource.com/setup_19.x — Node.js 19 \"Nineteen\"${normal}
* ${green}https://deb.nodesource.com/setup_20.x — Node.js 20 \"Iron\"${normal} (current)
# Run 'apt-get install'
if ! apt-get install -y apt-transport-https ca-certificates curl gnupg; then
handle_error "$?" "Failed to install packages"
fi
Please see ${bold}https://github.com/nodejs/Release${normal} for details about which
version may be appropriate for you.
if ! mkdir -p /usr/share/keyrings; then
handle_error "$?" "Makes sure the path /usr/share/keyrings exist or run ' mkdir -p /usr/share/keyrings' with sudo"
fi
The ${bold}NodeSource${normal} Node.js Linux distributions GitHub repository contains
information about which versions of Node.js and which Linux distributions
are supported and how to use the install scripts.
${bold}https://github.com/nodesource/distributions${normal}
"
rm -f /usr/share/keyrings/nodesource.gpg || true
rm -f /etc/apt/sources.list.d/nodesource.list || true
echo
echo "Continuing in 20 seconds (press Ctrl-C to abort) ..."
echo
sleep 20
# Run 'curl' and 'gpg'
if ! curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg; then
handle_error "$?" "Failed to download and import the NodeSource signing key"
fi
}
setup() {
# Function to configure the Repo
configure_repo() {
local node_version=$1
script_deprecation_warning
node_deprecation_warning
arch=$(dpkg --print-architecture)
if [ "$arch" != "amd64" ] && [ "$arch" != "arm64" ] && [ "$arch" != "armhf" ]; then
handle_error "1" "Unsupported architecture: $arch. Only amd64, arm64, and armhf are supported."
fi
print_status "Installing the NodeSource ${NODENAME} repo..."
echo "deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$node_version nodistro main" | tee /etc/apt/sources.list.d/nodesource.list > /dev/null
if $(uname -m | grep -Eq ^armv6); then
print_status "You appear to be running on ARMv6 hardware. Unfortunately this is not currently supported by the NodeSource Linux distributions. Please use the 'linux-armv6l' binary tarballs available directly from nodejs.org for Node.js 4 and later."
exit 1
fi
# N|solid Config
echo "Package: nsolid" | tee /etc/apt/preferences.d/nsolid > /dev/null
echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
PRE_INSTALL_PKGS=""
# Nodejs Config
echo "Package: nodejs" | tee /etc/apt/preferences.d/nodejs > /dev/null
echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
# Check that HTTPS transport is available to APT
# (Check snaked from: https://get.docker.io/ubuntu/)
if [ ! -e /usr/lib/apt/methods/https ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} apt-transport-https"
fi
if [ ! -x /usr/bin/lsb_release ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} lsb-release"
fi
if [ ! -x /usr/bin/curl ] && [ ! -x /usr/bin/wget ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} curl"
fi
# Used by apt-key to add new keys
if [ ! -x /usr/bin/gpg ]; then
PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} gnupg"
fi
# Populating Cache
print_status "Populating apt-get cache..."
exec_cmd 'apt-get update'
if [ "X${PRE_INSTALL_PKGS}" != "X" ]; then
print_status "Installing packages required for setup:${PRE_INSTALL_PKGS}..."
# This next command needs to be redirected to /dev/null or the script will bork
# in some environments
exec_cmd "apt-get install -y${PRE_INSTALL_PKGS} > /dev/null 2>&1"
fi
IS_PRERELEASE=$(lsb_release -d | grep 'Ubuntu .*development' >& /dev/null; echo $?)
if [[ $IS_PRERELEASE -eq 0 ]]; then
print_status "Your distribution, identified as \"$(lsb_release -d -s)\", is a pre-release version of Ubuntu. NodeSource does not maintain official support for Ubuntu versions until they are formally released. You can try using the manual installation instructions available at https://github.com/nodesource/distributions and use the latest supported Ubuntu version name as the distribution identifier, although this is not guaranteed to work."
exit 1
fi
DISTRO=$(lsb_release -c -s)
check_alt() {
if [ "X${DISTRO}" == "X${2}" ]; then
echo
echo "## You seem to be using ${1} version ${DISTRO}."
echo "## This maps to ${3} \"${4}\"... Adjusting for you..."
DISTRO="${4}"
# Run 'apt-get update'
if ! apt-get update -y; then
handle_error "$?" "Failed to run 'apt-get update'"
else
log "Repository configured successfully."
log "To install Node.js, run: apt-get install nodejs -y" "info"
log "You can use N|solid Runtime as a node.js alternative" "info"
log "To install N|solid Runtime, run: apt-get install nsolid -y \n" "success"
fi
}
check_alt "Astra Linux" "orel" "Debian" "stretch"
check_alt "BOSS" "anokha" "Debian" "wheezy"
check_alt "BOSS" "anoop" "Debian" "jessie"
check_alt "BOSS" "drishti" "Debian" "stretch"
check_alt "BOSS" "unnati" "Debian" "buster"
check_alt "BOSS" "urja" "Debian" "bullseye"
check_alt "bunsenlabs" "bunsen-hydrogen" "Debian" "jessie"
check_alt "bunsenlabs" "helium" "Debian" "stretch"
check_alt "bunsenlabs" "lithium" "Debian" "buster"
check_alt "Devuan" "jessie" "Debian" "jessie"
check_alt "Devuan" "ascii" "Debian" "stretch"
check_alt "Devuan" "beowulf" "Debian" "buster"
check_alt "Devuan" "chimaera" "Debian" "bullseye"
check_alt "Devuan" "ceres" "Debian" "sid"
check_alt "Devuan" "daedalus" "Debian" "bookworm"
check_alt "Deepin" "panda" "Debian" "sid"
check_alt "Deepin" "unstable" "Debian" "sid"
check_alt "Deepin" "stable" "Debian" "buster"
check_alt "Deepin" "apricot" "Debian" "buster"
check_alt "Deepin" "beige" "Debian" "bookworm"
check_alt "elementaryOS" "luna" "Ubuntu" "precise"
check_alt "elementaryOS" "freya" "Ubuntu" "trusty"
check_alt "elementaryOS" "loki" "Ubuntu" "xenial"
check_alt "elementaryOS" "juno" "Ubuntu" "bionic"
check_alt "elementaryOS" "hera" "Ubuntu" "bionic"
check_alt "elementaryOS" "odin" "Ubuntu" "focal"
check_alt "elementaryOS" "jolnir" "Ubuntu" "focal"
check_alt "elementaryOS" "horus" "Ubuntu" "jammy"
check_alt "Kali" "sana" "Debian" "jessie"
check_alt "Kali" "kali-rolling" "Debian" "bullseye"
check_alt "Linux Mint" "maya" "Ubuntu" "precise"
check_alt "Linux Mint" "qiana" "Ubuntu" "trusty"
check_alt "Linux Mint" "rafaela" "Ubuntu" "trusty"
check_alt "Linux Mint" "rebecca" "Ubuntu" "trusty"
check_alt "Linux Mint" "rosa" "Ubuntu" "trusty"
check_alt "Linux Mint" "sarah" "Ubuntu" "xenial"
check_alt "Linux Mint" "serena" "Ubuntu" "xenial"
check_alt "Linux Mint" "sonya" "Ubuntu" "xenial"
check_alt "Linux Mint" "sylvia" "Ubuntu" "xenial"
check_alt "Linux Mint" "tara" "Ubuntu" "bionic"
check_alt "Linux Mint" "tessa" "Ubuntu" "bionic"
check_alt "Linux Mint" "tina" "Ubuntu" "bionic"
check_alt "Linux Mint" "tricia" "Ubuntu" "bionic"
check_alt "Linux Mint" "ulyana" "Ubuntu" "focal"
check_alt "Linux Mint" "ulyssa" "Ubuntu" "focal"
check_alt "Linux Mint" "uma" "Ubuntu" "focal"
check_alt "Linux Mint" "una" "Ubuntu" "focal"
check_alt "Linux Mint" "vanessa" "Ubuntu" "jammy"
check_alt "Linux Mint" "vera" "Ubuntu" "jammy"
check_alt "Liquid Lemur" "lemur-3" "Debian" "stretch"
check_alt "LMDE" "betsy" "Debian" "jessie"
check_alt "LMDE" "cindy" "Debian" "stretch"
check_alt "LMDE" "debbie" "Debian" "buster"
check_alt "LMDE" "elsie" "Debian" "bullseye"
check_alt "MX Linux 17" "Horizon" "Debian" "stretch"
check_alt "MX Linux 18" "Continuum" "Debian" "stretch"
check_alt "MX Linux 19" "patito feo" "Debian" "buster"
check_alt "MX Linux 21" "wildflower" "Debian" "bullseye"
check_alt "Pardus" "onyedi" "Debian" "stretch"
check_alt "Parrot" "ara" "Debian" "bullseye"
check_alt "PureOS" "green" "Debian" "sid"
check_alt "PureOS" "amber" "Debian" "buster"
check_alt "PureOS" "byzantium" "Debian" "bullseye"
check_alt "SolydXK" "solydxk-9" "Debian" "stretch"
check_alt "Sparky Linux" "Tyche" "Debian" "stretch"
check_alt "Sparky Linux" "Nibiru" "Debian" "buster"
check_alt "Sparky Linux" "Po-Tolo" "Debian" "bullseye"
check_alt "Tanglu" "chromodoris" "Debian" "jessie"
check_alt "Trisquel" "toutatis" "Ubuntu" "precise"
check_alt "Trisquel" "belenos" "Ubuntu" "trusty"
check_alt "Trisquel" "flidas" "Ubuntu" "xenial"
check_alt "Trisquel" "etiona" "Ubuntu" "bionic"
check_alt "Ubilinux" "dolcetto" "Debian" "stretch"
check_alt "Uruk GNU/Linux" "lugalbanda" "Ubuntu" "xenial"
# Define Node.js version
NODE_VERSION="18.x"
if [ "X${DISTRO}" == "Xdebian" ]; then
print_status "Unknown Debian-based distribution, checking /etc/debian_version..."
NEWDISTRO=$([ -e /etc/debian_version ] && cut -d/ -f1 < /etc/debian_version)
if [ "X${NEWDISTRO}" == "X" ]; then
print_status "Could not determine distribution from /etc/debian_version..."
else
DISTRO=$NEWDISTRO
print_status "Found \"${DISTRO}\" in /etc/debian_version..."
fi
fi
# Check OS
check_os
print_status "Confirming \"${DISTRO}\" is supported..."
if [ -x /usr/bin/curl ]; then
exec_cmd_nobail "curl -sLf -o /dev/null 'https://deb.nodesource.com/${NODEREPO}/dists/${DISTRO}/Release'"
RC=$?
else
exec_cmd_nobail "wget -qO /dev/null -o /dev/null 'https://deb.nodesource.com/${NODEREPO}/dists/${DISTRO}/Release'"
RC=$?
fi
if [[ $RC != 0 ]]; then
print_status "Your distribution, identified as \"${DISTRO}\", is not currently supported, please contact NodeSource at https://github.com/nodesource/distributions/issues if you think this is incorrect or would like your distribution to be considered for support"
exit 1
fi
if [ -f "/etc/apt/sources.list.d/chris-lea-node_js-$DISTRO.list" ]; then
print_status 'Removing Launchpad PPA Repository for NodeJS...'
exec_cmd_nobail 'add-apt-repository -y -r ppa:chris-lea/node.js'
exec_cmd "rm -f /etc/apt/sources.list.d/chris-lea-node_js-${DISTRO}.list"
fi
print_status 'Adding the NodeSource signing key to your keyring...'
keyring='/usr/share/keyrings'
node_key_url="https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
local_node_key="$keyring/nodesource.gpg"
if [ -x /usr/bin/curl ]; then
exec_cmd "curl -s $node_key_url | gpg --dearmor | tee $local_node_key >/dev/null"
else
exec_cmd "wget -q -O - $node_key_url | gpg --dearmor | tee $local_node_key >/dev/null"
fi
print_status "Creating apt sources list file for the NodeSource ${NODENAME} repo..."
exec_cmd "echo 'deb [signed-by=$local_node_key] https://deb.nodesource.com/${NODEREPO} ${DISTRO} main' > /etc/apt/sources.list.d/nodesource.list"
exec_cmd "echo 'deb-src [signed-by=$local_node_key] https://deb.nodesource.com/${NODEREPO} ${DISTRO} main' >> /etc/apt/sources.list.d/nodesource.list"
print_status 'Running `apt-get update` for you...'
exec_cmd 'apt-get update'
yarn_site='https://dl.yarnpkg.com/debian'
yarn_key_url="$yarn_site/pubkey.gpg"
local_yarn_key="$keyring/yarnkey.gpg"
print_status """Run \`${bold}sudo apt-get install -y ${NODEPKG}${normal}\` to install ${NODENAME} and npm
## You may also need development tools to build native addons:
sudo apt-get install gcc g++ make
## To install the Yarn package manager, run:
curl -sL $yarn_key_url | gpg --dearmor | sudo tee $local_yarn_key >/dev/null
echo \"deb [signed-by=$local_yarn_key] $yarn_site stable main\" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt-get update && sudo apt-get install yarn
"""
}
## Defer setup until we have the complete script
setup
# Main execution
install_pre_reqs || handle_error $? "Failed installing pre-requisites"
configure_repo "$NODE_VERSION" || handle_error $? "Failed configuring repository"

View File

@@ -18,7 +18,7 @@
"format:fix": "dotenv -c -- turbo run format:fix",
"lint": "dotenv -c -- turbo run lint",
"lint:fix": "dotenv -c -- turbo run lint:fix",
"publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && git add . && git commit -m \"docs: update changelogs for release\n\nci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
"publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && pnpm format:fix && git add . && git commit -m \"docs: update changelogs for release\" -m \"ci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
"syncpack": "syncpack list-mismatches && syncpack lint-semver-ranges --types dev,peer,prod",
"syncpack:fix": "syncpack format && syncpack fix-mismatches",
"test": "trap 'node coverage.mjs' EXIT && dotenv -c -- turbo run test",

View File

@@ -1,8 +0,0 @@
{
"builders": {
"application": {
"implementation": "./lib/application.js",
"schema": "./node_modules/@angular-devkit/build-angular/src/builders/browser/schema.json"
}
}
}

View File

@@ -1,72 +0,0 @@
{
"name": "@openstapps/angular-builder",
"version": "3.2.0",
"type": "module",
"license": "GPL-3.0-only",
"author": "Thea Schöbl <dev@theaninova.de>",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"files": [
"lib",
"schemas",
"builders.json",
"README.md",
"CHANGELOG.md"
],
"builders": "builders.json",
"scripts": {
"build": "tsup-node --dts",
"docs": "typedoc --json ./docs/docs.json --options ../../typedoc.base.json src/index.ts",
"format": "prettier . -c --ignore-path ../../.gitignore",
"format:fix": "prettier --write . --ignore-path ../../.gitignore",
"lint": "eslint --ext .ts src/",
"lint:fix": "eslint --fix --ext .ts src/",
"test": "c8 mocha"
},
"dependencies": {
"@angular-devkit/architect": "0.1703.0",
"@angular-devkit/build-angular": "17.3.0",
"@angular-devkit/core": "17.3.0",
"cosmiconfig": "8.1.3",
"rxjs": "7.8.1",
"fontkit": "2.0.2",
"glob": "10.3.10"
},
"devDependencies": {
"@angular-devkit/schematics": "17.3.0",
"@openstapps/prettier-config": "workspace:*",
"@openstapps/tsconfig": "workspace:*",
"@types/fontkit": "2.0.7",
"@types/glob": "8.1.0",
"@types/node": "18.15.3",
"@types/chai": "4.3.5",
"@types/chai-as-promised": "7.1.5",
"@types/chai-spies": "1.0.3",
"@types/mocha": "10.0.1",
"c8": "7.14.0",
"chai": "4.3.7",
"chai-as-promised": "7.1.1",
"chai-spies": "1.0.0",
"mocha": "10.2.0",
"mocha-junit-reporter": "2.2.0",
"tsup": "6.7.0",
"ts-node": "10.9.2",
"typescript": "5.4.2"
},
"tsup": {
"entry": [
"src/application.ts",
"src/index.ts"
],
"sourcemap": true,
"clean": true,
"format": "esm",
"outDir": "lib"
},
"prettier": "@openstapps/prettier-config",
"eslintConfig": {
"extends": [
"@openstapps"
]
}
}

View File

@@ -1,33 +0,0 @@
/// <reference types="@angular-devkit/core" />
import {BuilderContext, BuilderOutput, createBuilder} from '@angular-devkit/architect';
import {BrowserBuilderOptions, executeBrowserBuilder} from '@angular-devkit/build-angular';
import {runPrebuild} from './shared.js';
import {from, of, mergeMap, Observable} from 'rxjs';
function applicationBuilder(
input: BrowserBuilderOptions,
context: BuilderContext,
): Observable<BuilderOutput> {
if (process.env.APP_VARIANT) {
input.fileReplacements ??= [];
input.fileReplacements.push(
{
replace: 'config/default.json',
with: `config/${process.env.APP_VARIANT}/default.json`,
},
{
replace: 'src/assets/imgs/logo.png',
with: `config/${process.env.APP_VARIANT}/logo.png`,
},
{
replace: 'src/assets/icon/favicon.png',
with: `config/${process.env.APP_VARIANT}/favicon.png`,
},
);
}
return from(runPrebuild(context)).pipe(
mergeMap(it => (it ? of(it) : executeBrowserBuilder(input, context, {}))),
);
}
export default createBuilder(applicationBuilder);

View File

@@ -1,36 +0,0 @@
/*
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {Font, open} from 'fontkit';
import {existsSync} from 'fs';
import {getUsedIcons} from './gather-used-icons.js';
import {fetchCodePointMap} from './get-code-points.js';
import type {IconConfig} from '../index.js';
export async function checkIconCorrectness(config: IconConfig) {
if (!existsSync(config.outputPath)) {
throw new Error('Icons have not been generated');
}
const modifiedFont = (await open(config.outputPath)) as Font;
const codePoints = await fetchCodePointMap();
for (const icon of await getUsedIcons(config)) {
const codePoint = codePoints.get(icon);
if (!codePoint) throw new Error(`"${icon}" is not a valid icon`);
if (!modifiedFont.getGlyph(Number.parseInt(codePoint, 16))) {
throw new Error(`"${icon}" (code point ${codePoint}) is missing`);
}
}
}

View File

@@ -1,11 +0,0 @@
import {cosmiconfig} from 'cosmiconfig';
import type {IconConfig} from '../index.js';
export async function getIconConfig(): Promise<IconConfig> {
const explorer = cosmiconfig('icons');
const result = await explorer.search();
if (!result) {
throw new Error('No icon configuration found');
}
return result.config;
}

View File

@@ -1,20 +0,0 @@
import {BuilderContext, BuilderOutput} from '@angular-devkit/architect';
import {checkIconCorrectness} from './icons/check-icon-correctness.js';
import {getIconConfig} from './icons/icon-config.js';
export async function runPrebuild(context: BuilderContext): Promise<void | BuilderOutput> {
context.reportStatus('Checking icons');
if (!process.env.SKIP_ICON_CHECK) {
const iconConfig = await getIconConfig();
try {
await checkIconCorrectness(iconConfig);
} catch (error) {
return {
success: false,
error:
(error as Error).message + '\n\nTo skip this check, set the environment variable SKIP_ICON_CHECK=1',
};
}
}
context.reportStatus('✔ Icons are correct.');
}

View File

@@ -1,4 +0,0 @@
{
"extends": "@openstapps/tsconfig",
"exclude": ["lib", "app.js"]
}

View File

@@ -1,5 +1,13 @@
# @openstapps/api-cli
## 3.3.2
### Patch Changes
- @openstapps/core@3.3.2
- @openstapps/core-tools@3.3.2
- @openstapps/api@3.3.2
## 3.3.0
### Minor Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/api-cli",
"description": "CLI client for @openstapps/api",
"version": "3.3.0",
"version": "3.3.2",
"type": "module",
"license": "GPL-3.0-only",
"repository": "git@gitlab.com:openstapps/api.git",

View File

@@ -1,5 +1,13 @@
# @openstapps/api-plugin
## 3.3.2
### Patch Changes
- @openstapps/core@3.3.2
- @openstapps/core-tools@3.3.2
- @openstapps/api@3.3.2
## 3.3.0
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/api-plugin",
"description": "Node.js library to interact with the StApps backend service",
"version": "3.3.0",
"version": "3.3.2",
"type": "module",
"license": "GPL-3.0-only",
"repository": "git@gitlab.com:openstapps/api.git",

View File

@@ -1,5 +1,11 @@
# @openstapps/api
## 3.3.2
### Patch Changes
- @openstapps/core@3.3.2
## 3.3.0
### Minor Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/api",
"description": "Node.js library to interact with the StApps backend service",
"version": "3.3.0",
"version": "3.3.2",
"type": "module",
"license": "GPL-3.0-only",
"repository": "git@gitlab.com:openstapps/api.git",

View File

@@ -1,5 +1,12 @@
# @openstapps/core-tools
## 3.3.2
### Patch Changes
- Updated dependencies [802a7a3f]
- @openstapps/easy-ast@3.3.2
## 3.3.0
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/core-tools",
"description": "Tools to convert and validate StAppsCore",
"version": "3.3.0",
"version": "3.3.2",
"type": "module",
"license": "GPL-3.0-only",
"repository": "git@gitlab.com:openstapps/core-tools.git",

View File

@@ -1,5 +1,11 @@
# @openstapps/core
## 3.3.2
### Patch Changes
- @openstapps/core-tools@3.3.2
## 3.3.0
### Minor Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/core",
"description": "StAppsCore - Generalized model of data",
"version": "3.3.0",
"version": "3.3.2",
"type": "module",
"license": "GPL-3.0-only",
"repository": "git@gitlab.com:openstapps/core.git",

View File

@@ -1,5 +1,11 @@
# @openstapps/easy-ast
## 3.3.2
### Patch Changes
- 802a7a3f: Fixed docs generation
## 3.3.0
### Minor Changes

View File

@@ -1,7 +1,7 @@
{
"name": "@openstapps/easy-ast",
"description": "Tool to easily handle TypeScript AST",
"version": "3.3.0",
"version": "3.3.2",
"type": "module",
"license": "GPL-3.0-only",
"repository": "git@gitlab.com:openstapps/core-tools.git",

1105
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff