Skip to content

Commit

Permalink
Fix runtests build target
Browse files Browse the repository at this point in the history
  • Loading branch information
Freymaurer committed Dec 1, 2022
1 parent b859e8e commit a5ff2cd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 136 deletions.
6 changes: 3 additions & 3 deletions build/Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,13 @@ Target.create "InstallClient" (fun _ ->

Target.create "bundle" (fun _ ->
[ "server", dotnet $"publish -c Release -o \"{deployPath}\"" serverPath
"client", dotnet "fable src/Client -o src/Client/output -e .fs.js -s --run webpack --config webpack.config.js" "" ]
"client", dotnet "fable src/Client -o src/Client/output -e .fs.js -s --run npm run build" "" ]
|> runParallel
)

Target.create "bundle-linux" (fun _ ->
[ "server", dotnet $"publish -c Release -r linux-x64 -o \"{deployPath}\"" serverPath
"client", dotnet "fable src/Client -s --run webpack --config webpack.config.js" "" ]
"client", dotnet "fable src/Client -s --run npm run build" "" ]
|> runParallel
)

Expand Down Expand Up @@ -270,7 +270,7 @@ Target.create "RunTests" (fun _ ->
run dotnet "build" sharedTestsPath
[
"server", dotnet "watch run -p tests/Server" ""
"client", dotnet "fable watch tests/Client -o tests/Client/output -e .fs.js -s --run webpack-dev-server --config webpack.tests.config" "" ]
"client", dotnet "fable watch tests/Client -o tests/Client/output -e .fs.js -s --run npm run test:live" "" ]
|> runParallel
)

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
],
"private": true,
"engines": {
"node": "~16",
"node": "~16 || ~18",
"npm": "~8"
},
"scripts": {
"start": "webpack-dev-server",
"build": "webpack -p",
"test:live": "webpack-dev-server --config webpack.tests.config.js"
"start": "webpack-dev-server --mode development",
"build": "webpack --mode production",
"test:live": "webpack-dev-server --mode development --env test"
},
"devDependencies": {
"@babel/core": "^7.16.0",
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var TEST_CONFIG = {
// to a external API server. See https://webpack.js.org/configuration/dev-server/#devserver-proxy
devServerProxy: undefined,
babel: undefined,
cssEntry: undefined,
cssEntry: './src/Client/style.scss',
}

var path = require('path');
Expand Down
127 changes: 0 additions & 127 deletions webpack.tests.config.js

This file was deleted.

0 comments on commit a5ff2cd

Please sign in to comment.