Skip to content

Commit cb12baf

Browse files
committed
fixing EM settings
1 parent 60c0c86 commit cb12baf

5 files changed

Lines changed: 38 additions & 19 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ hs_err_pid*
178178
/js_npm/rest/disease-sh-api/redis/
179179
/js_npm/rest/realworld-app/node_modules/
180180
/js_npm/rest/realworld-app/build/
181+
/js_npm/rest/realworld-app/dist/
182+
/js_npm/rest/realworld-app/instrumented/
181183
/js_npm/rest/spacex-api/node_modules/
182184
/js_npm/rest/spacex-api/build/
183185
/js_npm/graphql/react-finland/build/
@@ -190,7 +192,6 @@ hs_err_pid*
190192
/js_npm/graphql/ecommerce-server/instrumented/
191193
/js_npm/graphql/ecommerce-server/src/graphql/schemas/schema.gql
192194

193-
194195
#DotNet
195196
[Dd]ebug/
196197
[Bb]in/
@@ -212,3 +213,4 @@ dotnet_3/em/embedded/rest/SampleProjectDriver/logs/
212213

213214

214215

216+

js_npm/rest/realworld-app/em/app-driver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class AppController extends em.SutController {
8383
//note that for this sut, do not support mysql:8.*
8484
return new Promise(async (resolve) => {
8585
this.port = process.env.SUT_PORT || await getFreePort();
86-
this.server = await require("../src/dist/server").bootstrap(this.port);
86+
this.server = await require("../src/server").bootstrap(this.port);
8787
this.baseUrlOfSut = "http://localhost:" + this.port;
8888
resolve("http://localhost:" + this.port);
8989
});
@@ -93,7 +93,7 @@ class AppController extends em.SutController {
9393
stopSut() {
9494
return new Promise( (async resolve => {
9595
await dbHandler.stopDb();
96-
await require("../src/dist/server").stop().then(()=>{
96+
await require("../src/server").stop().then(()=>{
9797
// process.exit();
9898
resolve();
9999
});

js_npm/rest/realworld-app/package-lock.json

Lines changed: 25 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js_npm/rest/realworld-app/package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"description": "[![Build Status](https://travis-ci.org/anishkny/node-express-realworld-example-app.svg?branch=master)](https://travis-ci.org/anishkny/node-express-realworld-example-app)",
55
"main": "src/index.js",
66
"scripts": {
7-
"build": "tsc && babel em src -d build/src --copy-files",
8-
"em": "node build/src/em-main.js",
7+
"build": "rimraf dist && tsc",
8+
"em:run": "node instrumented/em/em-main.js",
9+
"em:build": "npm run build && rimraf instrumented & babel dist -d instrumented/src --copy-files && babel em -d instrumented/em --copy-files && babel em -d dist/em --copy-files",
910
"start": "node src/index.js",
1011
"start:watch": "nodemon",
1112
"prestart:prod": "tsc",
@@ -65,7 +66,8 @@
6566
"supertest": "^3.4.2",
6667
"ts-jest": "^25.4.0",
6768
"ts-node": "^8.9.1",
68-
"testcontainers": "7.20.0"
69+
"testcontainers": "7.20.0",
70+
"rimraf": "^3.0.0"
6971
},
7072
"jest": {
7173
"testEnvironment": "node",
@@ -89,7 +91,7 @@
8991
},
9092
"babel": {
9193
"only": [
92-
"src"
94+
"dist"
9395
],
9496
"plugins": [
9597
"module:evomaster-client-js"

js_npm/rest/realworld-app/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"target": "es6",
1212
"sourceMap": true,
1313
"allowJs": true,
14-
"outDir": "./src/dist"
14+
"outDir": "./dist"
1515
},
1616
"include": [
17-
"src/src/**/*"
17+
"src/**/*"
1818
],
1919
"exclude": [
2020
"node_modules",

0 commit comments

Comments
 (0)