Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
bc8bb30
Remove Lombiq.NodeJs.Extensions references.
sarahelsaig Apr 19, 2025
9784379
remove package.json and pnpm-lock.yaml.
sarahelsaig Apr 19, 2025
00b2f1f
Remove other node references.
sarahelsaig Apr 19, 2025
8470f32
Use MSBuild Copy task to copy the JS assets.
sarahelsaig Apr 19, 2025
5689e85
Copy CSS asset in OrchardCore.Commerce.Payment.
sarahelsaig Apr 19, 2025
29cee73
Organize copy tasks.
sarahelsaig Apr 19, 2025
2d2462c
Backport to CSS.
sarahelsaig Apr 19, 2025
22a79b6
Apply error notification styling everywhere.
sarahelsaig Apr 19, 2025
67b91e4
Merge remote-tracking branch 'origin/main' into issue/OCC-314
sarahelsaig Apr 20, 2025
edca38a
Use lint workflow.
sarahelsaig Apr 22, 2025
1e55f4a
Enable corepack.
sarahelsaig Apr 22, 2025
f732d74
Use --no-frozen-lockfile
sarahelsaig Apr 22, 2025
879f11a
Use --no-frozen-lockfile
sarahelsaig Apr 22, 2025
1d84f9d
Fix script-paths.
sarahelsaig Apr 22, 2025
d9ea0fd
Fix
sarahelsaig Apr 22, 2025
7aa78e4
Fix pwsh code styling.
sarahelsaig Apr 22, 2025
d959efb
Ensure absolute paths.
sarahelsaig Apr 22, 2025
c360351
Add deliberate errors to test validation.
sarahelsaig Apr 23, 2025
9120d17
Revert "Add deliberate errors to test validation."
sarahelsaig Apr 23, 2025
e4a229e
Pluralize.
sarahelsaig Apr 24, 2025
2facb95
Update .github/workflows/build-and-test.yml
sarahelsaig Apr 24, 2025
3c42a42
Merge branch 'issue/OCC-314' of https://github.com/OrchardCMS/Orchard…
sarahelsaig Apr 24, 2025
a69bea1
Update lint config.
sarahelsaig Apr 30, 2025
9867f8d
move asset files
sarahelsaig Apr 30, 2025
7dd40b7
Remove copy targets.
sarahelsaig Apr 30, 2025
5bb003e
Intentional MD linting violation.
sarahelsaig May 4, 2025
c3d8f4a
Update input names.
sarahelsaig May 4, 2025
14f5dbe
Fix config JSON.
sarahelsaig May 4, 2025
5eb8ec0
Revert.
sarahelsaig May 4, 2025
567b208
Update gitignore, fix project file.
sarahelsaig May 4, 2025
0a13b4e
remove duplicate files
sarahelsaig May 5, 2025
a61fc29
Conventional GHA workflow/job name
Piedone May 5, 2025
466bf06
Use simplified format.
sarahelsaig May 5, 2025
26ad11e
Reverting issue branch references for GHA
Piedone May 5, 2025
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
9 changes: 8 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
obj/
bin/
artifacts/
wwwroot/
is-cache/
node_modules/
*.user
.pnpm-debug.log
Expand Down
1 change: 0 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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="4.0.1-alpha.1.osoe-935" />
<PackageVersion Include="Lombiq.Tests.UI" Version="$(LombiqTestsUIVersion)" />
<PackageVersion Include="Lombiq.Tests.UI.AppExtensions" Version="$(LombiqTestsUIVersion)" />
Expand Down
13 changes: 0 additions & 13 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docs/resources/libraries/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down
4 changes: 0 additions & 4 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 0 additions & 11 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,4 @@
addLabels: [
'no-jira-community-activity-issue',
],
packageRules: [
{
// Not updating any of the node.js dependencies as they will be soon removed via
// https://github.com/OrchardCMS/OrchardCore.Commerce/issues/527.
matchPackageNames: [
'eslint*',
'pnpm',
],
enabled: false,
},
],
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,4 @@
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" />
</ItemGroup>

<ItemGroup Condition="Exists($(LombiqNodeJsExtensionsPath))">
<ProjectReference Include="$(LombiqNodeJsExtensionsPath)\Lombiq.NodeJs.Extensions.csproj" />
</ItemGroup>
<ImportGroup Condition="Exists($(LombiqNodeJsExtensionsPath))">
<Import Project="$(LombiqNodeJsExtensionsPath)\Lombiq.NodeJs.Extensions.props" />
<Import Project="$(LombiqNodeJsExtensionsPath)\Lombiq.NodeJs.Extensions.targets" />
</ImportGroup>
<ItemGroup Condition="!Exists($(LombiqNodeJsExtensionsPath))">
<PackageReference Include="Lombiq.NodeJs.Extensions" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ static ResourceManagementOptionsConfiguration() =>
_manifest
.DefineScript(CommerceRegions)
.SetDependencies(JQuery)
.SetUrl(
"~/OrchardCore.Commerce.ContentFields/js/commerce-regions.min.js",
"~/OrchardCore.Commerce.ContentFields/js/commerce-regions.js")
.SetUrl("~/OrchardCore.Commerce.ContentFields/js/commerce-regions.js")
.SetVersion("1.0.0");

public void Configure(ResourceManagementOptions options) => options.ResourceManifests.Add(_manifest);
Expand Down
23 changes: 0 additions & 23 deletions src/Modules/OrchardCore.Commerce.ContentFields/package.json

This file was deleted.

Loading