fix(eslint): 修复eslint无法extend, 提供lint设置接口

Author: yuhaoju

.gitignore

@@ -35,3 +35,5 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+cache

lib/models/Project.js

@@ -30,7 +30,7 @@ var Project = function () {
             cwd: this.cwd
         })[0] || '';
         this.extendConfig = this.configFile && this.configFile.match(/ykit\.([\w\.]+)\.js/) && this.configFile.match(/ykit\.([\w\.]+)\.js/)[1] && this.configFile.match(/ykit\.([\w\.]+)\.js/)[1].replace(/\./g, '-');
-        this.ignores = ["node_modules/**/*", "bower_components/**/*", "dev/**/*", "prd/**/*"];
+        this.ignores = ["node_modules/**/*", "bower_components/**/*", "dev/**/*", "prd/**/*", ".ykit_cache/**/*"];
         this.cachePath = this._isCacheDirExists(cwd) || '';
 
         this.readConfig();
@@ -48,6 +48,16 @@ var Project = function () {
                 this.commands = this.commands.concat(nextCommands);
             }
         }
+    }, {
+        key: 'setEslintConfig',
+        value: function setEslintConfig(projectEslintConfig) {
+            extend(true, this.eslintConfig, projectEslintConfig);
+        }
+    }, {
+        key: 'setStylelintConfig',
+        value: function setStylelintConfig(projectStylelintConfig) {
+            extend(true, this.stylelintConfig, projectStylelintConfig);
+        }
     }, {
         key: 'readConfig',
         value: function readConfig(options) {
@@ -64,6 +74,8 @@ var Project = function () {
                     setGroupExports: this.config.setGroupExports.bind(this.config),
                     setSync: this.config.setSync.bind(this.config),
                     setCommands: this.setCommands.bind(this),
+                    setEslintConfig: this.setEslintConfig.bind(this),
+                    setStylelintConfig: this.setStylelintConfig.bind(this),
                     config: this.config.getConfig(),
                     commands: this.commands,
                     middlewares: this.middlewares,
@@ -222,16 +234,22 @@ var Project = function () {
     }, {
         key: 'lint',
         value: function lint(dir, callback) {
+            warn('Linting JS Files ...');
+
             var CLIEngine = require('eslint').CLIEngine;
 
-            warn('Linting JS Files ...');
-            this.eslintConfig.useEslintrc = false;
+            // 如果有本地eslint优先使用本地eslint
+            if (requireg(sysPath.join(this.cwd, 'node_modules/', 'eslint'))) {
+                CLIEngine = requireg(sysPath.join(this.cwd, 'node_modules/', 'eslint')).CLIEngine;
+            }
 
-            extend(true, this.eslintConfig, this.config._config.eslintConfig);
+            // prepare eslint config file
+            var configFilePath = sysPath.join(__dirname, '../../cache', '.eslintrc.json');
+            fs.writeFileSync(configFilePath, JSON.stringify(this.eslintConfig));
+            this.eslintConfig.useEslintrc = false;
+            this.eslintConfig.configFile = configFilePath;
 
-            var cliengine = this.eslintConfig.linter || CLIEngine,
-                // 优先使用项目配置的linter
-            cli = new cliengine(this.eslintConfig),
+            var cli = new CLIEngine(this.eslintConfig),
                 report = cli.executeOnFiles(this._getLintFiles(dir, 'js')),
                 formatter = cli.getFormatter();
 

src/models/Project.js

@@ -25,7 +25,7 @@ class Project {
                             && this.configFile.match(/ykit\.([\w\.]+)\.js/)
                             && this.configFile.match(/ykit\.([\w\.]+)\.js/)[1]
                             && this.configFile.match(/ykit\.([\w\.]+)\.js/)[1].replace(/\./g, '-');
-        this.ignores = ["node_modules/**/*", "bower_components/**/*", "dev/**/*", "prd/**/*"];
+        this.ignores = ["node_modules/**/*", "bower_components/**/*", "dev/**/*", "prd/**/*", ".ykit_cache/**/*"];
         this.cachePath = this._isCacheDirExists(cwd) || ''
 
         this.readConfig();
@@ -38,6 +38,12 @@ class Project {
             this.commands = this.commands.concat(nextCommands)
         }
     }
+    setEslintConfig(projectEslintConfig) {
+        extend(true, this.eslintConfig, projectEslintConfig);
+    }
+    setStylelintConfig(projectStylelintConfig) {
+        extend(true, this.stylelintConfig, projectStylelintConfig);
+    }
     readConfig(options) {
         if (this.check()) {
             let userConfig = {
@@ -50,6 +56,8 @@ class Project {
                 setGroupExports: this.config.setGroupExports.bind(this.config),
                 setSync: this.config.setSync.bind(this.config),
                 setCommands: this.setCommands.bind(this),
+                setEslintConfig: this.setEslintConfig.bind(this),
+                setStylelintConfig: this.setStylelintConfig.bind(this),
                 config: this.config.getConfig(),
                 commands: this.commands,
                 middlewares: this.middlewares,
@@ -199,15 +207,25 @@ class Project {
     }
 
     lint(dir, callback) {
-        const CLIEngine = require('eslint').CLIEngine;
-
         warn('Linting JS Files ...');
-        this.eslintConfig.useEslintrc = false;
 
-        extend(true, this.eslintConfig, this.config._config.eslintConfig);
+        let CLIEngine = require('eslint').CLIEngine;
+
+        // 如果有本地eslint优先使用本地eslint
+        if(requireg(sysPath.join(this.cwd, 'node_modules/', 'eslint'))){
+            CLIEngine = requireg(sysPath.join(this.cwd, 'node_modules/', 'eslint')).CLIEngine
+        }
+
+        // prepare eslint config file
+        const configFilePath = sysPath.join(__dirname, '../../cache' ,'.eslintrc.json')
+        fs.writeFileSync(
+            configFilePath,
+            JSON.stringify(this.eslintConfig)
+        );
+        this.eslintConfig.useEslintrc = false
+        this.eslintConfig.configFile = configFilePath
 
-        const cliengine = this.eslintConfig.linter || CLIEngine, // 优先使用项目配置的linter
-            cli = new cliengine(this.eslintConfig),
+        const cli = new CLIEngine(this.eslintConfig),
             report = cli.executeOnFiles(this._getLintFiles(dir, 'js')),
             formatter = cli.getFormatter();