Skip to content

Commit bf4eccf

Browse files
committed
fixed configuration issues
1 parent 4c1b955 commit bf4eccf

4 files changed

Lines changed: 123 additions & 14 deletions

File tree

js_npm/rest/realworld-app/ormconfig.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ module.exports = {
55
"username": "test",
66
"password": "test",
77
"database": "test",
8-
"entities": [ process.env.NODE_ENV == 'production' ? __dirname + '/src/dist/**/**.entity.js' : (process.env.NODE_ENV == 'em_production'? __dirname + '/build/src/dist/**/**.entity.js':__dirname + '/src/src/**/**.entity.ts') ],
8+
"entities": [ process.env.NODE_ENV == 'production' ? __dirname + '/src/dist/**/**.entity.js' : (process.env.NODE_ENV == 'em_production'? __dirname + '/instrumented/src/**/**.entity.js':__dirname + '/src/src/**/**.entity.ts') ],
99
"migrationsTableName": "migrations",
10-
"migrations": [process.env.NODE_ENV == 'em_production'? "build/src/database/migration/*.js": "src/database/migration/*.js"],
10+
"migrations": [process.env.NODE_ENV == 'em_production'? "instrumented/src/database/migration/*.js": "src/database/migration/*.js"],
1111
"cli": {
12-
"migrationsDir": process.env.NODE_ENV == 'em_production'? "build/src/database/migration": "src/database/migration"
12+
"migrationsDir": process.env.NODE_ENV == 'em_production'? "instrumented/src/database/migration": "src/database/migration"
1313
},
1414
"synchronize": true
1515
}

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

Lines changed: 98 additions & 6 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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"main": "src/index.js",
66
"scripts": {
77
"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",
8+
"em:run": "cross-env NODE_ENV=em_production 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 swagger.json -d instrumented --copy-files && babel em -d dist/em --copy-files",
1010
"start": "node src/index.js",
1111
"start:watch": "nodemon",
1212
"prestart:prod": "tsc",
@@ -37,6 +37,7 @@
3737
"argon2": "^0.26.2",
3838
"class-transformer": "^0.2.3",
3939
"class-validator": "^0.11.1",
40+
"cross-env": "^7.0.3",
4041
"crypto": "^1.0.1",
4142
"crypto-js": "^4.0.0",
4243
"jsonwebtoken": "^8.5.1",
@@ -62,12 +63,12 @@
6263
"extend": ">=3.0.2",
6364
"jest": "^25.5.3",
6465
"nodemon": "^1.19.4",
66+
"rimraf": "^3.0.0",
6567
"superagent": "5.2.2",
6668
"supertest": "^3.4.2",
67-
"ts-jest": "^25.4.0",
68-
"ts-node": "^8.9.1",
6969
"testcontainers": "7.20.0",
70-
"rimraf": "^3.0.0"
70+
"ts-jest": "^25.4.0",
71+
"ts-node": "^8.9.1"
7172
},
7273
"jest": {
7374
"testEnvironment": "node",

js_npm/rest/realworld-app/yarn.lock

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,6 +1594,13 @@
15941594
dependencies:
15951595
"capture-stack-trace" "^1.0.0"
15961596

1597+
"cross-env@^7.0.3":
1598+
"integrity" "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="
1599+
"resolved" "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
1600+
"version" "7.0.3"
1601+
dependencies:
1602+
"cross-spawn" "^7.0.1"
1603+
15971604
"cross-spawn@^5.0.1":
15981605
"integrity" "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk="
15991606
"resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"
@@ -1623,6 +1630,15 @@
16231630
"shebang-command" "^2.0.0"
16241631
"which" "^2.0.1"
16251632

1633+
"cross-spawn@^7.0.1":
1634+
"integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
1635+
"resolved" "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
1636+
"version" "7.0.3"
1637+
dependencies:
1638+
"path-key" "^3.1.0"
1639+
"shebang-command" "^2.0.0"
1640+
"which" "^2.0.1"
1641+
16261642
"crypto-js@^4.0.0":
16271643
"integrity" "sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="
16281644
"resolved" "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"

0 commit comments

Comments
 (0)