Webpack - Githubissues

uwblueprint / BEP

2 stars 0 forks source link

Webpack #29

Closed faizaanmadhani closed 4 years ago

faizaanmadhani commented 4 years ago

Added Webpack Configuration. Currently bundles client/src/index.tsx file, and outputs bundle to dist/bundle.js.

Loaders include:

css-loader (to compile css)
style-loader (comes packaged with css-loader)
babel-loader (to allow for es6 -> es5 transpiling)
source-map-loader (to extract source maps)
ts-loader (to bundle typescript)

Preset Includes:

@babel/preset-react (to transpile react)

meganniu commented 4 years ago

@brandonleung I don't have too much exp with yarn but I heard that generally, we should push yarn.lock files

faizaanmadhani commented 4 years ago

@meganniu @brandonleung There are 68 merge conflicts on the yarn.lock file, though and according to the yarn docs, you shouldn't be manually editing the file. I was looking into this, which basically says to rebase the branch against master. Do you think this would be a good idea to try?

brandonleung commented 4 years ago

@faizaanmadhani rebasing is a good idea for this

faizaanmadhani commented 4 years ago

@brandonleung I just finished rebasing the branch and now there are no more merge conflicts. It's passed the travis ci tests. Let me know when it's good to merge. There were some changes, so I'm just airing on the side of caution.

brandonleung commented 4 years ago

It's good to merge!