Merge remote-tracking branch 'origin/main' into issue/OCC-351

Author: sarahelsaig

.dockerignore

@@ -0,0 +1,6 @@
+# Ignore any App_Data folder
+**/App_Data/
+
+# Ignore all built assets
+**/[b|B]in/
+**/[O|o]bj/

.github/workflows/build-and-test.yml

@@ -31,8 +31,15 @@ jobs:
     name: Codespell
     uses: Lombiq/GitHub-Actions/.github/workflows/codespell.yml@dev
 
+  lint:
+    name: Lint Scripts, Styles, and Texts
+    uses: Lombiq/NodeJs-Extensions/.github/workflows/lint.yml@dev
+    with:
+      scripts: 'src/Modules/OrchardCore.Commerce, src/Modules/OrchardCore.Commerce.ContentFields, src/Modules/OrchardCore.Commerce.Payment.Stripe'
+      styles-css: 'src/Modules/OrchardCore.Commerce, src/Modules/OrchardCore.Commerce.Payment'
+
   post-pull-request-checks-automation:
-    needs: [build-and-test-linux, build-and-test-windows, codespell]
+    needs: [build-and-test-linux, build-and-test-windows, codespell, lint]
     if: github.event.pull_request != ''
     uses: Lombiq/GitHub-Actions/.github/workflows/post-pull-request-checks-automation.yml@dev
     secrets:

.gitignore

@@ -4,7 +4,7 @@
 obj/
 bin/
 artifacts/
-wwwroot/
+is-cache/
 node_modules/
 *.user
 .pnpm-debug.log

Directory.Packages.props

@@ -17,7 +17,6 @@
     <PackageVersion Include="Lombiq.HelpfulLibraries.OrchardCore" Version="$(LombiqHelpfulLibrariesVersion)" />
     <PackageVersion Include="Lombiq.HelpfulLibraries.AspNetCore" Version="$(LombiqHelpfulLibrariesVersion)" />
     <PackageVersion Include="Lombiq.HelpfulLibraries.Refit" Version="$(LombiqHelpfulLibrariesVersion)" />
-    <PackageVersion Include="Lombiq.NodeJs.Extensions" Version="2.1.3" />
     <PackageVersion Include="Lombiq.Tests" Version="5.0.0" />
     <PackageVersion Include="Lombiq.Tests.UI" Version="$(LombiqTestsUIVersion)" />
     <PackageVersion Include="Lombiq.Tests.UI.AppExtensions" Version="$(LombiqTestsUIVersion)" />

Dockerfile

@@ -0,0 +1,25 @@
+# TARGETARCH and TARGETOS are set automatically when --platform is provided.
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+ARG TARGETOS
+LABEL stage=build-env
+WORKDIR /source
+
+# copy required files for building
+# .dockerignore excludes App_Data and binaries from these
+COPY ./src ./src
+COPY Directory.Build.props .
+COPY Directory.Packages.props .
+
+# build, results are placed in /app
+RUN dotnet publish src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj -c Release -o /app --framework net8.0 /p:RunAnalyzers=false
+
+# build runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS build_windows
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS build_linux
+FROM build_${TARGETOS} AS aspnet
+
+EXPOSE 80
+ENV ASPNETCORE_URLS=http://+:80
+WORKDIR /app
+COPY --from=build-env /app/ .
+ENTRYPOINT ["dotnet", "OrchardCore.Commerce.Web.dll"]

Dockerfile-CI

@@ -0,0 +1,14 @@
+# This Docker file is intended for the CI
+# A prerequisite is a published application in the .build/release  
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+ARG TARGETOS
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS build_windows
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS build_linux
+FROM build_${TARGETOS} AS aspnet
+
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+WORKDIR /app
+COPY .build/release /app
+ENTRYPOINT ["dotnet", "OrchardCore.Commerce.Web.dll"]

Dockerfile-CI.dockerignore

@@ -0,0 +1,7 @@
+# Buildkit Only working in linux
+
+# Ignore all
+**
+
+# Except precompiled files
+!/.build/release/*

Readme.md

@@ -24,19 +24,6 @@ See the [discussions page](https://github.com/OrchardCMS/OrchardCore.Commerce/di
 
 ### Pre-requisites
 
-This project uses [`Lombiq Node.js Extensions`](https://github.com/Lombiq/NodeJs-Extensions) to compile and lint client-side assets. See its pre-requisites [here](https://github.com/Lombiq/NodeJs-Extensions/tree/dev#pre-requisites).
-
-If you want to include OrchardCore.Commerce as a git submodule instead of NuGet package, include the [`Lombiq Helpful Libraries`](https://github.com/Lombiq/Helpful-Libraries/) and `Lombiq Node.js Extensions` submodules as well. In your solution directory create a _Directory.Build.props_ file if one doesn't exist. This should contain the properties that configure the path to the _Lombiq.HelpfulLibraries.OrchardCore.csproj_ file and the _Lombiq.NodeJs.Extensions_ project directory. For example:
-
-```xml
-<Project>
-  <PropertyGroup>
-    <LombiqHelpfulLibrariesPath>$(MSBuildThisFileDirectory)/src/Libraries/Lombiq.HelpfulLibraries</LombiqHelpfulLibrariesPath>
-    <LombiqNodeJsExtensionsPath>$(MSBuildThisFileDirectory)/src/Utilities/Lombiq.NodeJs.Extensions/Lombiq.NodeJs.Extensions</LombiqNodeJsExtensionsPath>
-  </PropertyGroup>
-</Project>
-```
-
 If you have [Lombiq Analyzers](https://github.com/Lombiq/.NET-Analyzers) included in your project as a submodule you should also add the following property to the _Directory.Build.props_ file:
 
 ```xml

docs/resources/libraries/README.md

@@ -14,7 +14,6 @@ The below table lists the different Tests libraries and code analyzers:
 |------------------------------------------------------------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
 | [Lombiq.Analyzers](https://github.com/Lombiq/.NET-Analyzers)           | .NET code analyzers and code convention settings                               | [BSD-3-Clause](https://github.com/Lombiq/.NET-Analyzers/blob/dev/License.md)     |
 | [Lombiq.HelpfulLibraries](https://github.com/Lombiq/Helpful-Libraries) | libraries that can be handy when developing for Orchard                        | [BSD-3-Clause](https://github.com/Lombiq/Helpful-Libraries/blob/dev/License.md)  |
-| [Lombiq.NodeJs.Extensions](https://github.com/Lombiq/.NET-Analyzers)   | .NET code analyzers and code convention settings                               | [BSD-3-Clause](https://github.com/Lombiq/NodeJs-Extensions/blob/dev/License.md)  |
 | [Lombiq.Tests.UI](https://github.com/Lombiq/UI-Testing-Toolbox)        | Web UI testing toolbox for Orchard Core applications with Selenium             | [BSD-3-Clause](https://github.com/Lombiq/UI-Testing-Toolbox/blob/dev/License.md) |
 | [VS Test SDK](https://github.com/microsoft/vstest/)                    | Visual Studio Test Platform.                                                   | [MIT](https://github.com/microsoft/vstest/blob/master/LICENSE)                   |
 | [xUnit 3](https://github.com/xunit/xunit)                              | Free, open source, community-focused unit testing tool for the .NET Framework. | [MIT](https://github.com/xunit/xunit/blob/main/LICENSE)                          |

mkdocs.yml

@@ -66,10 +66,6 @@ plugins:
   - search
   - git-authors
   - git-revision-date-localized
-  - exclude:
-      glob:
-        # Excluding the large node folder with all its MD files. We can't exclude everything apart from docs because there are links to e.g. C# files too.
-        - "*node_modules*"
 
 # Page tree
 nav: