Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
		
			
				
	
	
		
			24 lines
		
	
	
	
		
			480 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			24 lines
		
	
	
	
		
			480 B
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 | 
						|
 | 
						|
module.exports = {
 | 
						|
  test: /\.s?css$/i,
 | 
						|
  use: [
 | 
						|
    MiniCssExtractPlugin.loader,
 | 
						|
    'css-loader',
 | 
						|
    {
 | 
						|
      loader: 'postcss-loader',
 | 
						|
      options: {
 | 
						|
        sourceMap: true,
 | 
						|
      },
 | 
						|
    },
 | 
						|
    {
 | 
						|
      loader: 'sass-loader',
 | 
						|
      options: {
 | 
						|
        includePaths: ['app/javascript'],
 | 
						|
        fiber: require('fibers'),
 | 
						|
        implementation: require('sass'),
 | 
						|
        sourceMap: true,
 | 
						|
      },
 | 
						|
    },
 | 
						|
  ],
 | 
						|
};
 |