feat: split scripts and styles option to plugin

esdoc · Feb 19, 2017 · f28205a · f28205a
1 parent b37b5b6
commit f28205a
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 112 deletions.
diff --git a/src/BuiltinExternal/WebAPIExternal.js b/src/BuiltinExternal/WebAPIExternal.js
diff --git a/src/ESDoc.js b/src/ESDoc.js
@@ -153,10 +153,6 @@ export default class ESDoc {
 
     if (!config.package) config.package = './package.json';
 
-    if (!config.styles) config.styles = [];
-
-    if (!config.scripts) config.scripts = [];
-
     if (config.test) {
       assert(config.test.type);
       assert(config.test.source);

diff --git a/src/Publisher/Builder/DocBuilder.js b/src/Publisher/Builder/DocBuilder.js
@@ -158,17 +158,6 @@ export default class DocBuilder {
 
     ice.drop('testLink', !this._config.test);
 
-    // see StaticFileBuilder#exec
-    ice.loop('userScript', this._config.scripts || [], (i, userScript, ice)=>{
-      const name = `user/script/${i}-${path.basename(userScript)}`;
-      ice.attr('userScript', 'src', name);
-    });
-
-    ice.loop('userStyle', this._config.styles || [], (i, userStyle, ice)=>{
-      const name = `user/css/${i}-${path.basename(userStyle)}`;
-      ice.attr('userStyle', 'href', name);
-    });
-
     ice.drop('manualHeaderLink', !this._config.manual);
 
     if (this._config.manual && this._config.manual.globalIndex) {

diff --git a/src/Publisher/Builder/StaticFileBuilder.js b/src/Publisher/Builder/StaticFileBuilder.js
@@ -13,20 +13,5 @@ export default class StaticFileBuilder extends DocBuilder {
     callback(path.resolve(__dirname, './template/css'), './css');
     callback(path.resolve(__dirname, './template/script'), './script');
     callback(path.resolve(__dirname, './template/image'), './image');
-
-    // see DocBuilder#_buildLayoutDoc
-    const scripts = this._config.scripts || [];
-    for (let i = 0; i < scripts.length; i++) {
-      const userScript = scripts[i];
-      const name = `./user/script/${i}-${path.basename(userScript)}`;
-      callback(userScript, name);
-    }
-
-    const styles = this._config.styles || [];
-    for (let i = 0; i < styles.length; i++) {
-      const userStyle = styles[i];
-      const name = `./user/css/${i}-${path.basename(userStyle)}`;
-      callback(userStyle, name);
-    }
   }
 }
diff --git a/src/Publisher/Builder/template/layout.html b/src/Publisher/Builder/template/layout.html
@@ -7,8 +7,6 @@
   <link type="text/css" rel="stylesheet" href="css/style.css"/>
   <link type="text/css" rel="stylesheet" href="css/prettify-tomorrow.css"/>
   <script src="script/prettify/prettify.js"></script>
-  <link data-ice="userStyle" rel="stylesheet"/>
-  <script data-ice="userScript"></script>
   <script src="script/manual.js"></script>
 </head>
 <body class="layout-container" data-ice="rootContainer">

diff --git a/src/Publisher/publish.js b/src/Publisher/publish.js
@@ -41,6 +41,12 @@ export default function publish(values, asts, config) {
     fs.outputFileSync(filePath, html, {encoding: 'utf8'});
   }
 
+  function writeJS(js, fileName) {
+    log(`output: ${fileName}`);
+    const filePath = path.resolve(config.destination, fileName);
+    fs.outputFileSync(filePath, js, {encoding: 'utf8'});
+  }
+
   function writeBadge(badge, fileName) {
     log(`output: ${fileName}`);
     const filePath = path.resolve(config.destination, fileName);
@@ -72,7 +78,7 @@ export default function publish(values, asts, config) {
   new SingleDocBuilder(data, config).exec(writeHTML);
   new FileDocBuilder(data, config).exec(writeHTML);
   new StaticFileBuilder(data, config).exec(copy);
-  new SearchIndexBuilder(data, config).exec(writeHTML);
+  new SearchIndexBuilder(data, config).exec(writeJS);
   new ASTDocBuilder(data, asts, config).exec(writeAST);
   new SourceDocBuilder(data, config, coverage).exec(writeHTML);
   new ManualDocBuilder(data, config).exec(writeHTML, copy, writeBadge);

diff --git a/test/fixture/config/esdoc-scripts.json b/test/fixture/config/esdoc-scripts.json
diff --git a/test/fixture/config/esdoc-styles.json b/test/fixture/config/esdoc-styles.json
diff --git a/test/src/ConfigTest/ScriptsTest.js b/test/src/ConfigTest/ScriptsTest.js
diff --git a/test/src/ConfigTest/StylesTest.js b/test/src/ConfigTest/StylesTest.js