Skip to content

Commit 127d09f

Browse files
authored
Merge pull request #1386 from shockey/ie11
IE11 fixes
2 parents 2402570 + 8b7c735 commit 127d09f

File tree

9 files changed

+19
-1
lines changed

9 files changed

+19
-1
lines changed

.babelrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
{
1212
"expose": "plugins",
1313
"src": "src/plugins"
14+
},
15+
{
16+
"expose": "src",
17+
"src": "src"
1418
}
1519
]
1620
]

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
},
4242
"dependencies": {
4343
"boron": "^0.2.3",
44+
"bowser": "1.6.1",
4445
"classnames": "^2.1.3",
46+
"core-js": "^2.4.1",
4547
"immutable": "^3.x.x",
4648
"js-yaml": "^3.5.5",
4749
"json-beautify": "^1.0.1",

src/plugins/editor-autosuggest-keywords/keyword-map.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var Bool = ["true", "false"]
33
var Anything = String
44

5-
var combine = (...objs) => Object.assign({}, ...objs)
5+
var combine = (...objs) => objs ? Object.assign({}, ...objs) : {}
66

77
var makeValue = (val = "") => {
88
return {

src/plugins/validation/validation.worker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import "src/polyfills.js"
2+
13
import concat from "lodash/concat"
24
import { validate } from "./structural-validation/validator"
35
import { runSemanticValidators } from "./semantic-validators/hook"

src/polyfills.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
require("core-js/fn/object/values")
2+
require("core-js/fn/object/assign")
3+
require("core-js/fn/object/assign")
4+
require("core-js/es6/string")
5+
require("core-js/es6/array")

webpack-dist-bundle.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module.exports = require('./make-webpack-config.js')({
1919

2020
entry: {
2121
"swagger-editor-bundle": [
22+
"./src/polyfills.js",
2223
'./src/index.js'
2324
]
2425
},

webpack-dist.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module.exports = require('./make-webpack-config.js')({
1515

1616
entry: {
1717
"swagger-editor": [
18+
"./src/polyfills.js",
1819
'./src/index.js'
1920
]
2021
},

webpack-hot-dev-server.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ module.exports = require("./make-webpack-config.js")({
1818

1919
entry: {
2020
"swagger-editor-bundle": [
21+
"./src/polyfills.js",
2122
'./src/index.js'
2223
],
2324
'swagger-editor-standalone-preset': [
25+
"./src/polyfills.js",
2426
'./src/standalone/index.js'
2527
],
2628
'commons': ['react']

webpack-standalone.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = require("./make-webpack-config.js")({
1010

1111
entry: {
1212
"swagger-editor-standalone-preset": [
13+
"./src/polyfills.js",
1314
"./src/standalone/index.js"
1415
]
1516
},

0 commit comments

Comments
 (0)