webpack_driver 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ba342eead35d1724a2bca92475e051e606bdcc
-  data.tar.gz: 01bf6577333fd5b749a815812ed840d000cca105
+  metadata.gz: 0dabddeeea6cb7372add80de628a6171c7ff8f91
+  data.tar.gz: 02d915f02ce6c35b51713a85fa728c35e6f8b092
 SHA512:
-  metadata.gz: e1fe4ad83a82af9fdc95258a0f22575bb2841f26c0ce4edf0caf8d71e8a79827f84467da153e0e45294b9c675b0b7e180252a06c85f215261f790227f5f0a63f
-  data.tar.gz: 40356b5bab34e82640968b84048a3b25a023f923eed7268c9ea697bf52b144a301053b65d2d9fa70c1e01b0e415bdac99abe4b44549cf51b95c7205e5557c2d9
+  metadata.gz: 71fa04b99cc53dd36488abeebdc72a81216c82b35ec489ad0567f6151e09f23e3b42e895aca3ea13311441e743d84cec005cdba85fea777c496e1095f3b42ae5
+  data.tar.gz: 8127fbf1d6d221eaaff0d4db177d8ccd8ea5ae3e548d8af6c10b7841bcfe4e5084ff601fe9241d9d9b0f55880a77d4788b6641693c737d6f58860047a57b2d05

data/.gitignore

@@ -11,4 +11,5 @@ yarn.lock
 /pkg/
 /spec/reports/
 /tmp/
-/test/fixtures
+test/fixtures
+test/tmp

data/lib/status-plugin.js

@@ -18,13 +18,13 @@ WebpackDriverStatusPlugin.prototype.apply = function(compiler) {
         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.apply(new webpack.ProgressPlugin(function (percent, msg) {
+        log("compile", {
+            "progress":  percent,
+            "operation": msg,
+            "ms": Date.now() - timer
+        });
+    }));
 
     compiler.plugin("compile", function() {
         timer = Date.now();
@@ -38,6 +38,10 @@ WebpackDriverStatusPlugin.prototype.apply = function(compiler) {
         log("status", "invalid");
     });
 
+    compiler.plugin("after-environment", function() {
+        log("config", { output_path: compiler.options.output.path });
+    })
+
     compiler.plugin("failed-module", function(module) {
         log("failed-module", module);
     });
@@ -64,12 +68,14 @@ WebpackDriverStatusPlugin.prototype.apply = function(compiler) {
         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()});
+    // https://gist.github.com/kisenka/b31d3dd1d1a9182dde0bb3e3efe1a038
+    compiler.plugin("emit", function(compilation, callback) {
+        const assets = compilation.getStats().toJson().assets;
+        assets.forEach(function(asset) {
+            if (asset.chunkNames.length) {
+                log("asset", {id: asset.chunkNames[0], file: asset.name, size: asset.size});
             }
-        }
+        });
         callback();
     });
 

data/lib/webpack_driver/asset.rb

@@ -1,13 +1,25 @@
 module WebpackDriver
 
     class Asset
-        attr_reader :file, :size
 
-        def initialize(file, size)
-            @file = file
-            @size = size
+        attr_reader :id, :file, :size
+        attr_accessor :has_source_map
+
+        def initialize(attrs)
+            @id   = attrs['id'].to_sym
+            @size = attrs['size']
+            @file = attrs['file']
         end
 
+        def self.record(map, attrs)
+            id = attrs['id'].to_sym
+            file = attrs['file']
+            if map[id] && file && file.end_with?('.map')
+                map[id].has_source_map = true
+            else
+                map[id] = Asset.new(attrs)
+            end
+        end
     end
 
 end

data/lib/webpack_driver/compile.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module WebpackDriver
 
     class Compile < Process
@@ -5,12 +7,37 @@ module WebpackDriver
         def initialize(config)
             config.environment ||= { NODE_ENV: 'production' }
             super('webpack', config)
+            read_manifest
         end
 
         def valid?
-            !alive? && super
+            !alive? && complete? && last_status == 'success'
         end
 
-    end
+        def complete?
+            progress == 1
+        end
+
+        def record_progress(progress, msg)
+            super
+            write_manifest if complete?
+        end
 
+        def write_manifest
+            manifest = {}
+            assets.each do | id, asset |
+                manifest[id] = asset.file
+            end
+            config.manifest_file.write JSON.generate manifest
+        end
+
+        def read_manifest
+            return unless config.manifest_file.exist?
+            manifest = JSON.parse config.manifest_file.read
+            manifest.each do |id, file|
+                asset = Asset.new({ 'id' => id, 'file' => file })
+                assets[asset.id] = asset
+            end
+        end
+    end
 end

data/lib/webpack_driver/configuration/generated.rb

@@ -9,12 +9,31 @@ module WebpackDriver
 
             class_option :config
 
+            attr_reader :config_directory, :path, :generated_directory
+
+            def set_variables
+                @generated_directory = options[:config].tmp_directory
+                @config_directory = options[:config].file.dirname
+                @path = generated_directory.join('generated.config.js')
+            end
+
             def self.source_root
                 Pathname.new(__FILE__).dirname.join("..","..","..","templates")
             end
 
+
             def output
-                template("generated.config.js", options[:config].path,  verbose: false, force: true)
+                opts = { verbose: false, force: true }
+                template(
+                    options[:config].file.relative_path_from(self.class.source_root),
+                    options[:config].tmp_directory.join('webpack.config.js'),
+                    opts
+                )
+                template(
+                    'generated.config.js',
+                    path,
+                    opts
+                )
             end
 
         end

data/lib/webpack_driver/configuration.rb

@@ -10,22 +10,34 @@ module WebpackDriver
         attr_accessor :port
         attr_accessor :logger
         attr_accessor :compile_script
-        attr_accessor :directory
+        attr_accessor :tmp_directory
         attr_accessor :cmd_line_flags
+        attr_accessor :output_path
         attr_writer   :environment
-
-        attr_reader :file
-        attr_reader :generated
+        attr_accessor :file
+        attr_accessor :directory
         attr_accessor :logger
 
+        attr_reader :process
+
+
+
         ROOT = Pathname.new(__FILE__).dirname.join('..', '..')
 
-        def initialize(file = './webpack.config.js', options = {})
+        def initialize(options = {})
             options.each { |k, v| send("#{k}=", v) }
-            @directory ||= '.'
-            @file = Pathname.new(file)
-            @generated = Tempfile.new(['webpack.config', '.js'])
-            Generated.new([], config: self).invoke_all
+            @file = Pathname.new(file) unless file.nil?
+            @directory ||= Pathname.getwd
+            @output_path ||= @directory.join('public', 'assets')
+            @tmp_directory ||= @directory.join('tmp')
+            if file.exist?
+                @generated = Generated.new([], config: self)
+                @generated.invoke_all
+            end
+        end
+
+        def manifest_file
+            output_path.join('manifiest.json')
         end
 
         def generate!
@@ -36,10 +48,6 @@ module WebpackDriver
             file.exist?
         end
 
-        def path
-            @generated.path
-        end
-
         def gem_root
             ROOT
         end
@@ -49,7 +57,7 @@ module WebpackDriver
         end
 
         def flags
-            opts = ['--config', path]
+            opts = ['--config', @generated.path.to_s]
             opts += ['--port', port] if port
             opts += cmd_line_flags if cmd_line_flags
             opts
@@ -59,6 +67,11 @@ module WebpackDriver
             @logger ||= Logger.new(STDOUT)
         end
 
-    end
+        def launch(development:)
+            raise "Already launched" unless @process.nil?
+            logger.info "Startint"
+            @process = development ? DevServer.new(self) : Compile.new(self)
+        end
 
+    end
 end

data/lib/webpack_driver/dev_server.rb

@@ -10,7 +10,7 @@ module WebpackDriver
         end
 
         def valid?
-            alive? && super
+            alive? && last_status == 'success'
         end
 
         private

data/lib/webpack_driver/process.rb

@@ -12,20 +12,23 @@ module WebpackDriver
 
         def_delegators :@proc, :alive?, :environment, :wait
 
-        attr_reader :assets, :messages
-        attr_reader :config
+        attr_reader :config, :assets, :messages, :progress, :error,
+                    :last_compilation_message, :last_status
 
         def initialize(script, config)
             self.reset!
             @config = config
             args = ["./node_modules/.bin/#{script}"] + config.flags
-
+            config.logger.info("Starting webpack using command:\n#{args.join(' ')}")
             @proc = ::ChildProcess.build(*args)
 
             @proc.environment.merge!(
                 config.environment
             )
-            @proc.cwd = config.directory
+            if config.directory
+                config.logger.info("In directory: #{config.directory}")
+                @proc.cwd = config.directory
+            end
         end
 
         def start
@@ -43,8 +46,8 @@ module WebpackDriver
             @listener.join
         end
 
-        def valid?
-            last_compilation_message['operation'] == 'emit'
+        def in_progress?
+            !@error && @progress && @progress != 1
         end
 
         protected
@@ -52,42 +55,54 @@ module WebpackDriver
         def reset!
             @assets = Concurrent::Map.new
             @messages = Concurrent::Array.new
-        end
-
-        def last_compilation_message
-            msg = @messages.reverse_each.detect{ |l| l['type'] == 'compile' }
-            msg ? msg['value'] : {}
+            @last_compilation_message = {}
         end
 
         def record_error(error)
+            @error = error
             config.logger.error(
                 "#{error['name']}: #{error['resource']}\n#{error['message']}"
             )
         end
 
+        def record_progress(progress, msg)
+            @progress = progress
+            @last_compilation_message = msg['value']
+        end
+
         def record_message(msg)
+            @messages << msg unless msg['type'] == 'progress'
             case msg['type']
+            when 'status'
+                @last_status = msg['value']
             when 'asset'
-                name = msg['value']['name']
-                @assets[name] = Asset.new(name, msg['value']['size'])
+                Asset.record(@assets, msg['value'])
+            when 'compile'
+                record_progress msg['value']['progress'], msg
             when 'error'
                 record_error(msg['value'])
+            when 'config'
+                config.output_path = Pathname.new(msg['value']['output_path'])
             else
                 config.logger.debug(msg)
             end
-            @messages << msg
         end
 
 
         def listen_for_status_updates
             Thread.new do
                 @output.each_line do | l |
-                    match = l.match(/^STATUS: (.*)/)
-                    if match
-                        record_message(JSON.parse(match[1]))
-                        config.logger.debug(l.chomp)
-                    else
-                        config.logger.info(l.chomp)
+                puts l
+                    begin
+                        match = l.match(/^STATUS: (.*)/)
+                        if match
+                            record_message(JSON.parse(match[1]))
+                            config.logger.debug(l.chomp)
+                        else
+                            config.logger.info(l.chomp)
+                        end
+                    rescue => e
+                        config.logger.error "Exception #{e} encountered while processing line #{l}"
                     end
                 end
             end

data/lib/webpack_driver/version.rb

@@ -1,3 +1,3 @@
 module WebpackDriver
-  VERSION = "0.2.1"
+    VERSION = "0.3.0"
 end

data/templates/generated.config.js.tt

@@ -1,4 +1,4 @@
-var config = require('<%= options[:config].file %>');
+var config = require('./webpack.config.js');
 var WebpackDriverStatusPlugin = require('<%= options[:config].gem_root %>/lib/status-plugin.js');
 
 config.plugins = (config.plugins || []);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpack_driver
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knitter
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Run webpack-dev-server in a sub process