调整css打包顺序

baidu · May 20, 2019 · e00cf2b · e00cf2b
1 parent 70d851a
commit e00cf2b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 57 deletions.
diff --git a/fis-conf.js b/fis-conf.js
@@ -322,14 +322,19 @@ if (fis.project.currentMedia() === 'publish') {
                 '!zrender/**',
                 '!echarts/**',
             ],
+
+            'pkg/npm.css': [
+                'node_modules/*/**.css',
+                '!monaco-editor/**',
+            ],
+
             // css 打包
             'pkg/style.css': [
-                'node_modules/*/**.css',
                 '*.scss',
+                '*.css',
+                '!monaco-editor/**',
                 '!/scss/themes/*.scss',
                 // 要切换主题，不能打在一起。'/scss/*.scss',
-                '!monaco-editor/**',
-
                 '!/examples/style.scss',
                 '/examples/style.scss', // 让它在最下面
             ]

diff --git a/gh-pages/doc_9cbe7e1.css b/gh-pages/doc_9cbe7e1.css
diff --git a/gh-pages/index.html b/gh-pages/index.html
@@ -8,10 +8,10 @@
         content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="IE=Edge">        
     <link rel="stylesheet" href="https://bce.bdstatic.com/iconfont/iconfont.css" />
-    <link rel="stylesheet" href="/amis/pkg/style_a2f795d.css" />
+    <link rel="stylesheet" href="/amis/pkg/npm_df4fb67.css" />
     <link rel="stylesheet" title="default" href="/amis/scss/themes/default_c929c43.css" />
     <link rel="stylesheet" title="cxd" disabled href="/amis/scss/themes/cxd_b399955.css" />
-    <link rel="stylesheet" href="/amis/doc_9cbe7e1.css" />
+    <link rel="stylesheet" href="/amis/pkg/style_fb39355.css" />
     <style>
         .app-wrapper {
             position: relative;

diff --git a/gh-pages/pkg/style_a2f795d.css b/gh-pages/pkg/style_a2f795d.css