fix(presets): fix resolveLoader property

clippedjs · Dec 14, 2017 · db71ab7 · db71ab7
1 parent 8abe21f
commit db71ab7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 23 deletions.
diff --git a/presets/webpack-frontend/index.js b/presets/webpack-frontend/index.js
@@ -2,21 +2,13 @@ const path = require('path')
 const presetWebpack = require('clipped-preset-webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 
-module.exports = async (clipped, opt) => {
+module.exports = async (clipped, opt = {}) => {
   await clipped.use(presetWebpack)
 
-  // clipped.config.webpack.merge({
-  //   module: {
-  //     rules: [
-  //       {
-  //         test: /\.css$/,
-  //         loader: require.resolve('css-loader'),
-  //         include: [clipped.resolve('src')],
-  //         exclude: [/node_modules/]
-  //       }
-  //     ]
-  //   }
-  // })
+  clipped.config.webpack.resolve.modules
+    .add(path.join(__dirname, 'node_modules'))
+  clipped.config.webpack.resolveLoader.modules
+    .add(path.join(__dirname, 'node_modules'))
 
   clipped.config.webpack.module
     .rule('css')
@@ -25,7 +17,7 @@ module.exports = async (clipped, opt) => {
         .add(clipped.resolve('src'))
         .end()
       .use('css')
-        .loader(require('css-loader'))
+        .loader('css-loader')
 
   clipped.config.webpack
     .plugin('html')

diff --git a/presets/webpack-frontend/package-lock.json b/presets/webpack-frontend/package-lock.json
diff --git a/presets/webpack-frontend/package.json b/presets/webpack-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clipped-preset-webpack-frontend",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "main": "index.js",
   "keywords": [],

diff --git a/presets/webpack/index.js b/presets/webpack/index.js
@@ -20,7 +20,7 @@ module.exports = (clipped, opt = {}) => {
     resolveLoader: {
       modules: [
         clipped.resolve('node_modules'),
-        path.resolve(__dirname, 'node_modules'),
+        path.join(__dirname, 'node_modules'),
       ],
     },
     resolve: {
@@ -31,19 +31,19 @@ module.exports = (clipped, opt = {}) => {
       extensions: ['*', '.js', '.vue', '.jsx', '.json', '.marko', '.ts', '.tsx'],
       modules: [
         clipped.resolve('node_modules'),
-        path.resolve(__dirname, 'node_modules')
+        path.join(__dirname, 'node_modules')
       ]
     },
     module: {
       rules: [
         {
           test: /\.js$/,
-          loader: require.resolve('babel-loader'),
+          loader: 'babel-loader',
           include: [clipped.resolve('src')],
           exclude: [/node_modules/],
           options: {
             presets: [
-              [require.resolve('babel-preset-env'), { modules: false }]
+              ['babel-preset-env', { modules: false }]
             ]
           }
         }

diff --git a/presets/webpack/package-lock.json b/presets/webpack/package-lock.json
diff --git a/presets/webpack/package.json b/presets/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clipped-preset-webpack",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "main": "index.js",
   "keywords": [],

diff --git a/src/instance/config.js b/src/instance/config.js
@@ -20,7 +20,7 @@ async function execConfig (opt: Object = {}) { // eslint-disable-line
 export function initConfig (Clipped: Object) {
   Clipped.prototype.__initialized__ = false
 
-  Clipped.prototype.config = {a: '1'}
+  Clipped.prototype.config = {}
 
   Clipped.prototype.init = execConfig