Commit 47ce6ef9 authored by ytsurk's avatar ytsurk Committed by Ivica Puljic
Browse files

Issue #3045550 by pivica, ytsurk: Removal of gulp-sass-glob

parent 4cf401b9

bs_base.bs_base.install

+22 −0
Original line number Diff line number Diff line
@@ -142,3 +142,25 @@ function bs_base_bs_update_8006($target_theme_name) { 
    }

  }

}



/**

 * Remove node plugins that we do not use.

 */

function bs_base_bs_update_8007($target_theme_name) {

  $themes_info = _bs_base_drupal_theme_list_info();

  if (isset($themes_info[$target_theme_name])) {

    _bs_base_regexp_file($themes_info[$target_theme_name]->subpath . '/package.json', [

      "^.*\"eslint.*\n" => '',

      "^.*\"gulp-cached.*\n" => '',

      "^.*\"gulp-changed.*\n" => '',

      "^.*\"gulp-if.*\n" => '',

      "^.*\"gulp-notify.*\n" => '',

      "^.*\"gulp-sass-glob.*\n" => '',

      "^.*\"gulp-svgstore.*\n" => '',

      "^.*\"gulp-uglify.*\n" => '',

      "^.*\"node-sass-import-once.*\n" => '',

      "^.*\"postcss-scss.*\n" => '',

      "^.*\"pump.*\n" => '',

    ]);

  }

}

gulp-options.yml

+0 −12
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ gulpPlugins: 
    - "css-mqpacker"

    - "del"

    - "postcss-*"

    - "pump"

    - "stylelint"

    - "stylelint-*"

    - "through2"
@@ -64,14 +63,3 @@ processors: 
    clearAllMessages: true

    # Don't throw exception on error but continue with gulp tasks.

    throwError: false
 


# Configuration for error popup.

#onError:

#  title: 'Gulp error in '

#  message: '<%= error.message %>'

#  sound: 'Beep'

# Let's disable errors for now because it seems gulp plumber is making a mess.

# @todo - this needs to be fixed. Either we figure why plumber is making a mess

# (missing compiled files) or we remove it and try to add some other error

# handler helper.

onError: null

gulp-tasks.js

+0 −23
Original line number Diff line number Diff line
@@ -18,18 +18,6 @@ module.exports = function (gulp, plugins, options) { 
    plugins.mqpacker({sort: true})

  ];



  // Gulp error handler.

  if (options.onError) {

    options.onErrorCallback = function (err) {

      plugins.notify.onError({

        title: options.onError.title + err.plugin,

        message: options.onError.message,

        sound: options.onError.sound

      })(err);

      this.emit('end');

    };

  }



  // Defining gulp tasks.



  // Load theme _functions.scss partial if it exist so we can use them
@@ -57,14 +45,8 @@ module.exports = function (gulp, plugins, options) { 
  gulp.task('sass', function () {

    var task = gulp.src(options.sass.src + '/**/*.scss');



    if (options.onError) {

      // Error management in gulp.

      task.pipe(plugins.plumber({errorHandler: options.onErrorCallback}));

    }



    task.pipe(plugins.sassInject(options.sass.injectVariables))

      .pipe(plugins.through.obj(loadFunctions))

      .pipe(plugins.sassGlob())

      .pipe(plugins.sass({

        outputStyle: 'expanded',

        includePaths: options.sass.includePaths
@@ -77,13 +59,8 @@ module.exports = function (gulp, plugins, options) { 


  gulp.task('sass:dev', function () {

    var task = gulp.src(options.sass.src + '/**/*.scss', {sourcemaps: true});

    if (options.onError) {

      // Error management in gulp.

      task.pipe(plugins.plumber({errorHandler: options.onErrorCallback}));

    }

    task.pipe(plugins.sassInject(options.sass.injectVariables))

      .pipe(plugins.through.obj(loadFunctions))

      .pipe(plugins.sassGlob())

      .pipe(plugins.sass({

        outputStyle: 'expanded',

        includePaths: options.sass.includePaths,

package.json

+0 −11
Original line number Diff line number Diff line
@@ -8,31 +8,20 @@ 
    "css-mqpacker": "^7.0.0",

    "deepmerge": "^4.2.2",

    "del": "^6.0.0",

    "eslint": "^7.28.0",

    "font-awesome": "^4.7.0",

    "gulp": "^4.0.2",

    "gulp-cached": "^1.1.1",

    "gulp-changed": "^4.0.3",

    "gulp-concat": "^2.6.1",

    "gulp-debug": "^4.0.0",

    "gulp-if": "^3.0.0",

    "gulp-load-plugins": "^2.0.7",

    "gulp-notify": "^4.0.0",

    "gulp-plumber": "^1.2.1",

    "gulp-postcss": "^9.0.0",

    "gulp-sass": "^4.1.0",

    "gulp-sass-glob": "^1.1.0",

    "gulp-sass-inject": "^1.1.1",

    "gulp-sass-lint": "^1.4.0",

    "gulp-strip-css-comments": "^2.0.0",

    "gulp-svgstore": "^7.0.1",

    "gulp-uglify": "^3.0.2",

    "js-yaml": "^4.1.0",

    "node-sass-import-once": "^1.2.0",

    "postcss": "^8.3.4",

    "postcss-reporter": "^7.0.2",

    "postcss-scss": "^4.0.0",

    "pump": "^3.0.0",

    "stylelint": "^13.13.1",

    "stylelint-config-standard": "^22.0.0",

    "stylelint-order": "^4.1.0",

themes/bs_bootstrap/bs_bootstrap.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ base theme: bs_base 
core_version_requirement: ^8.7.7 || ^9



bs_versions:

  bs_base: 8005

  bs_base: 8007



# @todo - Core does not allow for now themes to declare dependencies on modules.

# @see https://www.drupal.org/project/drupal/issues/474684