Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-24 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

WebApp: Upgrading angular's version to v13

Browse Source
This commit is contained in:
Zoe Roux 2021-11-19 19:16:49 +01:00
parent e15c1e9eca
commit 2f25b59a69
No known key found for this signature in database
GPG Key ID: 8BB9CF5EF72AE933
7 changed files with 989 additions and 2722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,7 +2,3 @@
path = src/Kyoo.Transcoder path = src/Kyoo.Transcoder
url = ../Kyoo.Transcoder.git url = ../Kyoo.Transcoder.git
branch = master branch = master
[submodule "WebApp"]
path = src/Kyoo.WebApp/Front
url = ../Kyoo.WebApp.git
branch = master

2
front/.gitignore vendored
View File

@ -44,3 +44,5 @@ testem.log
# System Files # System Files
.DS_Store .DS_Store
Thumbs.db Thumbs.db
.angular/cache

37
front/package.json
View File

@ -16,20 +16,20 @@
"not IE 9-11" "not IE 9-11"
], ],
"dependencies": { "dependencies": {
"@angular/animations": "^12.2.12", "@angular/animations": "^13.0.2",
"@angular/cdk": "^12.2.12", "@angular/cdk": "^13.0.2",
"@angular/common": "^12.2.12", "@angular/common": "^13.0.2",
"@angular/compiler": "^12.2.12", "@angular/compiler": "^13.0.2",
"@angular/core": "^12.2.12", "@angular/core": "^13.0.2",
"@angular/forms": "^12.2.12", "@angular/forms": "^13.0.2",
"@angular/material": "^12.2.12", "@angular/material": "^13.0.2",
"@angular/platform-browser": "^12.2.12", "@angular/platform-browser": "^13.0.2",
"@angular/platform-browser-dynamic": "^12.2.12", "@angular/platform-browser-dynamic": "^13.0.2",
"@angular/router": "^12.2.12", "@angular/router": "^13.0.2",
"angular-auth-oidc-client": "^12.0.3", "angular-auth-oidc-client": "^13.0.0",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"detect-browser": "^5.2.1", "detect-browser": "^5.2.1",
"hls.js": "^1.0.12", "hls.js": "^1.1.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"libass-wasm": "AnonymusRaccoon/JavascriptSubtitlesOctopus", "libass-wasm": "AnonymusRaccoon/JavascriptSubtitlesOctopus",
"ngx-infinite-scroll": "^10.0.1", "ngx-infinite-scroll": "^10.0.1",
@ -38,18 +38,17 @@
"zone.js": "^0.11.4" "zone.js": "^0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^12.2.12", "@angular-devkit/build-angular": "^13.0.3",
"@angular/cli": "^12.2.12", "@angular/cli": "^13.0.3",
"@angular/compiler-cli": "^12.2.12", "@angular/compiler-cli": "^13.0.2",
"@angular/language-service": "^12.2.12", "@angular/language-service": "^13.0.2",
"@types/bootstrap": "^5.1.6", "@types/bootstrap": "^5.1.6",
"@types/hls.js": "^0.13.3",
"@types/jquery": "^3.5.8", "@types/jquery": "^3.5.8",
"@types/node": "^16.11.6", "@types/node": "^16.11.9",
"@types/video.js": "^7.3.27", "@types/video.js": "^7.3.27",
"codelyzer": "^6.0.2", "codelyzer": "^6.0.2",
"ts-node": "~10.4.0", "ts-node": "~10.4.0",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"typescript": "4.3.5" "typescript": "4.4.4"
} }
} }

3649
front/yarn.lock
View File

File diff suppressed because it is too large Load Diff

1
src/Kyoo.WebApp/Front

@ -1 +0,0 @@
Subproject commit 5df3d529c96a544ebf2dd8166a7ef2a23e6228a8

6
src/Kyoo.WebApp/Kyoo.WebApp.csproj
View File

@ -11,7 +11,7 @@
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules/**</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules/**</DefaultItemExcludes>
<SpaRoot>Front/</SpaRoot> <SpaRoot>../../front/</SpaRoot>
<Icons>../../icons/</Icons> <Icons>../../icons/</Icons>
<NpmStamp>$(SpaRoot)node_modules/.install-stamp</NpmStamp> <NpmStamp>$(SpaRoot)node_modules/.install-stamp</NpmStamp>
@ -54,8 +54,8 @@
<Target Name="RunWebpack" Condition="'$(SkipWebApp)' != 'true' And '$(Configuration)' == 'Release'"> <Target Name="RunWebpack" Condition="'$(SkipWebApp)' != 'true' And '$(Configuration)' == 'Release'">
<Message Importance="high" Text="Building the web app. This may take several minutes..." /> <Message Importance="high" Text="Building the web app. This may take several minutes..." />
<Exec WorkingDirectory="$(SpaRoot)" Command="yarn run build -- --prod" /> <Exec WorkingDirectory="$(SpaRoot)" Command="yarn run build -- --configuration production" />
<Exec WorkingDirectory="$(SpaRoot)" Command="yarn run build:ssr -- --prod" Condition="'$(BuildServerSideRenderer)' == 'true'" /> <Exec WorkingDirectory="$(SpaRoot)" Command="yarn run build:ssr -- --configuration production" Condition="'$(BuildServerSideRenderer)' == 'true'" />
</Target> </Target>
<Target Name="CopyFrontEndFiles" AfterTargets="RunWebpack" BeforeTargets="GetCopyToOutputDirectoryItems" Condition="'$(Configuration)' != 'Debug'"> <Target Name="CopyFrontEndFiles" AfterTargets="RunWebpack" BeforeTargets="GetCopyToOutputDirectoryItems" Condition="'$(Configuration)' != 'Debug'">

12
src/Kyoo.WebApp/WebAppModule.cs
View File

@ -59,10 +59,7 @@ namespace Kyoo.WebApp
public WebAppModule(ILogger<WebAppModule> logger) public WebAppModule(ILogger<WebAppModule> logger)
{ {
if (!Enabled) if (!Enabled)
{ logger.LogError("The web app files could not be found, it will be disabled");
logger.LogError("The web app files could not be found, it will be disabled. " +
"If you cloned the project, you probably forgot to use the --recurse flag");
}
} }
/// <inheritdoc /> /// <inheritdoc />
@ -123,12 +120,15 @@ namespace Kyoo.WebApp
/// <returns>The path of the source code of the web app or null if the directory has been deleted.</returns> /// <returns>The path of the source code of the web app or null if the directory has been deleted.</returns>
private static string _GetSpaSourcePath() private static string _GetSpaSourcePath()
{ {
string GetSelfPath([CallerFilePath] string path = null) static string GetRepoRootPath([CallerFilePath] string path = null)
{ {
// path is {RepoRoot}/src/Kyoo.WebApp/WebAppModules.cs
for (int i = 0; i < 3; i++)
path = Path.GetDirectoryName(path);
return path; return path;
} }
string path = Path.Join(Path.GetDirectoryName(GetSelfPath()), "Front"); string path = Path.Join(GetRepoRootPath(), "front");
return Directory.Exists(path) ? path : null; return Directory.Exists(path) ? path : null;
} }
} }