railman 1.0.3 → 1.0.4

data/templates/rails_app/config/webpack/development.js

@@ -1,30 +1,16 @@
-// Note: You must restart bin/webpack-watcher for changes to take effect
+// Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const webpack = require('webpack')
 const merge = require('webpack-merge')
-
 const sharedConfig = require('./shared.js')
 
-module.exports = merge(sharedConfig.config, {
+module.exports = merge(sharedConfig, {
   devtool: 'sourcemap',
 
   stats: {
     errorDetails: true
   },
 
-  devServer: {
-    stats: {
-      warnings: false
-    }
-  },
-
   output: {
     pathinfo: true
-  },
-
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      debug: true
-    })
-  ]
+  }
 })

data/templates/rails_app/config/webpack/development.server.js

@@ -0,0 +1,17 @@
+// Note: You must restart bin/webpack-dev-server for changes to take effect
+
+const { resolve } = require('path')
+const merge = require('webpack-merge')
+const devConfig = require('./development.js')
+const { devServer, publicPath, paths } = require('./configuration.js')
+
+module.exports = merge(devConfig, {
+  devServer: {
+    host: devServer.host,
+    port: devServer.port,
+    compress: true,
+    historyApiFallback: true,
+    contentBase: resolve(paths.output, paths.entry),
+    publicPath
+  }
+})

data/templates/rails_app/config/webpack/development.server.yml

@@ -0,0 +1,17 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  enabled: true
+  host: localhost
+  port: 8080
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+  enabled: false
+
+production:
+  <<: *default
+  enabled: false

data/templates/rails_app/config/webpack/loaders/assets.js

@@ -0,0 +1,12 @@
+const { env, publicPath } = require('../configuration.js')
+
+module.exports = {
+  test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,
+  use: [{
+    loader: 'file-loader',
+    options: {
+      publicPath,
+      name: env.NODE_ENV === 'production' ? '[name]-[hash].[ext]' : '[name].[ext]'
+    }
+  }]
+}

data/templates/rails_app/config/webpack/loaders/babel.js

@@ -0,0 +1,5 @@
+module.exports = {
+  test: /\.js(\.erb)?$/,
+  exclude: /node_modules/,
+  loader: 'babel-loader'
+}

data/templates/rails_app/config/webpack/loaders/coffee.js

@@ -0,0 +1,4 @@
+module.exports = {
+  test: /\.coffee(\.erb)?$/,
+  loader: 'coffee-loader'
+}

data/templates/rails_app/config/webpack/loaders/erb.js

@@ -0,0 +1,9 @@
+module.exports = {
+  test: /\.erb$/,
+  enforce: 'pre',
+  exclude: /node_modules/,
+  loader: 'rails-erb-loader',
+  options: {
+    runner: 'bin/rails runner'
+  }
+}

data/templates/rails_app/config/webpack/loaders/sass.js

@@ -0,0 +1,14 @@
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const { env } = require('../configuration.js')
+
+module.exports = {
+  test: /\.(scss|sass|css)$/i,
+  use: ExtractTextPlugin.extract({
+    fallback: 'style-loader',
+    use: [
+      { loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
+      'postcss-loader',
+      'sass-loader'
+    ]
+  })
+}

data/templates/rails_app/config/webpack/loaders/vue.js

@@ -0,0 +1,12 @@
+module.exports = {
+  test: /.vue$/,
+  loader: 'vue-loader',
+  options: {
+    loaders: {
+      js: 'babel-loader',
+      file: 'file-loader',
+      scss: 'vue-style-loader!css-loader!postcss-loader!sass-loader',
+      sass: 'vue-style-loader!css-loader!postcss-loader!sass-loader?indentedSyntax'
+    }
+  }
+}

data/templates/rails_app/config/webpack/paths.yml

@@ -0,0 +1,33 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  config: config/webpack
+  entry: packs
+  output: public
+  manifest: manifest.json
+  node_modules: node_modules
+  source: app/javascript
+  extensions:
+    - .coffee
+    - .js
+    - .jsx
+    - .ts
+    - .vue
+    - .sass
+    - .scss
+    - .css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+  manifest: manifest-test.json
+
+production:
+  <<: *default

data/templates/rails_app/config/webpack/production.js

@@ -1,23 +1,21 @@
-// Note: You must restart bin/webpack-watcher for changes to take effect
+// Note: You must restart bin/webpack-dev-server for changes to take effect
+
+/* eslint global-require: 0 */
 
 const webpack = require('webpack')
 const merge = require('webpack-merge')
 const CompressionPlugin = require('compression-webpack-plugin')
-
 const sharedConfig = require('./shared.js')
 
-module.exports = merge(sharedConfig.config, {
+module.exports = merge(sharedConfig, {
   output: { filename: '[name]-[chunkhash].js' },
 
   plugins: [
-    new webpack.LoaderOptionsPlugin({
-      minimize: true
-    }),
     new webpack.optimize.UglifyJsPlugin(),
     new CompressionPlugin({
       asset: '[path].gz[query]',
       algorithm: 'gzip',
-      test: /\.js$/
+      test: /\.(js|css|svg|eot|ttf|woff|woff2)$/
     })
   ]
 })

data/templates/rails_app/config/webpack/shared.js

@@ -1,80 +1,54 @@
-// Note: You must restart bin/webpack-watcher for changes to take effect
+// Note: You must restart bin/webpack-dev-server for changes to take effect
+
+/* eslint global-require: 0 */
+/* eslint import/no-dynamic-require: 0 */
 
 const webpack = require('webpack')
-const path = require('path')
-const process = require('process')
-const glob = require('glob')
+const { basename, dirname, join, relative, resolve } = require('path')
+const { sync } = require('glob')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const ManifestPlugin = require('webpack-manifest-plugin')
 const extname = require('path-complete-extname')
+const { env, paths, publicPath, loadersDir } = require('./configuration.js')
 
-let distDir = process.env.WEBPACK_DIST_DIR
-
-if (distDir === undefined) {
-  distDir = 'packs'
-}
+const extensionGlob = `**/*{${paths.extensions.join(',')}}*`
+const packPaths = sync(join(paths.source, paths.entry, extensionGlob))
 
-const config = {
-  entry: glob.sync(path.join('app', 'javascript', 'packs', '*.js*')).reduce(
+module.exports = {
+  entry: packPaths.reduce(
     (map, entry) => {
-      const basename = path.basename(entry, extname(entry))
       const localMap = map
-      localMap[basename] = path.resolve(entry)
+      const namespace = relative(join(paths.source, paths.entry), dirname(entry))
+      localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry)
       return localMap
     }, {}
   ),
 
-  output: { filename: '[name].js', path: path.resolve('public', distDir) },
+  output: {
+    filename: '[name].js',
+    path: resolve(paths.output, paths.entry),
+    publicPath
+  },
 
   module: {
-    rules: [
-      {
-        test: /.vue$/, loader: 'vue-loader',
-        options: {
-          loaders: { 'scss': 'vue-style-loader!css-loader!sass-loader', 'sass': 'vue-style-loader!css-loader!sass-loader?indentedSyntax'}
-        }
-      },
-      { test: /.png$/, loader: 'url-loader?mimetype=image/png'},
-      { test: /\.coffee(\.erb)?$/, loader: 'coffee-loader' },
-      {
-        test: /\.js(\.erb)?$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        options: {
-          presets: [
-            ['env', { modules: false }]
-          ]
-        }
-      },
-      {
-        test: /\.erb$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
-        loader: 'rails-erb-loader',
-        options: {
-          runner: 'DISABLE_SPRING=1 bin/rails runner'
-        }
-      }
-    ]
+    rules: sync(join(loadersDir, '*.js')).map(loader => require(loader))
   },
 
   plugins: [
-    new webpack.EnvironmentPlugin(Object.keys(process.env))
+    new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
+    new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css'),
+    new ManifestPlugin({ fileName: paths.manifest, publicPath, writeToFileEmit: true })
   ],
 
   resolve: {
-    alias: { 'vue$':'vue/dist/vue.esm.js' },
-    extensions: ['.js', '.coffee'],
+    extensions: paths.extensions,
     modules: [
-      path.resolve('app/javascript'),
-      path.resolve('node_modules')
+      resolve(paths.source),
+      resolve(paths.node_modules)
     ]
   },
 
   resolveLoader: {
-    modules: [path.resolve('node_modules')]
+    modules: [paths.node_modules]
   }
 }
-
-module.exports = {
-  distDir,
-  config
-}

data/templates/rails_app/config/webpack/test.js

@@ -0,0 +1,6 @@
+// Note: You must restart bin/webpack-dev-server for changes to take effect
+
+const merge = require('webpack-merge')
+const sharedConfig = require('./shared.js')
+
+module.exports = merge(sharedConfig, {})

data/templates/rails_app/package.json.tt

@@ -2,27 +2,34 @@
   "name": "<%= @config.app_name %>",
   "private": true,
   "dependencies": {
-    "axios": "^0.15.3",
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.3.2",
-    "babel-preset-env": "^1.1.11",
+    "autoprefixer": "^7.0.1",
+    "babel-core": "^6.24.1",
+    "babel-loader": "7.x",
+    "babel-preset-env": "^1.4.0",
     "coffee-loader": "^0.7.3",
-    "coffee-script": "^1.12.4",
-    "compression-webpack-plugin": "^0.3.2",
-    "css-loader": "^0.26.2",
+    "coffee-script": "^1.12.5",
+    "compression-webpack-plugin": "^0.4.0",
+    "css-loader": "^0.28.1",
+    "extract-text-webpack-plugin": "^2.1.0",
+    "file-loader": "^0.11.1",
     "glob": "^7.1.1",
-    "node-sass": "^4.5.0",
+    "js-yaml": "^3.8.4",
+    "node-sass": "^4.5.2",
     "path-complete-extname": "^0.1.0",
-    "rails-erb-loader": "^3.2.0",
-    "sass-loader": "^6.0.2",
-    "url-loader": "^0.5.8",
-    "vue": "^2.2.1",
-    "vue-loader": "^11.1.3",
-    "vue-template-compiler": "^2.2.1",
-    "webpack": "^2.2.1",
-    "webpack-merge": "^3.0.0"
+    "postcss-loader": "^2.0.3",
+    "postcss-smart-import": "^0.6.13",
+    "precss": "^1.4.0",
+    "rails-erb-loader": "^5.0.0",
+    "sass-loader": "^6.0.4",
+    "style-loader": "^0.17.0",
+    "vue": "^2.3.3",
+    "vue-loader": "^12.0.3",
+    "vue-template-compiler": "^2.3.3",
+    "webpack": "^2.5.1",
+    "webpack-manifest-plugin": "^1.1.0",
+    "webpack-merge": "^4.1.0"
   },
   "devDependencies": {
-    "webpack-dev-server": "^2.4.1"
+    "webpack-dev-server": "^2.4.5"
   }
 }

data/templates/rails_app/public/404.html

@@ -4,64 +4,64 @@
   <title>The page you were looking for doesn't exist (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-    margin: 0;
-  }
+    .rails-default-error-page {
+      background-color: #EFEFEF;
+      color: #2E2F30;
+      text-align: center;
+      font-family: arial, sans-serif;
+      margin: 0;
+    }
 
-  div.dialog {
-    width: 95%;
-    max-width: 33em;
-    margin: 4em auto 0;
-  }
+    .rails-default-error-page div.dialog {
+      width: 95%;
+      max-width: 33em;
+      margin: 4em auto 0;
+    }
 
-  div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
+    .rails-default-error-page div.dialog > div {
+      border: 1px solid #CCC;
+      border-right-color: #999;
+      border-left-color: #999;
+      border-bottom-color: #BBB;
+      border-top: #B00100 solid 4px;
+      border-top-left-radius: 9px;
+      border-top-right-radius: 9px;
+      background-color: white;
+      padding: 7px 12% 0;
+      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+    }
 
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
+    .rails-default-error-page h1 {
+      font-size: 100%;
+      color: #730E15;
+      line-height: 1.5em;
+    }
 
-  div.dialog > p {
-    margin: 0 0 1em;
-    padding: 1em;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
+    .rails-default-error-page div.dialog > p {
+      margin: 0 0 1em;
+      padding: 1em;
+      background-color: #F7F7F7;
+      border: 1px solid #CCC;
+      border-right-color: #999;
+      border-left-color: #999;
+      border-bottom-color: #999;
+      border-bottom-left-radius: 4px;
+      border-bottom-right-radius: 4px;
+      border-top-color: #DADADA;
+      color: #666;
+      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+    }
   </style>
 </head>
 
-<body>
-  <!-- This file lives in public/404.html -->
-  <div class="dialog">
-    <div>
-      <h1>The page you were looking for doesn't exist.</h1>
-      <p>You may have mistyped the address or the page may have moved.</p>
-    </div>
-    <p>If you are the application owner check the logs for more information.</p>
+<body class="rails-default-error-page">
+<!-- This file lives in public/404.html -->
+<div class="dialog">
+  <div>
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
+</div>
 </body>
 </html>