Authored by 李靖

合develop

1 { 1 {
2 "name": "mars-static", 2 "name": "mars-static",
3 - "version": "1.0.8", 3 + "version": "1.0.10",
4 "lockfileVersion": 1, 4 "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
@@ -1821,12 +1821,6 @@ @@ -1821,12 +1821,6 @@
1821 "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", 1821 "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
1822 "dev": true 1822 "dev": true
1823 }, 1823 },
1824 - "contains-path": {  
1825 - "version": "0.1.0",  
1826 - "resolved": "http://npm.yoho.cn/contains-path/-/contains-path-0.1.0.tgz",  
1827 - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",  
1828 - "dev": true  
1829 - },  
1830 "content-disposition": { 1824 "content-disposition": {
1831 "version": "0.5.2", 1825 "version": "0.5.2",
1832 "resolved": "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz", 1826 "resolved": "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz",
@@ -2955,60 +2949,12 @@ @@ -2955,60 +2949,12 @@
2955 "text-table": "0.2.0" 2949 "text-table": "0.2.0"
2956 } 2950 }
2957 }, 2951 },
2958 - "eslint-config-standard": {  
2959 - "version": "11.0.0-beta.0",  
2960 - "resolved": "http://npm.yoho.cn/eslint-config-standard/-/eslint-config-standard-11.0.0-beta.0.tgz",  
2961 - "integrity": "sha1-+K/mmAPZXGhaS4OSuHkxiOsDy7M=",  
2962 - "dev": true  
2963 - },  
2964 "eslint-config-yoho": { 2952 "eslint-config-yoho": {
2965 "version": "1.0.9", 2953 "version": "1.0.9",
2966 "resolved": "http://npm.yoho.cn/eslint-config-yoho/-/eslint-config-yoho-1.0.9.tgz", 2954 "resolved": "http://npm.yoho.cn/eslint-config-yoho/-/eslint-config-yoho-1.0.9.tgz",
2967 "integrity": "sha1-lz94ELHg4JtmBh3v1HfiFE0v3Ls=", 2955 "integrity": "sha1-lz94ELHg4JtmBh3v1HfiFE0v3Ls=",
2968 "dev": true 2956 "dev": true
2969 }, 2957 },
2970 - "eslint-import-resolver-node": {  
2971 - "version": "0.3.1",  
2972 - "resolved": "http://npm.yoho.cn/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz",  
2973 - "integrity": "sha1-RCJXTN5mqaewmZOO5NUIoZng48w=",  
2974 - "dev": true,  
2975 - "requires": {  
2976 - "debug": "2.6.9",  
2977 - "resolve": "1.5.0"  
2978 - },  
2979 - "dependencies": {  
2980 - "debug": {  
2981 - "version": "2.6.9",  
2982 - "resolved": "http://npm.yoho.cn/debug/-/debug-2.6.9.tgz",  
2983 - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",  
2984 - "dev": true,  
2985 - "requires": {  
2986 - "ms": "2.0.0"  
2987 - }  
2988 - }  
2989 - }  
2990 - },  
2991 - "eslint-module-utils": {  
2992 - "version": "2.1.1",  
2993 - "resolved": "http://npm.yoho.cn/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz",  
2994 - "integrity": "sha1-q67IJBd2E7ipWymWOeG2+s9HNEk=",  
2995 - "dev": true,  
2996 - "requires": {  
2997 - "debug": "2.6.9",  
2998 - "pkg-dir": "1.0.0"  
2999 - },  
3000 - "dependencies": {  
3001 - "debug": {  
3002 - "version": "2.6.9",  
3003 - "resolved": "http://npm.yoho.cn/debug/-/debug-2.6.9.tgz",  
3004 - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",  
3005 - "dev": true,  
3006 - "requires": {  
3007 - "ms": "2.0.0"  
3008 - }  
3009 - }  
3010 - }  
3011 - },  
3012 "eslint-plugin-html": { 2958 "eslint-plugin-html": {
3013 "version": "4.0.1", 2959 "version": "4.0.1",
3014 "resolved": "http://npm.yoho.cn/eslint-plugin-html/-/eslint-plugin-html-4.0.1.tgz", 2960 "resolved": "http://npm.yoho.cn/eslint-plugin-html/-/eslint-plugin-html-4.0.1.tgz",
@@ -3018,77 +2964,6 @@ @@ -3018,77 +2964,6 @@
3018 "htmlparser2": "3.9.2" 2964 "htmlparser2": "3.9.2"
3019 } 2965 }
3020 }, 2966 },
3021 - "eslint-plugin-import": {  
3022 - "version": "2.8.0",  
3023 - "resolved": "http://npm.yoho.cn/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz",  
3024 - "integrity": "sha1-+htu8x/LPFAcCYWcG4bx/FuYaJQ=",  
3025 - "dev": true,  
3026 - "requires": {  
3027 - "builtin-modules": "1.1.1",  
3028 - "contains-path": "0.1.0",  
3029 - "debug": "2.6.9",  
3030 - "doctrine": "1.5.0",  
3031 - "eslint-import-resolver-node": "0.3.1",  
3032 - "eslint-module-utils": "2.1.1",  
3033 - "has": "1.0.1",  
3034 - "lodash.cond": "4.5.2",  
3035 - "minimatch": "3.0.4",  
3036 - "read-pkg-up": "2.0.0"  
3037 - },  
3038 - "dependencies": {  
3039 - "debug": {  
3040 - "version": "2.6.9",  
3041 - "resolved": "http://npm.yoho.cn/debug/-/debug-2.6.9.tgz",  
3042 - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",  
3043 - "dev": true,  
3044 - "requires": {  
3045 - "ms": "2.0.0"  
3046 - }  
3047 - },  
3048 - "doctrine": {  
3049 - "version": "1.5.0",  
3050 - "resolved": "http://npm.yoho.cn/doctrine/-/doctrine-1.5.0.tgz",  
3051 - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",  
3052 - "dev": true,  
3053 - "requires": {  
3054 - "esutils": "2.0.2",  
3055 - "isarray": "1.0.0"  
3056 - }  
3057 - }  
3058 - }  
3059 - },  
3060 - "eslint-plugin-node": {  
3061 - "version": "5.2.1",  
3062 - "resolved": "http://npm.yoho.cn/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz",  
3063 - "integrity": "sha1-gN8yU8TXkBBF7If6ZgooTjK9yik=",  
3064 - "dev": true,  
3065 - "requires": {  
3066 - "ignore": "3.3.7",  
3067 - "minimatch": "3.0.4",  
3068 - "resolve": "1.5.0",  
3069 - "semver": "5.3.0"  
3070 - },  
3071 - "dependencies": {  
3072 - "semver": {  
3073 - "version": "5.3.0",  
3074 - "resolved": "http://npm.yoho.cn/semver/-/semver-5.3.0.tgz",  
3075 - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",  
3076 - "dev": true  
3077 - }  
3078 - }  
3079 - },  
3080 - "eslint-plugin-promise": {  
3081 - "version": "3.6.0",  
3082 - "resolved": "http://npm.yoho.cn/eslint-plugin-promise/-/eslint-plugin-promise-3.6.0.tgz",  
3083 - "integrity": "sha1-VLdljI9FSBPcKocK/4FS7ElpunU=",  
3084 - "dev": true  
3085 - },  
3086 - "eslint-plugin-standard": {  
3087 - "version": "3.0.1",  
3088 - "resolved": "http://npm.yoho.cn/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",  
3089 - "integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI=",  
3090 - "dev": true  
3091 - },  
3092 "eslint-scope": { 2967 "eslint-scope": {
3093 "version": "3.7.1", 2968 "version": "3.7.1",
3094 "resolved": "http://npm.yoho.cn/eslint-scope/-/eslint-scope-3.7.1.tgz", 2969 "resolved": "http://npm.yoho.cn/eslint-scope/-/eslint-scope-3.7.1.tgz",
@@ -5935,12 +5810,6 @@ @@ -5935,12 +5810,6 @@
5935 "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", 5810 "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
5936 "dev": true 5811 "dev": true
5937 }, 5812 },
5938 - "lodash.cond": {  
5939 - "version": "4.5.2",  
5940 - "resolved": "http://npm.yoho.cn/lodash.cond/-/lodash.cond-4.5.2.tgz",  
5941 - "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",  
5942 - "dev": true  
5943 - },  
5944 "lodash.memoize": { 5813 "lodash.memoize": {
5945 "version": "4.1.2", 5814 "version": "4.1.2",
5946 "resolved": "http://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz", 5815 "resolved": "http://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz",
@@ -6968,12 +6837,6 @@ @@ -6968,12 +6837,6 @@
6968 "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", 6837 "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
6969 "dev": true 6838 "dev": true
6970 }, 6839 },
6971 - "path-parse": {  
6972 - "version": "1.0.5",  
6973 - "resolved": "http://npm.yoho.cn/path-parse/-/path-parse-1.0.5.tgz",  
6974 - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",  
6975 - "dev": true  
6976 - },  
6977 "path-to-regexp": { 6840 "path-to-regexp": {
6978 "version": "0.1.7", 6841 "version": "0.1.7",
6979 "resolved": "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz", 6842 "resolved": "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz",
@@ -7079,15 +6942,6 @@ @@ -7079,15 +6942,6 @@
7079 } 6942 }
7080 } 6943 }
7081 }, 6944 },
7082 - "pkg-dir": {  
7083 - "version": "1.0.0",  
7084 - "resolved": "http://npm.yoho.cn/pkg-dir/-/pkg-dir-1.0.0.tgz",  
7085 - "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",  
7086 - "dev": true,  
7087 - "requires": {  
7088 - "find-up": "1.1.2"  
7089 - }  
7090 - },  
7091 "pluralize": { 6945 "pluralize": {
7092 "version": "7.0.0", 6946 "version": "7.0.0",
7093 "resolved": "http://npm.yoho.cn/pluralize/-/pluralize-7.0.0.tgz", 6947 "resolved": "http://npm.yoho.cn/pluralize/-/pluralize-7.0.0.tgz",
@@ -9990,15 +9844,6 @@ @@ -9990,15 +9844,6 @@
9990 "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", 9844 "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
9991 "dev": true 9845 "dev": true
9992 }, 9846 },
9993 - "resolve": {  
9994 - "version": "1.5.0",  
9995 - "resolved": "http://npm.yoho.cn/resolve/-/resolve-1.5.0.tgz",  
9996 - "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=",  
9997 - "dev": true,  
9998 - "requires": {  
9999 - "path-parse": "1.0.5"  
10000 - }  
10001 - },  
10002 "resolve-cwd": { 9847 "resolve-cwd": {
10003 "version": "2.0.0", 9848 "version": "2.0.0",
10004 "resolved": "http://registry.npm.taobao.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz", 9849 "resolved": "http://registry.npm.taobao.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz",