Merge pull request #6778 from reactioncommerce/release-5

Release 5
reactioncommerce · Jun 13, 2023 · 1675eb3 · 1675eb3
2 parents ecb8ef6 + bf03a7d
commit 1675eb3
Show file tree

Hide file tree

Showing 872 changed files with 32,144 additions and 3,445 deletions.
diff --git a/.changeset/brown-crabs-remain.md b/.changeset/brown-crabs-remain.md
@@ -0,0 +1,10 @@
+---
+"@reactioncommerce/api-plugin-authorization-simple": minor
+"@reactioncommerce/api-plugin-carts": minor
+"@reactioncommerce/api-plugin-catalogs": minor
+"@reactioncommerce/api-plugin-orders": minor
+"@reactioncommerce/api-plugin-products": minor
+"@reactioncommerce/api-plugin-sample-data": minor
+---
+
+Fulfillment Type feature
diff --git a/.changeset/cuddly-camels-wave.md b/.changeset/cuddly-camels-wave.md
@@ -0,0 +1,6 @@
+---
+"@reactioncommerce/api-plugin-authorization-simple": minor
+"@reactioncommerce/api-plugin-simple-schema": minor
+---
+
+New query endpoint introspectSchema
diff --git a/.changeset/funny-scissors-share.md b/.changeset/funny-scissors-share.md
@@ -0,0 +1,5 @@
+---
+"@reactioncommerce/api-plugin-promotions": minor
+---
+
+filter feature for promotions
diff --git a/.changeset/green-shoes-drive.md b/.changeset/green-shoes-drive.md
@@ -0,0 +1,32 @@
+---
+"reaction": minor
+"@reactioncommerce/api-plugin-accounts": minor
+"@reactioncommerce/api-plugin-address-validation": minor
+"@reactioncommerce/api-plugin-authorization-simple": minor
+"@reactioncommerce/api-plugin-carts": minor
+"@reactioncommerce/api-plugin-catalogs": minor
+"@reactioncommerce/api-plugin-discounts-codes": minor
+"@reactioncommerce/api-plugin-email": minor
+"@reactioncommerce/api-plugin-email-templates": minor
+"@reactioncommerce/api-plugin-files": minor
+"@reactioncommerce/api-plugin-inventory-simple": minor
+"@reactioncommerce/api-plugin-navigation": minor
+"@reactioncommerce/api-plugin-orders": minor
+"@reactioncommerce/api-plugin-payments": minor
+"@reactioncommerce/api-plugin-payments-stripe-sca": minor
+"@reactioncommerce/api-plugin-pricing-simple": minor
+"@reactioncommerce/api-plugin-products": minor
+"@reactioncommerce/api-plugin-settings": minor
+"@reactioncommerce/api-plugin-shipments": minor
+"@reactioncommerce/api-plugin-shipments-flat-rate": minor
+"@reactioncommerce/api-plugin-shops": minor
+"@reactioncommerce/api-plugin-sitemap-generator": minor
+"@reactioncommerce/api-plugin-surcharges": minor
+"@reactioncommerce/api-plugin-system-information": minor
+"@reactioncommerce/api-plugin-tags": minor
+"@reactioncommerce/api-plugin-taxes": minor
+"@reactioncommerce/api-plugin-taxes-flat-rate": minor
+"@reactioncommerce/api-utils": minor
+---
+
+checks for encodedId before calling decode. Normal-id pass through
diff --git a/.changeset/strange-terms-design.md b/.changeset/strange-terms-design.md
@@ -0,0 +1,44 @@
+---
+"@reactioncommerce/api-core": major
+"@reactioncommerce/api-plugin-accounts": major
+"@reactioncommerce/api-plugin-address-validation": major
+"@reactioncommerce/api-plugin-address-validation-test": major
+"@reactioncommerce/api-plugin-authentication": major
+"@reactioncommerce/api-plugin-authorization-simple": major
+"@reactioncommerce/api-plugin-carts": major
+"@reactioncommerce/api-plugin-catalogs": major
+"@reactioncommerce/api-plugin-discounts": major
+"@reactioncommerce/api-plugin-discounts-codes": major
+"@reactioncommerce/api-plugin-email": major
+"@reactioncommerce/api-plugin-email-smtp": major
+"@reactioncommerce/api-plugin-email-templates": major
+"@reactioncommerce/api-plugin-files": major
+"@reactioncommerce/api-plugin-i18n": major
+"@reactioncommerce/api-plugin-inventory": major
+"@reactioncommerce/api-plugin-inventory-simple": major
+"@reactioncommerce/api-plugin-job-queue": major
+"@reactioncommerce/api-plugin-navigation": major
+"@reactioncommerce/api-plugin-notifications": major
+"@reactioncommerce/api-plugin-orders": major
+"@reactioncommerce/api-plugin-payments": major
+"@reactioncommerce/api-plugin-payments-example": major
+"@reactioncommerce/api-plugin-payments-stripe-sca": major
+"@reactioncommerce/api-plugin-pricing-simple": major
+"@reactioncommerce/api-plugin-products": major
+"@reactioncommerce/api-plugin-sample-data": major
+"@reactioncommerce/api-plugin-settings": major
+"@reactioncommerce/api-plugin-shipments": major
+"@reactioncommerce/api-plugin-shipments-flat-rate": major
+"@reactioncommerce/api-plugin-shops": major
+"@reactioncommerce/api-plugin-simple-schema": major
+"@reactioncommerce/api-plugin-sitemap-generator": major
+"@reactioncommerce/api-plugin-surcharges": major
+"@reactioncommerce/api-plugin-system-information": major
+"@reactioncommerce/api-plugin-tags": major
+"@reactioncommerce/api-plugin-taxes": major
+"@reactioncommerce/api-plugin-taxes-flat-rate": major
+"@reactioncommerce/api-plugin-translations": major
+"@reactioncommerce/api-utils": major
+---
+
+Node18 upgrade includes assert json
diff --git a/.changeset/tidy-pens-care.md b/.changeset/tidy-pens-care.md
@@ -0,0 +1,5 @@
+---
+"reaction": major
+---
+
+Reaction version 5
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ defaults: &defaults
     DOCKER_NAMESPACE: "reactioncommerce"
     DOCKER_NAME: "reaction"
   docker:
-    - image: cimg/node:14.20.0
+    - image: cimg/node:18.10.0
 
 install_pnpm: &install_pnpm
   - run:
@@ -91,17 +91,22 @@ jobs:
       - <<: *pnpm_install
       - run:
           name: Test Unit
+          no_output_timeout: 30m
           command: pnpm test
+    resource_class: large
 
   test-integration-query:
     <<: *defaults
     docker:
-      - image: cimg/node:14.20.0
+      - image: cimg/node:18.10.0
       # Integration tests need MongoDB server running and accessible on port 27017
       - image: mongo:4.0
         command: mongod --oplogSize 128 --replSet rs0 --storageEngine=wiredTiger
         ports:
           - "27017:27017"
+      - image: redis
+        ports:
+          - "6379:6379"
     steps:
       - checkout
       - restore_cache:
@@ -119,16 +124,20 @@ jobs:
             sudo apt update && sudo apt-get install -y mongodb
             mongo --eval "rs.initiate()"
             pnpm run test:integration:query
+    resource_class: large
 
   test-integration-mutation:
     <<: *defaults
     docker:
-      - image: cimg/node:14.20.0
+      - image: cimg/node:18.10.0
       # Integration tests need MongoDB server running and accessible on port 27017
       - image: mongo:4.0
         command: mongod --oplogSize 128 --replSet rs0 --storageEngine=wiredTiger
         ports:
           - "27017:27017"
+      - image: redis
+        ports:
+          - "6379:6379"
     steps:
       - checkout
       - restore_cache:
@@ -146,6 +155,7 @@ jobs:
             sudo apt update && sudo apt-get install -y mongodb
             mongo --eval "rs.initiate()"
             pnpm run test:integration:mutation
+    resource_class: large
 
   release:
     <<: *defaults
@@ -189,6 +199,7 @@ jobs:
             echo "ROOT_URL=http://localhost:3000" >> .env
             echo "STORE_URL=http://localhost:4000" >> .env
             echo "STRIPE_API_KEY=YOUR_PRIVATE_STRIPE_API_KEY" >> .env
+            echo "REDIS_SERVER=redis://127.0.0.1:6379" >> .env
       - run:
           name: Create reaction.localhost network
           command: docker network create "reaction.localhost" || true

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -5,6 +5,9 @@ module.exports = {
   parserOptions: {
     ecmaVersion: 2020,
     sourceType: "module",
+    babelOptions: {
+      plugins: ["@babel/plugin-syntax-import-assertions"]
+    },
     ecmaFeatures: {
       impliedStrict: true
     },

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -14,7 +14,7 @@ jobs:
     permissions:
       contents: write # to create release (changesets/action)
       pull-requests: write # to create pull request (changesets/action)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
     steps:
       - uses: actions/checkout@v2
         with:
@@ -29,10 +29,10 @@ jobs:
           key: reaction-v6-node-modules-${{ hashFiles('package.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
           path: "**/node_modules"
 
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 18.10
 
       - name: Install pnpm
         run: npm i -g pnpm@latest
@@ -84,16 +84,16 @@ jobs:
     permissions:
       contents: write # to create release (changesets/action)
       pull-requests: write # to create pull request (changesets/action)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 18.10
 
       - name: Install pnpm
         run: npm i -g pnpm@latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
       contents: write # to create release (changesets/action)
       pull-requests: write # to create pull request (changesets/action)
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
 
     steps:
       - uses: actions/checkout@v2
@@ -27,10 +27,10 @@ jobs:
           key: reaction-v6-node-modules-${{ hashFiles('package.json') }}-${{ hashFiles('pnpm-lock.yaml') }}
           path: "**/node_modules"
 
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 18.10
 
       - name: Install pnpm
         run: npm i -g pnpm@latest

diff --git a/.github/workflows/tagging-and-release.yml b/.github/workflows/tagging-and-release.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.event.pull_request.merged == true && github.base_ref == 'trunk' && github.head_ref == 'changeset-release/trunk'
     permissions:
       contents: write # to create release (changesets/action)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-focal
 
     steps:
       - uses: actions/checkout@v2
@@ -22,10 +22,10 @@ jobs:
         run: |
           git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
           git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
-      - name: Use Node.js 14.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 18.10
 
       - name: Install dependencies
         run: |

diff --git a/.gitignore b/.gitignore
@@ -79,4 +79,7 @@ yalc-packages
 
 # Build
 dist
+
+# Editor
+.vscode
 .idea
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.20.0
+18.10.0
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/apps/reaction/.env.example b/apps/reaction/.env.example
@@ -1,3 +1,5 @@
 MONGO_URL=mongodb://mongo.reaction.localhost:27017/reaction
 ROOT_URL=http://localhost:3000
 STRIPE_API_KEY=YOUR_PRIVATE_STRIPE_API_KEY
+REDIS_SERVER=redis://127.0.0.1:6379
+MAIL_URL=smtp://localhost:1025
diff --git a/apps/reaction/Dockerfile b/apps/reaction/Dockerfile
@@ -1,7 +1,7 @@
 # Dockerfile for production builds
 # syntax=docker/dockerfile:1.4
 
-FROM node:14.20.0-alpine as deps
+FROM node:18.10.0-alpine as deps
 
 # hadolint ignore=DL3018
 RUN apk --no-cache add bash less curl make g++ glib
@@ -17,7 +17,7 @@ RUN pnpm --filter=reaction --prod deploy deps --ignore-scripts
 # hadolint ignore=DL3003,SC2015
 RUN cd deps/node_modules/sharp && npm run install
 
-FROM node:14.20.0-alpine
+FROM node:18.10.0-alpine
 
 # hadolint ignore=DL3018
 RUN apk --no-cache add bash less tini vim curl

diff --git a/apps/reaction/babel.config.cjs b/apps/reaction/babel.config.cjs
@@ -13,13 +13,14 @@ module.exports = function (api) { // eslint-disable-line no-undef
         "@babel/preset-env",
         {
           targets: {
-            node: "12"
+            node: "18"
           }
         }
       ]
     ],
     plugins: [
       "babel-plugin-transform-import-meta",
+      "@babel/plugin-syntax-import-assertions",
       "module:@reactioncommerce/babel-remove-es-create-require",
       "rewire-exports",
       "transform-es2015-modules-commonjs"

diff --git a/apps/reaction/jest.config.cjs b/apps/reaction/jest.config.cjs
@@ -30,8 +30,12 @@ const externalNodeModules = [
   "@reactioncommerce/api-plugin-pricing-simple",
   "@reactioncommerce/api-plugin-products",
   "@reactioncommerce/api-plugin-settings",
-  "@reactioncommerce/api-plugin-shipments-flat-rate",
-  "@reactioncommerce/api-plugin-shipments",
+  "@reactioncommerce/api-plugin-fulfillment",
+  "@reactioncommerce/api-plugin-fulfillment-type-shipping",
+  "@reactioncommerce/api-plugin-fulfillment-type-pickup",
+  "@reactioncommerce/api-plugin-fulfillment-method-shipping-flat-rate",
+  "@reactioncommerce/api-plugin-fulfillment-method-shipping-dynamic-rate",
+  "@reactioncommerce/api-plugin-fulfillment-method-pickup-store",
   "@reactioncommerce/api-plugin-shops",
   "@reactioncommerce/api-plugin-simple-schema",
   "@reactioncommerce/api-plugin-sitemap-generator",
@@ -205,7 +209,12 @@ const jestConfig = {
   // testResultsProcessor: null,
 
   // This option allows use of a custom test runner
-  // testRunner: "jasmine2",
+  testRunner: "jasmine2",
+
+  snapshotFormat: {
+    escapeString: true,
+    printBasicPrototype: true
+  },
 
   // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
   // testURL: "http://localhost",