Skip to content

Commit

Permalink
Merge pull request #39 from Lombiq/issue/OSOE-84
Browse files Browse the repository at this point in the history
OSOE-84: Migrate to Node.js Extensions
  • Loading branch information
sarahelsaig authored Oct 24, 2022
2 parents 476b559 + 80b0bf6 commit 1abe221
Show file tree
Hide file tree
Showing 67 changed files with 68 additions and 83,214 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../Utilities/Lombiq.Gulp.Extensions/ESLint/lombiq-base.js",
"extends": "../../Utilities/Lombiq.NodeJs.Extensions/Lombiq.NodeJs.Extensions/config/.eslintrc.lombiq-base.js",

"rules": {
// Add overriding rules here like this:
Expand Down
6 changes: 0 additions & 6 deletions .stylelintrc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// @import "../../../../Lombiq.BaseTheme/Assets/Styles/abstracts/mixins"; which both support. VS doesn't support paths
// starting with "~" either (https://developercommunity.visualstudio.com/t/Intellisense-not-working-in-sassscss-fi/33481)
// and you can't use IntelliSense to resolve paths outside of your current project directory using either format.
@import "../Lombiq.BaseTheme/Assets/Styles/abstracts/mixins";
@import "../../../../Lombiq.BaseTheme/Assets/Styles/abstracts/mixins";

// In this case we create a mixin that crops a media field into a nice wide banner. It's applied both for sites and blog
// posts in other files.
Expand Down
File renamed without changes
40 changes: 0 additions & 40 deletions Lombiq.BaseTheme.Samples/Gulpfile.js

This file was deleted.

12 changes: 12 additions & 0 deletions Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj
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 @@ -32,11 +34,21 @@
<ProjectReference Include="..\Lombiq.BaseTheme\Lombiq.BaseTheme.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.0.0-alpha.osoe-84.4" />
</ItemGroup>

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Remove="node_modules\**" />
</ItemGroup>

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

</Project>
34 changes: 29 additions & 5 deletions Lombiq.BaseTheme.Samples/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
{
"// SUMMARY": "We use Lombiq's Node.js Extensions project to process all frontend assets.",

"private": true,
"scripts": {
"dotnet-prebuild": "gulp",
"dotnet-postclean": "gulp clean"
},
"dependencies": {
"bootstrap": "^5.1.3"
}
},
"scripts": {
"build": "npm explore nodejs-extensions -- pnpm build",
"clean": "npm explore nodejs-extensions -- pnpm clean",
"watch": "npm explore nodejs-extensions -- pnpm watch"
},

"// nodejsExtensions": "Contains the custom configuration for asset processing with Node.js Extensions.",
"// assetsToCopy": "Contains an array of configuration objects to copy specific assets to wwwroot.",
"// scripts": "Absent, since this project uses the default configuration from Node.js Extensions.",
"// styles": "Absent, since this project uses the default configuration from Node.js Extensions.",

"nodejsExtensions": {
"assetsToCopy": [
{
"sources": [ "Assets" ],
"pattern": "Theme.png",
"target": "wwwroot"
},
{
"sources": [ "Assets/Icons" ],
"target": "wwwroot/icons"
}
]
},

"// NEXT STATION": "ResourceManagementOptionsConfiguration.cs"
}
73 changes: 0 additions & 73 deletions Lombiq.BaseTheme.Samples/wwwroot/css/pages/blog-post.css

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1abe221

Please sign in to comment.