Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduced module dependencies improvements #170

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Introduced module dependencies improvements #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Platforms>x64;ARM64</Platforms>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<Version>2.120.1</Version>
<Version>2.120.2</Version>
<Authors>OutSystems</Authors>
<Product>ReactView</Product>
<Copyright>Copyright © OutSystems 2023</Copyright>
Expand Down
10 changes: 3 additions & 7 deletions ReactViewControl/ModuleDependenciesProviderFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
namespace ReactViewControl;

public class ModuleDependenciesProviderFactory : IModuleDependenciesProviderFactory {
public sealed class ModuleDependenciesProviderFactory : IModuleDependenciesProviderFactory {

public static IModuleDependenciesProviderFactory Instance { get; private set; } = new ModuleDependenciesProviderFactory();

public static void SetInstance(IModuleDependenciesProviderFactory factory) {
Instance = factory;
}
public static IModuleDependenciesProviderFactory Instance { get; set; } = new ModuleDependenciesProviderFactory();

public virtual IModuleDependenciesProvider CreateModuleDependenciesProvider(string sourcePath) {
public IModuleDependenciesProvider CreateModuleDependenciesProvider(string sourcePath) {
return new FileDependenciesProvider(sourcePath);
}
}
2 changes: 1 addition & 1 deletion Sample.Avalonia/ExtendedReactView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ static ExtendedReactView() {
}

DevServerUri = new Uri(uri);
ModuleDependenciesProviderFactory.SetInstance(new HotReloadDependenciesProviderFactory(uri));
ModuleDependenciesProviderFactory.Instance = new HotReloadDependenciesProviderFactory(uri);
}

private static void OnEmbeddedResourceRequested(WebViewControl.ResourceHandler resourceHandler) {
Expand Down
4 changes: 2 additions & 2 deletions Sample.Avalonia/HotReloadDependenciesProviderFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

namespace Sample.Avalonia;

public class HotReloadDependenciesProviderFactory : ModuleDependenciesProviderFactory {
public sealed class HotReloadDependenciesProviderFactory : IModuleDependenciesProviderFactory {

private readonly string devServerUri;

public HotReloadDependenciesProviderFactory(string devServerUri) {
this.devServerUri = devServerUri;
}

public override IModuleDependenciesProvider CreateModuleDependenciesProvider(string sourcePath) {
public IModuleDependenciesProvider CreateModuleDependenciesProvider(string sourcePath) {
return new HotReloadDependenciesProvider(new Uri($"{devServerUri}{typeof(HotReloadDependenciesProviderFactory).Assembly.GetName().Name}/"), sourcePath);
}
}
Loading