Last active
August 29, 2015 13:58
-
-
Save leeight/9950470 to your computer and use it in GitHub Desktop.
app/ecom/fengchao/trunk/fc-star/fc-ue/nirvana-workspace/nirvana
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Index: edp-build-config.js | |
| =================================================================== | |
| --- edp-build-config.js (revision 96514) | |
| +++ edp-build-config.js (working copy) | |
| @@ -415,21 +415,17 @@ | |
| exports.getProcessors = function () { | |
| return [ | |
| new LessCompiler({ | |
| - exclude: ['*.tpl', '*.less', '*.js', '*.html', '*.css'], | |
| - include: [ | |
| + files: [ | |
| 'src/resource/css/dep.less', | |
| 'src/resource/css/common.less', | |
| 'src/resource/css/nirvana.less', | |
| 'src/resource/css/module.less', | |
| - '/main.html' | |
| - ], | |
| - entryExtnames: pageEntries | |
| + 'main.html' | |
| + ] | |
| }), | |
| - new CssCompressor(), | |
| + // new CssCompressor(), | |
| new ModuleCompiler({ | |
| - exclude: require('./module-compiler-exclude.js'), | |
| - configFile: 'module.conf', | |
| - entryExtnames: moduleEntries, | |
| + files: require('./module-compiler-exclude.js'), | |
| // 重写ModuleCompiler的process方法 | |
| process: function (file, processContext, callback) { | |
| var parentProcess = ModuleCompiler.prototype.process; | |
| @@ -452,61 +448,51 @@ | |
| getCombineConfig: function (combineModules) { | |
| var toExclude = [ | |
| // dep | |
| - "er", | |
| - "er/*", | |
| - "echarts", | |
| - "echarts/*", | |
| - "echarts/*/*", | |
| - "echarts/*/*/*", | |
| - "echarts/*/*/*/*", | |
| - "zrender", | |
| - "zrender/*", | |
| - "zrender/*/*", | |
| + "!er", | |
| + "!er/*", | |
| + "!echarts", | |
| + "!echarts/**", | |
| + "!zrender", | |
| + "!zrender/**", | |
| // esl | |
| - "/css", | |
| - "/js", | |
| - "/tpl", | |
| - "/etpl", | |
| - "/jstpl", | |
| + "!css", | |
| + "!js", | |
| + "!tpl", | |
| + "!etpl", | |
| + "!jstpl", | |
| // 公共 | |
| - "/common", | |
| - "/common/*", | |
| - "/common/*/*", | |
| - "/bizCommon", | |
| - "/bizCommon/*", | |
| - "/bizCommon/*/*", | |
| - "/bizCommon/*/*/*", | |
| - "/bizCommon/*/*/*/*", | |
| - "library", | |
| - "library/*/*", | |
| - "library/*/*/*", | |
| - "library/*/*/*/*", | |
| - "flags" | |
| + "!common", | |
| + "!common/**", | |
| + "!bizCommon", | |
| + "!bizCommon/**", | |
| + "!library", | |
| + "!library/**", | |
| + "!flags" | |
| ]; | |
| var toExcludeTpl = [ | |
| // tpls | |
| - '/resource/tpl/nirvana_tpl', | |
| - '/bizCommon/tpl', | |
| - '/aoPackage/tpl', | |
| - '/aoPackage/newtpl', | |
| - '/easyManage/tpl', | |
| - '/module/accountQualityScore/tpl', | |
| - '/tool/tpl', | |
| - '/fclab/fclabTpl', | |
| - '/message/tpl' | |
| + '!resource/tpl/nirvana_tpl', | |
| + '!bizCommon/tpl', | |
| + '!aoPackage/tpl', | |
| + '!aoPackage/newtpl', | |
| + '!easyManage/tpl', | |
| + '!module/accountQualityScore/tpl', | |
| + '!tool/tpl', | |
| + '!fclab/fclabTpl', | |
| + '!message/tpl' | |
| ]; | |
| for(var k in combineModules) { | |
| if (typeof combineModules[k] == 'object') { | |
| - var exclude = combineModules[k].exclude || []; | |
| - combineModules[k].exclude = exclude.concat(toExcludeTpl); | |
| + var files = combineModules[k].files|| []; | |
| + combineModules[k].files = files.concat(toExcludeTpl); | |
| } else { | |
| combineModules[k] = { | |
| - exclude: [].concat(toExcludeTpl) | |
| + files: toExcludeTpl | |
| }; | |
| } | |
| if (k != 'main') { | |
| - combineModules[k].exclude = combineModules[k].exclude.concat(toExclude); | |
| + combineModules[k].files = combineModules[k].files.concat(toExclude); | |
| } | |
| } | |
| return combineModules; | |
| @@ -541,32 +527,14 @@ | |
| } | |
| }), | |
| PathPrefixUpdater, | |
| + /* | |
| new JsCompressor({ | |
| isExclude: function (file) { | |
| return !REGEXP_DOT_JS.test(file.outputPath); | |
| } | |
| }), | |
| + */ | |
| new PathMapper({ | |
| - replacements: [ | |
| - { | |
| - type: 'html', tag: 'link', | |
| - attribute: 'href', extnames: pageEntries | |
| - }, | |
| - { | |
| - type: 'html', tag: 'img', | |
| - attribute: 'src', extnames: pageEntries | |
| - }, | |
| - { | |
| - type: 'html', tag: 'script', | |
| - attribute: 'src', extnames: pageEntries | |
| - }, | |
| - { | |
| - extnames: moduleEntries, replacer: 'module-config' | |
| - }, | |
| - { | |
| - extnames: 'css,less', replacer: 'css' | |
| - } | |
| - ], | |
| mapper: function (value) { | |
| if (/\.\.\/\.\.\/library\/src/.test(value)) { | |
| return value.replace('../../library/src', 'asset/dep'); | |
| @@ -576,7 +544,7 @@ | |
| } | |
| return value; | |
| } | |
| - }), | |
| + })/*, | |
| new CdnReplacer({ | |
| cdnList: [ | |
| 'http://tuiguang-p1.bdstatic.com', | |
| @@ -631,36 +599,35 @@ | |
| ); | |
| } | |
| }) | |
| + */ | |
| ]; | |
| }; | |
| exports.exclude = [ | |
| - '/tool', | |
| - '/doc', | |
| - '/test', | |
| - '/compile', | |
| - '/module.conf', | |
| - '/module-compiler-exclude.js', | |
| - '/dep/packages.manifest', | |
| - '/dep/*/*/test', | |
| - '/dep/*/*/tests', | |
| - '/dep/*/*/doc', | |
| - '/dep/*/*/demo', | |
| - '/dep/*/*/tool', | |
| - '/dep/*/*/asset', | |
| - '/dep/*/*/*.md', | |
| - '/dep/*/*/*.ruby-version', | |
| - '/dep/*/*/*.yml', | |
| - '/dep/*/*/Gmefile', | |
| - '/dep/*/*/*.lock', | |
| - '/dep/*/*/.npmignore', | |
| - '/dep/*/*/index.html', | |
| - '/dep/*/*/jshint.txt', | |
| - '/dep/*/*/.jshintrc', | |
| - '/dep/*/*/composer.json', | |
| - '/dep/*/*/package.json', | |
| - '/edp-*', | |
| - '/.edpproj', | |
| + 'doc', | |
| + 'test', | |
| + 'compile', | |
| + 'module.conf', | |
| + 'module-compiler-exclude.js', | |
| + 'dep/packages.manifest', | |
| + 'dep/*/*/test', | |
| + 'dep/*/*/tests', | |
| + 'dep/*/*/doc', | |
| + 'dep/*/*/demo', | |
| + 'dep/*/*/asset', | |
| + 'dep/*/*/*.md', | |
| + 'dep/*/*/*.ruby-version', | |
| + 'dep/*/*/*.yml', | |
| + 'dep/*/*/Gmefile', | |
| + 'dep/*/*/*.lock', | |
| + 'dep/*/*/.npmignore', | |
| + 'dep/*/*/index.html', | |
| + 'dep/*/*/jshint.txt', | |
| + 'dep/*/*/.jshintrc', | |
| + 'dep/*/*/composer.json', | |
| + 'dep/*/*/package.json', | |
| + 'edp-*', | |
| + '.edpproj', | |
| '.svn', | |
| '.git', | |
| '.gitignore', | |
| @@ -674,13 +641,13 @@ | |
| '*.swp', | |
| '*.py', | |
| 'start.bat', | |
| - '/debug', | |
| - '/scm', | |
| - '/dep/echarts/*/build', | |
| - '/dep/zrender/*/build', | |
| - '/dep/font-awesome/*/less', | |
| - '/dep/font-awesome/*/scss', | |
| - '/dep/font-awesome/*/src', | |
| + 'debug', | |
| + 'scm', | |
| + 'dep/echarts/*/build', | |
| + 'dep/zrender/*/build', | |
| + 'dep/font-awesome/*/less', | |
| + 'dep/font-awesome/*/scss', | |
| + 'dep/font-awesome/*/src', | |
| '../../library/dep', | |
| '../../library/src/*/test', | |
| '../../library/src/*/sample', | |
| @@ -692,4 +659,4 @@ | |
| for (var key in processors) { | |
| global[ key ] = processors[ key ]; | |
| } | |
| -}; | |
| \ No newline at end of file | |
| +}; | |
| Index: module-compiler-exclude.js | |
| =================================================================== | |
| --- module-compiler-exclude.js (revision 96514) | |
| +++ module-compiler-exclude.js (working copy) | |
| @@ -1,489 +1,80 @@ | |
| module.exports = [ | |
| - 'module-compiler-exclude.js', | |
| - 'dep/echarts/1.3.6/src/util/mapData/rawData/encode.js', | |
| - 'dep/etpl/2.0.6/src/main.js', | |
| - 'dep/jquery.cookie/1.4.0/Gruntfile.js', | |
| - 'dep/jquery.cookie/1.4.0/jquery.cookie.js', | |
| - 'src/accountOptimizer/all/action.js', | |
| - 'src/accountOptimizer/all/folderList.js', | |
| - 'src/accountOptimizer/all/lib_ao.js', | |
| - 'src/accountOptimizer/all/lib_widget.js', | |
| - 'src/accountOptimizer/all/materialList.js', | |
| - 'src/accountOptimizer/all/propset.js', | |
| - 'src/accountOptimizer/all/selectedList.js', | |
| - 'src/accountOptimizer/all/widget/widget.js', | |
| - 'src/accountOptimizer/all/widget/widget_13.js', | |
| - 'src/accountOptimizer/all/widget/widget_14.js', | |
| - 'src/accountOptimizer/all/widget/widget_15.js', | |
| - 'src/accountOptimizer/all/widget/widget_18.js', | |
| - 'src/accountOptimizer/all/widget/widget_20.js', | |
| - 'src/accountOptimizer/all/widget/widget_21.js', | |
| - 'src/accountOptimizer/all/widget/widget_22.js', | |
| - 'src/accountOptimizer/all/widget/widget_3.js', | |
| - 'src/accountOptimizer/all/widget/widget_4.js', | |
| - 'src/accountOptimizer/all/widget/widget_8.js', | |
| - 'src/accountOptimizer/decrease/lib_decrease.js', | |
| - 'src/aoPackage/actionConfig.js', | |
| - 'src/aoPackage/aoPkgControl.js', | |
| - 'src/aoPackage/config.js', | |
| - 'src/aoPackage/logCenter.js', | |
| - 'src/bizCommon/keyword/discount/discountWordUtil.js', | |
| - 'src/common/esl/esl.js', | |
| - 'src/resource/js/core.js', | |
| - 'src/resource/js/modules.js', | |
| - 'src/resource/js/nirvana.js', | |
| - 'src/resource/tpl/nirvana_tpl.js', | |
| - 'src/core/acc/acc.js', | |
| - 'src/core/acc/common/AccService.js', | |
| - 'src/core/acc/common/EntranceProcessor.js', | |
| - 'src/core/acc/config/authConfig.js', | |
| - 'src/core/acc/config/customService.js', | |
| - 'src/core/acc/config/moduleConfig.js', | |
| - 'src/core/bizCommon/common/bizUtil.js', | |
| - 'src/core/bizCommon/common/factory.js', | |
| - 'src/core/bizCommon/common/fields.js', | |
| - 'src/core/bizCommon/common/icon.js', | |
| - 'src/core/bizCommon/common/showReason.js', | |
| - 'src/core/bizCommon/common/tableUtil.js', | |
| - 'src/core/bizCommon/common/validate.js', | |
| - 'src/core/bizCommon/config/commonConfig.js', | |
| - 'src/core/bizCommon/config/error.js', | |
| - 'src/core/bizCommon/idea/idea.js', | |
| - 'src/core/bizCommon/keyword/keyword.js', | |
| - 'src/core/bizCommon/qStarTen.js', | |
| - 'src/core/bizCommon/region.js', | |
| - 'src/core/bizCommon/unit/unit.js', | |
| - 'src/core/common/arrayUtil.js', | |
| - 'src/core/common/attrHelper.js', | |
| - 'src/core/common/common.js', | |
| - 'src/core/common/delegate.js', | |
| - 'src/core/common/domUtil.js', | |
| - 'src/core/common/event.js', | |
| - 'src/core/common/fc.js', | |
| - 'src/core/common/listener.js', | |
| - 'src/core/common/localStorage.js', | |
| - 'src/core/common/number.js', | |
| - 'src/core/common/sessionStorage.js', | |
| - 'src/core/common/storage.js', | |
| - 'src/core/common/swf.js', | |
| - 'src/core/common/text.js', | |
| - 'src/core/common/tpl.js', | |
| - 'src/core/common/util.js', | |
| - 'src/core/common/utilities.js', | |
| - 'src/core/config/config.js', | |
| - 'src/core/config/matchPatternConfig.js', | |
| - 'src/core/config/modulesConfig.js', | |
| - 'src/core/config/regionConfig.js', | |
| - 'src/core/lib/er.js', | |
| - 'src/core/lib/sizzle.js', | |
| - 'src/core/lib/tangram-1.3.1.js', | |
| - 'src/core/lib/tangram-fx.js', | |
| - 'src/core/service/account.js', | |
| - 'src/core/service/accountOptimizer.js', | |
| - 'src/core/service/announce.js', | |
| - 'src/core/service/aoDecrease.js', | |
| - 'src/core/service/aoPackage.js', | |
| - 'src/core/service/appendIdea.js', | |
| - 'src/core/service/avatar.js', | |
| - 'src/core/service/batch.js', | |
| - 'src/core/service/common/Request.js', | |
| - 'src/core/service/common/Requester.js', | |
| - 'src/core/service/common/util.js', | |
| - 'src/core/service/common/validate.js', | |
| - 'src/core/service/config.js', | |
| - 'src/core/service/effectAnalyse.js', | |
| - 'src/core/service/estimator.js', | |
| - 'src/core/service/fbs.js', | |
| - 'src/core/service/fuseSuggestion.js', | |
| - 'src/core/service/history.js', | |
| - 'src/core/service/idea.js', | |
| - 'src/core/service/index.js', | |
| - 'src/core/service/interface.js', | |
| - 'src/core/service/keyword.js', | |
| - 'src/core/service/kr.js', | |
| - 'src/core/service/marketTrend.js', | |
| - 'src/core/service/material.js', | |
| - 'src/core/service/noun.js', | |
| - 'src/core/service/plan.js', | |
| - 'src/core/service/playback.js', | |
| - 'src/core/service/queryReport.js', | |
| - 'src/core/service/quickSetup.js', | |
| - 'src/core/service/remind.js', | |
| - 'src/core/service/report.js', | |
| - 'src/core/service/request.js', | |
| - 'src/core/service/sidenav.js', | |
| - 'src/core/service/test/demo/test/same.js', | |
| - 'src/core/service/test/demo/test/test.js', | |
| - 'src/core/service/test/fbstest.js', | |
| - 'src/core/service/test/qunit/qunit.js', | |
| - 'src/core/service/trans.js', | |
| - 'src/core/service/unit.js', | |
| - 'src/core/service/vega.js', | |
| - 'src/core/service/vpunish.js', | |
| - 'src/core/ui_1.0/UIBase.js', | |
| - 'src/core/ui_1.0/base/Accordion.js', | |
| - 'src/core/ui_1.0/base/BaseBox.js', | |
| - 'src/core/ui_1.0/base/BoxGroup.js', | |
| - 'src/core/ui_1.0/base/Bubble.js', | |
| - 'src/core/ui_1.0/base/Button.js', | |
| - 'src/core/ui_1.0/base/CheckBox.js', | |
| - 'src/core/ui_1.0/base/CheckBoxGroup.js', | |
| - 'src/core/ui_1.0/base/Dialog.js', | |
| - 'src/core/ui_1.0/base/Flash.js', | |
| - 'src/core/ui_1.0/base/FormTab.js', | |
| - 'src/core/ui_1.0/base/Label.js', | |
| - 'src/core/ui_1.0/base/List.js', | |
| - 'src/core/ui_1.0/base/Mask.js', | |
| - 'src/core/ui_1.0/base/Page.js', | |
| - 'src/core/ui_1.0/base/Radio.js', | |
| - 'src/core/ui_1.0/base/Select.js', | |
| - 'src/core/ui_1.0/base/SelectGroup.js', | |
| - 'src/core/ui_1.0/base/Tab.js', | |
| - 'src/core/ui_1.0/base/Table.js', | |
| - 'src/core/ui_1.0/base/TextInput.js', | |
| - 'src/core/ui_1.0/base/TextLine.js', | |
| - 'src/core/ui_1.0/base/TreeView.js', | |
| - 'src/core/ui_1.0/common/UIAction.js', | |
| - 'src/core/ui_1.0/common/UIAdapter.js', | |
| - 'src/core/ui_1.0/common/Validator.js', | |
| - 'src/core/ui_1.0/extension/AvatarMaterial.js', | |
| - 'src/core/ui_1.0/extension/CampareCalendar.js', | |
| - 'src/core/ui_1.0/extension/BatchUnitChoose.js', | |
| - 'src/core/ui_1.0/extension/ColorBar/ColorBar.js', | |
| - 'src/core/ui_1.0/extension/ColorBar/PeerBarHelper.js', | |
| - 'src/core/ui_1.0/extension/ColorBar/PeerDataBar.js', | |
| - 'src/core/ui_1.0/extension/CustomDialog.js', | |
| - 'src/core/ui_1.0/extension/CustomTable.js', | |
| - 'src/core/ui_1.0/extension/Guide.js', | |
| - 'src/core/ui_1.0/extension/IdeaBatchUnit.js', | |
| - 'src/core/ui_1.0/extension/InterlockingBox.js', | |
| - 'src/core/ui_1.0/extension/Iterator.js', | |
| - 'src/core/ui_1.0/extension/Loading.js', | |
| - 'src/core/ui_1.0/extension/Match.js', | |
| - 'src/core/ui_1.0/extension/MatchPattern.js', | |
| - 'src/core/ui_1.0/extension/MaterialLevel.js', | |
| - 'src/core/ui_1.0/extension/MaterialSelect.js', | |
| - 'src/core/ui_1.0/extension/MiniMultiCalendar.js', | |
| - 'src/core/ui_1.0/extension/MobileIdeaPreview.js', | |
| - 'src/core/ui_1.0/extension/MonthView.js', | |
| - 'src/core/ui_1.0/extension/MsgPopup.js', | |
| - 'src/core/ui_1.0/extension/MultiCalendar.js', | |
| - 'src/core/ui_1.0/extension/MultiCheckGroup.js', | |
| - 'src/core/ui_1.0/extension/Popup.js', | |
| - 'src/core/ui_1.0/extension/Region.js', | |
| - 'src/core/ui_1.0/extension/RegionFirstArea.js', | |
| - 'src/core/ui_1.0/extension/RegionSecondArea.js', | |
| - 'src/core/ui_1.0/extension/Schedule.js', | |
| - 'src/core/ui_1.0/extension/SearchCombo.js', | |
| - 'src/core/ui_1.0/extension/SelectAll.js', | |
| - 'src/core/ui_1.0/extension/SelectCombo.js', | |
| - 'src/core/ui_1.0/extension/SelectList.js', | |
| - 'src/core/ui_1.0/extension/SideNav.js', | |
| - 'src/core/ui_1.0/extension/SliderMarquee.js', | |
| - 'src/core/ui_1.0/extension/Suggestion.js', | |
| - 'src/core/ui_1.0/extension/Tip.js', | |
| - 'src/core/ui_1.0/extension/Title.js', | |
| - 'src/core/ui_1.0/extension/ToolBar.js', | |
| - 'src/core/ui_1.0/extension/TopN.js', | |
| - 'src/core/ui_1.0/ui.js', | |
| - 'src/core/ui_1.1/Base.js', | |
| - 'src/core/ui_1.1/base/AbstractButton.js', | |
| - 'src/core/ui_1.1/base/Bubble.js', | |
| - 'src/core/ui_1.1/base/Button.js', | |
| - 'src/core/ui_1.1/base/ComboBox.js', | |
| - 'src/core/ui_1.1/base/Input.js', | |
| - 'src/core/ui_1.1/base/Layer.js', | |
| - 'src/core/ui_1.1/base/List.js', | |
| - 'src/core/ui_1.1/base/Marquee.js', | |
| - 'src/core/ui_1.1/base/Popup.js', | |
| - 'src/core/ui_1.1/base/Suggestion.js', | |
| - 'src/core/ui_1.1/base/Table.js', | |
| - 'src/core/ui_1.1/base/TextLine.js', | |
| - 'src/core/ui_1.1/config/BubbleSourceConfig.js', | |
| - 'src/core/ui_1.1/extension/CustomColumn.js', | |
| - 'src/core/ui_1.1/extension/DownloadButton.js', | |
| - 'src/core/ui_1.1/extension/Filter.js', | |
| - 'src/core/ui_1.1/extension/MaterialMarquee.js', | |
| - 'src/core/ui_1.1/extension/PlanUnitSelector.js', | |
| - 'src/core/ui_1.1/extension/RegionLayer.js', | |
| - 'src/core/ui_1.1/extension/RegionSelector.js', | |
| - 'src/core/ui_1.1/extension/SaveButton.js', | |
| - 'src/core/ui_1.1/extension/SeedMarquee.js', | |
| - 'src/core/ui_1.1/extension/ValueEditor.js', | |
| - 'src/core/ui_1.1/ui.js', | |
| - 'src/fclab/abtest/abtest.js', | |
| - 'src/fclab/abtest/createTest/create.js', | |
| - 'src/fclab/abtest/createTest/save.js', | |
| - 'src/fclab/abtest/createTest/start.js', | |
| - 'src/fclab/abtest/createTest/step1.js', | |
| - 'src/fclab/abtest/createTest/step2.js', | |
| - 'src/fclab/abtest/createTest/step3.js', | |
| - 'src/fclab/abtest/report/fields.js', | |
| - 'src/fclab/abtest/report/mtllist.js', | |
| - 'src/fclab/abtest/util.js', | |
| - 'src/fclab/common/bubbleSource.js', | |
| - 'src/fclab/common/feedback.js', | |
| - 'src/fclab/common/labFail.js', | |
| - 'src/fclab/common/labLib.js', | |
| - 'src/fclab/common/labNav.js', | |
| - 'src/fclab/common/labSide.js', | |
| - 'src/fclab/cpa/addCpa.js', | |
| - 'src/fclab/cpa/addCpaOld.js', | |
| - 'src/fclab/cpa/config.js', | |
| - 'src/fclab/cpa/cpa.js', | |
| - 'src/fclab/cpa/cpaReports.js', | |
| - 'src/fclab/cpa/cpaTools.js', | |
| - 'src/fclab/cpa/cpaToolsOld.js', | |
| - 'src/fclab/home/home.js', | |
| - 'src/fclab/index.js', | |
| - 'src/fclab/module.js', | |
| - 'src/fclab/service/abtest.js', | |
| - 'src/fclab/service/cpa.js', | |
| - 'src/fclab/service/fclab.js', | |
| - 'src/fclab/ui/chosenBar.js', | |
| - 'src/fclab/ui/slideBar.js', | |
| - 'src/message/miptList.js', | |
| - 'src/message/msgCenter/messageBox.js', | |
| - 'src/message/msgCenter/messagePlans.js', | |
| - 'src/message/msgConfig.js', | |
| - 'src/message/msgEventUtil.js', | |
| - 'src/message/msgInit.js', | |
| - 'src/message/msgUtil.js', | |
| - 'src/message/service.js', | |
| - 'src/message/summary.js', | |
| - 'src/module/accountScore/AccountScore.js', | |
| - 'src/module/accountScore/AccountScoreBar.js', | |
| - 'src/module/accountScore/AccountScoreDetail.js', | |
| - 'src/module/accountScore/AccountScoreMonitor.js', | |
| - 'src/module/bidEstimator/estimator.js', | |
| - 'src/module/effectAnalyse/analyseKR.js', | |
| - 'src/module/effectAnalyse/editIdea.js', | |
| - 'src/module/effectAnalyse/effectAnalyse.js', | |
| - 'src/module/effectAnalyse/effectGuide.js', | |
| - 'src/module/effectAnalyse/lib_effectAnalyse.js', | |
| - 'src/module/feedback/feedback.js', | |
| - 'src/module/feedback/oldfeedback.js', | |
| - 'src/module/fuseSuggestion/actionAdapter.js', | |
| - 'src/module/fuseSuggestion/bizCommon/bid.js', | |
| - 'src/module/fuseSuggestion/bizCommon/idea.js', | |
| - 'src/module/fuseSuggestion/bizUtility/cache.js', | |
| - 'src/module/fuseSuggestion/bizView/bid.js', | |
| - 'src/module/fuseSuggestion/bizView/budget.js', | |
| - 'src/module/fuseSuggestion/bizView/idea.js', | |
| - 'src/module/fuseSuggestion/bizView/ideaList.js', | |
| - 'src/module/fuseSuggestion/bizView/keyword.js', | |
| - 'src/module/fuseSuggestion/bizView/plan.js', | |
| - 'src/module/fuseSuggestion/bizView/schedule.js', | |
| - 'src/module/fuseSuggestion/bizView/unit.js', | |
| - 'src/module/fuseSuggestion/bizView/wmatch.js', | |
| - 'src/module/fuseSuggestion/common/FuseItem.js', | |
| - 'src/module/fuseSuggestion/common/FuseSuggestion.js', | |
| - 'src/module/fuseSuggestion/config/config.js', | |
| - 'src/module/fuseSuggestion/controller.js', | |
| - 'src/module/fuseSuggestion/dataAdapter.js', | |
| - 'src/module/fuseSuggestion/monitor/monitor.js', | |
| - 'src/module/history/config.js', | |
| - 'src/module/history/history.js', | |
| - 'src/module/history/lib.js', | |
| - 'src/module/kr/common/base.js', | |
| - 'src/module/kr/common/expedition/embed.js', | |
| - 'src/module/kr/common/expedition/index.js', | |
| - 'src/module/kr/common/expedition/monitor.js', | |
| - 'src/module/kr/common/recycle/config.js', | |
| - 'src/module/kr/common/recycle/dialog.js', | |
| - 'src/module/kr/common/traffic/AddTrafficDialog.js', | |
| - 'src/module/kr/new/addwords.js', | |
| - 'src/module/kr/new/advance.js', | |
| - 'src/module/kr/new/autoGroup/AddPlanUnitDlg.js', | |
| - 'src/module/kr/new/autoGroup/AutoGroup.js', | |
| - 'src/module/kr/new/autoGroup/AutoGroupMonitor.js', | |
| - 'src/module/kr/new/autoGroup/AutoGroupView.js', | |
| - 'src/module/kr/new/autoGroup/BreadCrumb.js', | |
| - 'src/module/kr/new/autoGroup/DDManager.js', | |
| - 'src/module/kr/new/autoGroup/PlanUnitSideNav.js', | |
| - 'src/module/kr/new/autoGroup/PlanUnitTreeView.js', | |
| - 'src/module/kr/new/autoGroup/WordGroup.js', | |
| - 'src/module/kr/new/autoGroup/WordTable.js', | |
| - 'src/module/kr/new/autoGroup/autoGroupConf.js', | |
| - 'src/module/kr/new/autoGroup/autoGroupUtil.js', | |
| - 'src/module/kr/new/autounit/autounit.js', | |
| - 'src/module/kr/new/config.js', | |
| - 'src/module/kr/new/device.js', | |
| - 'src/module/kr/new/filter/filter.js', | |
| - 'src/module/kr/new/filter/filterField.js', | |
| - 'src/module/kr/new/index.js', | |
| - 'src/module/kr/new/kr.js', | |
| - 'src/module/kr/new/marquee.js', | |
| - 'src/module/kr/new/monitor.js', | |
| - 'src/module/kr/new/recycle.js', | |
| - 'src/module/kr/new/result.js', | |
| - 'src/module/kr/new/search.js', | |
| - 'src/module/kr/new/seedplayer.js', | |
| - 'src/module/kr/new/tab.js', | |
| - 'src/module/kr/new/toolbar.js', | |
| - 'src/module/kr/new/util.js', | |
| - 'src/module/kr/recommend_word.js', | |
| - 'src/module/marketTrend2.0/area.js', | |
| - 'src/module/marketTrend2.0/business.js', | |
| - 'src/module/marketTrend2.0/control.js', | |
| - 'src/module/marketTrend2.0/index.js', | |
| - 'src/module/marketTrend2.0/moduleBase.js', | |
| - 'src/module/marketTrend2.0/rankRec.js', | |
| - 'src/module/marketTrend2.0/time.js', | |
| - 'src/module/marketTrend2.0/word.js', | |
| - 'src/module/playback/playback.js', | |
| - 'src/module/queryReport/addQuery.js', | |
| - 'src/module/queryReport/addQueryCallback.js', | |
| - 'src/module/queryReport/addQueryNeg.js', | |
| - 'src/module/queryReport/queryReport.js', | |
| - 'src/module/quickSetup/action.js', | |
| - 'src/module/quickSetup/lib/lib_step1.js', | |
| - 'src/module/quickSetup/lib/lib_step2.js', | |
| - 'src/module/quickSetup/lib/lib_step3.js', | |
| - 'src/module/quickSetup/lib/lib_step4.js', | |
| - 'src/module/quickSetup/lib/lib_widget.js', | |
| - 'src/module/quickSetup/lib/slide.js', | |
| - 'src/module/report/cycle.js', | |
| - 'src/module/report/download.js', | |
| - 'src/module/report/lib_report.js', | |
| - 'src/module/report/mail.js', | |
| - 'src/module/report/myReport.js', | |
| - 'src/module/report/report.js', | |
| - 'src/module/schedule/RecmdScheduler.js', | |
| - 'src/module/schedule/ScheduleDlg.js', | |
| - 'src/module/schedule/ScheduleHelper.js', | |
| - 'src/module/schedule/ScheduleMonitor.js', | |
| - 'src/module/schedule/ScheduleOptimizer.js', | |
| - 'src/module/trans/getCode.js', | |
| - 'src/module/trans/newtrans.js', | |
| - 'src/module/trans/trans.js', | |
| - 'src/module/trans/transCheckSingle.js', | |
| - 'src/module/trans/transModify.js', | |
| - 'src/module/trans/transcheck.js', | |
| - 'src/module/trans/translist.js', | |
| - 'src/nirvana/common/auth.js', | |
| - 'src/nirvana/common/bubbleUtil.js', | |
| - 'src/nirvana/common/copyright.js', | |
| - 'src/nirvana/common/inlineHandler.js', | |
| - 'src/nirvana/common/keyword/batchMod.js', | |
| - 'src/nirvana/common/navigation.js', | |
| - 'src/nirvana/init.js', | |
| - 'src/nirvana/manage/bizCommon/SKR/KRCore.js', | |
| - 'src/nirvana/manage/bizCommon/SKR/SKR.js', | |
| - 'src/nirvana/manage/bizCommon/SKR/addWords.js', | |
| - 'src/nirvana/manage/bizCommon/SKR/result.js', | |
| - 'src/nirvana/manage/bizCommon/SKR/search.js', | |
| - 'src/nirvana/manage/bizCommon/SKR/toolbar.js', | |
| - 'src/nirvana/manage/bizCommon/ToolsModule.js', | |
| - 'src/nirvana/manage/bizCommon/account/account.js', | |
| - 'src/nirvana/manage/bizCommon/account/baseSet.js', | |
| - 'src/nirvana/manage/bizCommon/account/exactMatchExp.js', | |
| - 'src/nirvana/manage/bizCommon/account/ipExclusion/advancedIpExclusion.js', | |
| - 'src/nirvana/manage/bizCommon/account/ipExclusion/ipExclusion.js', | |
| - 'src/nirvana/manage/bizCommon/account/otherSetting.js', | |
| - 'src/nirvana/manage/bizCommon/accurateNegative.js', | |
| - 'src/nirvana/manage/bizCommon/budget.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/app/appIdeaEdit.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/app/appToMultiEdit.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/appendIdea.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/common/config/config.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/common/config/copyAppendIdeaDiff.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/common/lib.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/common/validator.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/commonOld/appendIdeaEditPrototype.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/copy/copyAppendIdea.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/copy/copyAppendIdeaLib.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/ecall/config.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/sublink/lib.js', | |
| - 'src/nirvana/manage/bizCommon/idea/appendIdea/sublink/sublinkIdeaEdit.js', | |
| - 'src/nirvana/manage/bizCommon/idea/basicIdea/ideaReplace/ideaReplace.js', | |
| - 'src/nirvana/manage/bizCommon/idea/basicIdea/modUrl.js', | |
| - 'src/nirvana/manage/bizCommon/idea/common/preview.js', | |
| - 'src/nirvana/manage/bizCommon/idea/config/ideaDifference.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/aoPackage.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/config.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/deviceOptLib.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/fillIdea.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/form.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/formConfig.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/lib.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/lineBreak.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/log.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/save.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/validate.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/common/wildCard.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editBasicIdea/edit.js', | |
| - 'src/nirvana/manage/bizCommon/idea/editSimple/editSimple.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/add.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/addError.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/modWordPrice.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/modWordUrl.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/modWordWmatch.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/moniKeyword.js', | |
| - 'src/nirvana/manage/bizCommon/keyword/transfer.js', | |
| - 'src/nirvana/manage/bizCommon/monitor/addFolder.js', | |
| - 'src/nirvana/manage/bizCommon/monitor/addMoniWords.js', | |
| - 'src/nirvana/manage/bizCommon/monitor/common.js', | |
| - 'src/nirvana/manage/bizCommon/negative.js', | |
| - 'src/nirvana/manage/bizCommon/offlineReason.js', | |
| - 'src/nirvana/manage/bizCommon/plan/advancedSet.js', | |
| - 'src/nirvana/manage/bizCommon/plan/baseSet.js', | |
| - 'src/nirvana/manage/bizCommon/plan/createPlan.js', | |
| - 'src/nirvana/manage/bizCommon/plan/lib.js', | |
| - 'src/nirvana/manage/bizCommon/plan/mPriceFactor.js', | |
| - 'src/nirvana/manage/bizCommon/plan/modShowprob.js', | |
| - 'src/nirvana/manage/bizCommon/plan/setDynamicIdea.js', | |
| - 'src/nirvana/manage/bizCommon/plan/setQrstat.js', | |
| - 'src/nirvana/manage/bizCommon/region.js', | |
| - 'src/nirvana/manage/bizCommon/similarWords.js', | |
| - 'src/nirvana/manage/bizCommon/unit/createUnit.js', | |
| - 'src/nirvana/manage/bizCommon/unit/modUnitMPriceFactor.js', | |
| - 'src/nirvana/manage/bizCommon/unit/modUnitPrice.js', | |
| - 'src/nirvana/manage/bizCommon/unit/phoneTrail.js', | |
| - 'src/nirvana/manage/bizCommon/unit/rename.js', | |
| - 'src/nirvana/manage/bizCommon/userDefine.js', | |
| - 'src/nirvana/manage/bizCommon/account/dynamicIdea.js', | |
| - 'src/nirvana/manage/common/batch.js', | |
| - 'src/nirvana/manage/common/crumbs.js', | |
| - 'src/nirvana/manage/common/filterControl.js', | |
| - 'src/nirvana/manage/common/manage.js', | |
| - 'src/nirvana/manage/common/searchShortcut.js', | |
| - 'src/nirvana/manage/common/tab.js', | |
| - 'src/nirvana/manage/config/LXBStat.js', | |
| - 'src/nirvana/manage/config/bubble.js', | |
| - 'src/nirvana/manage/config/externalLink.js', | |
| - 'src/nirvana/manage/idea/appendIdea/app/app.js', | |
| - 'src/nirvana/manage/idea/appendIdea/appendIdea.js', | |
| - 'src/nirvana/manage/idea/appendIdea/bridge/bridge.js', | |
| - 'src/nirvana/manage/idea/appendIdea/common/appendIdeaCommon.js', | |
| - 'src/nirvana/manage/idea/appendIdea/common/config.js', | |
| - 'src/nirvana/manage/idea/appendIdea/common/lib.js', | |
| - 'src/nirvana/manage/idea/appendIdea/ecall/ecall.js', | |
| - 'src/nirvana/manage/idea/appendIdea/phone/phone.js', | |
| - 'src/nirvana/manage/idea/appendIdea/sublink/sublink.js', | |
| - 'src/nirvana/manage/idea/basicIdea/idea.js', | |
| - 'src/nirvana/manage/idea/basicIdea/lib.js', | |
| - 'src/nirvana/manage/idea/common/config.js', | |
| - 'src/nirvana/manage/idea/common/ideaLib.js', | |
| - 'src/nirvana/manage/idea/common/ideaPublic.js', | |
| - 'src/nirvana/manage/idea/common/tableField.js', | |
| - 'src/nirvana/manage/keyword/keyword.js', | |
| - 'src/nirvana/manage/manage.js', | |
| - 'src/nirvana/manage/monitor/monitorDetail.js', | |
| - 'src/nirvana/manage/monitor/monitorList.js', | |
| - 'src/nirvana/manage/plan/plan.js', | |
| - 'src/nirvana/manage/unit/unit.js', | |
| - 'src/nirvana/newManage/common/ManageView.js', | |
| - 'src/nirvana/newManage/common/TableModel.js', | |
| - 'src/nirvana/newManage/common/materialCtrl.js', | |
| - 'src/nirvana/newManage/config/config.js', | |
| - 'src/nirvana/newManage/config/erConfig.js', | |
| - 'src/nirvana/newManage/manage.js', | |
| - 'src/nirvana/newManage/plan/plan.js', | |
| - 'src/nirvana/nirvana.js', | |
| - 'src/nirvana/ui/PlanUnitEditDlg.js', | |
| - 'src/tool/adpreview/oldAdPreview/main.js', | |
| - '../../library/src/edp/build/CdnReplacer.js', | |
| - '../../library/src/edp/build/FlagCompiler.js', | |
| - '../../library/src/edp/util.js' | |
| -]; | |
| \ No newline at end of file | |
| + '!module-compiler-exclude.js', | |
| + '!dep/echarts/*/src/util/mapData/rawData/**/*.js', | |
| + '!dep/jquery.cookie/*/*.js', | |
| + '!src/aoPackage/{actionConfig,aoPkgControl,config,logCenter}.js', | |
| + '!src/bizCommon/keyword/discount/discountWordUtil.js', | |
| + '!src/common/esl/esl.js', | |
| + '!src/{accountOptimizer,resource}/**/*.js', | |
| + '!src/core/acc/**/*.js', | |
| + | |
| + '!src/core/bizCommon/**/*.js', | |
| + // '!src/core/bizCommon/qEcharts.js' | |
| + | |
| + '!src/core/{config,common,lib,service}/*.js', | |
| + '!src/core/service/common/*.js', | |
| + '!src/core/service/test/**/*.js', | |
| + | |
| + '!src/core/ui_1.0/{ui,UIBase}.js', | |
| + '!src/core/ui_1.0/{base,common}/*.js', | |
| + '!src/core/ui_1.0/extension/**/*.js', | |
| + | |
| + '!src/core/ui_1.1/{ui,Base}.js', | |
| + '!src/core/ui_1.1/{base,config,extension}/*.js', | |
| + | |
| + '!src/fclab/abtest/**/*.js', | |
| + '!src/fclab/{index,module}.js', | |
| + '!src/fclab/{common,cpa,ui,home,service}/*.js', | |
| + | |
| + '!src/message/**/*.js', | |
| + // 'src/message/main.js', | |
| + | |
| + '!src/module/{' + | |
| + 'accountScore,' + | |
| + 'bidEstimator,' + | |
| + 'effectAnalyse,' + | |
| + 'feedback,' + | |
| + 'fuseSuggestion,' + | |
| + 'history,kr,' + | |
| + 'marketTrend2.0,' + | |
| + 'playback,' + | |
| + 'queryReport,' + | |
| + 'quickSetup,' + | |
| + 'report,' + | |
| + 'schedule,' + | |
| + 'trans}/**/*.js', | |
| + | |
| + '!src/nirvana/{common,newManage}/**/*.js', | |
| + | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/app/appIdeaEdit.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/app/appToMultiEdit.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/appendIdea.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/common/config/config.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/common/config/copyAppendIdeaDiff.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/common/lib.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/common/validator.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/commonOld/appendIdeaEditPrototype.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/copy/copyAppendIdea.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/copy/copyAppendIdeaLib.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/ecall/config.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/sublink/lib.js', | |
| + '!src/nirvana/manage/bizCommon/idea/appendIdea/sublink/sublinkIdeaEdit.js', | |
| + '!src/nirvana/manage/bizCommon/idea/basicIdea/ideaReplace/ideaReplace.js', | |
| + '!src/nirvana/manage/bizCommon/idea/basicIdea/modUrl.js', | |
| + '!src/nirvana/manage/bizCommon/idea/common/preview.js', | |
| + '!src/nirvana/manage/bizCommon/idea/config/ideaDifference.js', | |
| + '!src/nirvana/manage/bizCommon/idea/editBasicIdea/edit.js', | |
| + '!src/nirvana/manage/bizCommon/idea/editSimple/editSimple.js', | |
| + | |
| + '!src/nirvana/manage/bizCommon/*.js', | |
| + '!src/nirvana/manage/bizCommon/account/**/*.js', | |
| + '!src/nirvana/manage/bizCommon/{monitor,plan,unit,keyword,SKR}/*.js', | |
| + '!src/nirvana/manage/bizCommon/idea/editBasicIdea/common/*.js', | |
| + | |
| + '!src/nirvana/*.js', | |
| + '!src/nirvana/{manage,ui}/*.js', | |
| + '!src/nirvana/manage/{monitor,plan,unit,keyword,idea,config,common}/**/*.js', | |
| + | |
| + '!src/tool/adpreview/oldAdPreview/main.js', | |
| + '!../../library/src/edp/**/*.js', | |
| +]; | |
| Index: module.conf | |
| =================================================================== | |
| --- module.conf (revision 96514) | |
| +++ module.conf (working copy) | |
| @@ -1,99 +1,91 @@ | |
| { | |
| "baseUrl": "src", | |
| "paths": { | |
| - "css": "src/common/esl/css", | |
| - "js": "src/common/esl/js", | |
| - "text": "src/common/esl/text", | |
| - "tpl": "src/common/esl/tpl", | |
| - "jstpl": "src/common/esl/jstpl", | |
| - "flags": "src/common/flags/flags" | |
| + "css": "common/esl/css", | |
| + "js": "common/esl/js", | |
| + "text": "common/esl/text", | |
| + "tpl": "common/esl/tpl", | |
| + "jstpl": "common/esl/jstpl", | |
| + "flags": "common/flags/flags" | |
| }, | |
| "packages": [ | |
| { | |
| "name": "echarts", | |
| - "location": "dep/echarts/1.3.6/src", | |
| + "location": "../dep/echarts/1.3.6/src", | |
| "main": "echarts" | |
| }, | |
| { | |
| "name": "zrender", | |
| - "location": "dep/zrender/1.0.8/src", | |
| + "location": "../dep/zrender/1.0.8/src", | |
| "main": "zrender" | |
| }, | |
| { | |
| "name": "er", | |
| - "location": "dep/er/3.1.0-alpha.8/src", | |
| + "location": "../dep/er/3.1.0-alpha.8/src", | |
| "main": "main" | |
| }, | |
| { | |
| "name": "etpl", | |
| - "location": "dep/etpl/2.0.8/src", | |
| + "location": "../dep/etpl/2.0.8/src", | |
| "main": "main" | |
| }, | |
| { | |
| "name": "mini-event", | |
| - "location": "dep/mini-event/1.0.0/src", | |
| + "location": "../dep/mini-event/1.0.0/src", | |
| "main": "main" | |
| }, | |
| { | |
| "name": "jquery.cookie", | |
| - "location": "dep/jquery.cookie/1.4.0", | |
| + "location": "../dep/jquery.cookie/1.4.0", | |
| "main": "jquery.cookie.js" | |
| }, | |
| { | |
| "name": "ef", | |
| - "location": "dep/ef/3.1.0-alpha.3/src", | |
| + "location": "../dep/ef/3.1.0-alpha.3/src", | |
| "main": "main" | |
| }, | |
| { | |
| "name": "underscore", | |
| - "location": "dep/underscore/1.5.2/src", | |
| + "location": "../dep/underscore/1.5.2/src", | |
| "main": "underscore" | |
| }, | |
| { | |
| "name": "esui", | |
| - "location": "dep/esui/3.1.0-alpha.8/src", | |
| + "location": "../dep/esui/3.1.0-alpha.8/src", | |
| "main": "main" | |
| }, | |
| { | |
| "name": "moment", | |
| - "location": "dep/moment/2.0.1/src", | |
| + "location": "../dep/moment/2.0.1/src", | |
| "main": "moment" | |
| }, | |
| { | |
| "name": "library", | |
| - "location": "../../library/src", | |
| + "location": "../../../library/src", | |
| "main": "main" | |
| } | |
| ], | |
| "combine": { | |
| "main": { | |
| - "exclude": [ | |
| - "../debug/main" | |
| + "files": [ | |
| + "!../debug/main" | |
| ] | |
| }, | |
| "easyManage/main": { | |
| - "exclude": [ | |
| - "module/accountQualityScore", | |
| - "tool/*", | |
| - "tool/*/*", | |
| - "echarts/chart/*" | |
| + "files": [ | |
| + "!module/accountQualityScore", | |
| + "!tool/**", | |
| + "!echarts/chart/*" | |
| ] | |
| }, | |
| - "tool/main": { | |
| - "exclude": [] | |
| - }, | |
| + "tool/main": {}, | |
| "aoPackage/main": {}, | |
| - "fclab/bidinsight/main": { | |
| - "exclude": [] | |
| - }, | |
| + "fclab/bidinsight/main": {}, | |
| "module/accountQualityScore": { | |
| - "exclude": [ | |
| - "aoPackage/*", | |
| - "aoPackage/*/*", | |
| - "easyManage/*", | |
| - "easyManage/*/*", | |
| - "easyManage/*/*/*" | |
| + "files": [ | |
| + "!aoPackage/**", | |
| + "!easyManage/**" | |
| ] | |
| } | |
| } | |
| -} | |
| \ No newline at end of file | |
| +} | |
| Index: src/accountOptimizer/main.js | |
| =================================================================== | |
| --- src/accountOptimizer/main.js (revision 96514) | |
| +++ src/accountOptimizer/main.js (working copy) | |
| @@ -1,5 +1,5 @@ | |
| /** | |
| - * 该文件定义所有最终要打成一个模块文件的所有依赖文件，对于js!的依赖文件 | |
| + * 该文件定义所有最终要打成一个模块文件的所有依赖文件，对于js的依赖文件 | |
| * 最后这个文件会被完成替换成所有js文件的合并：main_version.js | |
| * | |
| * @author [email protected] | |
| Index: src/aoPackage/tpl.js | |
| =================================================================== | |
| --- src/aoPackage/tpl.js (revision 96514) | |
| +++ src/aoPackage/tpl.js (working copy) | |
| @@ -4,7 +4,7 @@ | |
| * path: aoPackage/tpl.js | |
| * desc: 优化包用到的所有模板定义：在这里定义，主要为了便于后续build时候能把这些模板打到一个文件里 | |
| * 最后这个文件会被完成替换成所有模板文件的合并：tpl_version.html (注意后缀发生了变化) | |
| - * 外部require id变成：require(['tpl!aoPackage/tpl_version.html']) | |
| + * 外部require id变成：require(['tpl！aoPackage/tpl_version.html']) | |
| * author: Wu Huiyao([email protected]) | |
| * date: $Date: 2013/07/29 $ | |
| */ | |
| @@ -30,4 +30,4 @@ | |
| require('tpl!aoPackage/recmword2/recmwordPkg.html'); | |
| require('tpl!aoPackage/season/seasonPkg.html'); | |
| require('tpl!aoPackage/roi/ROIPkg.html'); | |
| -}); | |
| \ No newline at end of file | |
| +}); | |
| Index: src/fclab/css/css.js | |
| =================================================================== | |
| --- src/fclab/css/css.js (revision 96514) | |
| +++ src/fclab/css/css.js (working copy) | |
| @@ -1,8 +1,8 @@ | |
| /** | |
| - * 该文件定义所有最终要打成一个文件的所有依赖文件，对于css!的依赖文件 | |
| + * 该文件定义所有最终要打成一个文件的所有依赖文件，对于css的依赖文件 | |
| * 最后这个文件会被完成替换成所有css文件的合并：css_version.css | |
| * | |
| - * 外部require id变成：require(['css!fclab/css/css_version.css']) | |
| + * 外部require id变成：require(['css！fclab/css/css_version.css']) | |
| * | |
| * @author [email protected] | |
| * @date 20130807 | |
| @@ -11,4 +11,4 @@ | |
| require('css!fclab/css/base.css'); | |
| require('css!fclab/css/cpa.css'); | |
| require('css!fclab/css/abtest.css'); | |
| -}); | |
| \ No newline at end of file | |
| +}); | |
| Index: src/fclab/main.js | |
| =================================================================== | |
| --- src/fclab/main.js (revision 96514) | |
| +++ src/fclab/main.js (working copy) | |
| @@ -1,8 +1,8 @@ | |
| /** | |
| - * 该文件定义所有最终要打成一个模块文件的所有依赖文件，对于js!的依赖文件 | |
| + * 该文件定义所有最终要打成一个模块文件的所有依赖文件，对于js的依赖文件 | |
| * 最后这个文件会被完成替换成所有js文件的合并：main_version.js | |
| * | |
| - * 外部require id变成：require(['js!fclab/main_version.js']) | |
| + * 外部require id变成：require(['js！fclab/main_version.js']) | |
| * | |
| * @author [email protected] | |
| * @date 20130807 | |
| @@ -50,4 +50,4 @@ | |
| require('js!fclab/cpa/cpaToolsOld.js'); | |
| require('js!fclab/cpa/cpaTools.js'); | |
| require('js!fclab/cpa/cpaReports.js'); | |
| -}); | |
| \ No newline at end of file | |
| +}); | |
| Index: src/message/main.js | |
| =================================================================== | |
| --- src/message/main.js (revision 96514) | |
| +++ src/message/main.js (working copy) | |
| @@ -1,8 +1,8 @@ | |
| /** | |
| - * 该文件定义所有最终要打成一个模块文件的所有依赖文件，对于js!的依赖文件 | |
| + * 该文件定义所有最终要打成一个模块文件的所有依赖文件，对于js的依赖文件 | |
| * 最后这个文件会被完成替换成所有js文件的合并：main_version.js | |
| * | |
| - * 外部require id变成：require(['js!message/main_version.js']) | |
| + * 外部require id变成：require(['js！message/main_version.js']) | |
| * | |
| * @author [email protected] | |
| * @date 20130807 | |
| @@ -17,4 +17,4 @@ | |
| require('js!message/miptList.js'); | |
| require('js!message/msgCenter/messageBox.js'); | |
| require('js!message/msgCenter/messagePlans.js'); | |
| -}); | |
| \ No newline at end of file | |
| +}); | |
| Index: src/message/tpl.js | |
| =================================================================== | |
| --- src/message/tpl.js (revision 96514) | |
| +++ src/message/tpl.js (working copy) | |
| @@ -2,7 +2,7 @@ | |
| * 该文件定义所有最终要打成一个文件的所有依赖模板 | |
| * 最后这个文件会被完成替换成所有模板文件的合并：tpl_version.html (注意后缀发生了变化) | |
| * | |
| - * 外部require id变成：require(['tpl!message/tpl_version.html']) | |
| + * 外部require id变成：require(['tpl！message/tpl_version.html']) | |
| * | |
| * @author [email protected] | |
| * @date 20130807 | |
| @@ -11,4 +11,4 @@ | |
| require('tpl!message/html/message.html'); | |
| require('tpl!message/html/messageBox.html'); | |
| require('tpl!message/html/messagePlans.html'); | |
| -}); | |
| \ No newline at end of file | |
| +}); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment