Test

Author: jan-rycko

lib/index.js

@@ -106,7 +106,7 @@ function getLoaderConfig (ctx) {
 function hoistUseRule (content) {
   const list = []
 
-  const cleared = content.replace(/@use [^;];/g, (match) => {
+  const cleared = content.replace(/@use [^;]*;/g, (match) => {
     if (!list.includes(match)) {
       list.push(match)
     }

test/fixtures/use-rule/expect.css

@@ -0,0 +1,11 @@
+header {
+  background: #ccc;
+}
+
+header {
+  width: 1px;
+}
+
+header {
+  height: 1px;
+}

test/fixtures/use-rule/index.scss

@@ -0,0 +1,3 @@
+@import "without-use.scss";
+@import "with-use.scss";
+@import "second-with-use.scss";

test/fixtures/use-rule/second-with-use.scss

@@ -0,0 +1,5 @@
+@use "sass:math";
+
+header {
+  height: math.div(6px, 6);
+}

test/fixtures/use-rule/webpack.config.js

@@ -0,0 +1,37 @@
+'use strict'
+
+const path = require('path')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const loader = require.resolve('../../..')
+const cssLoader = require.resolve('css-loader')
+
+module.exports = {
+  context: path.join(__dirname),
+  entry: {
+    index: './index.scss'
+  },
+  output: {
+    path: path.join(__dirname, '../../runtime/use-rule'),
+    filename: '[name].js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(scss|sass)$/,
+        use: ExtractTextPlugin.extract({
+          use: [
+            cssLoader,
+            loader
+          ]
+        })
+      },
+      {
+        test: /\.png$/,
+        loader: 'file-loader?name=[path][name].[ext]'
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin('[name].css')
+  ]
+}

test/fixtures/use-rule/with-use.scss

@@ -0,0 +1,5 @@
+@use "sass:math";
+
+header {
+  width: math.div(5px, 5);
+}

test/fixtures/use-rule/without-use.scss

@@ -0,0 +1,3 @@
+header {
+  background: #ccc;
+}

test/index.test.js

@@ -148,6 +148,11 @@ describe('test sass-loader', function() {
     runSimpleTest(done, 'data-import-issue')
   })
 
+
+  it('should be able to hoist @use rule usage in merged content', function(done) {
+    runSimpleTest(done, 'use-rule')
+  })
+
   it('should pass options to sass.render (#53)', function(done) {
     runSimpleTest(done, 'pass-output-style')
   })