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

OSOE-84: Merge task/nodejs-extensions to dev #129

Merged
merged 42 commits into from
Jan 25, 2023
Merged

OSOE-84: Merge task/nodejs-extensions to dev #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
78057e1
Migrate to Node.js Extensions
Sep 29, 2022
464b52a
Remove wwwroot
Sep 29, 2022
25c4a51
Remove package-lock.json
Sep 29, 2022
9cd2d3c
Restore deleted assets (due to "node_modules")
Sep 29, 2022
35c6b90
Consolidating PackageReference version
Sep 30, 2022
df2a873
Fix UI test by restoring datatables files - was somehow lost
Oct 6, 2022
c31a823
Update NE to latest NuGet package version
Oct 12, 2022
dc8b5ae
Update NE to latest NuGet package version
Oct 13, 2022
d32ff21
Merge remote-tracking branch 'origin/dev' into issue/OSOE-84
Oct 17, 2022
4d5d572
Document missing npm packages
Oct 19, 2022
610bb3a
Rename NodeModules to UnmanagedNodeModules
Oct 19, 2022
08cb77d
Remove todo comment in favor of new issue
Oct 20, 2022
3ceff6f
Merge remote-tracking branch 'origin/dev' into issue/OSOE-84
Oct 20, 2022
a3bc41f
Merge pull request #119 from Lombiq/issue/OSOE-84
sarahelsaig Oct 24, 2022
445052c
Merge remote-tracking branch 'origin/dev' into task/node-extensions
Oct 25, 2022
4d29d4b
Exclude UnmanagedNodeModules from spell checking
Oct 25, 2022
85ada42
Revert "Exclude UnmanagedNodeModules from spell checking"
Oct 25, 2022
93d74d3
Merge remote-tracking branch 'origin/dev' into task/node-extensions
sarahelsaig Oct 28, 2022
390887f
Update pnpm lock file to v7
Nov 15, 2022
d8a2839
Update documentation
Nov 19, 2022
0313607
Merge remote-tracking branch 'origin/dev' into task/node-extensions
Nov 25, 2022
7f79d5b
Merge remote-tracking branch 'origin/dev' into task/nodejs-extensions
Nov 25, 2022
7498ac9
Merge branch 'task/nodejs-extensions' into issue/OSOE-84-final
Nov 25, 2022
465eb5a
Merge remote-tracking branch 'origin/dev' into issue/OSOE-84-final
Dec 5, 2022
6118a45
Merge tag 'v4.0.0' into task/nodejs-extensions
Dec 7, 2022
e34fa1f
Merge branch 'task/nodejs-extensions' into issue/OSOE-84-final
Dec 7, 2022
fa28af2
Merge remote-tracking branch 'origin/dev' into issue/OSOE-84-final
Dec 12, 2022
8ff9a5e
Ignore urijs
Dec 12, 2022
cbadc81
Merge remote-tracking branch 'origin/dev' into task/nodejs-extensions
Dec 27, 2022
d0240ae
Merge branch 'task/nodejs-extensions' into issue/OSOE-84-final
Dec 28, 2022
570efdd
Update NE to latest NuGet package
Dec 28, 2022
a6ad7f1
Update NE to latest NuGet package
Dec 29, 2022
c08f7bb
Update HL to latest NuGet package
Dec 29, 2022
ec77ee3
Update NuGet package versions
Dec 29, 2022
a4b652b
Update NuGet packages
Jan 7, 2023
43ab086
Temporarily added code to investigate the stacktrace
Jan 11, 2023
5b0b0c4
Revert "Temporarily added code to investigate the stacktrace"
Jan 12, 2023
f4678fa
Merge remote-tracking branch 'origin/dev' into issue/OSOE-84-final
Jan 16, 2023
2420fd0
Update Lombiq NuGet packages
Jan 16, 2023
15811b2
Merge remote-tracking branch 'origin/dev' into task/nodejs-extensions
Jan 18, 2023
28f9dcd
Merge branch 'task/nodejs-extensions' into issue/OSOE-84-final
Jan 18, 2023
fa2a3b2
Merge pull request #127 from Lombiq/issue/OSOE-84-final
sarahelsaig Jan 24, 2023
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
0 ...les.net-bs4-css/dataTables.bootstrap4.css → ...les.net-bs4/css/dataTables.bootstrap4.css
View file
Open in desktop
File renamed without changes.
0 ...net-bs4-css/dataTables.bootstrap4.min.css → ...net-bs4/css/dataTables.bootstrap4.min.css
View file
Open in desktop
File renamed without changes.
0 ...ables.net-bs4-js/dataTables.bootstrap4.js → ...ables.net-bs4/js/dataTables.bootstrap4.js
View file
Open in desktop
File renamed without changes.
0 ...s.net-bs4-js/dataTables.bootstrap4.min.js → ...s.net-bs4/js/dataTables.bootstrap4.min.js
View file
Open in desktop
File renamed without changes.
0 ...ndors/datatables.net/jquery.dataTables.js → ...es/datatables.net/js/jquery.dataTables.js
View file
Open in desktop
File renamed without changes.
0 ...s/datatables.net/jquery.dataTables.min.js → ...atatables.net/js/jquery.dataTables.min.js
View file
Open in desktop
File renamed without changes.
47 changes: 0 additions & 47 deletions Lombiq.DataTables/Gulp/paths.js
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Lombiq.DataTables/Gulp/tasks/copy-assets.js
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions Lombiq.DataTables/Gulpfile.js
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions Lombiq.DataTables/Lombiq.DataTables.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

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

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down Expand Up @@ -30,9 +32,6 @@
<None Remove="Tests\**" />
</ItemGroup>

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

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
Expand All @@ -50,13 +49,15 @@
<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.LinqToDb\Lombiq.HelpfulLibraries.LinqToDb.csproj" />
<ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
<ProjectReference Include="..\..\..\Utilities\Lombiq.Gulp.Extensions\Lombiq.Gulp.Extensions.csproj" />
<ProjectReference Include="..\..\..\Utilities\Lombiq.Npm.Targets\Lombiq.Npm.Targets.csproj" />
<ProjectReference Include="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.LinqToDb" Version="5.1.0" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.0.0-alpha5.osoe-84" />
</ItemGroup>

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

</Project>
2 changes: 1 addition & 1 deletion Lombiq.DataTables/ResourceManagementOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ static ResourceManagementOptionsConfiguration()
// jQuery.DataTables-related resources.
_manifest
.DefineScript(ResourceNames.UriJs)
.SetUrl(Vendors + "urijs/URI.min.js", Vendors + "urijs/URI.js")
.SetUrl(Vendors + "urijs/URI.min.js", Vendors + "urijs/URI.js") // #spell-check-ignore-line
.SetDependencies(ResourceNames.JQuery)
.SetVersion("1.19.2");

Expand Down
2 changes: 1 addition & 1 deletion Lombiq.DataTables/Tests/Lombiq.DataTables.Tests.UI/Lombiq.DataTables.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="5.1.1" />
<PackageReference Include="Lombiq.Tests.UI" Version="5.1.2-alpha.0.osoe-84" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading