diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/danger/clean/cleaner.ts (renamed from scripts/danger/clean/cleaner.js) | 12 | ||||
-rwxr-xr-x | scripts/danger/clean/dev.sh | 2 | ||||
-rwxr-xr-x | scripts/watch/client.sh | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/danger/clean/cleaner.js b/scripts/danger/clean/cleaner.ts index 1a1e3dee7..d1dba4650 100644 --- a/scripts/danger/clean/cleaner.js +++ b/scripts/danger/clean/cleaner.ts | |||
@@ -1,16 +1,16 @@ | |||
1 | const eachSeries = require('async/eachSeries') | 1 | import * as eachSeries from 'async/eachSeries' |
2 | const rimraf = require('rimraf') | 2 | import * as rimraf from 'rimraf' |
3 | 3 | ||
4 | const constants = require('../../../server/initializers/constants') | 4 | import { CONFIG } from '../../../server/initializers/constants' |
5 | const db = require('../../../server/initializers/database') | 5 | import { database as db } from '../../../server/initializers/database' |
6 | 6 | ||
7 | db.init(true, function () { | 7 | db.init(true, function () { |
8 | db.sequelize.drop().asCallback(function (err) { | 8 | db.sequelize.drop().asCallback(function (err) { |
9 | if (err) throw err | 9 | if (err) throw err |
10 | 10 | ||
11 | console.info('Tables of %s deleted.', db.sequelize.config.database) | 11 | console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME) |
12 | 12 | ||
13 | const STORAGE = constants.CONFIG.STORAGE | 13 | const STORAGE = CONFIG.STORAGE |
14 | eachSeries(Object.keys(STORAGE), function (storage, callbackEach) { | 14 | eachSeries(Object.keys(STORAGE), function (storage, callbackEach) { |
15 | const storageDir = STORAGE[storage] | 15 | const storageDir = STORAGE[storage] |
16 | 16 | ||
diff --git a/scripts/danger/clean/dev.sh b/scripts/danger/clean/dev.sh index f4a5d1e8a..270ca0a2e 100755 --- a/scripts/danger/clean/dev.sh +++ b/scripts/danger/clean/dev.sh | |||
@@ -4,5 +4,5 @@ read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " | |||
4 | echo | 4 | echo |
5 | 5 | ||
6 | if [[ "$REPLY" =~ ^[Yy]$ ]]; then | 6 | if [[ "$REPLY" =~ ^[Yy]$ ]]; then |
7 | NODE_ENV=test node "./scripts/danger/clean/cleaner" | 7 | NODE_ENV=test npm run ts-node "./scripts/danger/clean/cleaner" |
8 | fi | 8 | fi |
diff --git a/scripts/watch/client.sh b/scripts/watch/client.sh index 3e4522547..c99ed14e6 100755 --- a/scripts/watch/client.sh +++ b/scripts/watch/client.sh | |||
@@ -2,4 +2,4 @@ | |||
2 | 2 | ||
3 | cd client || exit -1 | 3 | cd client || exit -1 |
4 | 4 | ||
5 | npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached --watch | 5 | npm run webpack-dev-server -- --config config/webpack.dev.js --progress --profile --colors --watch --content-base src/ --inline --hot |