Skip to content

Commit

Permalink
Fix new schedules being a blank page in IE11
Browse files Browse the repository at this point in the history
Co-authored-by: Cristen Blair Jones <cristenblair@gmail.com>
  • Loading branch information
digitalcora and thecristen committed Jan 31, 2020
1 parent 0d86925 commit 0126913
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ module.exports = {
}
]
]
};
}
1 change: 0 additions & 1 deletion apps/site/assets/tsconfig.webpack.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "./tsconfig",
"exclude": [
"**/__tests__/**/*",
"node_modules",
"vendor/",
"ts/ts-build/"
]
Expand Down
33 changes: 21 additions & 12 deletions apps/site/assets/webpack.config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ const webpack = require("webpack");
const path = require("path");
const postcssPresetEnv = require("postcss-preset-env");

const babelLoader = {
loader: "babel-loader",
options: {
configFile: "./babel.config.js"
}
};

const tsLoader = {
loader: "ts-loader",
options: {
configFile: "tsconfig.webpack.json"
}
};

module.exports = {
entry: {
app: ["./js/app-entry.js"],
Expand Down Expand Up @@ -33,22 +47,17 @@ module.exports = {
{
test: /\.(ts|tsx)$/,
exclude: [/node_modules/],
use: [
{ loader: "babel-loader" },
{
loader: "ts-loader",
options: {
configFile: "tsconfig.webpack.json"
}
}
]
use: [babelLoader, tsLoader]
},
{
test: /\.(js)$/,
exclude: [/node_modules/, path.resolve(__dirname, "ts/")],
use: {
loader: "babel-loader"
}
use: babelLoader
},
{
// https://docs.react-async.com/getting-started/installation#transpiling-for-legacy-browsers
test: /\/node_modules\/react-async\//,
use: [babelLoader, tsLoader]
},
{
test: /\.svg$/,
Expand Down

0 comments on commit 0126913

Please sign in to comment.