Merge pull request #167 from yast/update_deps

Update NPM dependencies, improve CI

.github/workflows/ci.yml

@@ -20,20 +20,15 @@ jobs:
     steps:
 
     - name: Git Checkout
-      uses: actions/checkout@v2
-
-    - name: Git Fix
-      # fix the ownership to pass a git security check
-      run: chown "$UID" .
+      uses: actions/checkout@v3
 
     - name: Prepare System
       run: zypper --non-interactive in --no-recommends breeze5-icons npm-default
 
     # if the included files are not up to date and there is a change in the
     # generated file then the package build later fails
     - name: Build QSS and CSS files
-      # reset possible package-lock changes
-      run: rake generate && git checkout src/package-lock.json
+      run: rake generate
 
     - name: Stylelint
       run: cd src && npx gulp lint

README.md

@@ -51,7 +51,7 @@ and testing the changes in a real installation.
 
 - Install npm: `sudo zypper install npm-default`
 - Go to the `src/` subdirectory.
-- Install the SASS processor and the tools: `npm install`
+- Install the SASS processor and the tools: `npm ci`
   - The NPM packages are installed into the `node_modules` subdirectory
 
 ### Building the QSS and CSS Files
@@ -60,6 +60,20 @@ and testing the changes in a real installation.
 - This generates all `theme/SLE/wizard/*.qss` and `theme/SLE/wizard/*.css`
   files.
 
+## Updating the NPM Packages
+
+The `npm ci` command installs the NPM packages exactly in the versions specified
+in the `package-lock.json` file.
+
+If you want to update the packages to the latest semver compatible version then
+run command `npm install`.
+
+If you want to update the packages to a newer, possibly incompatible version,
+then edit the `package.json` file and run `npm install`. Carefully check the
+built result.
+
+In all cases do not forget to commit the changes in both `package.json` and
+`package-lock.json` files to git.
 
 ### Sources
 

Rakefile

@@ -13,7 +13,7 @@ task :generate do
   end
 
   Dir.chdir("src") do
-    system("npm install") unless File.exist?("node_modules")
+    system("npm ci") unless File.exist?("node_modules")
     system("npx gulp")
   end
 end

package/yast2-theme.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Oct 20 07:53:13 UTC 2023 - Ladislav Slezák <[email protected]>
+
+- Dropped unmaintained "gulp-stylelint" internal development dependency
+- Manually updated the internal development dependencies to the latest
+  NPM packages
+- The stylesheets have been rebuilt with the new dependencies
+- Updated README.md
+- 5.0.1
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <[email protected]>
 

package/yast2-theme.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-theme
-Version:        5.0.0
+Version:        5.0.1
 Release:        0
 
 Source0:        %{name}-%{version}.tar.bz2

src/gulpfile.js

@@ -1,8 +1,8 @@
 const gulp = require('gulp');
-const gulpStylelint = require('gulp-stylelint');
 const sass = require('gulp-sass')(require('sass'));
 const rename = require('gulp-rename');
 const header = require('gulp-header');
+const spawn = require('child_process').spawn;
 
 let path = {
   src_source: 'scss',
@@ -49,14 +49,11 @@ const buildThemes = (done) => {
   })();
 };
 
-gulp.task('lint', function () {
-  return gulp
-    .src('**/*.scss')
-    .pipe(gulpStylelint({
-      reporters: [
-        {formatter: 'string', console: true}
-      ]
-    }));
+gulp.task('lint', function (cb) {
+  const cmd = spawn('npx', ['stylelint', '**/*.scss'], {stdio: 'inherit'});
+  cmd.on('close', function (code) {
+    cb(code);
+  });
 });
 
 gulp.task('default', gulp.series(buildThemes));