diff --git a/src/loader.js b/src/loader.js index 9189a73f..62f6c04b 100644 --- a/src/loader.js +++ b/src/loader.js @@ -156,7 +156,7 @@ export function pitch(request) { resultSource += query.hot ? hotLoader(result, { context: this.context, query }) - : ''; + : result; return callback(null, resultSource); }); diff --git a/test/cases/css-modules/expected/main.css b/test/cases/css-modules/expected/main.css new file mode 100644 index 00000000..aa712e10 --- /dev/null +++ b/test/cases/css-modules/expected/main.css @@ -0,0 +1,4 @@ +body { background: red; } +.index-a-module { background: green; } +.index-b-module { background: lightgreen; } + diff --git a/test/cases/css-modules/expected/main.js b/test/cases/css-modules/expected/main.js new file mode 100644 index 00000000..9993d999 --- /dev/null +++ b/test/cases/css-modules/expected/main.js @@ -0,0 +1,95 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 0); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports, __webpack_require__) { + +// extracted by extract-css-chunks-webpack-plugin +module.exports = {"a-module":"index-a-module","b-module":"index-b-module"}; + +/***/ }) +/******/ ]); \ No newline at end of file diff --git a/test/cases/css-modules/index.css b/test/cases/css-modules/index.css new file mode 100644 index 00000000..7a5976c6 --- /dev/null +++ b/test/cases/css-modules/index.css @@ -0,0 +1,3 @@ +body { background: red; } +.a-module { background: green; } +.b-module { background: lightgreen; } diff --git a/test/cases/css-modules/webpack.config.js b/test/cases/css-modules/webpack.config.js new file mode 100644 index 00000000..dee740f0 --- /dev/null +++ b/test/cases/css-modules/webpack.config.js @@ -0,0 +1,27 @@ +const Self = require('../../../'); + +module.exports = { + entry: './index.css', + module: { + rules: [ + { + test: /\.css$/, + use: [ + Self.loader, + { + loader: 'css-loader', + options: { + modules: true, + localIdentName: '[name]-[local]' + }, + }, + ], + }, + ], + }, + plugins: [ + new Self({ + filename: '[name].css', + }), + ], +};