Attempting to fix babel/babel#8829.

rdok · Nov 16, 2019 · c0aa42c · c0aa42c
1 parent 90f8da8
commit c0aa42c
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 12 deletions.
diff --git a/.babelrc b/.babelrc
@@ -5,7 +5,7 @@
     "plugins": [
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
-        "@babel/plugin-proposal-throw-expressions"
+        "@babel/plugin-proposal-throw-expressions",
+        "@babel/plugin-transform-runtime"
     ]
-
 }
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,5 @@
 .env
 
-build/
-
 # Logs
 logs
 *.log

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
         DEFAULT_EMAIL = credentials('rdok-email')
         COMPOSE_PROJECT_NAME = 'graphql-blog-api'
         POSTGRES_PASSWORD = credentials('database-password')
-        ENV = 'production'
+        NODE_ENV = 'production'
     }
     stages {
         stage('Deploy') { 

diff --git a/build/.gitignore b/build/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
@@ -7,7 +7,8 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 
 ARG environment
-RUN npm install "$environment"
+
+RUN npm install "${environment}"
 
 COPY . /app
 

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -5,6 +5,8 @@ services:
     volumes:
       - ".:/app"
       - "${DEV_NPM_CACHE}:/root/.npm"
+    environment:
+      - VIRTUAL_HOST
 
   db:
     ports:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     environment:
       - POSTGRES_PASSWORD
       - VIRTUAL_PORT
-      - ENV
+      - NODE_ENV
     command: sh -c "
       ./docker/wait-for-it.sh 'prisma:4466'
       && prisma deploy

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,14 +34,16 @@
     "@babel/plugin-proposal-class-properties": "^7.7.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
+    "@babel/plugin-transform-runtime": "^7.6.2",
     "@babel/preset-env": "^7.7.1",
+    "@babel/runtime": "^7.7.2",
     "graphql-cli": "^3.0.14",
     "graphql-yoga": "^1.18.3",
+    "marked": ">=0.6.1",
     "node-uuid": "^1.4.8",
+    "open": ">=6.0.0",
     "prisma": "^1.34.10",
     "prisma-binding": "^2.3.16",
-    "validator": "^12.0.0",
-    "open": ">=6.0.0",
-    "marked": ">=0.6.1"
+    "validator": "^12.0.0"
   }
 }