lanes 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0feadcbac0b7bbdcc56d60c45bbdcf69a208e9fc
-  data.tar.gz: e447deaa92b26506ec973523a75725d6b93e8a2a
+  metadata.gz: 4e996b32bc8dc10aa628ae2eaf9683e14f070ae9
+  data.tar.gz: 7b1e8f708c347328a33e5962068db0df86669ad6
 SHA512:
-  metadata.gz: fce5c603ac1ba03e5501882ad502436c7eb19b1fa11949ce52bd82b44971512500a729537fd86e1eacb680e4a24168a44cc7b42a67c3aded99691c20d9d8c9d7
-  data.tar.gz: f61a9c8e78347ec0963a171b048f58c46f4ce25941da5bce39c9c1dbe8304dd07806cd6e6b29f879a43e4fbb2aa4049bfecf47964295f9835bb458ede63165a9
+  metadata.gz: 841d9120509bc907ea6e434068b82346e37efdf9ed85baefa2e3f1293c3e947af65ed3c53ae4060f47e89caddcff2e02c72e9c4f785ce869b86a2651dd31fb49
+  data.tar.gz: 9828cea8c1618a6635b090a19c93260b6ffe1939484325b2e4f26d41040cd786319a9d3893bb692e867a198cd6c0a31f6f461ecdff714ee0948df79c2e31f52d

data/client/lanes/config.js

@@ -35,111 +35,3 @@ class Config {
 
 const ConfigInstance = new Config();
 export default ConfigInstance;
-
-
-
-    // static initClass() {
-
-    //     this.prototype.mixins = [ Lanes.Models.Mixins.FileSupport ];
-
-    //     this.prototype.props = {
-    //         id:       {type:"integer"},
-    //         settings: "object"
-    //     };
-
-    //     this.prototype.associations = {
-    //         logo:        { model: "Lanes.Models.Asset"        },
-    //         smtp:        { model: "Lanes.Models.SmtpSettings" },
-    //         print_logo:  { model: "Lanes.Models.Asset"        }
-    //     };
-    // }
-
-    // modelTypeIdentifier() { return 'system-settings'; }
-    // url() { return Lanes.config.api_path + '/system-settings'; }
-    // initialize() {
-    //     this.on('change:settings', this.setDefaultSettings);
-    //     this.smtp.set(__guard__(__guard__(this.settings, x1 => x1.lanes), x => x.smtp));
-    //     return this.setDefaultSettings();
-    // }
-
-    // setDefaultSettings() {
-    //     if (!this.settings) { this.settings = {}; }
-    //     return this.settings.lanes || (this.settings.lanes = {});
-    // }
-
-    // forExtension(ext) {
-    //     return this.settings[ext] || (this.settings[ext] = {});
-    // }
-
-    // setValueForExtension(ext, key, value) {
-    //     return this.forExtension(ext)[key] = value;
-    // }
-
-    // set(data) {
-    //     let ret = super.set(...arguments);
-    //     this.smtp.set(__guard__(__guard__(this.settings, x1 => x1.lanes), x => x.smtp));
-    //     return ret;
-    // }
-
-    // dataForSave() {
-    //     let data = super.dataForSave(...arguments);
-    //     data.settings.lanes.smtp = this.smtp.serialize();
-    //     return data;
-    // }
-
-
-// SystemSettings.initClass();
-
-// class Config extends Lanes.Models.State {
-//     static initClass() {
-
-//         this.prototype.session = {
-//             csrf_token:  { type: 'string', setOnce: true     },
-//             root_path:   { type: 'string', setOnce: true     },
-//             api_path:    { type: 'string', default: '/api'   },
-//             environment: { type: 'string', setOnce: true     },
-//             system_settings: { type: 'state', required: true },
-//             assets_path_prefix: { type: 'string', setOnce: true },
-//             api_host:    { type: 'string', default: `//${window.location.host }` },
-//             initial_workspace_screen_id: { type: 'string', setOnce: true      }
-//         };
-
-//         this.prototype.derived = {
-//             env: {
-//                 deps: ['environment'], fn() {
-//                     return {
-//                         test:        this.environment === 'test',
-//                         development: this.environment === 'development',
-//                         production:  this.environment === 'production'
-//                     };
-//                 }
-//             }
-//         };
-//     }
-
-//     initialize() {
-//         return this.system_settings = new SystemSettings;
-//     }
-
-//     bootstrap(options) {
-//         if (options.system_settings) {
-//             this.system_settings.set(options.system_settings);
-//             delete options.system_settings;
-//         }
-//         this.set(options);
-//         if (_.isObject(options)) { return Lanes.Extensions.setBootstrapData(options); }
-//     }
-// }
-// Config.initClass();
-
-// let configInstance = new Config;
-
-// Object.defineProperty(Lanes, 'config', {
-//     get() { return configInstance; },
-//     set() { throw new Error("Unable to reset config"); }
-// }
-// );
-
-// function __guard__(value, transform) {
-//   return (typeof value !== 'undefined' && value !== null) ? transform(value) : undefined;
-// }

data/lanes.gemspec

@@ -55,7 +55,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "pg",                     "~> 0.8"
     spec.add_dependency "rake",                   "~> 12.0"
     spec.add_dependency "require_all",            "~> 1.3"
-    spec.add_dependency "resque",                 "~> 1.25"
+    spec.add_dependency "resque",                 "~> 1.27"
     spec.add_dependency "sanitize",               "~> 3.0"
     spec.add_dependency "webpack_driver",         "~> 0.2"
     spec.add_dependency "knitter",                "~> 0.2"

data/lib/js/jest.config.json

@@ -3,11 +3,6 @@
     "notify": false,
     "testMatch": [ "**/?(*.)(spec|test).js?(x)" ],
     "moduleFileExtensions": [ "js", "jsx", "json" ],
-    "setupTestFrameworkScriptFile": "<rootDir>/lib/js/jest/setup.js",
-    "modulePaths": [
-        "<rootDir>/client",
-        "<rootDir>/lib/js/jest/stubs"
-    ],
     "transform": {
         "^.+\\.jsx?$": "babel-jest"
     },

data/lib/js/jest/mocks.js

@@ -49,4 +49,4 @@ fetch.mockResponses = (...responses) => {
 // Default mock is just a empty string.
 fetch.mockResponse('');
 
-export { fetch };
+module.exports = { fetch };

data/lib/js/jest/setup.js

@@ -1,19 +1,12 @@
-import { shallow, mount } from 'enzyme';
-import { useStrict } from 'mobx';
-import { fetch } from './mocks';
-
-import 'jest-enzyme';
-// jest.mock('flexboxgrid', () => {
-//     return {};
-// });
-
-//useStrict(true);
+const { shallow, mount } = require('enzyme');
+const { fetch } = require('./mocks');
 
 global.shallow = shallow;
 global.mount   = mount;
 global.fetch   = fetch;
+global.React   = require('React');
 
-jasmine.addMatchers({
+jest.addMatchers({
 
     toHaveRendered() {
         return {
@@ -25,7 +18,6 @@ jasmine.addMatchers({
                 } else {
                     result.message = `Expected wrapper to contain '${selector}' only once, but it was found ${matchCount} times`;
                 }
-
                 return result;
             },
         };

data/lib/js/webpack.config.js

@@ -2,8 +2,12 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
 const path = require('path');
-const roots = process.env.LANES_EXT_ROOTS || './client';
-const generated_dir = process.env.LANES_GENERATED_DIR;
+// const roots = process.env.LANES_EXT_ROOTS || './client';
+// const controlling_root = process.env.LANES_CONTROLLER_DIR;
+        // roots.split(',').concat([
+        //     'node_modules',
+        //     generated_dir,
+        // ]),
 
 const config = {
     entry: {
@@ -18,16 +22,13 @@ const config = {
         filename: 'lanes.js',
     },
     resolve: {
-        modules: roots.split(',').concat([
-            'node_modules',
-            generated_dir,
-        ]),
+        modules: process.env.LANES_MODULES.split(':'),
         extensions: ['.js', '.jsx'],
     },
     module: {
         rules: [
             { test: /\.css$/, use: ['style-loader', 'css-loader'] },
-            { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader' },
+            { loader: 'babel-loader', test: /\.jsx?$/, exclude: /node_modules/ },
             { test: /\.scss$/,
                 use: [
                     'style-loader',
@@ -50,7 +51,7 @@ const config = {
         new HtmlWebpackPlugin({
             title: 'My App',
             filename: 'index.html',
-            template: `${generated_dir}/root-view.tmpl.html`,
+            template: `${process.env.GENERATED_CONFIG_DIR}/root-view.tmpl.html`,
         }),
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development'),

data/lib/lanes.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'pathname'
 
 module Lanes
     ROOT_PATH = Pathname.new(__FILE__).dirname.join('..')

data/lib/lanes/command/app.rb

@@ -23,10 +23,11 @@ module Lanes
             end
 
             def create_files
-                [ "Gemfile", "Rakefile", "Guardfile", "config.ru",
-                  "config/database.yml"
+                [
+                    "Gemfile", "Rakefile", "Guardfile", "config.ru",
+                    ".babelrc", "config/database.yml"
                 ].each{ |f| template(f) }
-                [ ".eslintrc.js", ".babelrc", ".rubocop.yml"
+                [ ".eslintrc.js", ".rubocop.yml"
                 ].each{ |f| template("../#{f}", f) }
                 template "lib/namespace.rb", "lib/#{identifier}.rb"
                 template "lib/namespace/version.rb", "lib/#{identifier}/version.rb"
@@ -34,6 +35,7 @@ module Lanes
                 template "lib/namespace/base_model.rb", "lib/#{identifier}/model.rb"
                 template "config/screens.rb"
                 template "config/routes.rb"
+                template "config/webpack.config.js"
                 template "config/lanes.rb"
                 template "gitignore",".gitignore"
 
@@ -65,8 +67,13 @@ module Lanes
                 say 'Installing node modules', :green
                 yarn = Knitter::Yarn.new(self.destination_root)
                 yarn.init
-                ['lanes-framework', 'jest', 'webpack-dev-server'].each do | package_name |
-                    say(sprintf('    %-20s…', package_name), nil, false)
+                [
+                    'jest',
+                    'lanes-framework',
+                    'react-router',
+                    'webpack-dev-server'
+                ].each do | package_name |
+                    say(sprintf('    %-20s', package_name + '…'), nil, false)
                     package = Knitter::Package.new(package_name, yarn: yarn)
                     package.add
                     say 'done', :green

data/lib/lanes/command/jest.rb

@@ -5,7 +5,7 @@ require 'guard/jest'
 
 require_relative '../extension'
 require_relative '../command'
-
+require 'irb'
 module Lanes
     module Command
 
@@ -20,6 +20,7 @@ module Lanes
             attr_accessor :lanes_root_path
             attr_accessor :extension_path
             attr_accessor :config_file
+            attr_accessor :module_paths
 
             def apply_lanes_config
                 Lanes::Configuration.apply
@@ -29,18 +30,19 @@ module Lanes
             def configure
                 say 'Generating Jest Config', :green
                 ext = Command.load_current_extension(raise_on_fail: true)
-
                 self.extension_path = ext.root_path
-
                 self.lanes_root_path = ROOT
                 config_dir = Pathname.new(Dir.mktmpdir)
                 self.config_file = config_dir.join("jest.config.json")
+                self.module_paths = Extensions.asset_paths(ext, config_dir.to_s)
                 template('js/jest.config.json', config_file, verbose: false, force: true)
-                return self
+                self
             end
 
             def start
                 say 'Starting Jest', :green
+                say Dir.pwd, :yellow
+                puts "$(npm bin)/jest --watch --config #{config_file};"
                 exec("$(npm bin)/jest --watch --config #{config_file};")
             end
         end

data/lib/lanes/command/server.rb

@@ -1,10 +1,5 @@
 require 'guard/cli'
-require 'webpack_driver'
-require 'puma/cli'
-require 'guard/jest'
-#require 'lanes/api'
 require_relative '../webpack'
-require_relative 'jest_runner'
 
 module Lanes
     module Command
@@ -16,9 +11,7 @@ module Lanes
                 say "Launching testing server at http://localhost:8888/", :green
                 require 'lanes/api'
                 Lanes::Configuration.apply
-
-                API.webpack = Lanes::Webpack.server
-
+                API.webpack = Lanes::Webpack.new
                 threads = []
                 Thread.abort_on_exception = true
                 threads << Thread.new { API::Root.run! }
@@ -31,19 +24,14 @@ module Lanes
                     end
                     Lanes.logger.info "ok, ctrl-c trap registered"
                 end
-
                 API.webpack.start
-
                 sleep(1) # give webpack a bit of time to fail if it's going to
-
                 unless API.webpack.alive?
                     puts API.webpack.messages
                     exit 1
                 end
-
-                Guard.start
-
-                API.webpack.stop
+                Guard.start # will block until complete
+                API.webpack.stop # stop webpack after guard completes
             end
         end
     end

data/lib/lanes/extension.rb

@@ -17,6 +17,13 @@ module Lanes
                 end
             end
 
+            def asset_paths(controller, additional)
+                map { |ext| ext.root_path.join('client').to_s }.reverse + [
+                    controller.root_path.join('node_modules').to_s,
+                    additional
+                ]
+            end
+
             # lock the current controlling extension so that it can't
             # be changed by other extensions that are loaded later
             def lock_controlling!

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
 
 end

data/lib/lanes/webpack.rb

@@ -1,4 +1,6 @@
 require 'forwardable'
+require 'fileutils'
+require 'pathname'
 require 'erb'
 
 module Lanes
@@ -10,53 +12,53 @@ module Lanes
 
         extend Forwardable
         def_delegators :@process, :port, :environment, :stop, :alive?, :start, :wait
+        attr_reader :process
 
-        attr_reader :generated_asset_dir
+        def initialize
+            controller = Command.load_current_extension(raise_on_fail: true)
 
-        def self.server
             config = WebpackDriver::Configuration.new(
-                Pathname.new(__FILE__).dirname.join('..','js','webpack.config.js'),
-                directory: Pathname.new(__FILE__).dirname.join('..', '..'),
+                controller.root_path.join('config', 'webpack.config.js'),
                 cmd_line_flags: ['--hot', '--inline'],
-                logger: Lanes.logger
+                logger: Lanes.logger,
+                directory: controller.root_path
             )
 
-            Webpack.new(config)
+            generated_asset_dir = write_asset_files
+
+            config.environment.merge!(
+                EXTENSION_ID: controller.identifier,
+                LANES_MODULES: modules(controller, generated_asset_dir).join(':'),
+                ENTRY: 'show-maker/index.js',
+                GENERATED_CONFIG_DIR: generated_asset_dir.to_s
+            )
+            @process = ::WebpackDriver::DevServer.new(config)
         end
 
-        attr_reader :process
 
         def api_host
-            Lanes.env.production? ? '' : "http://localhost:#{API::Root.settings.port}"
+            Lanes.env.production? ?
+                '' : "http://localhost:#{API::Root.settings.port}"
         end
 
-        def initialize(config)
-
-            @generated_asset_dir = Pathname.new(Dir.mktmpdir)
-            generated_asset_dir.join('lanes').mkpath
-            write_asset_files
-
-            puts Extensions.map{|ext| ext.root_path.join('client').to_s }.join(',')
-
-            config.environment.merge!(
-                LANES_EXT_ROOTS: Extensions.map{|ext|
-                    ext.root_path.join('client').to_s
-                }.join(','),
-                LANES_GENERATED_DIR: generated_asset_dir.to_s
-            )
-
-            @process = ::WebpackDriver::DevServer.new(config)
+        def modules(controller, generated_asset_dir)
+            Extensions.asset_paths(controller, generated_asset_dir.to_s)
         end
 
         def write_asset_files
+            dir = Pathname.new(Dir.mktmpdir)
+            dir.join('lanes').mkpath
+
             screens = ERB.new(TEMPLATES.join('screens.js').read)
-            root_view  = ERB.new(TEMPLATES.join('root-view.html').read)
-            generated_asset_dir
+            root_view = ERB.new(TEMPLATES.join('root-view.html').read)
+            dir
                 .join('lanes', 'screen-definitions.js')
                 .write(screens.result(binding))
-            generated_asset_dir
-                .join('root-view.tmpl.html')
-                .write(root_view.result(binding))
+            template = dir.join('root-view.tmpl.html')
+            template.write(root_view.result(binding))
+            # set the mtime to the past, otherwise Webpack will build repeatedly for a second
+            FileUtils.touch template.to_s, :mtime => Time.now - 1.minute
+            return dir
         end
 
         def assets

data/package.json

@@ -6,38 +6,10 @@
   "repository": "https://github.com/argosity/lanes",
   "author": "Nathan Stitt <nathan@stitt.org>",
   "license": "MIT",
-  "files": [ "client" ],
+  "files": [
+    "client"
+  ],
   "dependencies": {
-    "classnames": "^2.2.5",
-    "domtastic": "^0.12.3",
-    "flexboxgrid": "^6.3.1",
-    "formous": "^0.9.2",
-    "grommet": "^1.2.1",
-    "history": "^4.5.1",
-    "invariant": "^2.2.2",
-    "lodash": "^4.17.4",
-    "loglevel": "^1.4.1",
-    "mobx": "^3.0.0",
-    "mobx-decorated-models": "^0.4.4",
-    "mobx-react": "^4.1.0",
-    "pluralize": "^3.1.0",
-    "qs": "^6.3.0",
-    "react": "^15.4.2",
-    "react-addons-shallow-compare": "^15.4.2",
-    "react-async-component": "^0.2.2",
-    "react-dom": "^15.4.2",
-    "react-dropzone": "^3.10.0",
-    "react-flexbox-grid": "nathanstitt/react-flexbox-grid#devel",
-    "react-motion": "^0.4.7",
-    "react-router": "^3.0.2",
-    "react-sidebar": "^2.3.0",
-    "react-virtualized": "^9.0.0",
-    "rsvp": "^3.3.3",
-    "serializr": "^1.1.9",
-    "validator": "^6.2.1",
-    "whatwg-fetch": "^2.0.2",
-    "when-dom-ready": "^1.2.4",
-
     "babel-core": "^6.21.0",
     "babel-eslint": "latest",
     "babel-jest": "^18.0.0",
@@ -53,25 +25,54 @@
     "babel-preset-react": "^6.16.0",
     "babel-preset-stage-0": "^6.22.0",
     "babel-preset-stage-1": "^6.16.0",
+    "classnames": "^2.2.5",
     "css-loader": "^0.26.1",
+    "domtastic": "^0.12.3",
     "enzyme": "^2.7.0",
     "eslint": "^3.13.1",
     "eslint-config-airbnb": "latest",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "latest",
     "eslint-plugin-react": "^6.9.0",
+    "flexboxgrid": "^6.3.1",
+    "formous": "^0.9.2",
+    "grommet": "^1.2.1",
+    "history": "^4.5.1",
     "html-webpack-plugin": "^2.28.0",
     "identity-obj-proxy": "^3.0.0",
+    "invariant": "^2.2.2",
     "jest": "^19.0.2",
     "jest-enzyme": "^2.1.2",
     "jest-fetch-mock": "^1.0.7",
+    "lodash": "^4.17.4",
+    "loglevel": "^1.4.1",
+    "mobx": "^3.0.0",
+    "mobx-decorated-models": "^0.4.4",
+    "mobx-react": "^4.1.0",
     "node-sass": "^4.5.0",
+    "pluralize": "^3.1.0",
+    "qs": "^6.3.0",
+    "react": "^15.4.2",
+    "react-addons-shallow-compare": "^15.4.2",
     "react-addons-test-utils": "^15.4.2",
+    "react-async-component": "^0.2.2",
+    "react-dom": "^15.4.2",
+    "react-dropzone": "^3.10.0",
+    "react-flexbox-grid": "nathanstitt/react-flexbox-grid#devel",
     "react-hot-loader": "3.0.0-beta.6",
+    "react-motion": "^0.4.7",
+    "react-router": "^3.0.2",
+    "react-sidebar": "^2.3.0",
     "react-test-renderer": "^15.4.2",
+    "react-virtualized": "^9.0.0",
+    "rsvp": "^3.3.3",
     "sass-loader": "^4.1.1",
+    "serializr": "^1.1.9",
     "style-loader": "^0.13.1",
+    "validator": "^6.2.1",
     "webpack": "v2.2.0-rc.4",
-    "webpack-dev-server": "v2.2.0-rc.0"
+    "webpack-dev-server": "v2.2.0-rc.0",
+    "whatwg-fetch": "^2.0.2",
+    "when-dom-ready": "^1.2.4"
   }
 }

data/templates/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # For development while Lanes is evolving track master branch
-gem "lanes", git: "https://github.com/argosity/lanes", branch: 'next-gen'
+gem "lanes", git: "https://github.com/argosity/lanes", branch: 'master'
 
 # gem "lanes", '<%= Lanes::VERSION %>'
 

data/templates/client/index.js

@@ -1,19 +1,6 @@
-//=require ./models/Base
-//=require ./components/Base
-//=require_tree ./models
-//=require_tree ./components
-//=require ./screens/Base
-//=require ./Extension
-
 /*
- Files located in the above directories are part of the default
- Javascript build and are downloaded to the client on the initial
- request.
-
- Accordingly, only essential files should be included here. Code that
- relates to a screen should be placed in the "screens" directory,
- where it will be loaded dynamically when the screen is displayed.
+  This is the main entry point for your application
+  By default it simply imports the standard lanes boot file
+*/
 
- Alternatively, feel free to modify the require statements above to
- only include the paths you need.
- */
+import 'lanes/boot';

data/templates/config/webpack.config.js

@@ -0,0 +1,105 @@
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const webpack = require('webpack');
+const path = require('path');
+
+const config = {
+    entry: {
+        lanes: [
+            'react-hot-loader/patch',
+            process.env.ENTRY,
+        ],
+    },
+    output: {
+        path: __dirname,
+        publicPath: '/',
+        filename: `${process.env.EXTENSION_ID}/.js`,
+    },
+    resolve: {
+        modules: process.env.LANES_MODULES.split(':'),
+        extensions: ['.js', '.jsx'],
+    },
+    module: {
+        rules: [
+            { test: /\.css$/, use: ['style-loader', 'css-loader'] },
+            {
+                loader: 'babel-loader',
+                test: /\.jsx?$/,
+                exclude: /node_modules/,
+                options: {
+                    plugins: [
+                        'react-hot-loader/babel',
+                        'babel-plugin-transform-decorators-legacy',
+                        'babel-plugin-transform-class-properties',
+                        'babel-plugin-transform-function-bind',
+                        'babel-plugin-transform-react-jsx',
+                        'babel-plugin-transform-runtime',
+                    ].map(require.resolve),
+                    presets: [
+                        [require.resolve('babel-preset-es2015'), { modules: false }],
+                        require.resolve('babel-preset-react'),
+                        require.resolve('babel-preset-stage-1'),
+                    ],
+                },
+            },
+            { test: /\.scss$/,
+                use: [
+                    'style-loader',
+                    'css-loader',
+                    {
+                        loader: 'sass-loader',
+                        options: {
+                            includePaths: [path.resolve('./node_modules')],
+                        },
+                    },
+                ],
+            },
+        ],
+    },
+    devtool: 'source-map',
+    plugins: [
+        new webpack.optimize.CommonsChunkPlugin({
+            name: 'vendor', minChunks: Infinity, filename: '[name].[hash].js',
+        }),
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            template: `${process.env.GENERATED_CONFIG_DIR}/root-view.tmpl.html`,
+        }),
+        new webpack.DefinePlugin({
+            'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development'),
+        }),
+    ],
+    node: {
+        fs: 'empty',
+    },
+    devServer: {
+        hot: true,
+        inline: true,
+        port: 8889,
+        historyApiFallback: true,
+        proxy: [{
+            context: '/api',
+            target: 'http://localhost:4567',
+        }],
+        stats: {
+            colors: true,
+            profile: true,
+            hash: false,
+            version: false,
+            timings: false,
+            assets: true,
+            chunks: false,
+            modules: false,
+            reasons: true,
+            children: false,
+            source: true,
+            errors: true,
+            errorDetails: false,
+            warnings: true,
+            publicPath: false,
+        },
+    },
+};
+
+// console.log(config)
+
+module.exports = config;

data/templates/js/jest.config.json

@@ -1,14 +1,19 @@
 {
-    "rootDir": "<%= lanes_root_path %>",
-    "preset": "<rootDir>/lib/js/jest.config.json",
+    "preset": "<%= lanes_root_path %>/lib/js/jest.config.json",
     "roots": [
         "<%= extension_path %>/client",
-        "<%= extension_path %>/spec",
-        "<rootDir>/client"
+        "<%= extension_path %>/spec"
     ],
+    "setupTestFrameworkScriptFile": "<%= lanes_root_path %>/lib/js/jest/setup.js",
+    "transform": {
+        "^.+\\.jsx?$": "babel-jest"
+    },
     "modulePaths": [
-        "<%= extension_path %>/client",
-        "<rootDir>/client",
-        "<rootDir>/lib/js/jest/stubs"
-    ]
+        <%= module_paths.map{|mod| "\"#{mod}\"" }.join(", ") %>,
+        "<%= lanes_root_path %>/lib/js/jest/stubs"
+    ],
+    "moduleNameMapper": {
+        "\\.(css|less|scss)$": "<rootDir>/lib/js/jest/styleMock.js",
+        "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/lib/js/jest/fileMock.js"
+    }
 }

data/templates/lib/namespace/extension.rb

@@ -14,7 +14,7 @@ module <%= namespace %>
         # is returned from this method, it will be passed to
         # the setBootstrapData method in client/<%= identifier %>/Extension.coffee
         # when the app boots
-        def client_bootstrap_data(view)
+        def client_bootstrap_data
             nil
         end
     end

data/yarn.lock

@@ -2965,14 +2965,10 @@ https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
-iconv-lite@0.4.13:
+iconv-lite@0.4.13, iconv-lite@~0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@~0.4.13:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-
 icss-replace-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.27'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -509,7 +509,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".babelrc"
 - ".dir-locals.el"
 - ".eslintrc.js"
 - ".flowconfig"
@@ -791,7 +790,6 @@ files:
 - lib/js/jest/setup.js
 - lib/js/jest/stubs/screen-definitions.js
 - lib/js/jest/styleMock.js
-- lib/js/webpack-status-plugin.js
 - lib/js/webpack.config.js
 - lib/lanes.rb
 - lib/lanes/access.rb
@@ -851,7 +849,6 @@ files:
 - lib/lanes/command/generate_screen.usage
 - lib/lanes/command/guard.rb
 - lib/lanes/command/jest.rb
-- lib/lanes/command/jest_runner.rb
 - lib/lanes/command/migration_support.rb
 - lib/lanes/command/model_attribute.rb
 - lib/lanes/command/named_command.rb
@@ -885,7 +882,6 @@ files:
 - lib/lanes/extension/definition.rb
 - lib/lanes/guard_tasks.rb
 - lib/lanes/hot_reload_plugin.rb
-- lib/lanes/jest.rb
 - lib/lanes/job.rb
 - lib/lanes/job/failure_logger.rb
 - lib/lanes/lanes_guard_plugin.rb
@@ -1037,6 +1033,7 @@ files:
 - spec/server/system_settings_spec.rb
 - tasks/migrations.rake
 - tasks/publish.rake
+- templates/.babelrc
 - templates/Gemfile
 - templates/Guardfile
 - templates/Rakefile
@@ -1059,6 +1056,7 @@ files:
 - templates/config/routes.rb
 - templates/config/screen.rb
 - templates/config/screens.rb
+- templates/config/webpack.config.js
 - templates/db/create_table_migration.rb
 - templates/gitignore
 - templates/js/jest.config.json
@@ -1070,13 +1068,13 @@ files:
 - templates/lib/namespace/model.rb
 - templates/lib/namespace/version.rb
 - templates/public/.gitkeep
-- templates/specs/client/Screen.coffee
-- templates/specs/client/components/ComponentSpec.coffee
-- templates/specs/client/models/ModelSpec.coffee
-- templates/specs/client/setup.js
-- templates/specs/fixtures/namespace/model.yml
-- templates/specs/server/model_spec.rb
-- templates/specs/server/spec_helper.rb
+- templates/spec/client/Screen.coffee
+- templates/spec/client/components/ComponentSpec.coffee
+- templates/spec/client/models/ModelSpec.coffee
+- templates/spec/client/setup.js
+- templates/spec/fixtures/namespace/model.yml
+- templates/spec/server/model_spec.rb
+- templates/spec/server/spec_helper.rb
 - test.js
 - views/lanes_root_view.erb
 - yard_ext/all.rb
@@ -1113,7 +1111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Lanes is a framework for easily writing single page web applications

data/lib/js/webpack-status-plugin.js

@@ -1,78 +0,0 @@
-"use strict";
-
-var webpack = require("webpack");
-
-function DashboardPlugin(options) {
-    this.options = options;
-}
-
-function log(type, value) {
-    console.log('STATUS:', JSON.stringify({type, value}));
-}
-
-DashboardPlugin.prototype.apply = function(compiler) {
-    var timer;
-
-    if ( compiler.options.devServer ) {
-        let {port, host, outputPath} = compiler.options.devServer;
-        log("dev-server", { port, host, outputPath });
-    }
-
-    // compiler.apply(new webpack.ProgressPlugin(function (percent, msg) {
-    //     log("compile", {
-    //         "progress":  percent,
-    //         "operation": msg,
-    //         "ms": Date.now() - timer
-    //     });
-    // }));
-
-    compiler.plugin("compile", function() {
-        timer = Date.now();
-        log("compile", {
-            "progress":  0,
-            "operation": "idle"
-        })
-    });
-
-    compiler.plugin("invalid", function() {
-        log("status", "invalid");
-    });
-
-    compiler.plugin("failed-module", function(module) {
-        log("failed-module", module);
-    });
-    compiler.plugin("done", function(stats) {
-        if (stats.compilation.errors && stats.compilation.errors.length){
-            log("status", "invalid");
-            for(var i = 0; i < stats.compilation.errors.length; i++){
-                var err = stats.compilation.errors[i];
-                log("error", {
-                    name: err.name, message: err.message,
-                    resource: err.module ? err.module.resource : ''
-                });
-            }
-        } else {
-            log("status", "success");
-        }
-    });
-
-    compiler.plugin("failed", function() {
-        log("status", "failed");
-    });
-
-    compiler.plugin("valid", function() {
-        log("status", "valid");
-    });
-
-    compiler.plugin("after-emit", function(compilation, callback) {
-        for (var k in compilation.assets){
-            if(!compilation.assets[k].parents){
-                log("asset", {name: k, size: compilation.assets[k].size()});
-            }
-        }
-        callback();
-    });
-
-}
-
-module.exports = DashboardPlugin;

data/lib/lanes/command/jest_runner.rb

@@ -1,63 +0,0 @@
-module Lanes
-    module Command
-
-        class JestRunner
-
-            attr_reader :proc
-
-            extend Forwardable
-
-            def_delegators :@proc, :alive?, :environment, :wait
-
-            def initialize
-                @proc = ::ChildProcess.build(
-                    Lanes::ROOT_PATH.join('node_modules/jest-cli/bin/jest.js').to_s,
-                    '--watch', '--config',
-                    Lanes::ROOT_PATH.join('lib', 'js', 'jest.config.js').to_s
-                )
-            end
-
-            def stop
-                @proc.stop
-                @output.close unless @output.closed?
-                @listener.exit
-            end
-
-            def write(str)
-                @proc.io.stdin.write(str + "\n")
-                puts "WRote #{str}"
-            end
-
-            def start
-                @proc.start
-                @output, w = IO.pipe
-                @proc.io.stdout = @proc.io.stderr = w
-
-                @proc.duplex  = true
-                puts "one"
-                puts "two"
-                @proc.start
-
-
-                @listener = Thread.new do
-                    @output.each_line do | l |
-                        Lanes.logger.info l.chomp
-                        print "\r"
-                    end
-
-#                         # match = l.match(/^STATUS: (.*)/)
-#                         # if match
-#                         #     record_message(JSON.parse(match[1]))
-#                         #    # WebpackDriver.config.logger.debug(l.chomp)
-#                         # else
-#                         #     WebpackDriver.config.logger.info(l.chomp)
-#                         # end
-#                     end
-                end
-            end
-
-
-        end
-
-    end
-end

data/lib/lanes/jest.rb

@@ -1,19 +0,0 @@
-require 'forwardable'
-require 'erb'
-
-module Lanes
-    class Jest
-        attr_reader :config_dir
-
-        def self.launch
-            puts 'Jest'
-            @config_dir = Pathname.new(Dir.mktmpdir)
-
-            template config_dir.join('jest.config'),    "#{client_dir}/screens/#{screen_id}/index.js"
-
-            puts Dir.glob(config_dir + '*')
-        end
-
-    end
-
-end