hauler 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517e3c307e0c965ff5d4d8db2ed055cb4e1c39a4
-  data.tar.gz: 864053fb64d3c840c4eea0b276dab19282eed481
+  metadata.gz: 44c97c03d5cd92496e95c6114b6b41b87bbf4d2f
+  data.tar.gz: ec2bfd1a32429b15d41d61d971e9665cc3604834
 SHA512:
-  metadata.gz: 7a3c900c022d9b185d912b9b69e087a2b81bd29352c36af60b6e94c3b9eb1a8fd8c69d05f214ca8d94421c6acd7221e9dada5f4b21b388d5837da9a53645d93a
-  data.tar.gz: f75794386bfcc518f0323d74c513f9527ded971b2d409c71a464eabbc41cfc68cc51a4700f726b1a46491dfc3764b3a41600a1a7b182a8c8af8c1f3c6bdbe531
+  metadata.gz: 36aed3fdde813b4acc9f3d414f04ab227406eec3dc77de06555f80e982f6a3d67ba5ce4a7116b3372a53ede0c88c3b4da234622d84696cd5bca11bd6f566b716
+  data.tar.gz: 01e66bba70893eef6eae9d74c8611fce337670135e5bd6c7e1776533c509b3a983db4e35547d744681279d1bbdf73a50ad512b6f63c41948f34d51cc7eb21897

data/.babelrc

@@ -1,3 +1,4 @@
 {
+  "presets": ["es2015", "stage-2"],
   "plugins": ["transform-flow-strip-types"]
 }

data/.eslintrc

@@ -1,9 +1,13 @@
 ---
 extends:
-  - airbnb
+  - eslint:recommended
 
 parser: babel-eslint
 
+env:
+  node: true
+  jest: true
+
 plugins:
   - flow-vars
 

data/.gitignore

@@ -10,4 +10,5 @@
 /tmp/
 
 /Gemfile.lock
+/npm-debug.log
 /*.gem

data/.nvmrc

@@ -0,0 +1 @@
+6.3.1

data/Makefile

@@ -1,5 +1,10 @@
 
-build:
+build_gem:
 	gem build hauler.gemspec
 
+publish_npm:
+	npm run build
+	cd dist/
+	npm publish
+
 .PHONY: all;

data/bin/dev-server.js

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 
+const hauler = require('hauler');
 const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
 
-const env = String(process.env.RAILS_ENV || process.env.NODE_ENV);
-const Hauler = require('hauler');
-const devServerConfig = Hauler.getDevServerConfig(env);
-const compilerConfig = Hauler.getCompilerConfig(env);
+const env = hauler.getEnvName();
+const railsRoot = process.argv[2];
+
+const devServerConfig = hauler.getDevServerConfig(env, railsRoot);
+const compilerConfig = hauler.getCompilerConfig(env, railsRoot);
 
 // console.log(devServerConfig);
 // console.log(compilerConfig);

data/bin/read-config.js

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+// @flow
+'use strict';
+
+const railsRoot = process.argv[2];
+
+const hauler = require('hauler');
+const env = hauler.getEnvName();
+
+const devServerConfig = hauler.getDevServerConfig(env, railsRoot);
+const compilerConfig = hauler.getCompilerConfig(env, railsRoot);
+const config = { devServerConfig, compilerConfig };
+const output = JSON.stringify(config);
+
+process.stdout.write(output);

data/bin/update-scripts.js

@@ -10,7 +10,7 @@ if (!pkg.scripts) {
 }
 
 Object.assign(pkg.scripts, {
-  start: './node_modules/hauler/bin/dev-server.js',
+  start: 'hauler-server $(pwd)',
 });
 
 const output = JSON.stringify(pkg, null, 2);

data/lib/generators/hauler/install_generator.rb

@@ -5,7 +5,11 @@ module Hauler
       desc 'Copy Hauler configuration files'
       source_root File.expand_path('../templates', __FILE__)
 
-      def copy_config_hauler
+      def copy_hauler_initializer
+        template 'config/initializers/hauler.rb'
+      end
+
+      def copy_hauler_config
         template 'config/hauler.js'
       end
 

data/lib/generators/hauler/install_npm_generator.rb

@@ -14,6 +14,7 @@ module Hauler
         css-loader@0.23.1
         extract-text-webpack-plugin@1.0.1
         file-loader@0.9.0
+        hauler@0.1.1
         image-webpack-loader@2.0.0
         immutable-devtools@0.0.7
         style-loader@0.13.1

data/lib/generators/hauler/templates/config/hauler.js

@@ -1,6 +1,10 @@
 
-module.exports = {
-  entries: [
-    '~app/assets/my_app/index.js',
-  ],
-};
+function haulerConfigFactory(env) {
+  return {
+    entries: {
+      application: '~app/assets/my_app/index.js',
+    },
+  };
+}
+
+module.exports = haulerConfigFactory;

data/lib/generators/hauler/templates/config/initializers/hauler.rb

@@ -0,0 +1 @@
+Rails.application.config.hauler.dev_server = Rails.env.development?

data/lib/generators/hauler/templates/eslintrc.json

@@ -1,8 +1,6 @@
 {
   "extends": [
-    "airbnb",
-    "plugin:import/errors",
-    "plugin:import/warnings"
+    "airbnb"
   ],
   "parser": "babel-eslint",
   "plugins": [

data/lib/generators/hauler/templates/webpack.config.js

@@ -1,5 +1,6 @@
 
-const Hauler = require('hauler');
-const env = String(process.env.RAILS_ENV || process.env.NODE_ENV);
+const hauler = require('hauler');
+const env = hauler.getEnvName();
 
-module.exports = Hauler.getCompilerConfig(env);
+const config = hauler.getCompilerConfig(env, __dirname);
+module.exports = config;

data/lib/hauler/helpers/hauler_helper.rb

@@ -0,0 +1,76 @@
+require 'active_support/concern'
+require 'action_view/helpers'
+
+module Hauler
+  module Helpers
+    #:nodoc:
+    module HaulerHelper
+      extend ::ActiveSupport::Concern
+
+      include ::ActionView::Helpers
+
+      included do
+        def hauler_dev_server?
+          Rails.application.config.hauler.dev_server
+        end
+
+        def hauler_webpack_config
+          return nil if !hauler_dev_server?
+          @hauler_webpack_config ||= JSON.parse(`hauler-read-config`)
+        end
+
+        def hauler_entries_names
+          @hauler_entries_names ||= begin
+            entries = hauler_webpack_config.try(:[], 'compilerConfig').try(:[], 'entry')
+            entries.try(:keys) || []
+          end
+        end
+
+        def hauler_entry?(path)
+          entry = path.gsub(/\.(css|js)$/, '')
+          hauler_entries_names.include?(entry)
+        end
+
+        def hauler_public_path
+          @hauler_public_path ||= begin
+            public_path = hauler_webpack_config.try(:[], 'devServerConfig').try(:[], 'publicPath')
+            public_path.gsub(%r{/$}, '')
+          end
+        end
+
+        def hauler_format_entry_path(entry)
+          output = entry
+          output += '.js' unless entry.end_with?('.js')
+          output.gsub(%r{^/}, '')
+        end
+
+        alias_method :orig_asset_path, :asset_path
+
+        def hauler_asset_path(path, options = {})
+          return nil unless options[:type].to_s == 'javascript'
+          return nil unless hauler_dev_server? && hauler_entry?(path)
+          [hauler_public_path, hauler_format_entry_path(path)].join('/')
+        end
+
+        def asset_path(source, options = {})
+          hauler_asset_path(source, options) || orig_asset_path(source, options)
+        end
+
+        def path_to_asset(*args)
+          asset_path(*args)
+        end
+
+        alias_method :orig_stylesheet_link_tag, :stylesheet_link_tag
+
+        def stylesheet_link_tag(*sources)
+          return orig_stylesheet_link_tag(*sources) unless hauler_dev_server?
+          options = sources.extract_options!.stringify_keys
+          sources.map do |source|
+            next if hauler_entry?(source)
+            orig_stylesheet_link_tag(source, options)
+          end.compact.join("\n").html_safe
+        end
+      end
+    end
+  end
+end

data/lib/hauler/railtie.rb

@@ -1,27 +1,20 @@
+require 'hauler'
 require 'rails'
-require 'rails/railtie'
-require 'active_support/ordered_options'
-require 'hauler/asset_tag_helper'
-# require 'yaml'
-# require 'erb'
+require 'hauler/helpers/hauler_helper'
+require 'active_support/core_ext/hash/indifferent_access'
 
+# :nodoc:
 module Hauler
-  #:nodoc:
-  class Railtie < ::Rails::Railtie
+  # :nodoc:
+  class Railtie < Rails::Railtie
     config.hauler = ActiveSupport::OrderedOptions.new
-    config.hauler.dev_server = true
+    config.hauler.dev_server = false
 
-    initializer 'hauler.configure_rails_initialization' do
-      # yaml = Pathname.new(Rails.root.join('config', 'assets.yml'))
-      # assets_config = YAML.load(ERB.new(yaml.read).result) || {}
-      # assets_config = assets_config[Rails.env]
+    config.eager_load_namespaces << Hauler
 
-      # if config.action_controller.asset_host.blank?
-      #   config.action_controller.asset_host = assets_config['asset_host']
-      # end
-
-      ::ActiveSupport.on_load :action_view do
-        include ::Hauler::AssetTagHelper
+    initializer 'hauler.helpers' do
+      ::ActiveSupport.on_load(:action_view) do
+        include Hauler::Helpers::HaulerHelper
       end
     end
   end

data/lib/hauler/version.rb

@@ -1,3 +1,8 @@
+# :nodoc:
 module Hauler
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
+
+  def self.version
+    VERSION
+  end
 end

data/lib/hauler.rb

@@ -1,2 +1,5 @@
+require 'active_support'
+require 'active_support/rails'
 require 'hauler/version'
+
 require 'hauler/railtie' if defined?(Rails)

data/make-package.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node --use_strict
 
 const fs = require('fs');
+const path = require('path');
 
-const pkg = require('./package.json');
+const pkg = Object.assign({}, require('./package.json'));
 delete pkg.scripts;
 Object.assign(pkg, {
   main: 'index.js',
@@ -11,3 +12,12 @@ Object.assign(pkg, {
 fs.writeFileSync('dist/package.json', JSON.stringify(pkg, null, 2));
 fs.writeFileSync('dist/LICENSE.txt', fs.readFileSync('./LICENSE.txt').toString());
 fs.writeFileSync('dist/README.md', fs.readFileSync('./README.md').toString());
+
+fs.mkdirSync('dist/bin');
+Object.keys(pkg.bin).forEach(key => {
+  const binaryPath = pkg.bin[key];
+  fs.writeFileSync(
+    path.join('dist', binaryPath),
+    fs.readFileSync(binaryPath).toString()
+  );
+});

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hauler",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "NodeJS binary for the hauler gem",
   "author": "Arturo Guzman @guzart",
   "license": "MIT",
@@ -10,28 +10,43 @@
   },
   "main": "dist/index.js",
   "bin": {
+    "hauler-read-config": "bin/read-config.js",
     "hauler-server": "bin/dev-server.js",
-    "hauler-update-scripts": "bin/update-scripts"
-  },
-  "directories": {
-    "test": "test"
+    "hauler-update-scripts": "bin/update-scripts.js"
   },
   "scripts": {
     "build": "npm-run-all clean compile generate_package",
     "clean": "rm -rf ./dist",
-    "compile": "./node_modules/babel-cli/bin/babel.js --out-dir=./dist --ignore=./decls ./src",
+    "compile": "./node_modules/babel-cli/bin/babel.js --out-dir=./dist --ignore=./decls,**/__tests__ ./src",
     "dev": "npm-run-all clean watch",
     "generate_package": "node make-package.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "watch": "./node_modules/babel-cli/bin/babel.js --watch=./src --ignore=./decls --out-dir=./dist"
+    "test": "jest --verbose",
+    "watch": "./node_modules/babel-cli/bin/babel.js --watch=./src --ignore=./decls,**/__tests__ --out-dir=./dist"
+  },
+  "peerDependencies": {
+    "extract-text-webpack-plugin": "~ 1.0",
+    "webpack": "~ 1.0",
+    "webpack-dev-server": "~ 1.0",
+    "whatwg-fetch": "~ 1.0"
   },
   "devDependencies": {
     "babel-cli": "^6.11.4",
+    "babel-core": "^6.11.4",
     "babel-eslint": "^6.1.2",
+    "babel-jest": "^14.1.0",
     "babel-plugin-transform-flow-strip-types": "^6.8.0",
+    "babel-polyfill": "^6.9.1",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-stage-2": "^6.11.0",
     "eslint": "^3.2.0",
     "eslint-plugin-flow-vars": "^0.5.0",
     "eslint-plugin-flowtype": "^2.4.0",
-    "flow-bin": "^0.30.0"
+    "extract-text-webpack-plugin": "^1.0.1",
+    "flow-bin": "^0.30.0",
+    "jest-cli": "^14.1.0",
+    "npm-run-all": "^2.3.0",
+    "webpack": "^1.13.1",
+    "webpack-dev-server": "^1.14.1",
+    "whatwg-fetch": "^1.0.0"
   }
 }

data/src/decls/hauler.js

@@ -1,3 +1,9 @@
+export type Hash = {[name: string]: any};
+
+export type HostInfo = {
+  host: string,
+  port: number,
+};
 
 export type ProjectConfig = {
   entries?: {[name: string]: string | Array<string>},
@@ -8,6 +14,7 @@ export type ProjectConfig = {
   prependPlugins?: Array<WebpackPlugin>,
   plugins?: Array<WebpackPlugin>,
   appendPlugins?: Array<WebpackPlugin>,
+  publicPath?: string,
   devServer?: WebpackDevServerConfig,
   compiler?: WebpackConfig,
 };

data/src/decls/webpack.js

@@ -1,5 +1,7 @@
 // @flow
 
+// DEV SERVER
+
 export type WebpackDevServerStatsConfig = {
   colors?: boolean,
   hash?: boolean,
@@ -29,7 +31,18 @@ export type WebpackDevServerConfig = {
   stats?: WebpackDevServerStatsConfig,
 };
 
-export type WebpackEntry = string | Array<string> | { [key: string]: WebpackEntry };
+// COMPILER
+
+export type WebpackPlugin = Object;
+
+export type WebpackLoader = {
+  test?: Object,
+  exclude?: Object,
+  include?: Object,
+  loader?: string,
+  loaders?: Array<string>,
+  query?: Object,
+};
 
 export type WebpackResolveConfig = {
   alias?: Object,
@@ -46,14 +59,6 @@ export type WebpackResolveLoaderConfig = WebpackResolveConfig & {
   moduleTemplates?: Array<string>,
 };
 
-export type WebpackLoader = {
-  test?: Object,
-  exclude?: Object,
-  include?: Object,
-  loader?: string,
-  loaders?: Array<string>,
-  query?: Object,
-};
 
 export type WebpackModuleConfig = {
   loaders?: Array<WebpackLoader>;
@@ -62,8 +67,6 @@ export type WebpackModuleConfig = {
   noParse?: Object | Array<Object>;
 }
 
-export type WebpackPlugin = Object;
-
 export type WebpackOutputConfig = {
   filename?: string,
   path?: string,
@@ -89,6 +92,8 @@ export type WebpackOutputConfig = {
   crossOriginLoading?: false | 'anonymous' | 'use-credentials',
 };
 
+export type WebpackEntry = string | Array<string> | { [key: string]: WebpackEntry };
+
 export type WebpackConfig = {
   context?: string,
   entry?: WebpackEntry,

data/src/defaults/compiler_config_factory.js

@@ -1,87 +1,7 @@
 // @flow
 
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const webpack = require('webpack');
-
-function getPlugins(env: string) {
-  let plugins = [
-    new webpack.ProvidePlugin({ fetch: 'exports?self.fetch!whatwg-fetch' }),
-    new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify(env) } }),
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor',
-      children: true,
-      minChunks: 2,
-      async: true,
-    }),
-  ];
-
-  if (env === 'development') {
-    plugins = plugins.concat([
-      new webpack.NoErrorsPlugin(),
-    ]);
-  }
-
-  if (env === 'production') {
-    plugins = plugins.concat([
-      new webpack.optimize.OccurrenceOrderPlugin(true),
-      new webpack.optimize.DedupePlugin(),
-      new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false } }),
-      new ExtractTextPlugin('[name].[contenthash].css'),
-    ]);
-  }
-
-  return plugins;
-}
-
-function configFactory(env: string) {
-  // individual loaders so that they can be replaced separately
-  const javascriptLoader = {
-    test: /\.jsx?$/,
-    loader: 'babel',
-    exclude: /node_modules/,
-    query: {
-      presets: ['es2015', 'react', 'stage-2'],
-      plugins: ['transform-class-properties'],
-    },
-  };
-
-  const sassLoader = {
-    test: /\.scss$/,
-    loader: 'style!css!sass',
-  };
-
-  const fontLoader = {
-    test: /\.(eot|svg|ttf|woff|woff2)$/,
-    loader: 'file',
-  };
-
-  const imageLoader = {
-    test: /\.(jpg|png|gif)$/,
-    loaders: [
-      'file',
-      'image-webpack?{progressive:true, optimizationLevel: 7, interlaced: false, pngquant:{quality: "65-90", speed: 4}}',
-    ],
-  };
-
-  if (env === 'production') {
-    javascriptLoader.query.plugins = javascriptLoader.query.plugins.concat([
-      'transform-react-remove-prop-types',
-      'transform-react-constant-elements',
-      'transform-react-inline-elements',
-    ]);
-
-    sassLoader.loader = ExtractTextPlugin.extract(
-      'style',
-      sassLoader.loader.replace('style!', '')
-    );
-  }
-
-  const appendPlugins = [];
-  const plugins = getPlugins(env);
-  const prependPlugins = [];
-
-  // straight webpack configuration
-  const compiler = {
+export default function defaultConfigFactory(env: string): WebpackConfig {
+  const config = {
     output: {
       filename: '[name].[chunkhash].js',
       path: '~public/assets',
@@ -98,20 +18,9 @@ function configFactory(env: string) {
   };
 
   if (env === 'development') {
-    compiler.output.filename = '[name].js';
-    compiler.output.chunkFilename = '[name].chunk.js';
+    config.output.filename = '[name].js';
+    config.output.chunkFilename = '[name].chunk.js';
   }
 
-  return {
-    javascriptLoader,
-    sassLoader,
-    fontLoader,
-    imageLoader,
-    prependPlugins,
-    plugins,
-    appendPlugins,
-    compiler,
-  };
+  return config;
 }
-
-module.exports = configFactory;

data/src/defaults/dev_server_config_factory.js

@@ -1,4 +1,6 @@
-function defaultConfigFactory() {
+// @flow
+
+export default function defaultConfigFactory() {
   return {
     quiet: false,
     noInfo: false,
@@ -6,7 +8,6 @@ function defaultConfigFactory() {
     port: 3001,
     hot: true,
     inline: true,
-    publicPath: '/assets/',
     headers: { 'AccessControl-Allow-Origin': '*' },
     stats: {
       colors: true,
@@ -16,5 +17,3 @@ function defaultConfigFactory() {
     },
   };
 }
-
-module.exports = defaultConfigFactory;