Merge pull request #5259 from reactioncommerce/release-v2.0.0-rc.12

Release v2.0.0 rc.12
reactioncommerce · Jul 2, 2019 · 2bb02a1 · 2bb02a1
2 parents 6c8e806 + bcd8204
commit 2bb02a1
Show file tree

Hide file tree

Showing 936 changed files with 32,265 additions and 28,028 deletions.
diff --git a/.circleci/bin/calibre-deploy.sh b/.circleci/bin/calibre-deploy.sh
@@ -6,13 +6,13 @@ URL=$1
 LOCATION=$2
 
 # Run One Off Test
-./../node_modules/calibre/bin/linux/calibre test create $URL --location=$LOCATION
+npx calibre@2.0.2 test create $URL --location=$LOCATION
 
 # Run Snapshot
 # California Snapshot Only (Be more generic as we add more site locations to track)
 if [ $LOCATION = "California" ]
 then
-    ./../node_modules/calibre/bin/linux/calibre site create-snapshot --site reaction-core-"$(echo $LOCATION | tr '[A-Z]' '[a-z]')"
+    npx calibre@2.0.2 site create-snapshot --site reaction-core-"$(echo $LOCATION | tr '[A-Z]' '[a-z]')"
 else
     echo "No Snapshot Configured for Location"
 fi
diff --git a/.circleci/bin/ecs-deploy-feature-branch.sh b/.circleci/bin/ecs-deploy-feature-branch.sh
diff --git a/.circleci/bin/ecs-deploy-release-branch.sh b/.circleci/bin/ecs-deploy-release-branch.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
           docker_layer_caching: true
       - restore_cache:
           name: Restoring Meteor cache
-          key: ${GLOBAL_CACHE_VERSION}-meteor
+          key: reaction-v2-meteor
       - run:
           name: Install Meteor
           command: |
@@ -36,7 +36,7 @@ jobs:
             fi
       - save_cache:
           name: Saving Meteor to cache
-          key: ${GLOBAL_CACHE_VERSION}-meteor-{{ epoch }}
+          key: reaction-v2-meteor-{{ epoch }}
           paths:
             - ~/.meteor
       - run:
@@ -70,11 +70,11 @@ jobs:
       # Store node_modules dependency cache.
       # Saved with package.json checksum and timestamped branch name keys.
       - save_cache:
-          key: ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+          key: reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
       - save_cache:
-          key: ${GLOBAL_CACHE_VERSION}-node-modules-{{ .Branch }}-{{ epoch }}
+          key: reaction-v2-node-modules-{{ .Branch }}-{{ epoch }}
           paths:
             - node_modules
 
@@ -141,26 +141,6 @@ jobs:
               echo "No deploy for forks"
             fi
 
-  deploy-to-ecs-release-branch:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: Deploy new task definition and update service in ECS
-          command: |
-            .circleci/bin/ecs-deploy-release-branch.sh
-          no_output_timeout: 30m
-
-  deploy-to-ecs-feature-branch:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: Deploy new task definition and update service in ECS
-          command: |
-            .circleci/bin/ecs-deploy-feature-branch.sh
-          no_output_timeout: 30m
-
   deploy-docs:
     <<: *defaults
     steps:
@@ -195,36 +175,47 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ .Branch }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-master
+            - reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+            - reaction-v2-node-modules-{{ .Branch }}
+            - reaction-v2-node-modules-master
       - run:
           name: Run Lint
           command: |
             npm run lint -- --quiet
 
+  graphql-lint:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+            - reaction-v2-node-modules-{{ .Branch }}
+            - reaction-v2-node-modules-master
+      - run:
+          name: Lint GraphQL schemas
+          command: |
+            npm run lint:gql
+
   test-app:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           name: Restoring Meteor cache
-          key: ${GLOBAL_CACHE_VERSION}-meteor
+          key: reaction-v2-meteor
       - run:
           name: Link Restored Meteor
           command: sudo ln -s ~/.meteor/meteor /usr/local/bin/meteor
       - restore_cache:
           # Fall back to less specific caches
           keys:
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ .Branch }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-master
-      - run:
-          name: Install Reaction CLI
-          command: sudo npm install -g reaction-cli
+            - reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+            - reaction-v2-node-modules-{{ .Branch }}
+            - reaction-v2-node-modules-master
       - run:
           name: Load App Plugins
-          command: reaction plugins load
+          command: node --experimental-modules ./.reaction/scripts/build.mjs
       - run:
           name: Run Meteor Integration Tests
           command: .circleci/tests.sh
@@ -235,9 +226,9 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ .Branch }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-master
+            - reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+            - reaction-v2-node-modules-{{ .Branch }}
+            - reaction-v2-node-modules-master
       - run:
           name: Run Unit Tests
           command: npm run test:unit
@@ -248,9 +239,9 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ .Branch }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-master
+            - reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+            - reaction-v2-node-modules-{{ .Branch }}
+            - reaction-v2-node-modules-master
       - run:
           name: Run Integration Tests
           command: npm run test:integration
@@ -271,11 +262,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run:
-          name: Install Calibre CLI
-          command: |
-            cd ~
-            sudo npm install calibre
       - run:
           name: California
           command: |
@@ -292,7 +278,7 @@ jobs:
           name: Frankfurt
           command: |
             .circleci/bin/calibre-deploy.sh ${STAGING_URL} Frankfurt
- 
+
   dockerfile-lint:
     <<: *defaults
     docker:
@@ -303,7 +289,7 @@ jobs:
           docker_layer_caching: true
       - run:
           name: Dockerfile Lint
-          command: | 
+          command: |
             hadolint Dockerfile
 
   snyk-security:
@@ -314,9 +300,9 @@ jobs:
           docker_layer_caching: true
       - restore_cache:
           keys:
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-{{ .Branch }}
-            - ${GLOBAL_CACHE_VERSION}-node-modules-master
+            - reaction-v2-node-modules-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}
+            - reaction-v2-node-modules-{{ .Branch }}
+            - reaction-v2-node-modules-master
       - run:
           name: Snyk Test
           command: |
@@ -361,15 +347,12 @@ workflows:
       - test-integration:
           requires:
             - build
-      - test-e2e:
-          requires:
-            - deploy-to-ecs-release-branch
-      - test-metrics:
-          requires: 
-            - deploy-to-ecs-release-branch
       - eslint:
           requires:
             - build
+      - graphql-lint:
+          requires:
+            - build
       - docker-build:
           context: reaction-build-read
           requires:
@@ -378,18 +361,6 @@ workflows:
           context: reaction-publish-docker
           requires:
             - docker-build
-      - deploy-to-ecs-release-branch:
-          requires:
-            - docker-push
-          filters:
-            branches:
-              only: /^release-2.*/
-      # - deploy-to-ecs-feature-branch:
-      #     requires:
-      #       - docker-push
-      #     filters:
-      #       branches:
-      #         only: /^feat.*/
       - deploy-docs:
           requires:
             - test-unit

diff --git a/.dockerignore b/.dockerignore
@@ -3,6 +3,13 @@
 .build.*
 .npm
 .git
+
+# This is necessary so plugins can use git repos as npm deps.
+# Leave this here unless you understand the implications.
+# See this issue for details: 
+# https://github.com/reactioncommerce/reaction/pull/5118
+!.git/modules/imports/plugins/custom
+
 .build.log
 Dockerfile
 Dockerfile-devserver

diff --git a/.env.example b/.env.example
@@ -1,3 +1,5 @@
+GRAPHQL_INTROSPECTION_ENABLED=true
+GRAPHQL_PLAYGROUND_ENABLED=true
 HYDRA_ADMIN_URL=http://hydra:4445
 HYDRA_OAUTH2_INTROSPECT_URL=http://hydra:4445/oauth2/introspect
 HYDRA_TOKEN_URL=http://hydra:4444/oauth2/token

diff --git a/.eslintignore b/.eslintignore
@@ -8,4 +8,5 @@ packages/*
 server/plugins.js
 
 node_modules/*
+# plugin node_modules
 **/node_modules/*
diff --git a/.meteor/packages b/.meteor/packages
@@ -49,10 +49,8 @@ twitter-config-ui@1.0.0
 alanning:roles
 aldeed:autoform@6.2.0
 aldeed:collection2@3.0.1
-aldeed:schema-index@3.0.0
 aldeed:template-extension
 bozhao:accounts-instagram
-meteorhacks:ssr
 meteorhacks:subs-manager
 ongoworks:security
 tmeasday:publish-counts

diff --git a/.meteor/versions b/.meteor/versions
@@ -7,7 +7,6 @@ accounts-twitter@1.4.2
 alanning:roles@1.2.16
 aldeed:autoform@6.3.0
 aldeed:collection2@3.0.1
-aldeed:schema-index@3.0.0
 aldeed:template-extension@4.1.0
 allow-deny@1.1.0
 audit-argument-checks@1.0.7
@@ -72,7 +71,6 @@ mdg:validated-method@1.2.0
 meteor@1.9.2
 meteor-base@1.4.0
 meteorhacks:picker@1.0.3
-meteorhacks:ssr@2.2.0
 meteorhacks:subs-manager@1.6.4
 meteortesting:browser-tests@0.2.0
 meteortesting:mocha@0.6.0