Skip to content

IE hotfix #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2018
Merged

IE hotfix #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f18ed7e
add babel engine plugin to webpack for IE compatibility
SupahNickie Sep 7, 2018
bfb4b17
yay, fixed IE styles thanks to Jon Swanson of Rakuten
SupahNickie Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 169 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/complete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
1 change: 1 addition & 0 deletions src/components/popup/details/purposes/purposes.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.container {
display: flex;
flex: 1;
flex-direction: column;

.disclaimer {
Expand Down
2 changes: 0 additions & 2 deletions src/components/popup/intro/intro.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
}

div.intro {
display: flex;
align-items: center;
padding: 0 4em;
flex: 1;
max-height: 100%;

.top {
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 5 additions & 1 deletion webpack.config.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -195,7 +196,10 @@ module.exports = [
// Static assets copy
new CopyWebpackPlugin([
{ from: './geoip.json' }
])
]),
new BabelEnginePlugin({
presets: ['env']
})
]).concat(ENV === 'production' ? uglifyPlugin : []),
},
// Docs config
Expand Down