Merge pull request #188 from Flowpack/feature/custom-graphql-adapter

FEATURE: Custom graphql adapter

Author: Sebobo

.gitattributes

@@ -4,8 +4,7 @@
 Plugin.js binary
 Plugin.css binary
 
-/Resources/Private/JavaScript export-ignore
-/Tests export-ignore
+/packages export-ignore
 /.yarn export-ignore
 /.env export-ignore
 /.github export-ignore

.github/workflows/tests.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [ main ]
 
+env:
+  YARN_ENABLE_IMMUTABLE_INSTALLS: false
+  PACKAGE_FOLDER: media-ui
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -50,6 +54,7 @@ jobs:
         uses: php-actions/phpstan@v3
         with:
           php_version: 8.1
+          version: 2.1.17
           command: analyse
           path: 'Classes/'
 
@@ -64,10 +69,14 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.1']
-        flow-versions: ['7.3']
+        flow-versions: ['8.3']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - name: Set package branch name
+        run: echo "PACKAGE_TARGET_VERSION=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
+        working-directory: .
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -78,7 +87,7 @@ jobs:
           ini-values: opcache.fast_shutdown=0
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache
           key: dependencies-composer-${{ hashFiles('composer.json') }}
@@ -87,14 +96,17 @@ jobs:
         run: |
           git clone https://github.com/neos/flow-base-distribution.git -b ${{ matrix.flow-versions }} ${FLOW_FOLDER}
           cd ${FLOW_FOLDER}
-          composer require --no-update --no-interaction flowpack/media-ui
+          composer require --no-update --no-interaction flowpack/entity-usage:"^1.1"
+          composer require --no-update --no-interaction flowpack/entity-usage-databasestorage:"^0.1"
+
+          git -C ../${{ env.PACKAGE_FOLDER }} checkout -b build
+          composer config repositories.package '{ "type": "path", "url": "../${{ env.PACKAGE_FOLDER }}", "options": { "symlink": false } }'
+          composer require --no-update --no-interaction flowpack/media-ui:"dev-build as dev-${PACKAGE_TARGET_VERSION}"
 
-      - name: Install distribution
+      - name: Composer Install
         run: |
           cd ${FLOW_FOLDER}
-          composer install --no-interaction --no-progress
-          rm -rf Packages/Application/Flowpack.Media.Ui
-          cp -r ../media-ui Packages/Application/Flowpack.Media.Ui
+          composer update --no-interaction --no-progress
 
       - name: Run Unit tests
         run: |
@@ -126,6 +138,7 @@ jobs:
     env:
       # Solves error when parcel tries to count cpus via lscpu
       PARCEL_WORKERS: 1
+      DEBUG: 'testcafe:tested-app:*'
 
     runs-on: ubuntu-latest
 
@@ -146,11 +159,11 @@ jobs:
         run: yarn build:plugin
 
       - name: Run TestCafe
-        run: yarn test:github-actions
+        run: yarn test:e2e:github-actions
 
       - name: Archive failure screenshots
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: e2e-failure-screenshots
           path: screenshots

.gitignore

@@ -14,17 +14,14 @@ node_modules
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
-Packages
-vendor
-composer.lock
+yarn-error.log
 /.parcel-cache
+.cache
 
 #
 # Compiled assets.
 #
-.cache
-Resources/Private/JavaScript/dev-server/dist
-yarn-error.log
+/packages/dev-server/dist
 
 #
 # editors / IDEs

.mocharc.json

@@ -1,5 +1,5 @@
 {
   "extension": ["ts"],
-  "spec": "Resources/Private/JavaScript/**/*.spec.ts",
+  "spec": "packages/**/*.spec.ts",
   "require": "ts-node/register"
 }

.nvmrc

@@ -1 +1 @@
-16
+22

.testcaferc.json

@@ -1,19 +1,20 @@
 {
   "browsers": {
-    "path": "chromium",
+    "path": "firefox",
     "cmd": "--window-size=1280,720"
   },
-  "src": ["Resources/Private/JavaScript/media-module/tests/**/*.ts"],
-  "appCommand": "yarn ts-node --project Resources/Private/JavaScript/dev-server/tsconfig.json Resources/Private/JavaScript/dev-server/src/server.ts",
+  "src": ["packages/media-module/tests/**/*.ts"],
+  "appCommand": "yarn dev:test",
+  "appInitDelay": 2000,
   "screenshots": {
     "takeOnFails": true
   },
+  "debugOnFail": false,
   "stopOnFirstFail": true,
-  "hostname": "localhost",
+  "hostname": "127.0.0.1",
+  "baseUrl": "http://127.0.0.1:8000",
   "retryTestPages": true,
   "pageLoadTimeout": 10000,
   "pageRequestTimeout": 60000,
-  "skipJsErrors": {
-    "stack": "/.*chrome-extension.*/ig"
-  }
+  "skipJsErrors": true
 }