Skip to content

Commit 117baba

Browse files
alexander2001ialexander2001i
committed
Merge branch 'environment/staging' into environment/production
2 parents bf237bd + 3fe3ab4 commit 117baba

File tree

419 files changed

+13788
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+13788
-302
lines changed

‎.gitignore‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,3 +559,14 @@ build
559559

560560
# vercel
561561
.vercel
562+
563+
564+
packages/core/src/domain/constants/secrets/*
565+
566+
567+
.env
568+
.env.staging
569+
.env.production
570+
571+
**/secrets/*
572+

‎.run/GraphQL.run.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="GraphQL" type="js.build_tools.npm">
3+
<package-json value="$PROJECT_DIR$/packages/graphql/package.json" />
4+
<command value="run" />
5+
<scripts>
6+
<script value="dev" />
7+
</scripts>
8+
<node-interpreter value="project" />
9+
<envs />
10+
<method v="2" />
11+
</configuration>
12+
</component>

‎.run/Worker.run.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Worker" type="js.build_tools.npm">
3+
<package-json value="$PROJECT_DIR$/packages/worker/package.json" />
4+
<command value="run" />
5+
<scripts>
6+
<script value="dev" />
7+
</scripts>
8+
<node-interpreter value="project" />
9+
<envs />
10+
<method v="2" />
11+
</configuration>
12+
</component>

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages/*",
44
"packages/firebase/functions"
55
],
6-
"version": "1.9.10",
6+
"version": "1.9.11-rc.2",
77
"npmClient": "yarn",
88
"useWorkspaces": true
99
}

‎packages/admin/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "admin",
3-
"version": "1.9.10-rc.0",
3+
"version": "1.9.11-rc.1",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

‎packages/core/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.env
2+
.env.staging
3+
.env.production
4+
5+
**/secrets/*
6+

‎packages/core/package.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"name": "@common/core",
3+
"version": "1.9.11-rc.2",
4+
"author": "Alexander Ivanov @alexander2001i",
5+
"main": "dist/index.js",
6+
"scripts": {
7+
"dev": "yarn compile:watch",
8+
"compile": "tsc -p tsconfig.json && yarn fix:paths",
9+
"compile:watch": "tsc-watch --onSuccess \"yarn fix:paths\"",
10+
"fix:paths": "tscpaths -p tsconfig.json -s ./src -o ./dist",
11+
"seed": "ts-node -r dotenv/config prisma/seed.ts",
12+
"db:sync": "prisma migrate deploy",
13+
"create:schema": "find prisma -name '*.prisma' -not -name \"schema.prisma\" -exec cat {} + > prisma/schema.prisma && prisma format",
14+
"create:migration": "yarn create:schema && prisma migrate dev"
15+
},
16+
"devDependencies": {
17+
"@types/request-ip": "^0.0.35",
18+
"@types/uuid": "^8.3.0",
19+
"prisma": "^2.21.1",
20+
"ts-node-dev": "^1.1.6",
21+
"tsc-watch": "^4.2.9",
22+
"tscpaths": "^0.0.9",
23+
"typescript": "^4.2.3"
24+
},
25+
"dependencies": {
26+
"@common/queues": "^1.9.11-rc.2",
27+
"@prisma/client": "^2.20.1",
28+
"@sendgrid/mail": "^7.4.2",
29+
"axios": "^0.21.1",
30+
"date-fns": "^2.19.0",
31+
"dotenv": "^8.2.0",
32+
"firebase-admin": "9.5.0",
33+
"lodash": "^4.17.21",
34+
"tsconfig-paths": "^3.9.0",
35+
"winston": "^3.3.3",
36+
"winston-slack-webhook-transport": "^2.0.1",
37+
"zod": "^1.11.13"
38+
}
39+
}

0 commit comments

Comments
 (0)