Merge remote-tracking branch 'origin/dev' into issue/LMBQ-555

Author: sarahelsaig

.github/actions/lint/action.yml

@@ -31,40 +31,57 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Setup NodeJs Extensions
+    - name: Set up Environment
+      id: set-up-environment
       shell: pwsh
       run: |
         '${{ github.action_path }}' >> $Env:GITHUB_PATH
 
-        $LombiqNodeJsExtensions = $(Resolve-Path '${{ github.action_path }}/../../../Lombiq.NodeJs.Extensions').Path
-        Write-Output "LOMBIQ_NODEJS_EXTENSIONS=$LombiqNodeJsExtensions"
-        "LOMBIQ_NODEJS_EXTENSIONS=$LombiqNodeJsExtensions" >> $Env:GITHUB_ENV
+        $nodeJsExtensionsPath = $(Resolve-Path '${{ github.action_path }}/../../../Lombiq.NodeJs.Extensions').Path
+        Write-Output "LOMBIQ_NODEJS_EXTENSIONS=$nodeJsExtensionsPath"
+        "LOMBIQ_NODEJS_EXTENSIONS=$nodeJsExtensionsPath" >> $Env:GITHUB_ENV
         "LOMBIQ_NODEJS_EXTENSIONS_GITHUB_ACTIONS=true" >> $Env:GITHUB_ENV
         "LOMBIQ_NODEJS_EXTENSIONS_GITHUB_ACTIONS_ROOT=$PWD" >> $Env:GITHUB_ENV
         "LOMBIQ_NODEJS_EXTENSIONS_WARN_AS_ERROR=true" >> $Env:GITHUB_ENV
 
-        # Make sure to keep the version number in sync with the matching command in
-        # Lombiq.NodeJs.Extensions/build/NodeJsExtensionsNpmPackage.targets.
-        corepack enable
-        corepack prepare pnpm@8.15.9+sha1.aa4bc353b5f59fe1f1df5d802ce049ddf7f3c60e --activate
+        # Read the packageManager from the package.json to be able to provide it to the pnpm setup action. While it can
+        # read it from the file, it can't access the file when the lint workflow is run from a parent workflow.
+        $packageJsonPath = Join-Path -Path $nodeJsExtensionsPath -ChildPath 'package.json'
+        $packageJsonContent = Get-Content -Path $packageJsonPath -Raw | ConvertFrom-Json -AsHashTable
+        $packageManager = $packageJsonContent['packageManager']
+        $pnpmVersion = $packageManager.Split('@')[1]
+        Write-Output "PNPM version in Node.js Extensions: $pnpmVersion"
+
+        "pnpm-version=$pnpmVersion" >> $Env:GITHUB_OUTPUT
+
+    # Relying on corepack, and also running pnpm setup is not enough, PNPM operations will fail while telling to run
+    # pnpm setup. Manually setting up PNPM_HOME and adding it to PATH didn't help either. So, using this action.
+    - name: Set up PNPM
+      uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      with:
+        version: ${{ steps.set-up-environment.outputs.pnpm-version }}
+
+    - name: Install Dependencies
+      shell: pwsh
+      run: |
+        cd $Env:LOMBIQ_NODEJS_EXTENSIONS
 
-        cd $LombiqNodeJsExtensions
         pnpm install --prefer-offline --no-frozen-lockfile
         pnpm link --global
 
     - name: Execute Linting
       shell: pwsh
       run: |
-        $library = $Env:LOMBIQ_NODEJS_EXTENSIONS
+        $libraryPath = $Env:LOMBIQ_NODEJS_EXTENSIONS
 
-        Invoke-NodeJsLinter -LibraryPath $library -Type scripts -Paths '${{ inputs.scripts }}'
-        Invoke-NodeJsLinter -LibraryPath $library -Type styles -Paths '${{ inputs.styles-scss }}'
-        Invoke-NodeJsLinter -LibraryPath $library -Type styles-css -Paths '${{ inputs.styles-css }}'
+        Invoke-NodeJsLinter -LibraryPath $libraryPath -Type scripts -Paths '${{ inputs.scripts }}'
+        Invoke-NodeJsLinter -LibraryPath $libraryPath -Type styles -Paths '${{ inputs.styles-scss }}'
+        Invoke-NodeJsLinter -LibraryPath $libraryPath -Type styles-css -Paths '${{ inputs.styles-css }}'
 
         if ('${{ inputs.lint-markdown }}' -ieq 'true')
         {
               Write-Output 'Markdown linting is enabled.'
-              Invoke-NodeJsLinter -LibraryPath $library -Type markdown -Paths '{ ".": { "markdown": { "source": "." } } }'
+              Invoke-NodeJsLinter -LibraryPath $libraryPath -Type markdown -Paths '{ ".": { "markdown": { "source": "." } } }'
         }
         else
         {

.github/workflows/lint.yml

@@ -50,6 +50,9 @@ jobs:
         with:
           token: ${{ secrets.CHECKOUT_TOKEN }}
 
+      - name: Set up Node.js
+        uses: Lombiq/GitHub-Actions/.github/actions/setup-node@dev
+
       - name: Run Linter
         uses: Lombiq/NodeJs-Extensions/.github/actions/lint@dev
         with:

.gitignore

@@ -1,3 +1,4 @@
+.idea/
 .vs/
 obj/
 bin/

Lombiq.NodeJs.Extensions.Samples.NuGet/Lombiq.NodeJs.Extensions.Samples.NuGet.csproj

@@ -19,7 +19,7 @@
   <ItemGroup>
     <!-- Adding Node.js Extensions as a PackageReference will result in inclusion of its .props and .targets files
          during Build. -->
-    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.2.1-alpha.0.osoe-954" />
+    <PackageReference Include="Lombiq.NodeJs.Extensions" Version="3.0.0" />
   </ItemGroup>
 
 </Project>

Lombiq.NodeJs.Extensions.Samples.NuGet/eslint.config.cjs

@@ -0,0 +1,20 @@
+const fs = require('fs');
+const { FlatCompat } = require('@eslint/eslintrc');
+
+const compat = new FlatCompat({ baseDirectory: __dirname });
+
+let eslintrc = compat.config({
+    // The following path may have to be adjusted to your directory structure.
+    extends: './node_modules/nodejs-extensions/config/.eslintrc.lombiq-base.js',
+
+    // Add custom rules and overrides here.
+    rules: {
+    },
+});
+
+if (fs.existsSync('./.eslintrc.js')) {
+    // eslint-disable-next-line global-require, import/extensions -- Special conditional require.
+    eslintrc = require('./.eslintrc.js');
+}
+
+module.exports = [...eslintrc];

Lombiq.NodeJs.Extensions.Samples.NuGet/package.json

@@ -5,7 +5,8 @@
     "watch": "npm explore nodejs-extensions -- pnpm watch"
   },
   "devDependencies": {
-    "eslint": "9.37.0",
+    "@eslint/eslintrc": "3.3.1",
+    "eslint": "9.39.1",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-n": "17.23.1",

Lombiq.NodeJs.Extensions.Samples/pnpm-lock.yaml

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <DefaultItemExcludes>.git*;$(DefaultItemExcludes)</DefaultItemExcludes>
+    <DefaultItemExcludes>.git*;node_modules\**;$(DefaultItemExcludes)</DefaultItemExcludes>
     <IsPublishable>false</IsPublishable>
   </PropertyGroup>
 

Lombiq.NodeJs.Extensions.SolutionMarkdownAnalysis/Lombiq.NodeJs.Extensions.SolutionMarkdownAnalysis.csproj

@@ -9,7 +9,7 @@
     }
   },
   "devDependencies": {
-    "eslint": "9.37.0",
+    "eslint": "9.39.1",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-n": "17.23.1",