add missing web components

onury · Jun 10, 2016 · 0514ccb · 0514ccb
1 parent cb1d7f5
commit 0514ccb
Show file tree

Hide file tree

Showing 15 changed files with 13,049 additions and 10 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,5 +1,5 @@
 {
-  "directory": "lib/web/components/",
+  "directory": "bower_components/",
   "timeout": 120000,
   "color": true,
   "registry": {

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ backup/
 wiki/
 doc/
 node_modules/
-lib/web/components/
+bower_components/
 tmp/
 test/input/private/
 test/output/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## Docma Change-Log
 ---
 
+#### **v1.0.1** Release (2015-06-11)
+
+- Fixed missing web components.
+
 #### **v1.0.0** Release (2015-06-11)
 
 - <p>**Docma** (Builder):</p>

diff --git a/bower.json b/bower.json
@@ -5,7 +5,6 @@
     "**/.*",
     "node_modules",
     "bower_components",
-    "lib/web/components/",
     "backup",
     "doc",
     "test",

diff --git a/lib/docma.js b/lib/docma.js
@@ -32,13 +32,18 @@ module.exports = (function () {
         DOCMA_CORE_PARTS: path.join(DIR_WEB, 'core.*.js'),
         // components to be compiled into docma-web (unminified files)
         DOCMA_COMPS: [
-            path.join(DIR_COMPS, 'dustjs-linkedin', 'dist', 'dust-core.js'),
-            path.join(DIR_COMPS, 'dustjs-helpers', 'dist', 'dust-helpers.js'),
-            path.join(DIR_COMPS, 'page', 'page.js'),
-            path.join(DIR_COMPS, 'eventEmitter', 'EventEmitter.js')
+            // path.join(DIR_COMPS, 'dustjs-linkedin', 'dist', 'dust-core.js'),
+            // path.join(DIR_COMPS, 'dustjs-helpers', 'dist', 'dust-helpers.js'),
+            // path.join(DIR_COMPS, 'page', 'page.js'),
+            // path.join(DIR_COMPS, 'eventEmitter', 'EventEmitter.js')
+            path.join(DIR_COMPS, 'dust-core.js'),
+            path.join(DIR_COMPS, 'dust-helpers.js'),
+            path.join(DIR_COMPS, 'page.js'),
+            path.join(DIR_COMPS, 'EventEmitter.js')
         ],
         // this is not compiled, used only for jsdom
-        JQUERY: path.join(DIR_COMPS, 'jquery', 'dist', 'jquery.min.js'),
+        // JQUERY: path.join(DIR_COMPS, 'jquery', 'dist', 'jquery.min.js'),
+        JQUERY: path.join(DIR_COMPS, 'jquery.min.js'),
         // docma base styles (for layout generally, not for styling)
         DOCMA_LESS: path.join(DIR_ASSETS, 'docma.less'),
         // JSON that includes emoji code to twemoji SVG filename mapping