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

Jump to bottom

OSOE-819: Use Source Generator to get version from package.json #128

Merged
merged 2 commits into from
Mar 15, 2024
Merged

OSOE-819: Use Source Generator to get version from package.json #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0179122
Get Vue version from source generator
AydinE Mar 15, 2024
25a6573
Merge dev
AydinE Mar 15, 2024
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
8 changes: 8 additions & 0 deletions Lombiq.VueJs/Lombiq.VueJs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,19 @@
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators.csproj" OutputItemType="Analyzer"/>
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />

<!-- Execute Lombiq.NodeJs separately, to avoid inheriting these instructions in projects that consume Lombiq.VueJs. -->
<Target Name="BuildLocalScripts" AfterTargets="NpmInstall">
<Exec Command="npm explore nodejs-extensions -- pnpm build" />
</Target>

<ItemGroup>
<AdditionalFiles Include="package.json"/>
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions Lombiq.VueJs/ResourceManagementOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
using Microsoft.Extensions.Options;
using Lombiq.HelpfulLibraries.SourceGenerators;
using Microsoft.Extensions.Options;
using OrchardCore.ResourceManagement;
using static Lombiq.VueJs.Constants.FeatureIds;
using static Lombiq.VueJs.Constants.ResourceNames;

namespace Lombiq.VueJs;

public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
[ConstantFromJson("VueVersion", "package.json", "vue")]
public partial class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
{
private const string Root = $"~/{Area}/";
private const string Js = Root + "js/";
private const string Vendors = Root + "vendors/";

// Always keep the version in sync with the value in package.json.
private const string VueVersion = "3.4.21";
private const string VueCdnRoot = $"https://unpkg.com/vue@{VueVersion}/dist/";

private static readonly ResourceManifest _manifest = new();
Expand Down