diff --git a/package.json b/package.json index a53931d..4efc4bf 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "fis": "1.9.45", "fis-parser-bdtmpl": "0.0.3", "fis-parser-less": "0.1.2", - "fis3": "3.3.25", + "fis3": "3.3.28", "fis3-hook-commonjs": "0.1.12", "fis3-parser-typescript": "0.2.2", "liftoff": "2.1.0", diff --git a/yog2-fis3.js b/yog2-fis3.js index e08276e..38d9d30 100644 --- a/yog2-fis3.js +++ b/yog2-fis3.js @@ -1,3 +1,5 @@ +'use strict'; + var fis = module.exports = require('fis3'); var path = require('path'); fis.require.prefixes.unshift('yog2'); @@ -13,6 +15,18 @@ fis.set('static', '/static'); fis.set('config', '/conf'); fis.set('component.dir', '/client/components'); fis.set('project.fileType.text', 'es,ts,tsx,jsx'); +fis.set('project.ignore', [ + 'issue.info', + 'README.md', + 'BCLOUD', + 'GIT_COMMIT', + 'fis.yml', + 'cooder', + 'build.sh', + 'component.json', + 'output/**', + 'fis-conf.js' +]); var clientRoadmap = { // all release to $static dir @@ -95,6 +109,10 @@ var serverRoadmap = { target: 2 }), rExt: 'js' + }, + '{node_modules/**,package.json}': { + useCompile: false, + release: 'app/${namespace}/$0' } }; diff --git a/yog2.js b/yog2.js index 86d4b8f..414df9a 100755 --- a/yog2.js +++ b/yog2.js @@ -23,6 +23,19 @@ fis.config.set('modules.preprocessor.tpl', 'components, extlang'); fis.config.set('modules.postprocessor.tpl', 'require-async'); fis.config.set('modules.postprocessor.js', 'jswrapper, require-async'); +fis.config.set('project.ignore', [ + 'issue.info', + 'README.md', + 'BCLOUD', + 'GIT_COMMIT', + 'fis.yml', + 'cooder', + 'build.sh', + 'component.json', + 'output/**', + 'fis-conf.js' +]); + // hack for server es compile fis.config.set('typescript.server.target', 2); @@ -114,6 +127,10 @@ var serverRoadmap = [{ useHash: false, useDomain: false, release: '${app}/${namespace}/$1' +}, { + reg:/(^\/node_modules\/(.*)|^\/package\.json)/, + useCompile: false, + release: 'app/${namespace}/$&' }]; var commonRoadmap = [{