From f18ed7e68d0de73a18897864961ba09efc2c13ed Mon Sep 17 00:00:00 2001 From: SupahNickie Date: Thu, 6 Sep 2018 18:20:18 -0700 Subject: [PATCH 1/2] add babel engine plugin to webpack for IE compatibility --- package-lock.json | 186 ++++++++++++++++++++++++++++++++++++---- package.json | 2 + src/complete.js | 2 + src/index.js | 2 +- webpack.config.babel.js | 6 +- 5 files changed, 179 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d5706a..0dedf14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -688,6 +688,96 @@ } } }, + "babel-engine-plugin": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/babel-engine-plugin/-/babel-engine-plugin-0.2.1.tgz", + "integrity": "sha512-JwbpX5GH3RLkXTLGHiH3ofkRAVRsyTD8Azz1sT1NHWtsylZR4lStCd6Iha6SNjWHiqRT7m0bJ2Fpe1s7J8xu9g==", + "dev": true, + "requires": { + "babel-core": "6.26.0", + "read-pkg-up": "2.0.0", + "semver": "5.5.0", + "webpack-sources": "0.2.3" + }, + "dependencies": { + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "source-list-map": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", + "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "webpack-sources": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", + "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=", + "dev": true, + "requires": { + "source-list-map": "1.1.2", + "source-map": "0.5.7" + } + } + } + }, "babel-eslint": { "version": "8.2.3", "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.3.tgz", @@ -1433,6 +1523,68 @@ "babel-types": "6.26.0" } }, + "babel-preset-env": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", + "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", + "dev": true, + "requires": { + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.26.0", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-regenerator": "6.26.0", + "browserslist": "3.2.8", + "invariant": "2.2.4", + "semver": "5.5.0" + }, + "dependencies": { + "browserslist": { + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", + "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", + "dev": true, + "requires": { + "caniuse-lite": "1.0.30000885", + "electron-to-chromium": "1.3.63" + } + }, + "caniuse-lite": { + "version": "1.0.30000885", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz", + "integrity": "sha512-cXKbYwpxBLd7qHyej16JazPoUacqoVuDhvR61U7Fr5vSxMUiodzcYa1rQYRYfZ5GexV03vGZHd722vNPLjPJGQ==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.63", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.63.tgz", + "integrity": "sha512-Ec35NNY040HKuSxMAzBMgz/uUI78amSWpBUD9x2gN7R7gkb/wgAcClngWklcLP0/lm/g0UUYHnC/tUIlZj8UvQ==", + "dev": true + } + } + }, "babel-preset-es2015": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz", @@ -5490,14 +5642,6 @@ } } }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -5508,6 +5652,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true, @@ -13736,15 +13888,6 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-length": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", @@ -13772,6 +13915,15 @@ "strip-ansi": "4.0.0" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/package.json b/package.json index 7c70582..da2a0cc 100644 --- a/package.json +++ b/package.json @@ -54,12 +54,14 @@ "autoprefixer": "^7.0.1", "babel": "^6.5.2", "babel-core": "^6.24.0", + "babel-engine-plugin": "^0.2.1", "babel-eslint": "^8.2.1", "babel-jest": "^22.2.0", "babel-loader": "^7.0.0", "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-object-assign": "^6.22.0", "babel-plugin-transform-react-jsx": "^6.8.0", + "babel-preset-env": "^1.7.0", "babel-preset-es2015": "^6.24.0", "babel-preset-stage-0": "^6.5.0", "babel-register": "^6.24.0", diff --git a/src/complete.js b/src/complete.js index cc1b3a9..a93c1e0 100644 --- a/src/complete.js +++ b/src/complete.js @@ -3,6 +3,8 @@ import 'core-js/fn/array/fill'; import 'core-js/fn/array/map'; import 'core-js/fn/array/for-each'; import 'core-js/fn/array/filter'; +import 'core-js/fn/array/from'; + import { init } from './lib/init'; import { CMP_GLOBAL_NAME } from "./lib/cmp"; diff --git a/src/index.js b/src/index.js index b03c010..11f7eb5 100755 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,7 @@ import 'core-js/fn/array/for-each'; import 'core-js/fn/array/filter'; import 'core-js/fn/array/from'; -import {init} from './lib/init'; +import { init } from './lib/init'; import { CMP_GLOBAL_NAME } from './lib/cmp'; function start() { diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 8e6f2ea..67fe328 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -3,6 +3,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin'; import CopyWebpackPlugin from 'copy-webpack-plugin'; import autoprefixer from 'autoprefixer'; import path from 'path'; +const BabelEnginePlugin = require('babel-engine-plugin'); const ENV = process.env.NODE_ENV || 'development'; @@ -195,7 +196,10 @@ module.exports = [ // Static assets copy new CopyWebpackPlugin([ { from: './geoip.json' } - ]) + ]), + new BabelEnginePlugin({ + presets: ['env'] + }) ]).concat(ENV === 'production' ? uglifyPlugin : []), }, // Docs config From bfb4b1738cdcd0aae5ba159b8f2a1be7e36cebf3 Mon Sep 17 00:00:00 2001 From: SupahNickie Date: Fri, 7 Sep 2018 11:29:16 -0700 Subject: [PATCH 2/2] yay, fixed IE styles thanks to Jon Swanson of Rakuten --- src/components/popup/details/purposes/purposes.less | 1 + src/components/popup/intro/intro.less | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/popup/details/purposes/purposes.less b/src/components/popup/details/purposes/purposes.less index 71fbfa2..6e64e79 100644 --- a/src/components/popup/details/purposes/purposes.less +++ b/src/components/popup/details/purposes/purposes.less @@ -2,6 +2,7 @@ .container { display: flex; + flex: 1; flex-direction: column; .disclaimer { diff --git a/src/components/popup/intro/intro.less b/src/components/popup/intro/intro.less index 084aa0a..78ed50a 100644 --- a/src/components/popup/intro/intro.less +++ b/src/components/popup/intro/intro.less @@ -3,10 +3,8 @@ } div.intro { - display: flex; align-items: center; padding: 0 4em; - flex: 1; max-height: 100%; .top {