Merge 984b038 into e8bb713

umijs · Aug 26, 2019 · 0841e40 · 0841e40
2 parents e8bb713 + 984b038
commit 0841e40
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -304,6 +304,13 @@ export default {
 * Type: `boolean`
 * Default: `false`
 
+#### injectCSS
+
+是否在 <head>里注入css, 如果`extractCSS: true`，则为`false`
+
+* Type: `boolean`
+* Default: `true`
+
 #### extraBabelPresets
 
 配置额外的 babel preset。

diff --git a/packages/father-build/src/fixtures/build/rollup-css-inject/.fatherrc.js b/packages/father-build/src/fixtures/build/rollup-css-inject/.fatherrc.js
@@ -0,0 +1,5 @@
+
+export default {
+  injectCSS: false,
+  esm: { type: 'rollup' },
+}
diff --git a/packages/father-build/src/fixtures/build/rollup-css-inject/expected/index.esm.js b/packages/father-build/src/fixtures/build/rollup-css-inject/expected/index.esm.js
@@ -0,0 +1,3 @@
+var css = "\n.a { color: green; }\n";
+
+console.log(css);
diff --git a/packages/father-build/src/fixtures/build/rollup-css-inject/src/foo.css b/packages/father-build/src/fixtures/build/rollup-css-inject/src/foo.css
@@ -0,0 +1,2 @@
+
+.a { color: green; }
diff --git a/packages/father-build/src/fixtures/build/rollup-css-inject/src/index.js b/packages/father-build/src/fixtures/build/rollup-css-inject/src/index.js
@@ -0,0 +1,3 @@
+import style from './foo.css';
+
+console.log(style);
diff --git a/packages/father-build/src/getRollupConfig.ts b/packages/father-build/src/getRollupConfig.ts
@@ -39,6 +39,7 @@ export default function(opts: IGetRollupConfigOpts): RollupOptions[] {
     file,
     target = 'browser',
     extractCSS = false,
+    injectCSS = true,
     cssModules: modules,
     extraPostCSSPlugins = [],
     extraBabelPresets = [],
@@ -128,6 +129,7 @@ export default function(opts: IGetRollupConfigOpts): RollupOptions[] {
     svgr(),
     postcss({
       extract: extractCSS,
+      inject: injectCSS,
       modules,
       use: [
         [

diff --git a/packages/father-build/src/schema.ts b/packages/father-build/src/schema.ts
@@ -82,6 +82,9 @@ export default {
     extractCSS: {
       type: 'boolean',
     },
+    injectCSS: {
+      type: 'boolean',
+    },
     autoprefixer: {
       type: 'object',
     },

diff --git a/packages/father-build/src/types.d.ts b/packages/father-build/src/types.d.ts
@@ -43,6 +43,7 @@ export interface IBundleOptions {
   extraExternals?: string[];
   cssModules?: boolean | Object;
   extractCSS?: boolean;
+  injectCSS?: boolean,
   autoprefixer?: Object;
   namedExports?: IStringArrayObject;
   runtimeHelpers?: boolean;