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 #76: Use webpack 4 #80

Merged
merged 1 commit into from
May 3, 2018
Merged

Fix #76: Use webpack 4 #80

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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ packages/
paket-files/
nupkg/
obj/
Content/paket.lock
Content/paket.lock
bin/
4 changes: 2 additions & 2 deletions Content/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Target "ArmTemplate" (fun _ ->
// You can safely replace these with your own subscription and client IDs hard-coded into this script.
let subscriptionId = try getBuildParam "subscriptionId" |> Guid.Parse with _ -> failwith "Invalid Subscription ID. This should be your Azure Subscription ID."
let clientId = try getBuildParam "clientId" |> Guid.Parse with _ -> failwith "Invalid Client ID. This should be the Client ID of a Native application registered in Azure with permission to create resources in your subscription."

tracefn "Deploying template '%s' to resource group '%s' in subscription '%O'..." armTemplate resourceGroupName subscriptionId
subscriptionId
|> authenticateDevice trace { ClientId = clientId; TenantId = None }
Expand Down Expand Up @@ -191,4 +191,4 @@ Target "AppService" (fun _ ->
==> "RestoreServer"
==> "Run"

RunTargetOrDefault "Build"
RunTargetOrDefault "Build"
21 changes: 11 additions & 10 deletions Content/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
"dependencies": {
"babel-polyfill": "6.26.0",
"babel-runtime": "6.26.0",
"react": "16.0.0",
"react-bootstrap": "0.31.3",
"react-dom": "16.0.0",
"react": "16.3.2",
"react-bootstrap": "0.32.1",
"react-dom": "16.3.2",
"remotedev": "0.2.7"
},
"devDependencies": {
"babel-core": "6.26.0",
"babel-loader": "7.1.2",
"babel-core": "6.26.3",
"babel-loader": "7.1.4",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-env": "1.6.0",
"concurrently": "3.5.0",
"fable-loader": "1.1.3",
"babel-preset-env": "1.6.1",
"concurrently": "3.5.1",
"fable-loader": "1.1.6",
"fable-utils": "1.0.6",
"webpack": "3.7.1",
"webpack-dev-server": "2.9.1"
"webpack": "4.6.0",
"webpack-cli": "^2.1.2",
"webpack-dev-server": "3.1.4"
},
"scripts": {
"prebuildServer": "dotnet restore src/Server/Server.fsproj",
Expand Down
1 change: 1 addition & 0 deletions Content/src/Client/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ console.log("Bundling for " + (isProduction ? "production" : "development") + ".
module.exports = {
devtool: "source-map",
entry: resolve('./Client.fsproj'),
mode: isProduction ? "production" : "development",
output: {
path: resolve('./public/js'),
publicPath: "/js",
Expand Down
Loading