Get everything working

Author: jamesdaniels

.dockerignore

@@ -0,0 +1,23 @@
+.DS_Store
+.git
+cloudbuild.yaml
+.travis.yml
+Dockerfile
+
+npm-debug.log
+
+dist/
+node_modules/
+
+.vscode/*
+reactfire/**/*.js
+!reactfire/babel.config.js
+
+reactfire/**/*.jsx
+reactfire/**/*.js.map
+reactfire/**/*.jsx.map
+reactfire/**/*.d.ts
+reactfire/pub/*
+reactfire/docs/reactfire-metadata.json
+.cache
+sample-complex/src/firebase-key.json

.nvmrc

@@ -1 +1 @@
-lts/*
+12.11.1

.travis.yml

@@ -1,10 +1,15 @@
 language: node_js
 sudo: false
-node_js:
-- 'lts/*'
 
 addons:
   chrome: stable
+  apt:
+    update: true
+    packages:
+    - default-jre
+    - default-jdk
+    - build-essential
+    - python2.7
 
 cache:
   yarn: true
@@ -37,6 +42,8 @@ install:
         yarn install --frozen-lockfile
       fi
     fi
+  - yarn global add firebase-tools
+  - firebase setup:emulators:firestore
 
 script:
   - cd reactfire

Dockerfile

@@ -1,16 +1,35 @@
 FROM debian:latest
 
+SHELL ["/bin/bash", "-l", "-c"]
+
+ENV CI true
+
 # Installing Java (and curl)
-RUN apt-get update && apt-get install -y curl default-jre default-jdk
-RUN apt-get install -y build-essential
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
-RUN nvm install .
-RUN nvm use .
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq < /dev/null > /dev/null
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -qq curl default-jre < /dev/null > /dev/null
 
+RUN curl --silent -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
+COPY .nvmrc /
+RUN nvm install .
 RUN npm install -g yarn firebase-tools
-
 RUN firebase setup:emulators:firestore
 
+ENV PYTHON /usr/bin/python2.7
+
+COPY package.json /
+COPY yarn.lock /
+COPY reactfire/package.json reactfire/
+COPY sample-complex/package.json sample-complex/
+COPY sample-simple/package.json sample-simple/
+RUN yarn install --frozen-lockfile
+
 COPY . /
 
-CMD yarn
+RUN cd reactfire && yarn build
+RUN cd reactfire && yarn test
+
+ARG SHORT_SHA=""
+ARG NPM_TOKEN=""
+ARG TAG_NAME=""
+
+RUN ./publish.sh

cloudbuild.yaml

@@ -3,34 +3,17 @@
 #   @canary `gcloud builds submit --substitutions=SHORT_SHA="9b0a0b0"`
 #   @next   `gcloud builds submit --substitutions=TAG_NAME="v1.2.3-rc.1"`
 #   @latest `gcloud builds submit --substitutions=TAG_NAME="v1.2.3"`
+
+# Not caching with kaniko due to https://github.com/GoogleContainerTools/kaniko/issues/713
 steps:
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/reactfire/docker']
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '-t', 'gcr.io/reactfire/docker', '--cache-from', 'gcr.io/reactfire/docker']
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['push', 'gcr.io/reactfire/firebase']
-- name: 'gcr.io/reactfire/docker'
-  args: ['install', '--frozen-lockfile']
-- name: 'gcr.io/reactfire/docker'
-  dir: 'reactfire'
-  args: ['build']
-- name: 'gcr.io/reactfire/docker'
-  dir: 'reactfire'
-  args: ['test']
-- name: 'gcr.io/reactfire/docker'
-  dir: 'reactfire/pub/reactfire'
+- name: gcr.io/cloud-builders/docker
   entrypoint: 'bash'
-  env:
-  - 'SHORT_SHA=$SHORT_SHA'
-  - 'TAG_NAME=$TAG_NAME'
-  args: ["../../../publish.sh"]
+  args:
+  - -c
+  - 'docker pull gcr.io/$PROJECT_ID/publish:latest; docker build -t gcr.io/$PROJECT_ID/publish:latest --cache-from gcr.io/$PROJECT_ID/publish:latest --build-arg SHORT_SHA=$SHORT_SHA --build-arg TAG_NAME=$TAG_NAME --build-arg NPM_TOKEN=$(echo $$NPM_TOKEN) . && docker push gcr.io/$PROJECT_ID/publish:latest'
   secretEnv: ['NPM_TOKEN']
 
 secrets:
 - kmsKeyName: projects/reactfire/locations/global/keyRings/cloud-build/cryptoKeys/cloud-build
   secretEnv:
-    NPM_TOKEN: CiQADamFn5XzbeNQgzTGST9r3Tp5skWlDbBiWaZljffgEm0yIxYSTQC1QbtmDtScXx1BPE+d3CP9rXvOY+n5J0XRuLTTqN7RaqyipCEqTi7+z1kI6mKyBo2ilsMtOtngNzbOZ8kZeUDA80ISLWrNs0hF8k78
-
-images:
-- gcr.io/reactfire/docker
+    NPM_TOKEN: CiQADamFn5XzbeNQgzTGST9r3Tp5skWlDbBiWaZljffgEm0yIxYSTQC1QbtmDtScXx1BPE+d3CP9rXvOY+n5J0XRuLTTqN7RaqyipCEqTi7+z1kI6mKyBo2ilsMtOtngNzbOZ8kZeUDA80ISLWrNs0hF8k78

publish.sh

@@ -1,14 +1,25 @@
-echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
+cd reactfire/pub/reactfire
 
-cp ../README.md .
-cp ../LICENSE .
+if test $NPM_TOKEN; then
+
+    echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
+
+    cp ../../../README.md .
+    cp -r ../../../docs .
+    cp ../../../LICENSE .
+
+    if test $TAG_NAME; then
+        npm version $(echo $TAG_NAME | sed 's/^v\(.*\)$/\1/')
+        npm publish . --tag next
+        ret=$?
+    else
+        npm version $(npm version | sed -n "s/^  reactfire: '\(.*\)',/\1/p")-canary.$SHORT_SHA
+        npm publish . --tag canary
+        ret=$?
+    fi
+
+    rm -f .npmrc
 
-if test $TAG_NAME; then
-    npm version $(echo $TAG_NAME | sed 's/^v\(.*\)$/\1/')
-    npm publish . --tag next
-else
-    npm version $(npm version | head -n 1 |  sed "s/^.*: '\([^']*\).*/\1/")-canary.$SHORT_SHA
-    npm publish . --tag canary
 fi
 
-rm -f .npmrc
+exit $ret

reactfire/package.json

@@ -26,17 +26,13 @@
     "rxfire": "^3.6.3",
     "rxjs": "^6.4.0"
   },
-  "peerDependencies": {
-    "firebase": "^6.0.0",
-    "react": "^16.9.0"
-  },
   "devDependencies": {
+    "firebase": "^7.0.0",
+    "react": "^16.9.0",
     "@babel/core": "^7.4.3",
     "@babel/preset-env": "^7.4.3",
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.3.3",
-    "@firebase/app": "^0.4.8",
-    "@firebase/app-types": "^0.4.0",
     "@testing-library/jest-dom": "^4.1.1",
     "@testing-library/react": "^9.3.0",
     "@testing-library/react-hooks": "^2.0.3",

reactfire/package.pub.json

@@ -23,7 +23,7 @@
     "rxjs": "^6.4.0"
   },
   "peerDependencies": {
-    "firebase": "^6.0.0",
+    "firebase": "^7.0.0",
     "react": "^16.9.0"
   }
 }

sample-complex/package.json

@@ -22,7 +22,7 @@
     "@types/react": "^16.8.14",
     "@types/react-dom": "^16.8.4",
     "express": "^4.16.4",
-    "firebase": "^5.10.0",
+    "firebase": "^7.0.0",
     "firebase-admin": "^7.3.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",