Skip to content

Commit

Permalink
Merge pull request #1606 from Giveth/revert-#1604
Browse files Browse the repository at this point in the history
Revert "651 run migration files as js file (#1604)"
  • Loading branch information
RamRamez authored Jun 5, 2024
2 parents 5140a93 + 965cea3 commit bd6a965
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@
"db:migrate:revert:test": "NODE_ENV=test npx typeorm-ts-node-commonjs migration:revert -d ./src/ormconfig.ts",
"db:migrate:run:local": "NODE_ENV=development npx typeorm-ts-node-commonjs migration:run -d ./src/ormconfig.ts",
"db:migrate:revert:local": "NODE_ENV=development npx typeorm-ts-node-commonjs migration:revert -d ./src/ormconfig.ts",
"db:migrate:run:production": "NODE_ENV=production typeorm migration:run -d ./build/src/ormconfig.js",
"db:migrate:revert:production": "NODE_ENV=production typeorm migration:revert -d ./build/src/ormconfig.js",
"db:migrate:run:production": "NODE_ENV=production npx typeorm-ts-node-commonjs migration:run -d ./src/ormconfig.ts",
"db:migrate:rever:productiont": "NODE_ENV=production npx typeorm-ts-node-commonjs migration:revert -d ./src/ormconfig.ts",
"prettify": "prettier --write '**/*.ts*' '**/*.test.ts*'",
"db:migrate:seedToken:run": "NODE_ENV=development ts-node ./node_modules/typeorm/cli -f ./src/seedToken-ormconfig.ts migration:run",
"db:migrate:seedToken:revert": "NODE_ENV=development ts-node ./node_modules/typeorm/cli -f ./src/seedToken-ormconfig.ts migration:revert",
Expand Down
6 changes: 1 addition & 5 deletions src/ormconfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ if (loadConfigResult.error) {

import { DataSource, DataSourceOptions } from 'typeorm';
import { getEntities } from './entities/entities';
import { ENVIRONMENTS } from './utils/utils';

const ormConfig: DataSourceOptions = {
type: 'postgres',
Expand All @@ -30,10 +29,7 @@ const ormConfig: DataSourceOptions = {
password: process.env.TYPEORM_DATABASE_PASSWORD,
database: process.env.TYPEORM_DATABASE_NAME,
entities: getEntities(),
migrations:
process.env.ENVIRONMENT === ENVIRONMENTS.PRODUCTION
? ['migration/*.js']
: ['migration/*.ts'],
migrations: ['migration/*.ts'],
// cli: {
// migrationsDir: 'migration',
// },
Expand Down

0 comments on commit bd6a965

Please sign in to comment.