chore(release): publish new version

- @standardnotes/analytics@2.26.18
 - @standardnotes/api-gateway@1.74.16
 - @standardnotes/auth-server@1.143.8
 - @standardnotes/domain-core@1.31.0
 - @standardnotes/event-store@1.11.46
 - @standardnotes/files-server@1.22.25
 - @standardnotes/home-server@1.15.69
 - @standardnotes/revisions-server@1.35.8
 - @standardnotes/scheduler-server@1.20.50
 - @standardnotes/settings@1.21.35
 - @standardnotes/syncing-server@1.99.0
 - @standardnotes/websockets-server@1.10.47

.dockerignore

@@ -0,0 +1,13 @@
+dist
+coverage
+
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/unplugged
+!.yarn/sdks
+!.yarn/versions
+
+data/*

.env.sample

@@ -1,6 +1,26 @@
+######
+# DB #
+######
+
+DB_HOST=db
 DB_PORT=3306
 DB_USERNAME=std_notes_user
 DB_PASSWORD=changeme123
 DB_DATABASE=standard_notes_db
+DB_TYPE=mysql
+
+#########
+# CACHE #
+#########
 
 REDIS_PORT=6379
+REDIS_HOST=cache
+CACHE_TYPE=redis
+
+########
+# KEYS #
+########
+
+AUTH_JWT_SECRET=
+AUTH_SERVER_ENCRYPTION_SERVER_KEY=
+VALET_TOKEN_SECRET=

.eslintrc

@@ -1,6 +1,5 @@
 {
   "root": true,
-  "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "project": "./tsconfig.json"
   },

.github/ci.env

@@ -0,0 +1,34 @@
+PUBLIC_FILES_SERVER_URL=http://localhost:3125
+DB_HOST=db
+DB_USERNAME=std_notes_user
+DB_PASSWORD=changeme123
+DB_DATABASE=standard_notes_db
+DB_PORT=3306
+DB_DEBUG_LEVEL=all
+DB_SQLITE_DATABASE_PATH=standard_notes_db
+REDIS_PORT=6379
+REDIS_HOST=cache
+AUTH_SERVER_ACCESS_TOKEN_AGE=4
+AUTH_SERVER_REFRESH_TOKEN_AGE=10
+AUTH_SERVER_EPHEMERAL_SESSION_AGE=300
+SYNCING_SERVER_REVISIONS_FREQUENCY=2
+AUTH_SERVER_LOG_LEVEL=debug
+SYNCING_SERVER_LOG_LEVEL=debug
+FILES_SERVER_LOG_LEVEL=debug
+REVISIONS_SERVER_LOG_LEVEL=debug
+API_GATEWAY_LOG_LEVEL=debug
+
+MYSQL_DATABASE=standard_notes_db
+MYSQL_USER=std_notes_user
+MYSQL_PASSWORD=changeme123
+MYSQL_ROOT_PASSWORD=changeme123
+
+MONGO_HOST=secondary_db
+MONGO_PORT=27017
+MONGO_USERNAME=standardnotes
+MONGO_PASSWORD=standardnotes
+MONGO_DATABASE=standardnotes
+
+AUTH_JWT_SECRET=f95259c5e441f5a4646d76422cfb3df4c4488842901aa50b6c51b8be2e0040e9
+AUTH_SERVER_ENCRYPTION_SERVER_KEY=1087415dfde3093797f9a7ca93a49e7d7aa1861735eb0d32aae9c303b8c3d060
+VALET_TOKEN_SECRET=4b886819ebe1e908077c6cae96311b48a8416bd60cc91c03060e15bdf6b30d1f

.github/dependabot.yml

@@ -30,6 +30,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/domain-core"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/domain-events"
     schedule:
@@ -50,11 +55,21 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/home-server"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/predicates"
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/revisions"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/scheduler"
     schedule:
@@ -86,7 +101,7 @@ updates:
       interval: "daily"
 
   - package-ecosystem: "npm"
-    directory: "/packages/workspace"
+    directory: "/packages/websockets"
     schedule:
       interval: "daily"
 

.github/workflows/analytics.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
+  call_server_application_workflow:
-    name: Server Utility
+    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: analytics
       workspace_name: "@standardnotes/analytics"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/api-gateway.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: api-gateway
       workspace_name: "@standardnotes/api-gateway"
-      e2e_tag_parameter_name: api_gateway_image_tag
       deploy_worker: false
       package_path: packages/api-gateway
     secrets: inherit

.github/workflows/auth.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: auth
       workspace_name: "@standardnotes/auth-server"
-      e2e_tag_parameter_name: auth_image_tag
       package_path: packages/auth
     secrets: inherit
 

.github/workflows/common-deploy.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v3
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -50,6 +50,6 @@ jobs:
       uses: aws-actions/amazon-ecs-deploy-task-definition@v1
       with:
         task-definition: ${{ steps.task-def-prod.outputs.task-definition }}
-        service: ${{ inputs.service_name }}-prod
+        service: ${{ inputs.service_name }}
         cluster: prod
         wait-for-service-stability: true

.github/workflows/common-docker-image.yml

@@ -6,9 +6,6 @@ on:
       service_name:
         required: true
         type: string
-      bundle_dir:
-        required: true
-        type: string
       package_path:
         required: true
         type: string
@@ -32,13 +29,16 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
     - name: Cache build
       id: cache-build
       uses: actions/cache@v3
       with:
         path: |
           packages/**/dist
-          ${{ inputs.bundle_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -47,13 +47,12 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
         node-version-file: '.nvmrc'
 
+    - name: Install dependencies
+      run: yarn install --immutable
+
     - name: Build
       if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
+      run: yarn build
-
-    - name: Bundle
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ inputs.bundle_dir }}
 
     - name: Login to Docker Hub
       uses: docker/login-action@v2
@@ -62,7 +61,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v3
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -82,11 +81,11 @@ jobs:
       uses: docker/setup-buildx-action@master
 
     - name: Publish Docker image
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v4
       with:
         builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ inputs.bundle_dir }}
+        context: .
-        file: ${{ inputs.bundle_dir }}/${{ inputs.package_path }}/Dockerfile
+        file: ${{ inputs.package_path }}/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
         tags: |

.github/workflows/common-e2e.yml

@@ -0,0 +1,170 @@
+name: Reusable Run E2E Test Suite Workflow
+
+on:
+  workflow_call:
+    inputs:
+      snjs_image_tag:
+        type: string
+        default: latest
+        description: The Docker image tag used for SNJS container
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+
+jobs:
+  e2e:
+    name: (Self Hosting) E2E Test Suite
+    strategy:
+      fail-fast: false
+      matrix:
+        secondary_db_enabled: [true, false]
+        transition_mode_enabled: [true, false]
+    runs-on: ubuntu-latest
+
+    services:
+      snjs:
+        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
+        ports:
+        - 9001:9001
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install
+      run: yarn install --immutable
+
+    - name: Run Server
+      run: docker compose -f docker-compose.ci.yml up -d
+      env:
+        DB_TYPE: mysql
+        CACHE_TYPE: redis
+        SECONDARY_DB_ENABLED: ${{ matrix.secondary_db_enabled }}
+        TRANSITION_MODE_ENABLED: ${{ matrix.transition_mode_enabled }}
+
+    - name: Wait for server to start
+      run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
+
+    - name: Run E2E Test Suite
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
+
+    - name: Show logs on failure
+      if: ${{ failure() }}
+      run: |
+        echo "# Errors:"
+        tail -n 100 logs/*.err
+        echo "# Logs:"
+        tail -n 100 logs/*.log
+
+  e2e-home-server:
+    name: (Home Server) E2E Test Suite
+    strategy:
+      fail-fast: false
+      matrix:
+        db_type: [mysql, sqlite]
+        cache_type: [redis, memory]
+        secondary_db_enabled: [true, false]
+        transition_mode_enabled: [true, false]
+
+    runs-on: ubuntu-latest
+
+    services:
+      snjs:
+        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
+        ports:
+        - 9001:9001
+      cache:
+        image: redis
+        ports:
+          - 6379:6379
+      db:
+        image: mysql
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: standardnotes
+          MYSQL_USER: standardnotes
+          MYSQL_PASSWORD: standardnotes
+      secondary_db:
+        image: mongo:5.0
+        ports:
+          - 27017:27017
+        env:
+          MONGO_INITDB_ROOT_USERNAME: standardnotes
+          MONGO_INITDB_ROOT_PASSWORD: standardnotes
+          MONGO_INITDB_DATABASE: standardnotes
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install Dependencies
+      run: yarn install --immutable
+
+    - name: Build
+      run: yarn build
+
+    - name: Copy dotenv file
+      run: cp packages/home-server/.env.sample packages/home-server/.env
+
+    - name: Fill in env variables
+      run: |
+        sed -i "s/JWT_SECRET=/JWT_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/AUTH_JWT_SECRET=/AUTH_JWT_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/ENCRYPTION_SERVER_KEY=/ENCRYPTION_SERVER_KEY=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/PSEUDO_KEY_PARAMS_KEY=/PSEUDO_KEY_PARAMS_KEY=$(openssl rand -hex 32)/g" packages/home-server/.env
+        sed -i "s/VALET_TOKEN_SECRET=/VALET_TOKEN_SECRET=$(openssl rand -hex 32)/g" packages/home-server/.env
+        echo "ACCESS_TOKEN_AGE=4" >> packages/home-server/.env
+        echo "REFRESH_TOKEN_AGE=10" >> packages/home-server/.env
+        echo "REVISIONS_FREQUENCY=2" >> packages/home-server/.env
+        echo "DB_HOST=localhost" >> packages/home-server/.env
+        echo "DB_PORT=3306" >> packages/home-server/.env
+        echo "DB_DATABASE=standardnotes" >> packages/home-server/.env
+        echo "DB_SQLITE_DATABASE_PATH=homeserver.db" >> packages/home-server/.env
+        echo "DB_USERNAME=standardnotes" >> packages/home-server/.env
+        echo "DB_PASSWORD=standardnotes" >> packages/home-server/.env
+        echo "DB_TYPE=${{ matrix.db_type }}" >> packages/home-server/.env
+        echo "DB_DEBUG_LEVEL=all" >> packages/home-server/.env
+        echo "REDIS_URL=redis://localhost:6379" >> packages/home-server/.env
+        echo "CACHE_TYPE=${{ matrix.cache_type }}" >> packages/home-server/.env
+        echo "SECONDARY_DB_ENABLED=${{ matrix.secondary_db_enabled }}" >> packages/home-server/.env
+        echo "TRANSITION_MODE_ENABLED=${{ matrix.transition_mode_enabled }}" >> packages/home-server/.env
+        echo "MONGO_HOST=localhost" >> packages/home-server/.env
+        echo "MONGO_PORT=27017" >> packages/home-server/.env
+        echo "MONGO_DATABASE=standardnotes" >> packages/home-server/.env
+        echo "MONGO_USERNAME=standardnotes" >> packages/home-server/.env
+        echo "MONGO_PASSWORD=standardnotes" >> packages/home-server/.env
+        echo "FILES_SERVER_URL=http://localhost:3123" >> packages/home-server/.env
+        echo "E2E_TESTING=true" >> packages/home-server/.env
+
+    - name: Run Server
+      run: nohup yarn workspace @standardnotes/home-server start > logs/output.log 2>&1 &
+      env:
+        PORT: 3123
+
+    - name: Wait for server to start
+      run: for i in {1..30}; do curl -s http://localhost:3123/healthcheck && break || sleep 1; done
+
+    - name: Run E2E Test Suite
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
+
+    - name: Show logs on failure
+      if: ${{ failure() }}
+      run: tail -n 500 logs/output.log

.github/workflows/common-self-hosting.yml

@@ -0,0 +1,47 @@
+name: Reusable Publish Docker Self Hosting Image Workflow
+
+on:
+  workflow_call:
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@master
+      with:
+        platforms: all
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@master
+
+    - name: Publish Docker image
+      uses: docker/build-push-action@v4
+      with:
+        builder: ${{ steps.buildx.outputs.name }}
+        context: .
+        file: Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: |
+          standardnotes/server:latest
+          standardnotes/server:${{ github.sha }}

.github/workflows/common-server-application.yml

@@ -17,9 +17,6 @@ on:
         required: false
         default: true
         type: boolean
-      e2e_tag_parameter_name:
-        required: false
-        type: string
       package_path:
         required: true
         type: string
@@ -36,177 +33,11 @@ on:
         required: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    outputs:
-      temp_dir: ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ steps.bundle-dir.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-  lint:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Lint
-      run: yarn lint:${{ inputs.service_name }}
-
-  test:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Test
-      run: yarn test ${{ inputs.package_path }}
-
-  e2e:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ needs.build.outputs.temp_dir }}
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@master
-      with:
-        platforms: all
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@master
-
-    - name: Publish Docker image for E2E testing
-      uses: docker/build-push-action@v3
-      with:
-        builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ needs.build.outputs.temp_dir }}
-        file: ${{ needs.build.outputs.temp_dir }}/${{ inputs.package_path }}/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: standardnotes/${{ inputs.service_name }}:${{ github.sha }}
-
-    - name: Run E2E test suite
-      uses: convictional/trigger-workflow-and-wait@master
-      with:
-        owner: standardnotes
-        repo: self-hosted
-        github_token: ${{ secrets.CI_PAT_TOKEN }}
-        workflow_file_name: testing-with-updating-client-and-server.yml
-        wait_interval: 30
-        client_payload: '{"${{ inputs.e2e_tag_parameter_name }}": "${{ github.sha }}"}'
-        propagate_failure: true
-        trigger_workflow: true
-        wait_workflow: true
-
   publish:
-    needs: [ build, test, lint, e2e ]
-
     name: Publish Docker Image
     uses: standardnotes/server/.github/workflows/common-docker-image.yml@main
     with:
       service_name: ${{ inputs.service_name }}
-      bundle_dir: ${{ needs.build.outputs.temp_dir }}
       package_path: ${{ inputs.package_path }}
       workspace_name: ${{ inputs.workspace_name }}
     secrets: inherit

.github/workflows/common-server-utility.yml

@@ -1,164 +0,0 @@
-name: Reusable Server Utility Workflow
-
-on:
-  workflow_call:
-    inputs:
-      service_name:
-        required: true
-        type: string
-      workspace_name:
-        required: true
-        type: string
-      deploy_web:
-        required: false
-        default: true
-        type: boolean
-      deploy_worker:
-        required: false
-        default: true
-        type: boolean
-      package_path:
-        required: true
-        type: string
-    secrets:
-      DOCKER_USERNAME:
-        required: true
-      DOCKER_PASSWORD:
-        required: true
-      CI_PAT_TOKEN:
-        required: true
-      AWS_ACCESS_KEY_ID:
-        required: true
-      AWS_SECRET_ACCESS_KEY:
-        required: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    outputs:
-      temp_dir: ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ steps.bundle-dir.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-  lint:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Lint
-      run: yarn lint:${{ inputs.service_name }}
-
-  test:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Test
-      run: yarn test ${{ inputs.package_path }}
-
-  publish:
-    needs: [ build, test, lint ]
-
-    name: Publish Docker Image
-    uses: standardnotes/server/.github/workflows/common-docker-image.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}
-      bundle_dir: ${{ needs.build.outputs.temp_dir }}
-      package_path: ${{ inputs.package_path }}
-      workspace_name: ${{ inputs.workspace_name }}
-    secrets: inherit
-
-  deploy-web:
-    if: ${{ inputs.deploy_web }}
-
-    needs: publish
-
-    name: Deploy Web
-    uses: standardnotes/server/.github/workflows/common-deploy.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}
-      docker_image: ${{ inputs.service_name }}:${{ github.sha }}
-    secrets: inherit
-
-  deploy-worker:
-    if: ${{ inputs.deploy_worker }}
-
-    needs: publish
-
-    name: Deploy Worker
-    uses: standardnotes/server/.github/workflows/common-deploy.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}-worker
-      docker_image: ${{ inputs.service_name }}:${{ github.sha }}
-    secrets: inherit

.github/workflows/e2e-test-suite.yml

@@ -0,0 +1,29 @@
+name: E2E Test Suite On Self Hosted Server
+
+run-name: E2E Test Suite against ${{ inputs.ref_name }} by ${{ inputs.author }}
+
+on:
+  schedule:
+    - cron: '0 */12 * * *'
+  workflow_dispatch:
+    inputs:
+      snjs_image_tag:
+        type: string
+        default: latest
+        description: The Docker image tag used for SNJS container
+      author:
+        type: string
+        default: unknown
+        description: The author that triggered the workflow
+      ref_name:
+        type: string
+        default: unknown
+        description: The ref name from which the workflow was triggered
+
+jobs:
+  e2e:
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    with:
+      snjs_image_tag: ${{ inputs.snjs_image_tag || 'latest' }}
+    secrets: inherit

.github/workflows/event-store.yml

@@ -1,38 +0,0 @@
-name: Event Store
-
-concurrency:
-  group: event-store
-  cancel-in-progress: true
-
-on:
-  push:
-    tags:
-      - '*standardnotes/event-store*'
-  workflow_dispatch:
-
-jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
-    with:
-      service_name: event-store
-      workspace_name: "@standardnotes/event-store"
-      deploy_web: false
-      package_path: packages/event-store
-    secrets: inherit
-
-  newrelic:
-    needs: call_server_utility_workflow
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Create New Relic deployment marker for Worker
-        uses: newrelic/deployment-marker-action@v1
-        with:
-          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
-          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
-          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_EVENT_STORE_PROD }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"

.github/workflows/files.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: files
       workspace_name: "@standardnotes/files-server"
-      e2e_tag_parameter_name: files_image_tag
       package_path: packages/files
     secrets: inherit
 

.github/workflows/pr.yml

@@ -25,6 +25,9 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
         node-version-file: '.nvmrc'
 
+    - name: Install
+      run: yarn install --immutable
+
     - name: Build
       run: yarn build
 
@@ -42,7 +45,6 @@ jobs:
       with:
         path: |
           packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
         key: ${{ runner.os }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -51,6 +53,9 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
         node-version-file: '.nvmrc'
 
+    - name: Install
+      run: yarn install --immutable
+
     - name: Build
       if: steps.cache-build.outputs.cache-hit != 'true'
       run: yarn build
@@ -72,7 +77,6 @@ jobs:
       with:
         path: |
           packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
         key: ${{ runner.os }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -81,6 +85,9 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
         node-version-file: '.nvmrc'
 
+    - name: Install
+      run: yarn install --immutable
+
     - name: Build
       if: steps.cache-build.outputs.cache-hit != 'true'
       run: yarn build
@@ -89,81 +96,8 @@ jobs:
       run: yarn test
 
   e2e:
-    strategy:
-      matrix:
-        application: 
-          - { "service_name": "api-gateway", "workspace_name": "@standardnotes/api-gateway", "e2e_tag_parameter_name": "api_gateway_image_tag", "package_path": "packages/api-gateway" }
-          - { "service_name": "auth", "workspace_name": "@standardnotes/auth-server", "e2e_tag_parameter_name": "auth_image_tag", "package_path": "packages/auth" }  
-          - { "service_name": "files", "workspace_name": "@standardnotes/files-server", "e2e_tag_parameter_name": "files_image_tag", "package_path": "packages/files" }
-          - { "service_name": "revisions", "workspace_name": "@standardnotes/revisions-server", "e2e_tag_parameter_name": "revisions_image_tag", "package_path": "packages/revisions"}
-          - { "service_name": "syncing-server-js",  "workspace_name": "@standardnotes/syncing-server", "e2e_tag_parameter_name": "syncing_server_js_image_tag", "package_path": "packages/syncing-server" }
-    runs-on: ubuntu-latest
-
     needs: build
 
-    steps:
+    name: E2E
-    - uses: actions/checkout@v3
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-
+    secrets: inherit
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ matrix.application.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.e2e.outputs.temp_dir }}
-        key: ${{ runner.os }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build
-
-    - name: Bundle
-      run: yarn workspace ${{ matrix.application.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@master
-      with:
-        platforms: all
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@master
-
-    - name: Publish Docker image for E2E testing
-      uses: docker/build-push-action@v3
-      with:
-        builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ steps.bundle-dir.outputs.temp_dir }}
-        file: ${{ steps.bundle-dir.outputs.temp_dir }}/${{ matrix.application.package_path }}/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: standardnotes/${{ matrix.application.service_name }}:${{ github.sha }}
-
-    - name: Run E2E test suite
-      uses: convictional/trigger-workflow-and-wait@master
-      with:
-        owner: standardnotes
-        repo: self-hosted
-        github_token: ${{ secrets.CI_PAT_TOKEN }}
-        workflow_file_name: testing-with-updating-client-and-server.yml
-        wait_interval: 30
-        client_payload: '{"${{ matrix.application.e2e_tag_parameter_name }}": "${{ github.sha }}"}'
-        propagate_failure: true
-        trigger_workflow: true
-        wait_workflow: true

.github/workflows/publish.yml

@@ -5,9 +5,113 @@ on:
     branches: [ main ]
 
 jobs:
-  release_and_publish:
+  build:
     if: contains(github.event.head_commit.message, 'chore(release)') == false
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install
+      run: yarn install --immutable
+
+    - name: Build
+      run: yarn build
+
+  lint:
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install
+      run: yarn install --immutable
+
+    - name: Build
+      if: steps.cache-build.outputs.cache-hit != 'true'
+      run: yarn build
+
+    - name: Lint
+      run: yarn lint
+
+  test:
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Install
+      run: yarn install --immutable
+
+    - name: Build
+      if: steps.cache-build.outputs.cache-hit != 'true'
+      run: yarn build
+
+    - name: Test
+      run: yarn test
+
+  e2e:
+    needs: build
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
+
+  publish-self-hosting:
+    needs: [ test, lint, e2e ]
+    name: Publish Self Hosting Docker Image
+    uses: standardnotes/server/.github/workflows/common-self-hosting.yml@main
+    secrets: inherit
+
+  publish-services:
+    needs: [ test, lint, e2e ]
+
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -15,6 +119,14 @@ jobs:
           token: ${{ secrets.CI_PAT_TOKEN }}
           fetch-depth: 0
 
+      - name: Cache build
+        id: cache-build
+        uses: actions/cache@v3
+        with:
+          path: |
+            packages/**/dist
+          key: ${{ runner.os }}-build-${{ github.sha }}
+
       - name: Setup git config
         run: |
           git config --global user.name "standardci"
@@ -34,7 +146,11 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
 
-      - name: Build packages
+      - name: Install
+        run: yarn install --immutable
+
+      - name: Build
+        if: steps.cache-build.outputs.cache-hit != 'true'
         run: yarn build
 
       - name: Bump version
@@ -44,4 +160,3 @@ jobs:
         run: yarn publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.CI_NPM_TOKEN }}
-

.github/workflows/revisions.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: revisions
       workspace_name: "@standardnotes/revisions-server"
-      e2e_tag_parameter_name: revisions_image_tag
       package_path: packages/revisions
     secrets: inherit
 

.github/workflows/scheduler.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
+  call_server_application_workflow:
-    name: Server Utility
+    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: scheduler
       workspace_name: "@standardnotes/scheduler-server"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/syncing-server.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: syncing-server-js
       workspace_name: "@standardnotes/syncing-server"
-      e2e_tag_parameter_name: syncing_server_js_image_tag
       package_path: packages/syncing-server
     secrets: inherit
 

.github/workflows/websockets.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
+  call_server_application_workflow:
-    name: Server Utility
+    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: websockets
       workspace_name: "@standardnotes/websockets-server"
@@ -21,7 +21,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/workspace.yml

@@ -1,47 +0,0 @@
-name: Workspace Server
-
-concurrency:
-  group: workspace
-  cancel-in-progress: true
-
-on:
-  push:
-    tags:
-      - '*standardnotes/workspace-server*'
-  workflow_dispatch:
-
-jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
-    with:
-      service_name: workspace
-      workspace_name: "@standardnotes/workspace-server"
-      package_path: packages/workspace
-    secrets: inherit
-
-  newrelic:
-    needs: call_server_utility_workflow
-
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Create New Relic deployment marker for Web
-        uses: newrelic/deployment-marker-action@v1
-        with:
-          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
-          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
-          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_WORKSPACE_WEB_PROD }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"
-
-      - name: Create New Relic deployment marker for Worker
-        uses: newrelic/deployment-marker-action@v1
-        with:
-          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
-          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
-          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_WORKSPACE_WORKER_PROD }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"

.gitignore

@@ -11,12 +11,20 @@ newrelic_agent.log
 !.yarn/patches
 !.yarn/plugins
 !.yarn/releases
-!.yarn/unplugged
 !.yarn/sdks
 !.yarn/versions
 
+yarn.build-error.log
+
 packages/files/uploads/*
 !packages/files/uploads/.gitkeep
 
 data/*
 !data/.gitkeep
+
+packages/**/data/*
+
+logs/*
+!logs/.gitkeep
+
+docker-compose.yml

.nvmrc

@@ -1 +1 @@
-18.13.0
+20.6.1

.pnp.loader.mjs

@@ -1,5 +1,5 @@
-import { URL as URL$1, fileURLToPath, pathToFileURL } from 'url';
 import fs from 'fs';
+import { URL as URL$1, fileURLToPath, pathToFileURL } from 'url';
 import path from 'path';
 import moduleExports, { Module } from 'module';
 import { createHash } from 'crypto';
@@ -10,7 +10,8 @@ const SAFE_TIME = 456789e3;
 
 const PortablePath = {
   root: `/`,
-  dot: `.`
+  dot: `.`,
+  parent: `..`
 };
 const npath = Object.create(path);
 const ppath = Object.create(path.posix);
@@ -88,7 +89,6 @@ async function copyPromise(destinationFs, destination, sourceFs, source, opts) {
   }));
 }
 async function copyImpl(prelayout, postlayout, destinationFs, destination, sourceFs, source, opts) {
-  var _a, _b, _c;
   const destinationStat = opts.didParentExist ? await maybeLStat(destinationFs, destination) : null;
   const sourceStat = await sourceFs.lstatPromise(source);
   const { atime, mtime } = opts.stableTime ? { atime: defaultTime, mtime: defaultTime } : sourceStat;
@@ -114,8 +114,8 @@ async function copyImpl(prelayout, postlayout, destinationFs, destination, sourc
         throw new Error(`Unsupported file type (${sourceStat.mode})`);
       }
   }
-  if (((_a = opts.linkStrategy) == null ? void 0 : _a.type) !== `HardlinkFromIndex` || !sourceStat.isFile()) {
+  if (opts.linkStrategy?.type !== `HardlinkFromIndex` || !sourceStat.isFile()) {
-    if (updated || ((_b = destinationStat == null ? void 0 : destinationStat.mtime) == null ? void 0 : _b.getTime()) !== mtime.getTime() || ((_c = destinationStat == null ? void 0 : destinationStat.atime) == null ? void 0 : _c.getTime()) !== atime.getTime()) {
+    if (updated || destinationStat?.mtime?.getTime() !== mtime.getTime() || destinationStat?.atime?.getTime() !== atime.getTime()) {
       postlayout.push(() => destinationFs.lutimesPromise(destination, atime, mtime));
       updated = true;
     }
@@ -185,7 +185,7 @@ async function copyFileViaIndex(prelayout, postlayout, destinationFs, destinatio
   let indexStat = await maybeLStat(destinationFs, indexPath);
   if (destinationStat) {
     const isDestinationHardlinkedFromIndex = indexStat && destinationStat.dev === indexStat.dev && destinationStat.ino === indexStat.ino;
-    const isIndexModified = (indexStat == null ? void 0 : indexStat.mtimeMs) !== defaultTimeMs;
+    const isIndexModified = indexStat?.mtimeMs !== defaultTimeMs;
     if (isDestinationHardlinkedFromIndex) {
       if (isIndexModified && linkStrategy.autoRepair) {
         atomicBehavior = 0 /* Lock */;
@@ -255,8 +255,7 @@ async function copyFileDirect(prelayout, postlayout, destinationFs, destination,
   return true;
 }
 async function copyFile(prelayout, postlayout, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts) {
-  var _a;
+  if (opts.linkStrategy?.type === `HardlinkFromIndex`) {
-  if (((_a = opts.linkStrategy) == null ? void 0 : _a.type) === `HardlinkFromIndex`) {
     return copyFileViaIndex(prelayout, postlayout, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts, opts.linkStrategy);
   } else {
     return copyFileDirect(prelayout, postlayout, destinationFs, destination, destinationStat, sourceFs, source, sourceStat, opts);
@@ -386,7 +385,7 @@ class FakeFS {
             throw error;
           }
         }
-        createdDirectory ?? (createdDirectory = subPath);
+        createdDirectory ??= subPath;
         if (chmod != null)
           await this.chmodPromise(subPath, chmod);
         if (utimes != null) {
@@ -417,7 +416,7 @@ class FakeFS {
             throw error;
           }
         }
-        createdDirectory ?? (createdDirectory = subPath);
+        createdDirectory ??= subPath;
         if (chmod != null)
           this.chmodSync(subPath, chmod);
         if (utimes != null) {
@@ -612,12 +611,14 @@ class FakeFS {
       throw error;
     }
   }
-  async writeJsonPromise(p, data) {
+  async writeJsonPromise(p, data, { compact = false } = {}) {
-    return await this.writeFilePromise(p, `${JSON.stringify(data, null, 2)}
+    const space = compact ? 0 : 2;
+    return await this.writeFilePromise(p, `${JSON.stringify(data, null, space)}
 `);
   }
-  writeJsonSync(p, data) {
+  writeJsonSync(p, data, { compact = false } = {}) {
-    return this.writeFileSync(p, `${JSON.stringify(data, null, 2)}
+    const space = compact ? 0 : 2;
+    return this.writeFileSync(p, `${JSON.stringify(data, null, space)}
 `);
   }
   async preserveTimePromise(p, cb) {
@@ -851,7 +852,7 @@ class ProxiedFS extends FakeFS {
   readFileSync(p, encoding) {
     return this.baseFs.readFileSync(this.fsMapToBase(p), encoding);
   }
-  async readdirPromise(p, opts) {
+  readdirPromise(p, opts) {
     return this.baseFs.readdirPromise(this.mapToBase(p), opts);
   }
   readdirSync(p, opts) {
@@ -931,12 +932,24 @@ class NodeFS extends BasePortableFakeFS {
         this.realFs.opendir(npath.fromPortablePath(p), this.makeCallback(resolve, reject));
       }
     }).then((dir) => {
-      return Object.defineProperty(dir, `path`, { value: p, configurable: true, writable: true });
+      const dirWithFixedPath = dir;
+      Object.defineProperty(dirWithFixedPath, `path`, {
+        value: p,
+        configurable: true,
+        writable: true
+      });
+      return dirWithFixedPath;
     });
   }
   opendirSync(p, opts) {
     const dir = typeof opts !== `undefined` ? this.realFs.opendirSync(npath.fromPortablePath(p), opts) : this.realFs.opendirSync(npath.fromPortablePath(p));
-    return Object.defineProperty(dir, `path`, { value: p, configurable: true, writable: true });
+    const dirWithFixedPath = dir;
+    Object.defineProperty(dirWithFixedPath, `path`, {
+      value: p,
+      configurable: true,
+      writable: true
+    });
+    return dirWithFixedPath;
   }
   async readPromise(fd, buffer, offset = 0, length = 0, position = -1) {
     return await new Promise((resolve, reject) => {
@@ -1214,16 +1227,16 @@ class NodeFS extends BasePortableFakeFS {
   }
   async readdirPromise(p, opts) {
     return await new Promise((resolve, reject) => {
-      if (opts == null ? void 0 : opts.withFileTypes) {
+      if (opts) {
-        this.realFs.readdir(npath.fromPortablePath(p), { withFileTypes: true }, this.makeCallback(resolve, reject));
+        this.realFs.readdir(npath.fromPortablePath(p), opts, this.makeCallback(resolve, reject));
       } else {
         this.realFs.readdir(npath.fromPortablePath(p), this.makeCallback((value) => resolve(value), reject));
       }
     });
   }
   readdirSync(p, opts) {
-    if (opts == null ? void 0 : opts.withFileTypes) {
+    if (opts) {
-      return this.realFs.readdirSync(npath.fromPortablePath(p), { withFileTypes: true });
+      return this.realFs.readdirSync(npath.fromPortablePath(p), opts);
     } else {
       return this.realFs.readdirSync(npath.fromPortablePath(p));
     }
@@ -1357,6 +1370,10 @@ class VirtualFS extends ProxiedFS {
   }
 }
 
+const [major, minor] = process.versions.node.split(`.`).map((value) => parseInt(value, 10));
+const WATCH_MODE_MESSAGE_USES_ARRAYS = major > 19 || major === 19 && minor >= 2 || major === 18 && minor >= 13;
+const HAS_LAZY_LOADED_TRANSLATORS = major > 19 || major === 19 && minor >= 3;
+
 const builtinModules = new Set(Module.builtinModules || Object.keys(process.binding(`natives`)));
 const isBuiltinModule = (request) => request.startsWith(`node:`) || builtinModules.has(request);
 function readPackageScope(checkPath) {
@@ -1384,11 +1401,6 @@ function readPackage(requestPath) {
   return JSON.parse(fs.readFileSync(jsonPath, `utf8`));
 }
 
-const [major, minor] = process.versions.node.split(`.`).map((value) => parseInt(value, 10));
-const HAS_CONSOLIDATED_HOOKS = major > 16 || major === 16 && minor >= 12;
-const HAS_UNFLAGGED_JSON_MODULES = major > 17 || major === 17 && minor >= 5 || major === 16 && minor >= 15;
-const HAS_JSON_IMPORT_ASSERTION_REQUIREMENT = major > 17 || major === 17 && minor >= 1 || major === 16 && minor > 14;
-
 async function tryReadFile$1(path2) {
   try {
     return await fs.promises.readFile(path2, `utf8`);
@@ -1424,11 +1436,7 @@ function getFileFormat(filepath) {
       );
     }
     case `.json`: {
-      if (HAS_UNFLAGGED_JSON_MODULES)
+      return `json`;
-        return `json`;
-      throw new Error(
-        `Unknown file extension ".json" for ${filepath}`
-      );
     }
     case `.js`: {
       const pkg = readPackageScope(filepath);
@@ -1449,54 +1457,32 @@ function getFileFormat(filepath) {
   }
 }
 
-async function getFormat$1(resolved, context, defaultGetFormat) {
-  const url = tryParseURL(resolved);
-  if ((url == null ? void 0 : url.protocol) !== `file:`)
-    return defaultGetFormat(resolved, context, defaultGetFormat);
-  const format = getFileFormat(fileURLToPath(url));
-  if (format) {
-    return {
-      format
-    };
-  }
-  return defaultGetFormat(resolved, context, defaultGetFormat);
-}
-
-async function getSource$1(urlString, context, defaultGetSource) {
-  const url = tryParseURL(urlString);
-  if ((url == null ? void 0 : url.protocol) !== `file:`)
-    return defaultGetSource(urlString, context, defaultGetSource);
-  return {
-    source: await fs.promises.readFile(fileURLToPath(url), `utf8`)
-  };
-}
-
 async function load$1(urlString, context, nextLoad) {
-  var _a;
   const url = tryParseURL(urlString);
-  if ((url == null ? void 0 : url.protocol) !== `file:`)
+  if (url?.protocol !== `file:`)
     return nextLoad(urlString, context, nextLoad);
   const filePath = fileURLToPath(url);
   const format = getFileFormat(filePath);
   if (!format)
     return nextLoad(urlString, context, nextLoad);
-  if (HAS_JSON_IMPORT_ASSERTION_REQUIREMENT && format === `json` && ((_a = context.importAssertions) == null ? void 0 : _a.type) !== `json`) {
+  if (format === `json` && context.importAssertions?.type !== `json`) {
     const err = new TypeError(`[ERR_IMPORT_ASSERTION_TYPE_MISSING]: Module "${urlString}" needs an import assertion of type "json"`);
     err.code = `ERR_IMPORT_ASSERTION_TYPE_MISSING`;
     throw err;
   }
   if (process.env.WATCH_REPORT_DEPENDENCIES && process.send) {
+    const pathToSend = pathToFileURL(
+      npath.fromPortablePath(
+        VirtualFS.resolveVirtual(npath.toPortablePath(filePath))
+      )
+    ).href;
     process.send({
-      "watch:import": pathToFileURL(
+      "watch:import": WATCH_MODE_MESSAGE_USES_ARRAYS ? [pathToSend] : pathToSend
-        npath.fromPortablePath(
-          VirtualFS.resolveVirtual(npath.toPortablePath(filePath))
-        )
-      ).href
     });
   }
   return {
     format,
-    source: await fs.promises.readFile(filePath, `utf8`),
+    source: format === `commonjs` ? void 0 : await fs.promises.readFile(filePath, `utf8`),
     shortCircuit: true
   };
 }
@@ -1880,12 +1866,7 @@ function patternKeyCompare(a, b) {
     return 1;
   return 0;
 }
-function packageImportsResolve({
+function packageImportsResolve({ name, base, conditions, readFileSyncFn }) {
-  name,
-  base,
-  conditions,
-  readFileSyncFn
-}) {
   if (name === "#" || StringPrototypeStartsWith(name, "#/") || StringPrototypeEndsWith(name, "/")) {
     const reason = "is not a valid internal imports specifier name";
     throw new ERR_INVALID_MODULE_SPECIFIER(name, reason, fileURLToPath(base));
@@ -1992,7 +1973,7 @@ async function resolve$1(originalSpecifier, context, nextResolve) {
     specifier = fileURLToPath(url);
   }
   const { parentURL, conditions = [] } = context;
-  const issuer = parentURL ? fileURLToPath(parentURL) : process.cwd();
+  const issuer = parentURL && tryParseURL(parentURL)?.protocol === `file:` ? fileURLToPath(parentURL) : process.cwd();
   const pnpapi = findPnpApi(issuer) ?? (url ? findPnpApi(specifier) : null);
   if (!pnpapi)
     return nextResolve(originalSpecifier, context, nextResolve);
@@ -2002,7 +1983,7 @@ async function resolve$1(originalSpecifier, context, nextResolve) {
   let allowLegacyResolve = false;
   if (dependencyNameMatch) {
     const [, dependencyName, subPath] = dependencyNameMatch;
-    if (subPath === ``) {
+    if (subPath === `` && dependencyName !== `pnpapi`) {
       const resolved = pnpapi.resolveToUnqualified(`${dependencyName}/package.json`, issuer);
       if (resolved) {
         const content = await tryReadFile$1(resolved);
@@ -2013,10 +1994,17 @@ async function resolve$1(originalSpecifier, context, nextResolve) {
       }
     }
   }
-  const result = pnpapi.resolveRequest(specifier, issuer, {
+  let result;
-    conditions: new Set(conditions),
+  try {
-    extensions: allowLegacyResolve ? void 0 : []
+    result = pnpapi.resolveRequest(specifier, issuer, {
-  });
+      conditions: new Set(conditions),
+      extensions: allowLegacyResolve ? void 0 : []
+    });
+  } catch (err) {
+    if (err instanceof Error && `code` in err && err.code === `MODULE_NOT_FOUND`)
+      err.code = `ERR_MODULE_NOT_FOUND`;
+    throw err;
+  }
   if (!result)
     throw new Error(`Resolving '${specifier}' from '${issuer}' failed`);
   const resultURL = pathToFileURL(result);
@@ -2032,36 +2020,36 @@ async function resolve$1(originalSpecifier, context, nextResolve) {
   };
 }
 
-const binding = process.binding(`fs`);
+if (!HAS_LAZY_LOADED_TRANSLATORS) {
-const originalfstat = binding.fstat;
+  const binding = process.binding(`fs`);
-const ZIP_MASK = 4278190080;
+  const originalfstat = binding.fstat;
-const ZIP_MAGIC = 704643072;
+  const ZIP_MASK = 4278190080;
-binding.fstat = function(...args) {
+  const ZIP_MAGIC = 704643072;
-  const [fd, useBigint, req] = args;
+  binding.fstat = function(...args) {
-  if ((fd & ZIP_MASK) === ZIP_MAGIC && useBigint === false && req === void 0) {
+    const [fd, useBigint, req] = args;
-    try {
+    if ((fd & ZIP_MASK) === ZIP_MAGIC && useBigint === false && req === void 0) {
-      const stats = fs.fstatSync(fd);
+      try {
-      return new Float64Array([
+        const stats = fs.fstatSync(fd);
-        stats.dev,
+        return new Float64Array([
-        stats.mode,
+          stats.dev,
-        stats.nlink,
+          stats.mode,
-        stats.uid,
+          stats.nlink,
-        stats.gid,
+          stats.uid,
-        stats.rdev,
+          stats.gid,
-        stats.blksize,
+          stats.rdev,
-        stats.ino,
+          stats.blksize,
-        stats.size,
+          stats.ino,
-        stats.blocks
+          stats.size,
-      ]);
+          stats.blocks
-    } catch {
+        ]);
+      } catch {
+      }
     }
-  }
+    return originalfstat.apply(this, args);
-  return originalfstat.apply(this, args);
+  };
-};
+}
 
 const resolve = resolve$1;
-const getFormat = HAS_CONSOLIDATED_HOOKS ? void 0 : getFormat$1;
+const load = load$1;
-const getSource = HAS_CONSOLIDATED_HOOKS ? void 0 : getSource$1;
-const load = HAS_CONSOLIDATED_HOOKS ? load$1 : void 0;
 
-export { getFormat, getSource, load, resolve };
+export { load, resolve };