Skip to content

Commit ca11149

Browse files
authored
OCC-314: Remove Node.js dependency (#577)
1 parent b3c1fb3 commit ca11149

35 files changed

Lines changed: 67 additions & 5979 deletions

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,15 @@ jobs:
3131
name: Codespell
3232
uses: Lombiq/GitHub-Actions/.github/workflows/codespell.yml@dev
3333

34+
lint:
35+
name: Lint Scripts, Styles, and Texts
36+
uses: Lombiq/NodeJs-Extensions/.github/workflows/lint.yml@dev
37+
with:
38+
scripts: 'src/Modules/OrchardCore.Commerce, src/Modules/OrchardCore.Commerce.ContentFields, src/Modules/OrchardCore.Commerce.Payment.Stripe'
39+
styles-css: 'src/Modules/OrchardCore.Commerce, src/Modules/OrchardCore.Commerce.Payment'
40+
3441
post-pull-request-checks-automation:
35-
needs: [build-and-test-linux, build-and-test-windows, codespell]
42+
needs: [build-and-test-linux, build-and-test-windows, codespell, lint]
3643
if: github.event.pull_request != ''
3744
uses: Lombiq/GitHub-Actions/.github/workflows/post-pull-request-checks-automation.yml@dev
3845
secrets:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
obj/
55
bin/
66
artifacts/
7-
wwwroot/
7+
is-cache/
88
node_modules/
99
*.user
1010
.pnpm-debug.log

Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<PackageVersion Include="Lombiq.HelpfulLibraries.OrchardCore" Version="$(LombiqHelpfulLibrariesVersion)" />
1818
<PackageVersion Include="Lombiq.HelpfulLibraries.AspNetCore" Version="$(LombiqHelpfulLibrariesVersion)" />
1919
<PackageVersion Include="Lombiq.HelpfulLibraries.Refit" Version="$(LombiqHelpfulLibrariesVersion)" />
20-
<PackageVersion Include="Lombiq.NodeJs.Extensions" Version="2.1.3" />
2120
<PackageVersion Include="Lombiq.Tests" Version="4.0.1-alpha.1.osoe-935" />
2221
<PackageVersion Include="Lombiq.Tests.UI" Version="$(LombiqTestsUIVersion)" />
2322
<PackageVersion Include="Lombiq.Tests.UI.AppExtensions" Version="$(LombiqTestsUIVersion)" />

Readme.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@ See the [discussions page](https://github.com/OrchardCMS/OrchardCore.Commerce/di
2424

2525
### Pre-requisites
2626

27-
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).
28-
29-
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:
30-
31-
```xml
32-
<Project>
33-
<PropertyGroup>
34-
<LombiqHelpfulLibrariesPath>$(MSBuildThisFileDirectory)/src/Libraries/Lombiq.HelpfulLibraries</LombiqHelpfulLibrariesPath>
35-
<LombiqNodeJsExtensionsPath>$(MSBuildThisFileDirectory)/src/Utilities/Lombiq.NodeJs.Extensions/Lombiq.NodeJs.Extensions</LombiqNodeJsExtensionsPath>
36-
</PropertyGroup>
37-
</Project>
38-
```
39-
4027
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:
4128

4229
```xml

docs/resources/libraries/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ The below table lists the different Tests libraries and code analyzers:
1414
|------------------------------------------------------------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
1515
| [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) |
1616
| [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) |
17-
| [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) |
1817
| [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) |
1918
| [VS Test SDK](https://github.com/microsoft/vstest/) | Visual Studio Test Platform. | [MIT](https://github.com/microsoft/vstest/blob/master/LICENSE) |
2019
| [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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ plugins:
6666
- search
6767
- git-authors
6868
- git-revision-date-localized
69-
- exclude:
70-
glob:
71-
# 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.
72-
- "*node_modules*"
7369

7470
# Page tree
7571
nav:

renovate.json5

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,4 @@
44
addLabels: [
55
'no-jira-community-activity-issue',
66
],
7-
packageRules: [
8-
{
9-
// Not updating any of the node.js dependencies as they will be soon removed via
10-
// https://github.com/OrchardCMS/OrchardCore.Commerce/issues/527.
11-
matchPackageNames: [
12-
'eslint*',
13-
'pnpm',
14-
],
15-
enabled: false,
16-
},
17-
],
187
}

src/Modules/OrchardCore.Commerce.ContentFields/OrchardCore.Commerce.ContentFields.csproj

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,4 @@
4444
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" />
4545
</ItemGroup>
4646

47-
<ItemGroup Condition="Exists($(LombiqNodeJsExtensionsPath))">
48-
<ProjectReference Include="$(LombiqNodeJsExtensionsPath)\Lombiq.NodeJs.Extensions.csproj" />
49-
</ItemGroup>
50-
<ImportGroup Condition="Exists($(LombiqNodeJsExtensionsPath))">
51-
<Import Project="$(LombiqNodeJsExtensionsPath)\Lombiq.NodeJs.Extensions.props" />
52-
<Import Project="$(LombiqNodeJsExtensionsPath)\Lombiq.NodeJs.Extensions.targets" />
53-
</ImportGroup>
54-
<ItemGroup Condition="!Exists($(LombiqNodeJsExtensionsPath))">
55-
<PackageReference Include="Lombiq.NodeJs.Extensions" />
56-
</ItemGroup>
57-
5847
</Project>

src/Modules/OrchardCore.Commerce.ContentFields/ResourceManagementOptionsConfiguration.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ static ResourceManagementOptionsConfiguration() =>
1212
_manifest
1313
.DefineScript(CommerceRegions)
1414
.SetDependencies(JQuery)
15-
.SetUrl(
16-
"~/OrchardCore.Commerce.ContentFields/js/commerce-regions.min.js",
17-
"~/OrchardCore.Commerce.ContentFields/js/commerce-regions.js")
15+
.SetUrl("~/OrchardCore.Commerce.ContentFields/js/commerce-regions.js")
1816
.SetVersion("1.0.0");
1917

2018
public void Configure(ResourceManagementOptions options) => options.ResourceManifests.Add(_manifest);

src/Modules/OrchardCore.Commerce.ContentFields/package.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)