refactor: stuff (#903)

webpack-contrib · Mar 6, 2019 · cc81af1 · cc81af1
1 parent e9ce745
commit cc81af1
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 36 deletions.
diff --git a/src/index.js b/src/index.js
@@ -151,14 +151,6 @@ export default function loader(content, map, meta) {
         .warnings()
         .forEach((warning) => this.emitWarning(new Warning(warning)));
 
-      if (result.map) {
-        const newMap = result.map.toJSON();
-
-        console.log(newMap.file);
-        console.log(newMap.sourceRoot);
-        console.log(newMap.sources);
-      }
-
       const messages = result.messages || [];
 
       // Run other loader (`postcss-loader`, `sass-loader` and etc) for importing CSS

diff --git a/test/camelCase-option.test.js b/test/camelCase-option.test.js
@@ -1,4 +1,4 @@
-const { webpack, evaluated } = require('./helpers');
+import { webpack, evaluated } from './helpers';
 
 describe('camelCase option', () => {
   it('true', async () => {

diff --git a/test/errors.test.js b/test/errors.test.js
@@ -1,4 +1,4 @@
-const loader = require('../src/cjs');
+import loader from '../src/cjs';
 
 it('validation', () => {
   const validate = (options) =>

diff --git a/test/getLocalIdent-option.test.js b/test/getLocalIdent-option.test.js
@@ -1,4 +1,4 @@
-const path = require('path');
+import path from 'path';
 
 const { webpack, evaluated } = require('./helpers');
 

diff --git a/test/helpers.js b/test/helpers.js
@@ -1,11 +1,11 @@
-const vm = require('vm');
-const path = require('path');
+import vm from 'vm';
+import path from 'path';
 
-const del = require('del');
-const webpack = require('webpack');
-const MemoryFS = require('memory-fs');
-const stripAnsi = require('strip-ansi');
-const normalizePath = require('normalize-path');
+import del from 'del';
+import webpack from 'webpack';
+import MemoryFS from 'memory-fs';
+import stripAnsi from 'strip-ansi';
+import normalizePath from 'normalize-path';
 
 function evaluated(output, modules, moduleId = 1) {
   let m;

diff --git a/test/icss.test.js b/test/icss.test.js
@@ -1,7 +1,7 @@
-const path = require('path');
-const fs = require('fs');
+import path from 'path';
+import fs from 'fs';
 
-const { webpack, evaluated } = require('./helpers');
+import { webpack, evaluated } from './helpers';
 
 const testCasesPath = path.join(__dirname, 'fixtures/icss/tests-cases');
 const testCases = fs.readdirSync(testCasesPath);

diff --git a/test/import-option.test.js b/test/import-option.test.js
@@ -1,4 +1,4 @@
-const { webpack, evaluated, normalizeErrors } = require('./helpers');
+import { webpack, evaluated, normalizeErrors } from './helpers';
 
 describe('import option', () => {
   it('true', async () => {

diff --git a/test/importLoaders-option.test.js b/test/importLoaders-option.test.js
@@ -1,6 +1,6 @@
-const postcssPresetEnv = require('postcss-preset-env');
+import postcssPresetEnv from 'postcss-preset-env';
 
-const { webpack, evaluated } = require('./helpers');
+import { webpack, evaluated } from './helpers';
 
 describe('importLoaders option', () => {
   it('not specify (no loader before)', async () => {

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -1,8 +1,8 @@
-const path = require('path');
+import path from 'path';
 
-const postcssPresetEnv = require('postcss-preset-env');
+import postcssPresetEnv from 'postcss-preset-env';
 
-const { webpack, evaluated, normalizeErrors } = require('./helpers');
+import { webpack, evaluated, normalizeErrors } from './helpers';
 
 describe('loader', () => {
   it('should compile with `js` entry point', async () => {

diff --git a/test/localIdentName-option.test.js b/test/localIdentName-option.test.js
@@ -1,6 +1,6 @@
-const path = require('path');
+import path from 'path';
 
-const { webpack, evaluated } = require('./helpers');
+import { webpack, evaluated } from './helpers';
 
 describe('localIdentName option', () => {
   it('basic', async () => {

diff --git a/test/modules-option.test.js b/test/modules-option.test.js
@@ -1,7 +1,7 @@
-const path = require('path');
-const fs = require('fs');
+import path from 'path';
+import fs from 'fs';
 
-const { webpack, evaluated } = require('./helpers');
+import { webpack, evaluated } from './helpers';
 
 const testCasesPath = path.join(__dirname, 'fixtures/modules/tests-cases');
 const testCases = fs.readdirSync(testCasesPath);

diff --git a/test/sourceMap-option.test.js b/test/sourceMap-option.test.js
@@ -1,8 +1,8 @@
-const path = require('path');
+import path from 'path';
 
-const postcssPresetEnv = require('postcss-preset-env');
+import postcssPresetEnv from 'postcss-preset-env';
 
-const { webpack, evaluated, normalizeSourceMap } = require('./helpers');
+import { webpack, evaluated, normalizeSourceMap } from './helpers';
 
 describe('sourceMap option', () => {
   describe('true', () => {

diff --git a/test/url-option.test.js b/test/url-option.test.js
@@ -1,4 +1,4 @@
-const { webpack, evaluated, normalizeErrors } = require('./helpers');
+import { webpack, evaluated, normalizeErrors } from './helpers';
 
 describe('url option', () => {
   it('true', async () => {