Phone-Input: Add flag-icon-css

Automattic · f66375462e456f8a56f7eb0738987dc7939263cf · umurkontaci committed Aug 14, 2016 · Aug 14, 2016 · f663754
1 parent 6bf9607
commit f66375462e456f8a56f7eb0738987dc7939263cf
Unified Split

Showing with 44 additions and 2 deletions.

+1 −0 .gitattributes

+3 −0 assets/stylesheets/style.scss

+35 −1 npm-shrinkwrap.json

+2 −0 package.json

+3 −1 webpack.config.js
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+npm-shrinkwrap.json binary
diff --git a/assets/stylesheets/style.scss b/assets/stylesheets/style.scss
@@ -2,6 +2,9 @@
 @import '../../node_modules/react-virtualized/styles';
 @import '../../node_modules/draft-js/dist/Draft';
 
+$flag-icon-css-path: 'images/flags' !default;
+@import '../../node_modules/flag-icon-css/sass/flag-icon';
+
 // Shared
 @import 'shared/reset';                        // css reset before the rest of the styles are defined
 @import 'shared/functions';                    // functions that we've used from Compass, ported over
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
@@ -446,7 +446,7 @@
       "version": "0.0.9"
     },
     "bluebird": {
-      "version": "3.4.6"
+      "version": "2.11.0"
     },
     "body-parser": {
       "version": "1.15.2",
@@ -766,6 +766,17 @@
     "cookiejar": {
       "version": "2.1.0"
     },
+    "copy-webpack-plugin": {
+      "version": "3.0.1",
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4"
+        },
+        "minimatch": {
+          "version": "3.0.3"
+        }
+      }
+    },
     "core-js": {
       "version": "2.4.1"
     },
@@ -1488,6 +1499,9 @@
     "fizzy-ui-utils": {
       "version": "2.0.3"
     },
+    "flag-icon-css": {
+      "version": "2.3.0"
+    },
     "flat-cache": {
       "version": "1.2.1",
       "dev": true
@@ -1542,6 +1556,9 @@
     "fresh": {
       "version": "0.3.0"
     },
+    "fs-extra": {
+      "version": "0.26.7"
+    },
     "fs.realpath": {
       "version": "1.0.0"
     },
@@ -1686,6 +1703,9 @@
     "hard-source-webpack-plugin": {
       "version": "0.0.42",
       "dependencies": {
+        "bluebird": {
+          "version": "3.4.6"
+        },
         "source-map": {
           "version": "0.5.6"
         }
@@ -2148,6 +2168,9 @@
     "json5": {
       "version": "0.4.0"
     },
+    "jsonfile": {
+      "version": "2.4.0"
+    },
     "jsonfilter": {
       "version": "1.1.2",
       "dev": true,
@@ -2198,6 +2221,9 @@
     "kind-of": {
       "version": "3.0.4"
     },
+    "klaw": {
+      "version": "1.3.1"
+    },
     "latest-version": {
       "version": "1.0.1",
       "dev": true
@@ -2543,6 +2569,14 @@
     "node-contains": {
       "version": "1.0.0"
     },
+    "node-dir": {
+      "version": "0.1.16",
+      "dependencies": {
+        "minimatch": {
+          "version": "3.0.3"
+        }
+      }
+    },
     "node-fetch": {
       "version": "1.6.3"
     },
diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
     "component-uid": "0.0.2",
     "cookie": "0.1.2",
     "cookie-parser": "1.3.2",
+    "copy-webpack-plugin": "3.0.1",
     "creditcards": "2.1.2",
     "debug": "2.2.0",
     "dom-helpers": "2.4.0",
@@ -54,6 +55,7 @@
     "exports-loader": "0.6.2",
     "express": "4.13.3",
     "filesize": "3.2.1",
+    "flag-icon-css": "2.3.0",
     "flux": "2.1.1",
     "get-video-id": "1.1.0",
     "hard-source-webpack-plugin": "0.0.42",
diff --git a/webpack.config.js b/webpack.config.js
@@ -12,6 +12,7 @@ const webpack = require( 'webpack' ),
 const config = require( './server/config' ),
 	sections = require( './client/sections' ),
 	ChunkFileNamePlugin = require( './server/bundler/plugin' ),
+	CopyWebpackPlugin = require( 'copy-webpack-plugin' ),
 	HardSourceWebpackPlugin = require( 'hard-source-webpack-plugin' );
 
 /**
@@ -86,7 +87,8 @@ const webpackConfig = {
 			}
 		} ),
 		new webpack.optimize.OccurenceOrderPlugin( true ),
-		new webpack.IgnorePlugin( /^props$/ )
+		new webpack.IgnorePlugin( /^props$/ ),
+		new CopyWebpackPlugin( [ { from: 'node_modules/flag-icon-css/flags', to: 'images/flags' } ] )
 	],
 	externals: [ 'electron' ]
 };