Concat all js files. Closes jackfranklin#14

gabrielperales · Mar 19, 2017 · 8636d4f · 8636d4f
1 parent 5ea4e42
commit 8636d4f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 elm-stuff/
 build/
 node_modules/
-dist/
+**/*.DS_Store
diff --git a/index.html b/index.html
@@ -6,9 +6,7 @@
     <link rel="stylesheet" type="text/css" href="/style.css" />
   </head>
   <body>
-    <script src="/vendor/highlight.pack.js"></script>
     <script type="text/javascript" src="js/App.js"></script>
-    <script type="text/javascript" src="js/ports.js"></script>
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

diff --git a/js/ports.js b/js/ports.js
@@ -1,4 +1,7 @@
+var elm = require('../src/Main.elm');
+
 var app = Elm.MyApp.fullscreen();
+
 app.ports.newTitle.subscribe(function(value) {
   if (value) {
     document.title = value + ' | The Elm Playground'

diff --git a/src/js/app.js b/src/js/app.js
@@ -0,0 +1,11 @@
+var Elm = require('../App.elm');
+
+var app = Elm.MyApp.fullscreen();
+
+app.ports.newTitle.subscribe(function(value) {
+  if (value) {
+    document.title = value + ' | The Elm Playground'
+  } else {
+    document.title = 'The Elm Playground'
+  }
+});
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,9 +3,11 @@ const path = require('path');
 const webpack = require('webpack');
 
 module.exports = {
-  entry: './src/App.elm',
+  entry: [
+    './src/App.elm',
+    './src/js/app.js',
+  ],
   output: {
-    library: 'Elm',
     path: path.join(__dirname, 'build'),
     filename: 'js/App.js',
   },
@@ -21,6 +23,9 @@ module.exports = {
     }],
   },
   plugins: [
+    new webpack.ProvidePlugin({
+      hljs: path.join(__dirname, './vendor/highlight.pack.js'),
+    }),
     new CopyWebpackPlugin([
       {
         from: 'style.css',
@@ -29,17 +34,14 @@ module.exports = {
         from: 'img/*',
       },
       {
-        from: 'js/*',
-      },
-      {
-        from: 'vendor/**/*',
+        from: 'vendor/**/*.css',
       },
       {
         from: 'content/**/*',
       },
       {
         from: 'index.html',
-      }
-    ])
+      },
+    ]),
   ],
 };