From 64c6d22d85f233773daef231c33889b1f8357ac2 Mon Sep 17 00:00:00 2001 From: Sean Eshbaugh Date: Mon, 30 Apr 2018 19:00:58 -0500 Subject: [PATCH] Fixed assets. --- .../forms/_checkboxes.scss => admin/index.js} | 0 app/javascript/application/index.js | 3 + .../stylesheets}/_layout.scss | 0 .../stylesheets}/_pages.scss | 0 .../stylesheets}/_posts.scss | 0 .../stylesheets}/_typography.scss | 2 +- .../stylesheets}/_variables.scss | 5 +- .../application/stylesheets/application.scss | 11 +++ .../stylesheets}/layout/_footer.scss | 0 .../stylesheets}/layout/_header.scss | 0 .../stylesheets}/layout/_main.scss | 0 app/javascript/packs/admin.js | 2 + app/javascript/packs/application.js | 22 +++-- app/javascript/packs/images.js | 1 - .../images/apple-touch-icon-ipad-retina.png | Bin .../images/apple-touch-icon-ipad.png | Bin .../images/apple-touch-icon-iphone-retina.png | Bin .../images/apple-touch-icon-iphone.png | Bin .../{ => shared}/images/icons/32x32/chart.png | Bin .../images/icons/32x32/page-add.png | Bin .../images/icons/32x32/picture-add.png | Bin .../images/icons/32x32/post-add.png | Bin .../images/icons/32x32/user-add.png | Bin .../images/icons/social/github.png | Bin .../images/icons/social/linkedin.png | Bin app/javascript/{ => shared}/images/index.js | 0 app/javascript/shared/index.js | 6 ++ .../{packs => shared/javascripts}/form.js | 0 .../shared => shared/stylesheets}/_forms.scss | 0 .../stylesheets}/_variables.scss | 0 .../shared => shared/stylesheets}/form.scss | 0 .../shared/stylesheets/forms/_checkboxes.scss | 0 .../stylesheets}/forms/_input_fields.scss | 0 app/javascript/stylesheets/application.scss | 11 --- app/views/layouts/application.html.haml | 4 +- config/environments/development.rb | 2 + config/environments/production.rb | 2 + .../initializers/content_security_policy.rb | 5 +- package.json | 2 +- yarn.lock | 84 +++++++----------- 40 files changed, 83 insertions(+), 79 deletions(-) rename app/javascript/{stylesheets/shared/forms/_checkboxes.scss => admin/index.js} (100%) create mode 100644 app/javascript/application/index.js rename app/javascript/{stylesheets/application => application/stylesheets}/_layout.scss (100%) rename app/javascript/{stylesheets/application => application/stylesheets}/_pages.scss (100%) rename app/javascript/{stylesheets/application => application/stylesheets}/_posts.scss (100%) rename app/javascript/{stylesheets/application => application/stylesheets}/_typography.scss (97%) rename app/javascript/{stylesheets/application => application/stylesheets}/_variables.scss (59%) create mode 100644 app/javascript/application/stylesheets/application.scss rename app/javascript/{stylesheets/application => application/stylesheets}/layout/_footer.scss (100%) rename app/javascript/{stylesheets/application => application/stylesheets}/layout/_header.scss (100%) rename app/javascript/{stylesheets/application => application/stylesheets}/layout/_main.scss (100%) create mode 100644 app/javascript/packs/admin.js delete mode 100644 app/javascript/packs/images.js rename app/javascript/{ => shared}/images/apple-touch-icon-ipad-retina.png (100%) rename app/javascript/{ => shared}/images/apple-touch-icon-ipad.png (100%) rename app/javascript/{ => shared}/images/apple-touch-icon-iphone-retina.png (100%) rename app/javascript/{ => shared}/images/apple-touch-icon-iphone.png (100%) rename app/javascript/{ => shared}/images/icons/32x32/chart.png (100%) rename app/javascript/{ => shared}/images/icons/32x32/page-add.png (100%) rename app/javascript/{ => shared}/images/icons/32x32/picture-add.png (100%) rename app/javascript/{ => shared}/images/icons/32x32/post-add.png (100%) rename app/javascript/{ => shared}/images/icons/32x32/user-add.png (100%) rename app/javascript/{ => shared}/images/icons/social/github.png (100%) rename app/javascript/{ => shared}/images/icons/social/linkedin.png (100%) rename app/javascript/{ => shared}/images/index.js (100%) create mode 100644 app/javascript/shared/index.js rename app/javascript/{packs => shared/javascripts}/form.js (100%) rename app/javascript/{stylesheets/shared => shared/stylesheets}/_forms.scss (100%) rename app/javascript/{stylesheets/shared => shared/stylesheets}/_variables.scss (100%) rename app/javascript/{stylesheets/shared => shared/stylesheets}/form.scss (100%) create mode 100644 app/javascript/shared/stylesheets/forms/_checkboxes.scss rename app/javascript/{stylesheets/shared => shared/stylesheets}/forms/_input_fields.scss (100%) delete mode 100644 app/javascript/stylesheets/application.scss diff --git a/app/javascript/stylesheets/shared/forms/_checkboxes.scss b/app/javascript/admin/index.js similarity index 100% rename from app/javascript/stylesheets/shared/forms/_checkboxes.scss rename to app/javascript/admin/index.js diff --git a/app/javascript/application/index.js b/app/javascript/application/index.js new file mode 100644 index 0000000..2736f7a --- /dev/null +++ b/app/javascript/application/index.js @@ -0,0 +1,3 @@ +import "./stylesheets/application"; + +console.log("application.js"); diff --git a/app/javascript/stylesheets/application/_layout.scss b/app/javascript/application/stylesheets/_layout.scss similarity index 100% rename from app/javascript/stylesheets/application/_layout.scss rename to app/javascript/application/stylesheets/_layout.scss diff --git a/app/javascript/stylesheets/application/_pages.scss b/app/javascript/application/stylesheets/_pages.scss similarity index 100% rename from app/javascript/stylesheets/application/_pages.scss rename to app/javascript/application/stylesheets/_pages.scss diff --git a/app/javascript/stylesheets/application/_posts.scss b/app/javascript/application/stylesheets/_posts.scss similarity index 100% rename from app/javascript/stylesheets/application/_posts.scss rename to app/javascript/application/stylesheets/_posts.scss diff --git a/app/javascript/stylesheets/application/_typography.scss b/app/javascript/application/stylesheets/_typography.scss similarity index 97% rename from app/javascript/stylesheets/application/_typography.scss rename to app/javascript/application/stylesheets/_typography.scss index 28a0d82..f76b4b9 100644 --- a/app/javascript/stylesheets/application/_typography.scss +++ b/app/javascript/application/stylesheets/_typography.scss @@ -1,4 +1,4 @@ body { color: $text-color; font-family: $sans-serif-font-stack; -} \ No newline at end of file +} diff --git a/app/javascript/stylesheets/application/_variables.scss b/app/javascript/application/stylesheets/_variables.scss similarity index 59% rename from app/javascript/stylesheets/application/_variables.scss rename to app/javascript/application/stylesheets/_variables.scss index 2e11b7d..732007f 100644 --- a/app/javascript/stylesheets/application/_variables.scss +++ b/app/javascript/application/stylesheets/_variables.scss @@ -1,8 +1,9 @@ -@import "../shared/variables"; +@import "../../shared/stylesheets/variables"; $background-color: $white !default; -$text-color: $off-white !defaultl; +$text-color: $off-white !default; $main-header-color: $off-black !default; $main-footer-background-color: $off-black !default; $main-footer-color: $off-white !default; +$main-footer-height: 80px !default; diff --git a/app/javascript/application/stylesheets/application.scss b/app/javascript/application/stylesheets/application.scss new file mode 100644 index 0000000..6b95be2 --- /dev/null +++ b/app/javascript/application/stylesheets/application.scss @@ -0,0 +1,11 @@ +@charset "UTF-8"; + +@import "~normalize.css"; + +@import "./variables"; +//@import "shared/variables"; +//@import "shared/forms"; +@import "./typography"; +@import "./layout"; +@import "./pages"; +@import "./posts"; diff --git a/app/javascript/stylesheets/application/layout/_footer.scss b/app/javascript/application/stylesheets/layout/_footer.scss similarity index 100% rename from app/javascript/stylesheets/application/layout/_footer.scss rename to app/javascript/application/stylesheets/layout/_footer.scss diff --git a/app/javascript/stylesheets/application/layout/_header.scss b/app/javascript/application/stylesheets/layout/_header.scss similarity index 100% rename from app/javascript/stylesheets/application/layout/_header.scss rename to app/javascript/application/stylesheets/layout/_header.scss diff --git a/app/javascript/stylesheets/application/layout/_main.scss b/app/javascript/application/stylesheets/layout/_main.scss similarity index 100% rename from app/javascript/stylesheets/application/layout/_main.scss rename to app/javascript/application/stylesheets/layout/_main.scss diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js new file mode 100644 index 0000000..2f06b4b --- /dev/null +++ b/app/javascript/packs/admin.js @@ -0,0 +1,2 @@ +import "../shared"; +import "../admin"; diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 9b22eae..fba81c8 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -1,9 +1,13 @@ -require.context("../stylesheets", true, /^\.\/[^_].*\.(css|scss|sass)$/i); - -//require("../stylesheets/application.scss"); - -import Rails from "rails-ujs"; - -Rails.start(); - -import "./form"; +/* eslint no-console:0 */ +// This file is automatically compiled by Webpack, along with any other files +// present in this directory. You're encouraged to place your actual application logic in +// a relevant structure within app/javascript and only use these pack files to reference +// that code so it'll be compiled. +// +// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate +// layout file, like app/views/layouts/application.html.erb + +import "../shared"; +import "../application"; + +console.log('Hello World from Webpacker'); diff --git a/app/javascript/packs/images.js b/app/javascript/packs/images.js deleted file mode 100644 index d33813c..0000000 --- a/app/javascript/packs/images.js +++ /dev/null @@ -1 +0,0 @@ -import "../images"; diff --git a/app/javascript/images/apple-touch-icon-ipad-retina.png b/app/javascript/shared/images/apple-touch-icon-ipad-retina.png similarity index 100% rename from app/javascript/images/apple-touch-icon-ipad-retina.png rename to app/javascript/shared/images/apple-touch-icon-ipad-retina.png diff --git a/app/javascript/images/apple-touch-icon-ipad.png b/app/javascript/shared/images/apple-touch-icon-ipad.png similarity index 100% rename from app/javascript/images/apple-touch-icon-ipad.png rename to app/javascript/shared/images/apple-touch-icon-ipad.png diff --git a/app/javascript/images/apple-touch-icon-iphone-retina.png b/app/javascript/shared/images/apple-touch-icon-iphone-retina.png similarity index 100% rename from app/javascript/images/apple-touch-icon-iphone-retina.png rename to app/javascript/shared/images/apple-touch-icon-iphone-retina.png diff --git a/app/javascript/images/apple-touch-icon-iphone.png b/app/javascript/shared/images/apple-touch-icon-iphone.png similarity index 100% rename from app/javascript/images/apple-touch-icon-iphone.png rename to app/javascript/shared/images/apple-touch-icon-iphone.png diff --git a/app/javascript/images/icons/32x32/chart.png b/app/javascript/shared/images/icons/32x32/chart.png similarity index 100% rename from app/javascript/images/icons/32x32/chart.png rename to app/javascript/shared/images/icons/32x32/chart.png diff --git a/app/javascript/images/icons/32x32/page-add.png b/app/javascript/shared/images/icons/32x32/page-add.png similarity index 100% rename from app/javascript/images/icons/32x32/page-add.png rename to app/javascript/shared/images/icons/32x32/page-add.png diff --git a/app/javascript/images/icons/32x32/picture-add.png b/app/javascript/shared/images/icons/32x32/picture-add.png similarity index 100% rename from app/javascript/images/icons/32x32/picture-add.png rename to app/javascript/shared/images/icons/32x32/picture-add.png diff --git a/app/javascript/images/icons/32x32/post-add.png b/app/javascript/shared/images/icons/32x32/post-add.png similarity index 100% rename from app/javascript/images/icons/32x32/post-add.png rename to app/javascript/shared/images/icons/32x32/post-add.png diff --git a/app/javascript/images/icons/32x32/user-add.png b/app/javascript/shared/images/icons/32x32/user-add.png similarity index 100% rename from app/javascript/images/icons/32x32/user-add.png rename to app/javascript/shared/images/icons/32x32/user-add.png diff --git a/app/javascript/images/icons/social/github.png b/app/javascript/shared/images/icons/social/github.png similarity index 100% rename from app/javascript/images/icons/social/github.png rename to app/javascript/shared/images/icons/social/github.png diff --git a/app/javascript/images/icons/social/linkedin.png b/app/javascript/shared/images/icons/social/linkedin.png similarity index 100% rename from app/javascript/images/icons/social/linkedin.png rename to app/javascript/shared/images/icons/social/linkedin.png diff --git a/app/javascript/images/index.js b/app/javascript/shared/images/index.js similarity index 100% rename from app/javascript/images/index.js rename to app/javascript/shared/images/index.js diff --git a/app/javascript/shared/index.js b/app/javascript/shared/index.js new file mode 100644 index 0000000..a9f9bc0 --- /dev/null +++ b/app/javascript/shared/index.js @@ -0,0 +1,6 @@ +import Rails from "rails-ujs"; + +import "./images"; +import "./javascripts/form"; + +Rails.start(); diff --git a/app/javascript/packs/form.js b/app/javascript/shared/javascripts/form.js similarity index 100% rename from app/javascript/packs/form.js rename to app/javascript/shared/javascripts/form.js diff --git a/app/javascript/stylesheets/shared/_forms.scss b/app/javascript/shared/stylesheets/_forms.scss similarity index 100% rename from app/javascript/stylesheets/shared/_forms.scss rename to app/javascript/shared/stylesheets/_forms.scss diff --git a/app/javascript/stylesheets/shared/_variables.scss b/app/javascript/shared/stylesheets/_variables.scss similarity index 100% rename from app/javascript/stylesheets/shared/_variables.scss rename to app/javascript/shared/stylesheets/_variables.scss diff --git a/app/javascript/stylesheets/shared/form.scss b/app/javascript/shared/stylesheets/form.scss similarity index 100% rename from app/javascript/stylesheets/shared/form.scss rename to app/javascript/shared/stylesheets/form.scss diff --git a/app/javascript/shared/stylesheets/forms/_checkboxes.scss b/app/javascript/shared/stylesheets/forms/_checkboxes.scss new file mode 100644 index 0000000..e69de29 diff --git a/app/javascript/stylesheets/shared/forms/_input_fields.scss b/app/javascript/shared/stylesheets/forms/_input_fields.scss similarity index 100% rename from app/javascript/stylesheets/shared/forms/_input_fields.scss rename to app/javascript/shared/stylesheets/forms/_input_fields.scss diff --git a/app/javascript/stylesheets/application.scss b/app/javascript/stylesheets/application.scss deleted file mode 100644 index 9af8b12..0000000 --- a/app/javascript/stylesheets/application.scss +++ /dev/null @@ -1,11 +0,0 @@ -@charset "UTF-8"; - -@import "~normalize.css"; - -@import "application/variables"; -@import "shared/variables"; -@import "shared/forms"; -@import "application/typography"; -@import "application/layout"; -@import "application/pages"; -@import "application/posts"; \ No newline at end of file diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 614e84d..7ecd7f8 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -43,5 +43,5 @@ %div.main-footer-credit= t('.credit_html') %nav.main-footer-nav %ul.main-footer-nav-list - %li.main-footer-nav-list-item= link_to(image_tag(asset_pack_path('images/icons/social/github.png', alt_text: 'GitHub')), 'https://github.com/seaneshbaugh', class: 'main-footer-nav-list-item-link') - %li.main-footer-nav-list-item= link_to(image_tag(asset_pack_path('images/icons/social/linkedin.png', alt_text: 'LinkedIn')), 'https://www.linkedin.com/in/sean-eshbaugh-44153434', class: 'main-footer-nav-list-item-link') + %li.main-footer-nav-list-item= link_to(image_tag(asset_pack_path('shared/images/icons/social/github.png', alt_text: 'GitHub')), 'https://github.com/seaneshbaugh', class: 'main-footer-nav-list-item-link') + %li.main-footer-nav-list-item= link_to(image_tag(asset_pack_path('shared/images/icons/social/linkedin.png', alt_text: 'LinkedIn')), 'https://www.linkedin.com/in/sean-eshbaugh-44153434', class: 'main-footer-nav-list-item-link') diff --git a/config/environments/development.rb b/config/environments/development.rb index 26bff99..1aef27d 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,4 +1,6 @@ Rails.application.configure do + # Verifies that versions and hashed value of the package contents in the project's package.json + config.webpacker.check_yarn_integrity = true # Verifies that versions and hashed value of the package contents in the project's package.json config.webpacker.check_yarn_integrity = true diff --git a/config/environments/production.rb b/config/environments/production.rb index 65f68ab..eb2cfe3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,6 @@ Rails.application.configure do + # Verifies that versions and hashed value of the package contents in the project's package.json + config.webpacker.check_yarn_integrity = false # Verifies that versions and hashed value of the package contents in the project's package.json config.webpacker.check_yarn_integrity = false diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index d3bcaa5..ce515a8 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -4,7 +4,8 @@ # For further information see the following documentation # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy -# Rails.application.config.content_security_policy do |policy| +Rails.application.config.content_security_policy do |policy| + policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development? # policy.default_src :self, :https # policy.font_src :self, :https, :data # policy.img_src :self, :https, :data @@ -14,7 +15,7 @@ # # Specify URI for violation reports # # policy.report_uri "/csp-violation-report-endpoint" -# end +end # If you are using UJS then enable automatic nonce generation # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } diff --git a/package.json b/package.json index 62af06c..1dadb62 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,6 @@ }, "devDependencies": { "sass-lint": "^1.12.1", - "webpack-dev-server": "^3.1.0" + "webpack-dev-server": "2.11.2" } } diff --git a/yarn.lock b/yarn.lock index 0020114..bc49014 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1245,7 +1245,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1: +chalk@^2.0.1, chalk@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" dependencies: @@ -3591,20 +3591,10 @@ lodash.uniq@^4.5.0: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" -log-symbols@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - dependencies: - chalk "^2.0.1" - loglevel@^1.4.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" -loglevelnext@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.3.tgz#0f69277e73bbbf2cd61b94d82313216bf87ac66e" - longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -3615,7 +3605,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: dependencies: js-tokens "^3.0.0" -loud-rejection@^1.0.0, loud-rejection@^1.6.0: +loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" dependencies: @@ -3765,9 +3755,9 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mime@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b" +mime@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" mimic-fn@^1.0.0: version "1.2.0" @@ -6048,6 +6038,10 @@ thunky@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371" +time-stamp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" + timers-browserify@^2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae" @@ -6253,10 +6247,6 @@ urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" -url-join@^2.0.2: - version "2.0.5" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728" - url-parse@1.0.x: version "1.0.5" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" @@ -6357,21 +6347,19 @@ wbuf@^1.1.0, wbuf@^1.7.2: dependencies: minimalistic-assert "^1.0.0" -webpack-dev-middleware@2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4" +webpack-dev-middleware@1.12.2: + version "1.12.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e" dependencies: - loud-rejection "^1.6.0" memory-fs "~0.4.1" - mime "^2.1.0" + mime "^1.5.0" path-is-absolute "^1.0.0" range-parser "^1.0.3" - url-join "^2.0.2" - webpack-log "^1.0.1" + time-stamp "^2.0.0" -webpack-dev-server@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#5d2365514d9dfa0d415502742d2cc28afc4a32d8" +webpack-dev-server@2.11.2: + version "2.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz#1f4f4c78bf1895378f376815910812daf79a216f" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" @@ -6398,18 +6386,8 @@ webpack-dev-server@^3.1.0: spdy "^3.4.1" strip-ansi "^3.0.0" supports-color "^5.1.0" - webpack-dev-middleware "2.0.6" - webpack-log "^1.1.2" - yargs "9.0.1" - -webpack-log@^1.0.1, webpack-log@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.1.2.tgz#cdc76016537eed24708dc6aa3d1e52189efee107" - dependencies: - chalk "^2.1.0" - log-symbols "^2.1.0" - loglevelnext "^1.0.1" - uuid "^3.1.0" + webpack-dev-middleware "1.12.2" + yargs "6.6.0" webpack-manifest-plugin@^1.3.2: version "1.3.2" @@ -6543,6 +6521,12 @@ yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" +yargs-parser@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" + dependencies: + camelcase "^3.0.0" + yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" @@ -6555,23 +6539,23 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" -yargs@9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c" +yargs@6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: - camelcase "^4.1.0" + camelcase "^3.0.0" cliui "^3.2.0" decamelize "^1.1.1" get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" y18n "^3.2.1" - yargs-parser "^7.0.0" + yargs-parser "^4.2.0" yargs@^7.0.0: version "7.1.0"