Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5029e27
Angular CLI update for packages - @angular/core@19, @angular/cli@19, …
marksvc Sep 9, 2025
0117e26
@angular/cli migration - use-application-builder
marksvc Sep 9, 2025
2d188a1
@angular/core migration - explicit-standalone-flag
marksvc Sep 9, 2025
6bec739
@angular/core migration - provide-initializer
marksvc Sep 9, 2025
96e4572
Angular CLI update for packages - @angular/material@19
marksvc Sep 9, 2025
90eb613
@angular/material migration - migration-v19
marksvc Sep 9, 2025
2f27d6e
Fix serviceWorker from bool to path to ngsw-config.json
marksvc Jul 17, 2025
73a9c5f
Add more standalone:true
marksvc Jul 17, 2025
0aa2b95
Rm deprecated suppressImplicitAnyIndexErrors
marksvc Jul 17, 2025
deec1fd
Update scss
marksvc Jul 18, 2025
45144a2
rm deprecated lighten,darken
marksvc Jul 18, 2025
e44862c
scss import to use
marksvc Jul 18, 2025
0b61675
Find $likes
marksvc Jul 18, 2025
41a39eb
rm ignored publicHost
marksvc Jul 18, 2025
38a805d
Fix text test
marksvc Jul 21, 2025
fec7026
Fix dotnet accessing angular
marksvc Jul 24, 2025
a9357a0
Update spa paths for production build
marksvc Jul 25, 2025
ae12624
Put 3rdpartylicenses.txt in dist/browser
marksvc Jul 29, 2025
cbbcbcc
more dir and build adjustments
marksvc Jul 29, 2025
4528be2
Fix Notes tests by adding snapshots before ngOnInit
marksvc Jul 29, 2025
ee85035
Fix paginator test
marksvc Jul 29, 2025
1141287
Fix e2e test at draft stepper
marksvc Jul 30, 2025
4106983
Apply Prettier formatting
marksvc Jul 30, 2025
8a55ea5
add custom ScrollStrategy to fix issue with CdkScrollable in upgrade …
siltomato Jul 31, 2025
2360935
Update typescript to fix storybook
marksvc Aug 1, 2025
2d5778e
Set storybook components to standalone:false
marksvc Aug 1, 2025
2857827
Define provided objects
marksvc Aug 1, 2025
1206da0
Fix local SB by reordering static dirs
marksvc Aug 8, 2025
ebb9a6e
Adjust to help with conflict resolution
marksvc Aug 8, 2025
519ff8a
Groom
marksvc Aug 8, 2025
8016239
Fix json
marksvc Aug 8, 2025
7a842bf
Improve variable name
marksvc Aug 13, 2025
5fe72f5
Windows for echo open
marksvc Aug 13, 2025
1bbf60e
Update package lock
marksvc Aug 13, 2025
2e8243e
Make RealtimeServer TS version the same
marksvc Aug 13, 2025
cd440fc
rm standalone:true
marksvc Aug 13, 2025
04379ed
rm pipe standalone: true
marksvc Aug 13, 2025
bb23f47
Adjust undefined mocks
marksvc Aug 13, 2025
872979a
BB standalone false
marksvc Aug 28, 2025
bc78e68
Formatting
marksvc Aug 28, 2025
e7eb8a2
change web worker SPA route for new ng application builder worker names
siltomato Aug 29, 2025
0f6b8a6
fix material sys-primary style ref
siltomato Aug 29, 2025
d25506e
Use --mat-sys-error and --mat-sys-on-error
marksvc Aug 29, 2025
3f66c57
Revise SPA route detection
marksvc Sep 5, 2025
af55aec
Revise IsSpaRoute
marksvc Sep 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions scripts/db_tools/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"compilerOptions": {
"module": "commonjs"
}

},
"compilerOptions": {
"baseUrl": "./",
Expand All @@ -23,24 +22,17 @@
"module": "ES2020",
"allowSyntheticDefaultImports": true,
"allowJs": true,
"lib": [
"es2018",
"dom"
],
"lib": ["es2018", "dom"],
"emitDecoratorMetadata": true,
"suppressImplicitAnyIndexErrors": true,
"esModuleInterop": true,
"typeRoots": ["node_modules/@types", "../../src/RealtimeServer/typings",
],
"typeRoots": ["node_modules/@types", "../../src/RealtimeServer/typings"],
"resolveJsonModule": true,
"paths": {
"xforge-common/*": [
"../../src/SIL.XForge.Scripture/ClientApp/src/xforge-common/*"
],
"*": [ "../../src/RealtimeServer/typings/*"]
"xforge-common/*": ["../../src/SIL.XForge.Scripture/ClientApp/src/xforge-common/*"],
"*": ["../../src/RealtimeServer/typings/*"]
},
"inlineSourceMap": false,
"inlineSources": true,
"noEmit": false,
"noEmit": false
}
}
15 changes: 8 additions & 7 deletions src/RealtimeServer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/RealtimeServer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
"sharedb-mingo-memory": "^4.0.1",
"ts-jest": "^29.1.2",
"ts-mockito": "^2.6.1",
"typescript": "~5.2.2"
"typescript": "~5.7.3"
}
}
1 change: 0 additions & 1 deletion src/SIL.XForge.Scripture/ClientApp/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# compiled output
/dist
/dist-server
/tmp
/out-tsc

Expand Down
5 changes: 3 additions & 2 deletions src/SIL.XForge.Scripture/ClientApp/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ module.exports = {
},
docs: {},
staticDirs: [
{ from: '../src/assets', to: '/assets' },
{ from: '../src/app/checking/checking/test-audio', to: '/assets/audio/' }
// Note that 'embedded' directories appear to need to be higher, not lower.
{ from: '../src/app/checking/checking/test-audio', to: '/assets/audio' },
{ from: '../src/assets', to: '/assets' }
]
};
22 changes: 7 additions & 15 deletions src/SIL.XForge.Scripture/ClientApp/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"browser": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"progress": true,
"polyfills": "src/polyfills.ts",
"polyfills": ["src/polyfills.ts"],
"assets": [
"src/favicon.ico",
"src/assets",
Expand All @@ -36,7 +36,7 @@
],
"styles": ["src/styles.scss", "src/material-styles.scss", "src/themes/themes.scss"],
"stylePreprocessorOptions": {
"includePaths": ["node_modules"]
"includePaths": ["node_modules", "."]
},
"allowedCommonJsDependencies": [
"@bugsnag/browser",
Expand All @@ -58,9 +58,7 @@
],
"scripts": [],
"aot": false,
"vendorChunk": true,
"extractLicenses": true,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true,
Expand All @@ -84,9 +82,7 @@
"outputHashing": "all",
"namedChunks": true,
"aot": true,
"vendorChunk": false,
"buildOptimizer": true,
"serviceWorker": true
"serviceWorker": "ngsw-config.json"
},
"staging": {
"budgets": [
Expand All @@ -105,9 +101,7 @@
"outputHashing": "all",
"namedChunks": true,
"aot": true,
"vendorChunk": false,
"buildOptimizer": true,
"serviceWorker": true
"serviceWorker": "ngsw-config.json"
},
"pwaTest": {
"fileReplacements": [
Expand All @@ -118,8 +112,7 @@
],
"outputHashing": "all",
"namedChunks": true,
"vendorChunk": false,
"serviceWorker": true
"serviceWorker": "ngsw-config.json"
},
"development": {}
},
Expand All @@ -133,7 +126,6 @@
"buildTarget": "SIL.XForge.Scripture:build:production"
},
"development": {
"publicHost": "localhost:4200",
"buildTarget": "SIL.XForge.Scripture:build:development"
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,12 @@ export async function generateDraft(
await expect(closeLocator).toBeVisible({ timeout: 5 * 60_000 });
await user.click(closeLocator);

// The stepper renders every step to the page at once, so we need to keep track of which step we're on
let currentStep = 0;
// The stepper renders every step to the page at once. Get the step we're on.
function getStep(): Locator {
return page.locator(`#cdk-step-content-0-${currentStep}`);
return page.locator('.mat-horizontal-stepper-content-current');
}
async function goToNextStepExpectingHeading(expectedHeading: string): Promise<void> {
await user.click(getStep().getByRole('button', { name: 'Next' }));
currentStep++;
await expect(getStep().getByRole('heading', { name: expectedHeading })).toBeVisible();
await user.wait(1500);
}
Expand Down
Loading
Loading