feat: merge 1.0 #762

Author: denolfe

.eslintrc.js

@@ -21,6 +21,27 @@ module.exports = {
     },
   },
   overrides: [
+    {
+      files: ['test/**/int.spec.ts'],
+      rules: {
+        '@typescript-eslint/no-use-before-define': 'off',
+        '@typescript-eslint/consistent-type-imports': 'warn',
+        'jest/prefer-strict-equal': 'off',
+      }
+    },
+    {
+      files: ['test/**/e2e.spec.ts'],
+      extends: [
+        'plugin:playwright/playwright-test'
+      ],
+      rules: {
+        'jest/consistent-test-it': 'off',
+        'jest/require-top-level-describe': 'off',
+        'jest/no-test-callback': 'off',
+        'jest/prefer-strict-equal': 'off',
+        'jest/expect-expect': 'off',
+      }
+    },
     {
       files: ['*.ts', '*.tsx'],
       parser: '@typescript-eslint/parser',

.github/workflows/tests.yml

@@ -31,11 +31,25 @@ jobs:
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
     - run: yarn build
-    - run: yarn test:client
-    - run: yarn test:int # In-memory db + api tests
-    - run: yarn demo:generate:types
-      env:
-        CI: true
+
+    - name: Component Tests
+      run: yarn test:components
+    - name: Integration Tests
+      run: yarn test:int
+
+    - name: Generate Payload Types
+      run: yarn dev:generate-types fields
+
+    # - name: Install Playwright Browsers
+    #   run: npx playwright install --with-deps
+    # - name: E2E Tests
+    #   run: yarn test:e2e
+    # - uses: actions/upload-artifact@v2
+    #   if: always()
+    #   with:
+    #     name: playwright-report
+    #     path: playwright-report/
+    #     retention-days: 30
   install_npm:
     runs-on: ubuntu-latest
     strategy:

.gitignore

@@ -2,8 +2,6 @@ coverage
 package-lock.json
 dist
 .idea
-cypress/videos
-cypress/screenshots
 
 # Created by https://www.gitignore.io/api/node,macos,windows,webstorm,sublimetext,visualstudiocode
 

.vscode/launch.json

@@ -29,55 +29,17 @@
       "request": "launch",
       "name": "Launch Program",
       "env": {
-        "PAYLOAD_CONFIG_PATH": "demo/payload.config.ts",
         "BABEL_ENV": "development"
       },
-      "program": "${workspaceFolder}/demo/index.js",
+      "program": "${workspaceFolder}/test/dev.js",
       "skipFiles": [
         "<node_internals>/**"
       ],
-      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/babel-node",
-      "runtimeArgs": [
-        "--nolazy"
-      ],
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Launch Program - Production",
-      "env": {
-        "PAYLOAD_CONFIG_PATH": "demo/payload.config.ts",
-        "NODE_ENV": "production",
-        "BABEL_ENV": "development"
-      },
-      "program": "${workspaceFolder}/demo/index.js",
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
-      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/babel-node",
-      "outputCapture": "std",
       "runtimeArgs": [
         "--nolazy"
       ],
-    },
-    {
-      "type": "chrome",
-      "request": "launch",
-      "name": "Launch Chrome against Localhost",
-      "url": "http://localhost:3000/admin",
-      "webRoot": "${workspaceFolder}"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Payload Generate Types",
-      "program": "${workspaceFolder}/src/bin/generateTypes.ts",
-      "env": {
-        "PAYLOAD_CONFIG_PATH": "demo/payload.config.ts",
-      },
-      "outFiles": [
-        "${workspaceFolder}/dist/**/*.js",
-        "!**/node_modules/**"
+      "args": [
+        "fields"
       ]
     },
   ]

CHANGELOG.md

@@ -2,3 +2,4 @@ export { default as Button } from '../dist/admin/components/elements/Button';
 export { default as Card } from '../dist/admin/components/elements/Card';
 export { default as Eyebrow } from '../dist/admin/components/elements/Eyebrow';
 export { default as Nav } from '../dist/admin/components/elements/Nav';
+export { default as Gutter } from '../dist/admin/components/elements/Gutter';