Skip to content
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

Jump to bottom

Fix new schedules being a blank page in IE11 #366

Merged
merged 1 commit into from
Jan 31, 2020
Merged

Fix new schedules being a blank page in IE11 #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/site/assets/.babelrc.js → apps/site/assets/babel.config.js
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "./tsconfig",
"exclude": [
"**/__tests__/**/*",
"node_modules",
"vendor/",
thecristen marked this conversation as resolved.
Show resolved Hide resolved
"ts/ts-build/"
]
Expand Down
33 changes: 21 additions & 12 deletions apps/site/assets/webpack.config.base.js
View file
Open in desktop
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\//,
thecristen marked this conversation as resolved.
Show resolved Hide resolved
use: [babelLoader, tsLoader]
},
{
test: /\.svg$/,
Expand Down