From af5d55accf7f17b08aa1d725842f745622631e9a Mon Sep 17 00:00:00 2001 From: zdy350 <276199037@qq.com> Date: Fri, 2 Jun 2017 19:42:51 +0800 Subject: [PATCH 01/37] Dev (#737) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove redundant code in line 322 line 322 is same to line 330 * 添加encoding插件文档 * Update intro.md add ？ * Update config-props.md * Update uri.md (#872) 删除示例代码中误加的语句 * Update release.md 片段编译 * Update build.md typo * 补充es6配置 对translate-es6的配置使用进行更正 * Update config.md (#1049) * 修正Laravel拼写错误 看来PHPer并不怎么用FIS3？ * Update config-props.md --- doc/docs/INDEX.md | 2 +- doc/docs/api/config-props.md | 13 +++++++++++++ doc/docs/api/config.md | 2 +- doc/docs/beginning/release.md | 18 ++++++++++++++++++ doc/docs/build.md | 2 +- doc/docs/lv2.md | 8 ++++++-- doc/docs/user-dev/uri.md | 1 - 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/doc/docs/INDEX.md b/doc/docs/INDEX.md index 77a85d366..5df775724 100644 --- a/doc/docs/INDEX.md +++ b/doc/docs/INDEX.md @@ -44,7 +44,7 @@ - [解决方案封装](./lv3.md#解决方案封装) - [基于Smarty的解决方案](./lv3.md#基于Smarty的解决方案) - [基于纯PHP的解决方案](./lv3.md#基于纯PHP的解决方案) - - [基于Laveral的解决方案](./lv3.md#基于Laveral的解决方案) + - [基于Laravel的解决方案](./lv3.md#基于Laravel的解决方案) - 接口文档 - [命令行](./api/command.md) - [配置](./api/config.md) diff --git a/doc/docs/api/config-props.md b/doc/docs/api/config-props.md index a6eddb809..e2e6401e0 100644 --- a/doc/docs/api/config-props.md +++ b/doc/docs/api/config-props.md @@ -133,6 +133,7 @@ fis3 以文件属性控制文件的编译合并以及各种操作；文件属性 - [requires](#requires) - [useSameNameRequire](#useSameNameRequire) - [useCache](#useCache) +- [useCompile](#useCompile) #### release * 解释：设置文件的产出路径。默认是文件相对项目根目录的路径，以 / 开头。该值可以设置为 false ，表示为不产出（unreleasable）文件。 @@ -401,6 +402,18 @@ fis.match('/mod.js', { }); ``` +#### useCompile +* 注释： FIS是否对文件进行编译 +* 值类型：`bool` +* 默认值： `true` +* 说明：设置为 `false` 后文件会通过FIS发布，但是FIS不对文件做任何修改 + + ```js + fis.match('**.html', { + useCompile: false + }); + ``` + ### 插件属性 插件属性决定了匹配的文件进行哪些插件的处理； diff --git a/doc/docs/api/config.md b/doc/docs/api/config.md index 259e50465..6467c34e5 100644 --- a/doc/docs/api/config.md +++ b/doc/docs/api/config.md @@ -90,7 +90,7 @@ fis.match('a.js', { optimizer: null }) ``` -这样的设置下，当 `a.js` 处理使还是会被调用压缩器进行压缩； +这样的设置下，当 `a.js` 处理时还是会被调用压缩器进行压缩； ### ::package diff --git a/doc/docs/beginning/release.md b/doc/docs/beginning/release.md index 322ab191e..2d2d1d0d1 100644 --- a/doc/docs/beginning/release.md +++ b/doc/docs/beginning/release.md @@ -258,6 +258,24 @@ fis3 release -d ../output ![](./img/demo-hash-css-diff.png) - 对应 url 也带上了 md5 戳 +### 片段编译 + +有些插件会对文件中的一部分先进行片段编译`fis.compile.partial`, 这时可以对相应的片段编译配置对应的规则。 + +``` +// vue组件中的less片段处理 +fis.match('src/vue/**.vue:less', { + rExt: 'css', + parser: fis.plugin('less'), + release: 'xxx' // 这个无效 +}); + +// 注意：因为组件中的样式片段编译只是编译内容，所以上面的release配置是无效的。要配置其release，需要针对生成的css文件： +fis.match('src/vue/(**.css)', { + release: '/vue-style/$1' +}); +``` + ### 压缩资源 为了减少资源网络传输的大小，通过压缩器对 js、css、图片进行压缩是一直以来前端工程优化的选择。在 FIS3 中这个过程非常简单，通过给文件配置压缩器即可。 diff --git a/doc/docs/build.md b/doc/docs/build.md index a61d08fd5..9c88c672f 100644 --- a/doc/docs/build.md +++ b/doc/docs/build.md @@ -42,7 +42,7 @@ fis.release = function (opt) { } ``` -如上述代码，整个 FIS3 的构建流程大题概括分为三个阶段。 +如上述代码，整个 FIS3 的构建流程大体概括分为三个阶段。 1. 扫描项目目录拿到文件并初始化出一个文件对象列表 2. 对文件对象中每一个文件进行[单文件编译](#单文件编译流程) diff --git a/doc/docs/lv2.md b/doc/docs/lv2.md index cfbb27e88..d7369972c 100644 --- a/doc/docs/lv2.md +++ b/doc/docs/lv2.md @@ -46,7 +46,9 @@ my-proj/node_modules/fis3-parser-translate-es6/index.js ```js // vi index.js -// babel node.js api 只需要 babel-core 即可 +// babel node.js api 只有 babel-core 不能完成翻译 +// babel-core 需要安装依赖 babel-preset-es2015 +// 参考: 阮一峰的es6入门 http://es6.ruanyifeng.com/#docs/intro var babel = require('babel-core'); module.exports = function (content, file, options) { var result = babel.transform(content, opts); @@ -69,7 +71,9 @@ my-proj/index.html ```js fis.match('*.es6', { - parser: fis.plugin('translate-es6'), + parser: fis.plugin('translate-es6', { + presets: ['es2015'] + }), rExt: '.js' // .es6 最终修改其后缀为 .js }) ``` diff --git a/doc/docs/user-dev/uri.md b/doc/docs/user-dev/uri.md index 06c668b0f..1b0177f9c 100644 --- a/doc/docs/user-dev/uri.md +++ b/doc/docs/user-dev/uri.md @@ -319,7 +319,6 @@ fis.match('/images/(*.{png,gif})', { ```css .style { background: url('images/body-bg.png'); - background: url('/static/pic/body-bg_1b8c3e0.png'); } ``` From 07906c08b5247672250ba147ae2f1e935871691b Mon Sep 17 00:00:00 2001 From: Fangshi He Date: Fri, 2 Jun 2017 19:44:17 +0800 Subject: [PATCH 02/37] Dev (#1137) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove redundant code in line 322 line 322 is same to line 330 * 添加encoding插件文档 * Update intro.md add ？ * Update config-props.md * Update uri.md (#872) 删除示例代码中误加的语句 * Update release.md 片段编译 * Update build.md typo * 补充es6配置 对translate-es6的配置使用进行更正 * Update config.md (#1049) * 修正Laravel拼写错误 看来PHPer并不怎么用FIS3？ * Update config-props.md From f41a541fc1b1cf77e6e334cc43033c7c14b16b3b Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Fri, 14 Jul 2017 09:56:50 +0800 Subject: [PATCH 03/37] [UPDATE] fix README.md syntax --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1db28c7e9..9191f6715 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ npm install -g fis3 ## 例子 -``` +```bash mkdir my-proj cd my-proj fis3 init @@ -73,12 +73,12 @@ https://github.com/fex-team/fis3-demo ## 常用插件 -###优化类（插件属性：optimizer） +### 优化类（插件属性：optimizer） - [fis-optimizer-uglify-js](https://www.npmjs.com/package/fis-optimizer-uglify-js) UglifyJS2 压缩插件 - [fis-optimizer-clean-css](https://www.npmjs.com/package/fis-optimizer-clean-css) CleanCss 压缩插件 - [fis-optimizer-png-compressor](https://www.npmjs.com/package/fis-optimizer-png-compressor) PNG 压缩插件 -###预处理类（插件属性：parser） +### 预处理类（插件属性：parser） - [fis-parser-less](https://www.npmjs.com/package/fis-parser-less) less 解析插件 - [fis-parser-node-sass](https://www.npmjs.com/package/fis-parser-node-sass) sass / scss 解析插件 - [fis-parser-handlebars](https://www.npmjs.com/package/fis-parser-handlebars) handlebars 解析插件 From d549bd9216f510d88f3d31a8ca20ac6c3e9f7c4d Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Tue, 25 Jul 2017 14:59:38 +0800 Subject: [PATCH 04/37] version + 1 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 81ecd564c..519b33527 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.33", + "version": "3.4.34", "description": "fis 3.0", "main": "index.js", "bin": { @@ -24,9 +24,9 @@ "fis-spriter-csssprites": "0.3.11", "fis3-command-init": "1.0.14", "fis3-command-inspect": "1.0.3", - "fis3-command-release": "1.3.13", + "fis3-command-release": "1.3.14", "fis3-command-server": "0.0.9", - "fis3-server-node": "0.1.1", + "fis3-server-node": "0.1.2", "fis3-deploy-http-push": "2.0.6", "fis3-deploy-encoding": "1.0.0", "fis3-deploy-local-deliver": "1.0.0", From f005cc986ae22268f007ce9d5d3bcfb6e81b167e Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Mon, 4 Sep 2017 14:41:32 +0800 Subject: [PATCH 05/37] Update util.js --- lib/util.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util.js b/lib/util.js index 961c710bb..6b5146eae 100644 --- a/lib/util.js +++ b/lib/util.js @@ -22,7 +22,7 @@ var TEXT_FILE_EXTS = [ 'text', 'xhtml', 'html', 'md', 'conf', 'po', 'config', 'tmpl', 'coffee', 'less', 'sass', 'jsp', - 'scss', 'manifest', 'bak', 'asp', + 'scss', 'pcss', 'manifest', 'bak', 'asp', 'tmp', 'haml', 'jade', 'aspx', 'ashx', 'java', 'py', 'c', 'cpp', 'h', 'cshtml', 'asax', 'master', @@ -68,6 +68,7 @@ var TEXT_FILE_EXTS = [ 'sass': 'text/css', 'scss': 'text/css', 'styl': 'text/css', + 'pcss': 'text/css', 'manifest': 'text/cache-manifest', //image 'svg': 'image/svg+xml', From 50da17f1b13c30b29696fcb7f877cbdc1c4a7578 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Mon, 4 Sep 2017 16:06:49 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20.pcss=20=E5=88=B0?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 519b33527..b3f9484dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.34", + "version": "3.4.35", "description": "fis 3.0", "main": "index.js", "bin": { From 549a35437a4e690628e6868bad7c45388c295268 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Mon, 9 Oct 2017 16:17:51 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20command-release=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b3f9484dd..112888609 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.35", + "version": "3.4.36", "description": "fis 3.0", "main": "index.js", "bin": { @@ -24,7 +24,7 @@ "fis-spriter-csssprites": "0.3.11", "fis3-command-init": "1.0.14", "fis3-command-inspect": "1.0.3", - "fis3-command-release": "1.3.14", + "fis3-command-release": "1.3.17", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.2", "fis3-deploy-http-push": "2.0.6", From 2dd83e75d0ac238e304e1390e24a4b91a3264cf7 Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Tue, 7 Nov 2017 12:11:39 +0800 Subject: [PATCH 08/37] [UPDATE] update png-compress and cssscripts plugin --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 112888609..8bfa68c54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.36", + "version": "3.4.37", "description": "fis 3.0", "main": "index.js", "bin": { @@ -19,9 +19,9 @@ "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", - "fis-optimizer-png-compressor": "0.1.6", + "fis-optimizer-png-compressor": "0.2.0", "fis-optimizer-uglify-js": "0.2.2", - "fis-spriter-csssprites": "0.3.11", + "fis-spriter-csssprites": "0.4.0", "fis3-command-init": "1.0.14", "fis3-command-inspect": "1.0.3", "fis3-command-release": "1.3.17", From 581eefbe38c60890dc76a127acab1ee23365d0eb Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Tue, 7 Nov 2017 12:13:02 +0800 Subject: [PATCH 09/37] [UPDATE] release 3.4.38 --- ISSUE_TEMPLATE | 32 ++++---------------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE index 7ce2fb30a..9b137d580 100644 --- a/ISSUE_TEMPLATE +++ b/ISSUE_TEMPLATE @@ -1,31 +1,7 @@ - - * **操作系统**: -* **Node版本**: -* **FIS版本**: -* **解决方案**: +* **Node版本**: +* **FIS版本**: +* **解决方案**: * **依赖插件**: - + diff --git a/package.json b/package.json index 8bfa68c54..4fc303d0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.37", + "version": "3.4.38", "description": "fis 3.0", "main": "index.js", "bin": { From 5e02923f0b724459c482ab18d8ef880dfa72c7d7 Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Tue, 7 Nov 2017 12:19:54 +0800 Subject: [PATCH 10/37] [UPDATE] update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9191f6715..a66e8cda2 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ ![](https://img.shields.io/npm/v/fis3.svg) ![](https://img.shields.io/npm/dm/fis3.svg) [![Build Status](https://travis-ci.org/fex-team/fis3.svg?branch=master)](https://travis-ci.org/fex-team/fis3) [![Coverage Status](https://coveralls.io/repos/fex-team/fis3/badge.svg?branch=master&service=github)](https://coveralls.io/github/fex-team/fis3?branch=master) +[![](https://david-dm.org/fex-team/fis3/status.svg)](https://david-dm.org/fex-team/fis3) FIS3 面向**前端**的**工程构建系统**。解决前端工程中性能优化、资源加载（异步、同步、按需、预加载、依赖管理、合并、内嵌）、模块化开发、自动化工具、开发规范、代码部署等问题。 From 91402b6794b32f9ec3891a9ac6743a186af36316 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Thu, 9 Nov 2017 10:59:26 +0800 Subject: [PATCH 11/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20deploy=20=E6=B3=A8?= =?UTF-8?q?=E6=84=8F=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/docs/beginning/debug.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/docs/beginning/debug.md b/doc/docs/beginning/debug.md index d85f57028..4d2d175b8 100644 --- a/doc/docs/beginning/debug.md +++ b/doc/docs/beginning/debug.md @@ -68,6 +68,9 @@ fis3 release -wL 当我们开发项目后，需要发布到测试机（联调机），一般可以通过如 SMB、FTP 等上传代码。FIS3 默认支持使用 HTTP 上传代码，首先需要在测试机部署上传接收脚本（或者服务），这个脚本非常简单，现在给出了 [php 的实现版本](https://github.com/fex-team/fis-command-release/blob/master/tools/receiver.php)，可以把它放到测试机上某个 Web 服务根目录，并且配置一个 url 能访问到即可。 +> 注意：**此代码存在很大的安全隐患，没有做任何安全考虑，请不要部署到线上服务。** +> 百度内部请使用：http://agroup.baidu.com/fis/md/article/196978 + > 示例脚本是 php 脚本，测试机 Web 需要支持 PHP 的解析
> 如果需要其他语言实现，请参考这个 php 脚本实现，如果嫌麻烦，我们提供了一个 node 版本的[接收端](https://github.com/fex-team/receiver) From 30118ba252f1a58f29320313b4a50bdb0b1bff74 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Thu, 9 Nov 2017 11:46:18 +0800 Subject: [PATCH 12/37] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E7=9B=B8=E5=85=B3=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/util.js | 452 +++++++++++++++++++++++++-------------------------- 1 file changed, 226 insertions(+), 226 deletions(-) diff --git a/test/util.js b/test/util.js index adc91692b..f923dbb7c 100644 --- a/test/util.js +++ b/test/util.js @@ -1163,105 +1163,105 @@ describe('util: _parseUrl(url, opt)', function () { }); //hide- local -describe('util: _download(url, [callback], [extract], [opt])', function () { - var downdir = __dirname + '/download/'; - this.timeout(25000); - before(function () { - //清空fis tmp download dir - var files = []; - var tmpdir = fis.project.getTempPath('downloads'); - var path = tmpdir; - if (fs.existsSync(path)) { - files = fs.readdirSync(path); - files.forEach(function (file, index) { - var curPath = path + "/" + file; - fs.unlinkSync(curPath); - }); - } - }); - it('general', function (done) { - //var url = 'http://10.48.30.87:8088/test/download/downTest01.tar'; - //var url = 'http://fex.baidu.com/fis3/static/images/code_1750c9a.png'; - var url = 'http://127.0.0.1/fis3/test/attachment/code_1750c9a.png'; - //var url = 'https://raw.githubusercontent.com/fex-team/fis3/gh-pages/logo_8652a39.png'; - - var path = fis.project.getTempPath('downloads'); - var hash = fis.util.md5(url, 8); - _.download(url, function (err) { - //expect(path + '/' + hash + '.png').to.be.exist; - expect(fs.existsSync(path + '/' + hash + '.png')).to.be.true; - done(); - }); - - }); - - it('extract', function (done) { - var name = 'downTest'; - //var url = 'http://10.48.30.87:8088/test/download/' + name + '.tar'; - //var url = 'http://fex.baidu.com/fis3/test/attachment/downTest.tar'; - var url = 'http://127.0.0.1/fis3/test/attachment/downTest.tar'; - //var url = 'https://raw.githubusercontent.com/fex-team/fis3/gh-pages/test/test.jar'; - var extract = downdir; - _.download(url, function (err) { - var hash = fis.util.md5(url, 8); - var path = fis.project.getTempPath('downloads'); - expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.true; - expect(fs.existsSync(extract + '/downTest')).to.be.true; - - done(); - }, extract); //, extract 解压有问题 这种情况 还未处理 - - }); - - it('not_exist', function (done) { - //var url = 'http://fex.baidu.com/fis3/test/downTest05.tar'; //不存在的包 - var url = 'http://127.0.0.1/fis3/test/downTest05.tar'; //不存在的包 - var not_exist = 0; - _.download(url, function (msg) { - if (msg == 404) - not_exist = 1; - - var path = fis.project.getTempPath('downloads'); - var hash = fis.util.md5(url, 8); - expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.false; - expect(not_exist).to.be.equal(1); - - done(); - - }); - - }); - - it('extract-error', function (done) { - //var url = 'http://fex.baidu.com/fis3/test/downTest05.tar'; - var url = 'http://127.0.0.1/fis3/test/downTest05.tar'; - var not_exist = 0; - var extract = downdir; - _.download(url, function (msg) { - if (msg == 404) - not_exist = 1; - - var hash = fis.util.md5(url, 8); - expect(fs.existsSync(extract + '/' + hash + '.tar')).to.be.false; - expect(not_exist).to.be.equal(1); - - done(); - }, extract, { - 'data': "write opt.data!" - }); - }); - - it('下载错误', function () { - var url = 'http://10.48.30.87:8088/test/download/test.tar.gz'; - var extract = downdir; - _.download(url, function () { - var hash = fis.util.md5(url, 8); - var path = fis.project.getTempPath('downloads'); - expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.false; - }, extract); - }); - -}); +// describe('util: _download(url, [callback], [extract], [opt])', function () { +// var downdir = __dirname + '/download/'; +// this.timeout(25000); +// before(function () { +// //清空fis tmp download dir +// var files = []; +// var tmpdir = fis.project.getTempPath('downloads'); +// var path = tmpdir; +// if (fs.existsSync(path)) { +// files = fs.readdirSync(path); +// files.forEach(function (file, index) { +// var curPath = path + "/" + file; +// fs.unlinkSync(curPath); +// }); +// } +// }); +// it('general', function (done) { +// //var url = 'http://10.48.30.87:8088/test/download/downTest01.tar'; +// //var url = 'http://fex.baidu.com/fis3/static/images/code_1750c9a.png'; +// var url = 'http://127.0.0.1/fis3/test/attachment/code_1750c9a.png'; +// //var url = 'https://raw.githubusercontent.com/fex-team/fis3/gh-pages/logo_8652a39.png'; + +// var path = fis.project.getTempPath('downloads'); +// var hash = fis.util.md5(url, 8); +// _.download(url, function (err) { +// //expect(path + '/' + hash + '.png').to.be.exist; +// expect(fs.existsSync(path + '/' + hash + '.png')).to.be.true; +// done(); +// }); + +// }); + +// it('extract', function (done) { +// var name = 'downTest'; +// //var url = 'http://10.48.30.87:8088/test/download/' + name + '.tar'; +// //var url = 'http://fex.baidu.com/fis3/test/attachment/downTest.tar'; +// var url = 'http://127.0.0.1/fis3/test/attachment/downTest.tar'; +// //var url = 'https://raw.githubusercontent.com/fex-team/fis3/gh-pages/test/test.jar'; +// var extract = downdir; +// _.download(url, function (err) { +// var hash = fis.util.md5(url, 8); +// var path = fis.project.getTempPath('downloads'); +// expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.true; +// expect(fs.existsSync(extract + '/downTest')).to.be.true; + +// done(); +// }, extract); //, extract 解压有问题 这种情况 还未处理 + +// }); + +// it('not_exist', function (done) { +// //var url = 'http://fex.baidu.com/fis3/test/downTest05.tar'; //不存在的包 +// var url = 'http://127.0.0.1/fis3/test/downTest05.tar'; //不存在的包 +// var not_exist = 0; +// _.download(url, function (msg) { +// if (msg == 404) +// not_exist = 1; + +// var path = fis.project.getTempPath('downloads'); +// var hash = fis.util.md5(url, 8); +// expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.false; +// expect(not_exist).to.be.equal(1); + +// done(); + +// }); + +// }); + +// it('extract-error', function (done) { +// //var url = 'http://fex.baidu.com/fis3/test/downTest05.tar'; +// var url = 'http://127.0.0.1/fis3/test/downTest05.tar'; +// var not_exist = 0; +// var extract = downdir; +// _.download(url, function (msg) { +// if (msg == 404) +// not_exist = 1; + +// var hash = fis.util.md5(url, 8); +// expect(fs.existsSync(extract + '/' + hash + '.tar')).to.be.false; +// expect(not_exist).to.be.equal(1); + +// done(); +// }, extract, { +// 'data': "write opt.data!" +// }); +// }); + +// it('下载错误', function () { +// var url = 'http://10.48.30.87:8088/test/download/test.tar.gz'; +// var extract = downdir; +// _.download(url, function () { +// var hash = fis.util.md5(url, 8); +// var path = fis.project.getTempPath('downloads'); +// expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.false; +// }, extract); +// }); + +// }); describe('util: _upload(url, [opt], [data], content, subpath, callback)', function () { this.timeout(20000); @@ -1334,133 +1334,133 @@ describe('util: _upload(url, [opt], [data], content, subpath, callback)', functi // }); }); -describe('util: _install(name, [version], opt)', function () { - var installdir = __dirname + '/install/'; - this.timeout(25000); - after(function () { - //清空install文件夹 - fis.cache.clean(installdir); - }); - - it('general', function (done) { - var name = 'installTest'; - var version = '*';//* - var opt = { - //'remote': 'http://10.48.30.87:8088/test/install', - //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', - 'remote': 'http://127.0.0.1/fis3/test/attachment/install', - 'extract': installdir, - 'done': function () { - var hash = fis.util.md5(opt.remote + '/' + name + '/' + version + '/.tar', 8); - var path = fis.project.getTempPath('downloads'); - expect(path + '/' + hash + '.tar').to.be.exist; - expect(installdir + name).to.be.exist; - done(); - } - }; - - _.install(name, version, opt); - - }); - - it('version-done', function (done) { - var name = 'installTest'; - var version = '0.3'; - var opt = { - //'remote': 'http://10.48.30.87:8088/test/install', - //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', - 'remote': 'http://127.0.0.1/fis3/test/attachment/install', - 'extract': installdir, - 'done': function () { - var hash = fis.util.md5(opt.remote + '/' + name + '/' + version + '/.tar', 8); - var path = fis.project.getTempPath('downloads'); - expect(path + '/' + hash + '.tar').to.be.exist; - expect(installdir + name + version).to.be.exist; - - done(); - } - }; - - _.install(name, version, opt); - }); - - it('opt.before', function (done) { - var gname = 'installTest'; - var version = '0.2'; - var opt = { - //'remote': 'http://10.48.30.87:8088/test/install', - //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', - 'remote': 'http://127.0.0.1/fis3/test/attachment/install', - 'extract': installdir, - 'done': function (name, version) { - expect(path + '/' + hash + '.tar').to.be.exist; - expect(installdir + name + version).to.be.exist; - - done(); - }, - 'before': function (name, version) { - expect(name).to.be.equal(gname); - expect(version).to.be.equal("0.2"); - } - }; - var hash = fis.util.md5(opt.remote + '/' + gname + '/' + version + '/.tar', 8); - var path = fis.project.getTempPath('downloads'); - - _.install(gname, version, opt); - }); - - it('opt.err_not exist', function (done) { - var gname = 'installTest'; - var version = '0.5'; //不存在的版本 - var opt = { - //'remote': 'http://10.48.30.87:8088/test/install', - //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', - 'remote': 'http://127.0.0.1/fis3/test/attachment/install', - 'extract': installdir, - 'done': function (name, version) { - expect(true).to.be.false; - }, - 'before': function (name, version) { - expect(name).to.be.equal(gname); - expect(version).to.be.equal("0.5"); - }, - 'error': function (err) { - var hash = fis.util.md5(opt.remote + '/' + gname + '/' + version + '/.tar', 8); - var path = fis.project.getTempPath('downloads'); - expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.false; - expect(fs.existsSync(installdir + gname + version)).to.be.false; - - done(); - } - }; - _.install(gname, version, opt); - - }); - - it('extract, pkg', function () { - //pkg项目package.json里配置依赖pkg0.2,两个都应该install - var name = 'pkgTest'; - var version = '*'; - var opt = { - //'remote': 'http://10.48.30.87:8088/test/install', - //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', - 'remote': 'http://127.0.0.1/fis3/test/attachment/install', - 'extract': installdir, - 'done': function () { - var hash = fis.util.md5(opt.remote + '/' + name + '/latest.tar', 8); - var hash_dep = fis.util.md5(opt.remote + '/' + name + '/0.2.tar', 8); - var path = fis.project.getTempPath('downloads'); - expect(path + '/' + hash + '.tar').to.be.exist; - expect(path + '/' + hash_dep + '.tar').to.be.exist; - expect(installdir + name).to.be.exist; - expect(installdir + dep_name).to.be.exist; - } - }; - var dep_name = 'pkgTest0.2'; - - _.install(name, version, opt); - }); -}); +// describe('util: _install(name, [version], opt)', function () { +// var installdir = __dirname + '/install/'; +// this.timeout(25000); +// after(function () { +// //清空install文件夹 +// fis.cache.clean(installdir); +// }); + +// it('general', function (done) { +// var name = 'installTest'; +// var version = '*';//* +// var opt = { +// //'remote': 'http://10.48.30.87:8088/test/install', +// //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', +// 'remote': 'http://127.0.0.1/fis3/test/attachment/install', +// 'extract': installdir, +// 'done': function () { +// var hash = fis.util.md5(opt.remote + '/' + name + '/' + version + '/.tar', 8); +// var path = fis.project.getTempPath('downloads'); +// expect(path + '/' + hash + '.tar').to.be.exist; +// expect(installdir + name).to.be.exist; +// done(); +// } +// }; + +// _.install(name, version, opt); + +// }); + +// it('version-done', function (done) { +// var name = 'installTest'; +// var version = '0.3'; +// var opt = { +// //'remote': 'http://10.48.30.87:8088/test/install', +// //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', +// 'remote': 'http://127.0.0.1/fis3/test/attachment/install', +// 'extract': installdir, +// 'done': function () { +// var hash = fis.util.md5(opt.remote + '/' + name + '/' + version + '/.tar', 8); +// var path = fis.project.getTempPath('downloads'); +// expect(path + '/' + hash + '.tar').to.be.exist; +// expect(installdir + name + version).to.be.exist; + +// done(); +// } +// }; + +// _.install(name, version, opt); +// }); + +// it('opt.before', function (done) { +// var gname = 'installTest'; +// var version = '0.2'; +// var opt = { +// //'remote': 'http://10.48.30.87:8088/test/install', +// //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', +// 'remote': 'http://127.0.0.1/fis3/test/attachment/install', +// 'extract': installdir, +// 'done': function (name, version) { +// expect(path + '/' + hash + '.tar').to.be.exist; +// expect(installdir + name + version).to.be.exist; + +// done(); +// }, +// 'before': function (name, version) { +// expect(name).to.be.equal(gname); +// expect(version).to.be.equal("0.2"); +// } +// }; +// var hash = fis.util.md5(opt.remote + '/' + gname + '/' + version + '/.tar', 8); +// var path = fis.project.getTempPath('downloads'); + +// _.install(gname, version, opt); +// }); + +// it('opt.err_not exist', function (done) { +// var gname = 'installTest'; +// var version = '0.5'; //不存在的版本 +// var opt = { +// //'remote': 'http://10.48.30.87:8088/test/install', +// //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', +// 'remote': 'http://127.0.0.1/fis3/test/attachment/install', +// 'extract': installdir, +// 'done': function (name, version) { +// expect(true).to.be.false; +// }, +// 'before': function (name, version) { +// expect(name).to.be.equal(gname); +// expect(version).to.be.equal("0.5"); +// }, +// 'error': function (err) { +// var hash = fis.util.md5(opt.remote + '/' + gname + '/' + version + '/.tar', 8); +// var path = fis.project.getTempPath('downloads'); +// expect(fs.existsSync(path + '/' + hash + '.tar')).to.be.false; +// expect(fs.existsSync(installdir + gname + version)).to.be.false; + +// done(); +// } +// }; +// _.install(gname, version, opt); + +// }); + +// it('extract, pkg', function () { +// //pkg项目package.json里配置依赖pkg0.2,两个都应该install +// var name = 'pkgTest'; +// var version = '*'; +// var opt = { +// //'remote': 'http://10.48.30.87:8088/test/install', +// //'remote': 'http://fex.baidu.com/fis3/test/attachment/install', +// 'remote': 'http://127.0.0.1/fis3/test/attachment/install', +// 'extract': installdir, +// 'done': function () { +// var hash = fis.util.md5(opt.remote + '/' + name + '/latest.tar', 8); +// var hash_dep = fis.util.md5(opt.remote + '/' + name + '/0.2.tar', 8); +// var path = fis.project.getTempPath('downloads'); +// expect(path + '/' + hash + '.tar').to.be.exist; +// expect(path + '/' + hash_dep + '.tar').to.be.exist; +// expect(installdir + name).to.be.exist; +// expect(installdir + dep_name).to.be.exist; +// } +// }; +// var dep_name = 'pkgTest0.2'; + +// _.install(name, version, opt); +// }); +// }); //hide- local -end describe('util: _.readJSON(path)', function () { it('general-readJson', function () { From 038ba5981613d0859273eea01e0b80f24747d05b Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Thu, 9 Nov 2017 11:52:53 +0800 Subject: [PATCH 13/37] Update debug.md --- doc/docs/beginning/debug.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/docs/beginning/debug.md b/doc/docs/beginning/debug.md index 4d2d175b8..25a09adf5 100644 --- a/doc/docs/beginning/debug.md +++ b/doc/docs/beginning/debug.md @@ -68,7 +68,7 @@ fis3 release -wL 当我们开发项目后，需要发布到测试机（联调机），一般可以通过如 SMB、FTP 等上传代码。FIS3 默认支持使用 HTTP 上传代码，首先需要在测试机部署上传接收脚本（或者服务），这个脚本非常简单，现在给出了 [php 的实现版本](https://github.com/fex-team/fis-command-release/blob/master/tools/receiver.php)，可以把它放到测试机上某个 Web 服务根目录，并且配置一个 url 能访问到即可。 -> 注意：**此代码存在很大的安全隐患，没有做任何安全考虑，请不要部署到线上服务。** +> 注意：**此代码存在很大的安全隐患，没有做任何安全考虑，请不要部署到线上服务。** > 百度内部请使用：http://agroup.baidu.com/fis/md/article/196978 > 示例脚本是 php 脚本，测试机 Web 需要支持 PHP 的解析
From 9e5d83ce33a3cf445d0b254e70340fcb417b9d16 Mon Sep 17 00:00:00 2001 From: fansekey Date: Sun, 12 Nov 2017 23:55:29 -0600 Subject: [PATCH 14/37] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a66e8cda2..d41f3459d 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,16 @@ FIS3 面向**前端**的**工程构建系统**。解决前端工程中性能优 > 如果对FIS先有些了解，但理解不深的，可试着带着这句话去看文档
> FIS3 会在配置文件中给文件添加相应属性，用于控制文件的编译、合并等各种操作；文件属性包括基本属性和插件属性，[详细请参考](https://github.com/fex-team/fis3/blob/master/doc/docs/api/config-props.md#文件属性) -``` +```bash npm install -g fis3 ``` +**如果 Node 版本低于 4.x 请安装旧版本** + +```bash +npm install -g fis3@3.4.36 +``` + ## 文档 快速入门、配置、插件开发以及原理等文档 [doc/docs/INDEX.md](doc/docs/INDEX.md) From 6f31e14954f3aadf236f073ef95eec04cc60d29c Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Mon, 18 Dec 2017 14:52:27 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20fis3-command-release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4fc303d0c..bb48ebf8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.38", + "version": "3.4.39", "description": "fis 3.0", "main": "index.js", "bin": { @@ -24,7 +24,7 @@ "fis-spriter-csssprites": "0.4.0", "fis3-command-init": "1.0.14", "fis3-command-inspect": "1.0.3", - "fis3-command-release": "1.3.17", + "fis3-command-release": "1.3.18", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.2", "fis3-deploy-http-push": "2.0.6", From ac399895159c2e5ff91fc7677a5157103661f5cc Mon Sep 17 00:00:00 2001 From: ganlei Date: Tue, 5 Jun 2018 20:46:59 +0800 Subject: [PATCH 16/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9set=E4=B8=8Eget?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=A4=84=E7=90=86=E4=B8=8D=E5=90=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=AD=98=E5=8F=96=E5=80=BC=E4=B8=8D=E5=90=8C=E7=9A=84?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/config.js b/lib/config.js index 12413fbaa..712c1f834 100644 --- a/lib/config.js +++ b/lib/config.js @@ -106,7 +106,8 @@ var Config = Object.derive(/** @lends fis.config.Config.prototype */{ }, _get: function(path) { var result = this.data; - (path || '').split('.').forEach(function(key) { + path = String(path || '').trim(); + path.split('.').forEach(function(key) { if (key && (typeof result !== 'undefined')) { result = result[key]; } From 3234241dd05320bea5268ccc1de3afabf88db458 Mon Sep 17 00:00:00 2001 From: WuShangHai <18620800179@163.com> Date: Mon, 11 Jun 2018 14:17:43 +0800 Subject: [PATCH 17/37] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=87=E6=A1=A3=20?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=90=88=E5=B9=B6=E4=B8=80=E5=A4=84=E6=9C=89?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/docs/pack.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/docs/pack.md b/doc/docs/pack.md index 5bf194413..56b475418 100644 --- a/doc/docs/pack.md +++ b/doc/docs/pack.md @@ -75,10 +75,10 @@ fis.match('::package', { // main.js 的所有同步依赖加入队列 '/static/hello/src/main.js:deps', - // 将 main.js 所以异步依赖加入队列 + // 将 main.js 的所有异步依赖加入队列 '/static/hello/src/main.js:asyncs', - // 移除 comp.js 所有同步依赖 + // 移除 comp.js 的所有同步依赖 '!/static/hello/src/comp.js:deps' ], From 16819d7d5f8f8fb0152b0cbbc5e552c31adbe748 Mon Sep 17 00:00:00 2001 From: PopPopRet Date: Sat, 4 Aug 2018 10:22:07 +0800 Subject: [PATCH 18/37] fix upload error --- lib/util.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/util.js b/lib/util.js index 6b5146eae..ab3c8921d 100644 --- a/lib/util.js +++ b/lib/util.js @@ -1268,6 +1268,9 @@ _.upload = function(url, opt, data, content, subpath, callback) { callback(err.message || err); }); }); + req.on('error', function(err) { + callback(err.message || err); + }); collect.forEach(function(d) { req.write(d); }); From eadc96bfe112d5d4cf5eb349e8a2b6e195bcb5c2 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Tue, 4 Sep 2018 14:11:30 +0800 Subject: [PATCH 19/37] =?UTF-8?q?useCompile=20=E5=BA=94=E8=AF=A5=E6=98=AF?= =?UTF-8?q?=E7=94=B1=E6=BA=90=E6=96=87=E4=BB=B6=E5=90=8E=E7=BC=80=E5=86=B3?= =?UTF-8?q?=E5=AE=9A=E8=80=8C=E4=B8=8D=E6=98=AF=E4=BA=A7=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/file.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/file.js b/lib/file.js index 60b835496..92d5e89b8 100644 --- a/lib/file.js +++ b/lib/file.js @@ -220,7 +220,7 @@ var File = Object.derive(function() { this._likes = {}; this.defineLikes(); - if (_.isTextFile(rExt)) { + if (_.isTextFile(ext)) { this._isImage = false; this._isText = true; this.charset = null; @@ -266,7 +266,7 @@ var File = Object.derive(function() { this.isJsonLike = true; break; } - } else if (_.isImageFile(rExt)) { + } else if (_.isImageFile(ext)) { // this.useDomain = true; // this.useHash = rExt !== '.ico'; } else { From bf861697fdd0b21455ad80796b0a51195c554e6c Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Tue, 13 Nov 2018 18:51:56 +0800 Subject: [PATCH 20/37] =?UTF-8?q?=E6=94=AF=E6=8C=81node=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bb48ebf8e..5bcd3ba72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.39", + "version": "3.4.40", "description": "fis 3.0", "main": "index.js", "bin": { @@ -26,7 +26,7 @@ "fis3-command-inspect": "1.0.3", "fis3-command-release": "1.3.18", "fis3-command-server": "0.0.9", - "fis3-server-node": "0.1.2", + "fis3-server-node": "0.1.3", "fis3-deploy-http-push": "2.0.6", "fis3-deploy-encoding": "1.0.0", "fis3-deploy-local-deliver": "1.0.0", From 2efea4605a3c2561e59f45090b2143d6356b3569 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Fri, 21 Dec 2018 15:28:58 +0800 Subject: [PATCH 21/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20fis3=20inspect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5bcd3ba72..282a6e2c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.40", + "version": "3.4.41", "description": "fis 3.0", "main": "index.js", "bin": { @@ -23,7 +23,7 @@ "fis-optimizer-uglify-js": "0.2.2", "fis-spriter-csssprites": "0.4.0", "fis3-command-init": "1.0.14", - "fis3-command-inspect": "1.0.3", + "fis3-command-inspect": "~1.0.6", "fis3-command-release": "1.3.18", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.3", From f4de2a624d46bfc7a98aacf3fad8a887579c0f04 Mon Sep 17 00:00:00 2001 From: fansekey Date: Fri, 11 Jan 2019 16:48:10 +0800 Subject: [PATCH 22/37] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 282a6e2c1..e0407a081 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "glob": "5.0.3", "iconv-lite": "0.2.10", "liftoff": "2.2.1", - "lodash": "4.12.0", - "minimatch": "2.0.4", + "lodash": "4.17.5", + "minimatch": "3.0.4", "minimist": "1.1.1", "tar": "2.2.1", "fis-command-install": "0.2.17", From 4670014bac58a95f60278410ad9c36954397f7d9 Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Fri, 11 Jan 2019 18:40:47 +0800 Subject: [PATCH 23/37] [UPDATE] update image process plugin --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e0407a081..c9f365c2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.41", + "version": "3.4.42", "description": "fis 3.0", "main": "index.js", "bin": { @@ -19,9 +19,9 @@ "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", - "fis-optimizer-png-compressor": "0.2.0", + "fis-optimizer-png-compressor": "0.2.1", "fis-optimizer-uglify-js": "0.2.2", - "fis-spriter-csssprites": "0.4.0", + "fis-spriter-csssprites": "0.4.1", "fis3-command-init": "1.0.14", "fis3-command-inspect": "~1.0.6", "fis3-command-release": "1.3.18", From 7327d6c933172fbb96b8fe940d07eaee5fad30c9 Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Fri, 11 Jan 2019 19:07:26 +0800 Subject: [PATCH 24/37] [UPDATE] fis-optimizer-png-compressor@0.2.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9f365c2a..b9d1491eb 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", - "fis-optimizer-png-compressor": "0.2.1", + "fis-optimizer-png-compressor": "0.2.2", "fis-optimizer-uglify-js": "0.2.2", "fis-spriter-csssprites": "0.4.1", "fis3-command-init": "1.0.14", From 520927407625914017b0fe4c31c04c23140e3757 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Fri, 27 Dec 2019 15:21:28 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20watch=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b9d1491eb..7a74ab994 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.42", + "version": "3.4.43", "description": "fis 3.0", "main": "index.js", "bin": { @@ -24,7 +24,7 @@ "fis-spriter-csssprites": "0.4.1", "fis3-command-init": "1.0.14", "fis3-command-inspect": "~1.0.6", - "fis3-command-release": "1.3.18", + "fis3-command-release": "1.3.19", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.3", "fis3-deploy-http-push": "2.0.6", From 3ee08e9d07b94ae596d38e6ecde226c2910fbf9c Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Tue, 12 May 2020 17:04:29 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E5=85=88=E8=BF=98=E5=8E=9F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81,=E6=96=B0=E7=89=88=E6=9C=AC=E5=AF=B9=20node=20?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=BE=88=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7a74ab994..1313ae832 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.43", + "version": "3.4.44", "description": "fis 3.0", "main": "index.js", "bin": { @@ -24,7 +24,7 @@ "fis-spriter-csssprites": "0.4.1", "fis3-command-init": "1.0.14", "fis3-command-inspect": "~1.0.6", - "fis3-command-release": "1.3.19", + "fis3-command-release": "1.3.18", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.3", "fis3-deploy-http-push": "2.0.6", From d6ead5b65a0a9aa8914ac4a91577d1a0dfd92209 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Tue, 2 Feb 2021 12:35:19 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E5=8E=BB=E6=8E=89=20csssprite=20?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 1313ae832..c1f6ea716 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.44", + "version": "3.4.45", "description": "fis 3.0", "main": "index.js", "bin": { @@ -21,7 +21,6 @@ "fis-optimizer-clean-css": "0.0.9", "fis-optimizer-png-compressor": "0.2.2", "fis-optimizer-uglify-js": "0.2.2", - "fis-spriter-csssprites": "0.4.1", "fis3-command-init": "1.0.14", "fis3-command-inspect": "~1.0.6", "fis3-command-release": "1.3.18", From 15008ccfddd438c6aaaf909ef0835dff09936986 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Tue, 2 Feb 2021 12:36:32 +0800 Subject: [PATCH 28/37] =?UTF-8?q?png=20compress=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index c1f6ea716..0eb55330d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", - "fis-optimizer-png-compressor": "0.2.2", "fis-optimizer-uglify-js": "0.2.2", "fis3-command-init": "1.0.14", "fis3-command-inspect": "~1.0.6", From b22cfe0325e6b07d5db65429373add5690ee59ac Mon Sep 17 00:00:00 2001 From: xiangshouding Date: Fri, 13 Aug 2021 10:12:04 +0800 Subject: [PATCH 29/37] [UPDATE] Delete useless files --- .../common/widget/css-base/package.json | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100755 test/diff_fis3_smarty/product_code/hao123_fis3_smarty/common/widget/css-base/package.json diff --git a/test/diff_fis3_smarty/product_code/hao123_fis3_smarty/common/widget/css-base/package.json b/test/diff_fis3_smarty/product_code/hao123_fis3_smarty/common/widget/css-base/package.json deleted file mode 100755 index d8ebb4e75..000000000 --- a/test/diff_fis3_smarty/product_code/hao123_fis3_smarty/common/widget/css-base/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "base-css", - "version": "0.0.1", - "description": "base-css", - "dependencies": {}, - "devDependencies": { - "grunt": "~0.4.1", - "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-concat": "~0.1.3", - "grunt-contrib-uglify": "~0.2.0", - "grunt-contrib-cssmin": "~0.6.0", - "grunt-contrib-connect": "~0.2.0", - "grunt-contrib-clean": "~0.4.0", - "grunt-contrib-htmlmin": "~0.1.3", - "grunt-contrib-watch": "~0.4.0", - "grunt-usemin": "~0.1.12", - "grunt-mocha": "~0.3.0", - "grunt-open": "~0.2.0", - "grunt-svgmin": "~0.1.0", - "grunt-concurrent": "~0.1.0", - "grunt-contrib-stylus": "~0.5.1", - "grunt-shell": "~0.3.0", - "matchdep": "~0.1.1" - }, - "scripts": { - "build": "grunt build" - }, - "engines": { - "node": ">=0.8.0" - } -} From a75f44283487924dbbd294fde59181ed22d2a103 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Fri, 13 Aug 2021 11:40:26 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/package.json | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/package.json b/doc/package.json index 3b96e2beb..804e37b32 100644 --- a/doc/package.json +++ b/doc/package.json @@ -16,7 +16,7 @@ "license": "MIT", "dependencies": { "fis3-postpackager-loader": "^1.0.17", - "highlight.js": "^8.6.0", + "highlight.js": ">=9.18.2", "marked": "^0.3.3" } } diff --git a/package.json b/package.json index 0eb55330d..c92cdffde 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.45", + "version": "3.4.46", "description": "fis 3.0", "main": "index.js", "bin": { @@ -12,10 +12,10 @@ "glob": "5.0.3", "iconv-lite": "0.2.10", "liftoff": "2.2.1", - "lodash": "4.17.5", + "lodash": "4.17.21", "minimatch": "3.0.4", - "minimist": "1.1.1", - "tar": "2.2.1", + "minimist": "1.2.3", + "tar": "3.2.3", "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", From 8c75cb51136f51a3af20a6f29f8df57ac63d4b18 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Fri, 13 Aug 2021 11:41:30 +0800 Subject: [PATCH 31/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20tar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c92cdffde..ea929b24f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "lodash": "4.17.21", "minimatch": "3.0.4", "minimist": "1.2.3", - "tar": "3.2.3", + "tar": "4.4.2", "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", From 48c3dd3160c38d9d5faa948eacd795083662d777 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Fri, 13 Aug 2021 11:42:11 +0800 Subject: [PATCH 32/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20tar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea929b24f..59209b47c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "lodash": "4.17.21", "minimatch": "3.0.4", "minimist": "1.2.3", - "tar": "4.4.2", + "tar": "4.4.15", "fis-command-install": "0.2.17", "fis-lolcat": "1.0.1", "fis-optimizer-clean-css": "0.0.9", From 1bddbdb2ff660563571e54f09dd7993764fff21d Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Wed, 13 Oct 2021 14:26:47 +0800 Subject: [PATCH 33/37] =?UTF-8?q?=E7=94=A8=20beta=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=94=A8=E6=9C=80=E6=96=B0=E7=9A=84=20release=20=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 59209b47c..f0d1d1f3b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.4.46", + "version": "3.5.0-beta.0", "description": "fis 3.0", "main": "index.js", "bin": { @@ -22,7 +22,7 @@ "fis-optimizer-uglify-js": "0.2.2", "fis3-command-init": "1.0.14", "fis3-command-inspect": "~1.0.6", - "fis3-command-release": "1.3.18", + "fis3-command-release": "1.3.19", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.3", "fis3-deploy-http-push": "2.0.6", From 2a59d197773c6167281a302262a765ecec6890e9 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Mon, 10 Jan 2022 13:03:43 +0800 Subject: [PATCH 34/37] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20fis3-deploy-http-pus?= =?UTF-8?q?h=20=E5=9B=BA=E5=AE=9A=20colors=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f0d1d1f3b..2b937d236 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.5.0-beta.0", + "version": "3.5.0-beta.1", "description": "fis 3.0", "main": "index.js", "bin": { @@ -25,7 +25,7 @@ "fis3-command-release": "1.3.19", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.3", - "fis3-deploy-http-push": "2.0.6", + "fis3-deploy-http-push": "2.0.7", "fis3-deploy-encoding": "1.0.0", "fis3-deploy-local-deliver": "1.0.0", "fis3-hook-components": "1.0.4", From ae540445226df219a8c1ed54265536fe603f4010 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Mon, 21 Mar 2022 17:06:56 +0800 Subject: [PATCH 35/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E4=B8=AD=E7=9A=84=20\//=20=E8=A2=AB=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E6=98=AF=E6=B3=A8=E9=87=8A=E8=80=8C=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/compile.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/compile.js b/lib/compile.js index 2363a20f5..89a81c8d5 100644 --- a/lib/compile.js +++ b/lib/compile.js @@ -319,7 +319,7 @@ function analyseComment(comment, callback) { * @memberOf fis.compile */ function extJs(content, callback, file) { - var reg = /"(?:[^\\"\r\n\f]|\\[\s\S])*"|'(?:[^\\'\n\r\f]|\\[\s\S])*'|(\/\/[^\r\n\f]+|\/\*[\s\S]*?(?:\*\/|$))|\b(__inline|__uri|__require|__id|__moduleId|__hash)\s*\(\s*("(?:[^\\"\r\n\f]|\\[\s\S])*"|'(?:[^\\'\n\r\f]|\\[\s\S])*')\s*\)/g; + var reg = /"(?:[^\\"\r\n\f]|\\[\s\S])*"|'(?:[^\\'\n\r\f]|\\[\s\S])*'|((? Date: Wed, 22 Nov 2023 17:26:38 +0800 Subject: [PATCH 36/37] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dnode>=3D14?= =?UTF-8?q?=E9=AB=98=E7=89=88=E6=9C=AC=E6=97=A0=E6=B3=95=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BC=A0=E5=85=A5undefined=20issues#1320?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.js b/lib/util.js index ab3c8921d..083719b59 100644 --- a/lib/util.js +++ b/lib/util.js @@ -730,7 +730,7 @@ _.write = function(path, data, charset, append) { if (append) { fs.appendFileSync(path, data, null); } else { - fs.writeFileSync(path, data, null); + fs.writeFileSync(path, data || '', null); } }; From 3a5407cb4e14efd28c91f7eb49133eb52b18d7e5 Mon Sep 17 00:00:00 2001 From: 2betop <2betop.cn@gmail.com> Date: Wed, 22 Nov 2023 17:38:57 +0800 Subject: [PATCH 37/37] bump: release 3.5.0-beta.4 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index eb09d31b8..2684df927 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fis3", - "version": "3.5.0-beta.2", + "version": "3.5.0-beta.4", "description": "fis 3.0", "main": "index.js", "bin": { @@ -25,7 +25,7 @@ "fis3-command-release": "1.3.19", "fis3-command-server": "0.0.9", "fis3-server-node": "0.1.3", - "fis3-deploy-http-push": "2.0.7", + "fis3-deploy-http-push": "2.0.8", "fis3-deploy-encoding": "1.0.0", "fis3-deploy-local-deliver": "1.0.0", "fis3-hook-components": "1.0.4",