Vue rewrite upmerge22

.editorconfig

@@ -5,11 +5,16 @@ trim_trailing_whitespace = true
 end_of_line = lf
 insert_final_newline = true
 
-[*.{js,php,html,vue}]
+[*.{php,html,css}]
 indent_style = space
 indent_size = 4
 charset = utf-8
 
+[*.{js,ts,vue}]
+indent_style = tab
+indent_size = 4
+charset = utf-8
+
 [*.bats]
 indent_style = space
 indent_size = 2

.eslintrc.js

@@ -1,10 +1,46 @@
 module.exports = {
+ root: true,
+ parser: 'vue-eslint-parser',
+ parserOptions: {
+ parser: {
+ ts: '@typescript-eslint/parser',
+ },
+ ecmaVersion: 2020,
+ },
+ env: {
+ jest: true,
+ },
  extends: [
+ 'eslint:recommended',
+ 'plugin:vue/base',
+ 'plugin:vue/essential',
+ '@vue/standard',
+ '@vue/typescript/recommended',
  '@nextcloud',
+ 'plugin:@typescript-eslint/recommended',
  ],
+ ignorePatterns: ['*.d.ts'],
  rules: {
- 'jsdoc/check-alignment': 'off',
- 'vue/html-indent': 'off',
- 'indent': ['error', 4]
+ 'no-console': 'warn',
+ '@typescript-eslint/no-var-requires': 'off',
+
+ // TODO: Trouble importing .ts files into .vue files for some reason?
+ 'import/extensions': 'off',
+ 'n/no-missing-import': 'off',
+ },
+ settings: {
+ 'import/resolver': {
+ node: {
+ extensions: ['.ts'],
+ },
+ },
  },
+ overrides: [
+ {
+ files: ['*spec.ts', 'tests/javascript/unit/setup.ts'],
+ rules: {
+ '@typescript-eslint/no-explicit-any': 'off',
+ },
+ },
+ ],
 }

.github/dependabot.yml

@@ -13,6 +13,7 @@ updates:
  labels:
  - "dependencies"
  - "Skip-Changelog"
+ versioning-strategy: increase
 
  # Maintain dependencies for Composer
  - package-ecosystem: "composer"
@@ -22,6 +23,7 @@ updates:
  labels:
  - "dependencies"
  - "Skip-Changelog"
+ versioning-strategy: increase
 
  # Maintain dependencies for GitHub Actions
  - package-ecosystem: "github-actions"

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+
+* Resolves: # <!-- related github issue -->
+
+## Summary
+
+<!-- your text -->
+
+## Checklist
+
+- Code is [properly formatted](https://nextcloud.github.io/news/developer/#coding-style-guidelines)
+- [Sign-off message](https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md) is added to all commits
+- Changelog entry added for all important changes.

.github/workflows/api-integration-tests.yml

@@ -16,7 +16,7 @@ jobs:
  name: "Integration: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}"
  services:
  postgres:
- image: postgres
+ image: postgres:14
  env:
  POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
  options: >-
@@ -28,26 +28,24 @@ jobs:
  - 5432:5432 # Maps tcp port 5432 on service container to the host
  strategy:
  matrix:
- php-versions: ['7.4', '8.0']
- nextcloud: ['stable22', 'stable23']
+ php-versions: ['8.0', '8.1']
+ nextcloud: ['stable27']
  database: ['sqlite', 'pgsql', 'mysql']
  experimental: [false]
  include:
- - php-versions: 8.0
+ - php-versions: 8.1
  nextcloud: pre-release
  database: sqlite
  experimental: true
- - php-versions: 8.1
+ - php-versions: 8.2
  nextcloud: pre-release
  database: sqlite
  experimental: true
- - php-versions: 8.1
- nextcloud: stable24
- database: sqlite
- experimental: false
  steps:
  - name: Checkout
  uses: actions/checkout@v3
+ with:
+ submodules: recursive
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
@@ -56,8 +54,8 @@ jobs:
  extensions: pdo_sqlite,pdo_mysql,pdo_pgsql,gd,zip
  coverage: none
 
- - name: Setup BATS
- uses: mig4/setup-bats@v1.2.0
+ - name: Setup BATS & httpie
+ run: sudo apt-get install -y httpie && npm install -g bats@1.7.0
 
  ### MySQL specific setup
  - name: Setup mysql
@@ -108,8 +106,21 @@ jobs:
  check-code: false
  force: ${{ matrix.experimental }}
 
- - name: Setup problem matchers for PHP
- run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+ - name: Run API tests
+ working-directory: ../server
+ run: |
+ php -S localhost:8080 &> /tmp/webserver.log &
+ cd apps/news/tests/test_helper/feeds && php -S localhost:8090 &> /tmp/feedserver.log &
+
+ sleep 2
+
+ cd ${{ github.workspace }}/../server
+
+ bats apps/news/tests/api
+
+ # Kill php server
+ kill %1
+ kill %2
 
  - name: Functional tests maintenance
  working-directory: ../server
@@ -118,7 +129,16 @@ jobs:
 
  - name: Functional tests
  working-directory: ../server
- run: bats apps/news/tests/integration
+ run: |
+ cd apps/news/tests/test_helper/feeds && php -S localhost:8090 &> /tmp/feedserver.log &
+
+ sleep 2
+
+ cd ${{ github.workspace }}/../server
+
+ bats apps/news/tests/command
+
+ kill %1
 
  - name: Prep PHP tests
  working-directory: ../server/apps/news
@@ -127,3 +147,4 @@ jobs:
  - name: Feed tests
  working-directory: ../server/apps/news
  run: make feed-test
+

.github/workflows/api-php-static-code-check.yml

@@ -7,15 +7,11 @@ jobs:
  continue-on-error: true
  strategy:
  matrix:
- php-versions: [ '7.4', '8.0' ]
- nextcloud: [ 'stable24' ]
+ php-versions: ['8.0', '8.1', '8.2' ]
+ nextcloud: [ 'stable27' ]
  database: [ 'sqlite' ]
  include:
- - php-versions: 8.1
- nextcloud: stable24
- database: sqlite
- experimental: false
- - php-versions: 8.1
+ - php-versions: 8.2
  nextcloud: pre-release
  database: sqlite
  experimental: true

.github/workflows/api-php-tests.yml

@@ -10,16 +10,10 @@ jobs:
  strategy:
  matrix:
  php-versions: ['8.1']
- nextcloud: ['stable24']
+ nextcloud: ['stable27']
  database: ['sqlite']
  experimental: [false]
  codecoverage: [false]
- include:
- - php-versions: 8.0
- nextcloud: stable24
- database: sqlite
- experimental: false
- codecoverage: true
  steps:
  - name: Checkout
  uses: actions/checkout@v3
@@ -50,9 +44,6 @@ jobs:
  app: 'news'
  check-code: false
 
- - name: Setup problem matchers for PHPUnit
- run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
  - name: Prep PHP tests
  working-directory: ../server/apps/news
  run: make php-test-dependencies

.github/workflows/build-release.yml

@@ -15,7 +15,7 @@ jobs:
  strategy:
  matrix:
  php-versions: ['8.1']
- nextcloud: ['stable24']
+ nextcloud: ['stable27']
  database: ['sqlite']
  steps:
  - name: Checkout
@@ -29,7 +29,7 @@ jobs:
  coverage: none
 
  - name: Set up server non MySQL
- uses: SMillerDev/nextcloud-actions/setup-nextcloud@fae87e29aa7cdf1ea0b8033c67f60e75b10be2cd
+ uses: SMillerDev/nextcloud-actions/setup-nextcloud@main
  with:
  cron: false
  version: ${{ matrix.nextcloud }}
@@ -39,7 +39,7 @@ jobs:
  run: make
 
  - name: Configure server with app
- uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@fae87e29aa7cdf1ea0b8033c67f60e75b10be2cd
+ uses: SMillerDev/nextcloud-actions/setup-nextcloud-app@main
  with:
  app: ${{ env.APP_NAME }}
  check-code: false
@@ -52,7 +52,7 @@ jobs:
  app_public_crt: ${{ secrets.APP_PUBLIC_CRT }}
 
  - name: Upload app tarball to release
- uses: svenstaro/upload-release-action@483c1e56f95e88835747b1c7c60581215016cbf2
+ uses: svenstaro/upload-release-action@2b9d2847a97b04d02ad5c3df2d3a27baa97ce689
  id: attach_to_release
  with:
  repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/frontend-nodejs-tests.yml

@@ -4,13 +4,13 @@ on:
 
 jobs:
  php:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
  continue-on-error: ${{ matrix.experimental }}
  name: "Frontend: Nextcloud ${{ matrix.nextcloud }} - PHP ${{ matrix.php-versions }} - DB ${{ matrix.database }}"
  strategy:
  matrix:
  php-versions: ['8.1']
- nextcloud: ['stable24']
+ nextcloud: ['stable27']
  database: ['sqlite']
  experimental: [false]
  steps:

.github/workflows/lint-eslint.yml

@@ -0,0 +1,46 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
+name: Lint
+
+on: pull_request
+
+permissions:
+ contents: read
+
+concurrency: 
+ group: lint-eslint-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ lint:
+ runs-on: ubuntu-latest
+
+ name: eslint
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Read package.json node and npm engines version
+ uses: skjnldsv/read-package-engines-version-actions@v2.2
+ id: versions
+ with:
+ fallbackNode: '^16'
+ fallbackNpm: '^6'
+
+ - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+ uses: actions/setup-node@v3
+ with:
+ node-version: ${{ steps.versions.outputs.nodeVersion }}
+
+ - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
+ run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+
+ - name: Install dependencies
+ run: npm ci
+
+ - name: Lint
+ run: npm run lint

.github/workflows/post-merge-tasks.yml

@@ -10,7 +10,7 @@ jobs:
  name: "Coverage: Nextcloud PHP ${{ matrix.php-versions }}"
  strategy:
  matrix:
- nextcloud: ['stable24']
+ nextcloud: ['stable27']
  steps:
  - name: Checkout
  uses: actions/checkout@v3