Merge pull request #21 from ElemeFE/fix/module-name

update option
ElemeFE · May 3, 2016 · 29c7e4b · 29c7e4b
2 parents 7e51b2d + 5210a40
commit 29c7e4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -89,8 +89,8 @@ cooking.set({
   urlLoaderLimit: 10000,
   // 接受 amd cjs umd var，其中 cjs 会被翻译成  webpack 的 commonjs2
   format: 'var',
-  // 如果format 为 'umd'，需要设置该值
-  umdName: '',
+  // 如果format 为 'umd' 或 'amd'，需要设置该值
+  moduleName: '',
 
   // 会加载 CommonsChunkPlugin，接受 String|Object
   // 如果有多个可以配制成 Object, {'name': 'filename'}

diff --git a/test/cooking.test.js b/test/cooking.test.js
@@ -74,7 +74,7 @@ test('cooking set format', t => {
 
   cooking.set({
     format: 'umd',
-    umdName: 'ABC'
+    moduleName: 'ABC'
   })
 
   t.is(cooking.config.output.library, 'ABC')

diff --git a/util/merge.js b/util/merge.js
@@ -52,11 +52,15 @@ module.exports = function (userConfig, baseConfig) {
       config.output.libraryTarget = userConfig.format
     }
 
-    // umdName
-    if (userConfig.format === 'umd' && !userConfig.umdName) {
-      logger.fatal('请配置 umdName')
+    // moduleName
+    if (userConfig.format === 'umd' || userConfig.format === 'amd') {
+      if (userConfig.moduleName) {
+        config.output.library = userConfig.moduleName
+        config.output.umdNamedDefine = true
+      } else {
+        logger.fatal('请配置 moduleName')
+      }
     }
-    config.output.library = userConfig.umdName
 
     // plugin
     config.plugins.Define = new webpack.DefinePlugin({