Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@

# Git version is dynamically generated
airflow/git_version
# Exclude mode_modules pulled by "yarn" for compilation of www files generated by NPM
airflow/www/node_modules
airflow/ui/node_modules
airflow/auth/managers/simple/ui/node_modules

Expand Down
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
/airflow/api_connexion/ @ephraimbuddy @pierrejeambrun
/airflow/api_fastapi/ @ephraimbuddy @pierrejeambrun

# WWW
/airflow/www/ @ryanahamilton @ashb @bbovenzi @pierrejeambrun @jscheffl

# UI
/airflow/ui/ @bbovenzi @pierrejeambrun @ryanahamilton @jscheffl

Expand Down
20 changes: 0 additions & 20 deletions .github/boring-cyborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ labelPRBasedOnFilePath:
- airflow/api_connexion/**/*
- clients/**/*
- docs/apache-airflow/stable-rest-api-ref.rst
- tests/api_connexion/**/*

area:dev-tools:
- scripts/**/*
Expand All @@ -319,10 +318,6 @@ labelPRBasedOnFilePath:
- .pre-commit-config.yaml
- .rat-excludes
- .readthedocs.yml
- airflow/www/.eslintignore
- airflow/www/.eslintrc
- airflow/www/.stylelintignore
- airflow/www/.stylelintrc

kind:documentation:
- docs/**/*
Expand All @@ -331,22 +326,7 @@ labelPRBasedOnFilePath:
- chart/**/*
- docs/helm-chart/**

area:Webserver:
- airflow/cli/commands/local_commands/webserver_command.py
- airflow/www/**/*
- tests/cli/commands/local_commands/test_webserver_command.py
- tests/www/**/*

area:UI:
- airflow/www/static/**/*
- airflow/www/templates/**/*
- airflow/www/.eslintignore
- airflow/www/.eslintrc
- airflow/www/.stylelintignore
- airflow/www/.stylelintrc
- airflow/www/package.json
- airflow/www/webpack.config.js
- airflow/www/yarn.lock
- docs/apache-airflow/ui.rst
- airflow/ui/**/*

Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/basic-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,44 +151,6 @@ jobs:
retention-days: '2'
if: steps.restore-eslint-cache-simple-am-ui.outputs.stash-hit != 'true'

tests-www:
timeout-minutes: 10
name: React WWW tests
runs-on: ${{ fromJSON(inputs.runs-on-as-json-public) }}
if: inputs.run-www-tests == 'true'
steps:
- name: "Cleanup repo"
shell: bash
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" -u 0:0 bash -c "rm -rf /workspace/*"
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v4
with:
persist-credentials: false
- name: "Cleanup docker"
run: ./scripts/ci/cleanup_docker.sh
- name: "Setup node"
uses: actions/setup-node@v4
with:
node-version: 21
- name: "Restore eslint cache (www)"
uses: apache/infrastructure-actions/stash/restore@1c35b5ccf8fba5d4c3fdf25a045ca91aa0cbc468
with:
path: airflow/www/node_modules/
key: cache-www-node-modules-v1-${{ runner.os }}-${{ hashFiles('airflow/www/**/yarn.lock') }}
id: restore-eslint-cache
- run: yarn --cwd airflow/www/ install --frozen-lockfile --non-interactive
- run: yarn --cwd airflow/www/ run test
env:
FORCE_COLOR: 2
- name: "Save eslint cache (www)"
uses: apache/infrastructure-actions/stash/save@1c35b5ccf8fba5d4c3fdf25a045ca91aa0cbc468
with:
path: airflow/www/node_modules/
key: cache-www-node-modules-v1-${{ runner.os }}-${{ hashFiles('airflow/www/**/yarn.lock') }}
if-no-files-found: 'error'
retention-days: '2'
if: steps.restore-eslint-cache.outputs.stash-hit != 'true'

install-pre-commit:
timeout-minutes: 5
name: "Install pre-commit for cache"
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ airflow.db

# Airflow temporary artifacts
airflow/git_version
airflow/www/static/coverage/
airflow/www/*.log
airflow/ui/coverage/
logs/
airflow-webserver.pid
Expand Down
64 changes: 8 additions & 56 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,13 @@ repos:
- id: insert-license
name: Add license for CSS/JS/JSX/PUML/TS/TSX
files: \.(css|jsx?|puml|tsx?)$
exclude: ^\.github/.*$|^airflow/www/static/js/types/api-generated.ts$|ui/openapi-gen/|.*/dist/.*
exclude: ^\.github/.*$|ui/openapi-gen/|.*/dist/.*
args:
- --comment-style
- "/*!| *| */"
- --license-filepath
- scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all JINJA template files
files: ^airflow/www/templates/.*\.html$
exclude: ^\.github/.*$
args:
- --comment-style
- "{#||#}"
- --license-filepath
- scripts/ci/license-templates/LICENSE.txt
- --fuzzy-match-generates-todo
- id: insert-license
name: Add license for all Shell files
exclude: ^\.github/.*$|^dev/breeze/autocomplete/.*$
Expand Down Expand Up @@ -312,7 +302,7 @@ repos:
exclude: material-icons\.css$|^images/.*$|^RELEASE_NOTES\.txt$|^.*package-lock\.json$|^.*/kinglear\.txt$|^.*pnpm-lock\.yaml$|.*/dist/.*
args:
- --ignore-words=docs/spelling_wordlist.txt
- --skip=providers/.*/src/airflow/providers/*/*.rst,providers/*/docs/changelog.rst,airflow/www/*.log,docs/*/commits.rst,providers/*/docs/commits.rst,providers/*/*/docs/commits.rst,docs/apache-airflow/tutorial/pipeline_example.csv,*.min.js,*.lock,INTHEWILD.md
- --skip=providers/.*/src/airflow/providers/*/*.rst,providers/*/docs/changelog.rst,docs/*/commits.rst,providers/*/docs/commits.rst,providers/*/*/docs/commits.rst,docs/apache-airflow/tutorial/pipeline_example.csv,*.min.js,*.lock,INTHEWILD.md
- --exclude-file=.codespellignorelines
- repo: https://github.com/woodruffw/zizmor-pre-commit
rev: v1.0.0
Expand Down Expand Up @@ -616,7 +606,6 @@ repos:
^airflow/api_connexion/openapi/v1.yaml$|
^airflow/ui/openapi-gen/|
^airflow/cli/commands/local_commands/fastapi_api_command.py$|
^airflow/cli/commands/local_commands/webserver_command.py$|
^airflow/config_templates/|
^airflow/models/baseoperator.py$|
^airflow/operators/__init__.py$|
Expand Down Expand Up @@ -649,9 +638,6 @@ repos:
^airflow/ui/pnpm-lock.yaml$|
^airflow/utils/db.py$|
^airflow/utils/trigger_rule.py$|
^airflow/www/static/css/bootstrap-theme.css$|
^airflow/www/static/js/types/api-generated.ts$|
^airflow/www/templates/appbuilder/flash.html$|
^chart/values.schema.json$|
^dev/|
^docs/README.rst$|
Expand Down Expand Up @@ -858,13 +844,6 @@ repos:
entry: koalaman/shellcheck:v0.8.0 -x -a
files: \.(bash|sh)$|^hooks/build$|^hooks/push$
exclude: ^dev/breeze/autocomplete/.*$
- id: lint-css
name: stylelint
entry: "stylelint"
language: node
files: ^airflow/www/.*\.(css|sass|scss)$
# Keep dependency versions in sync w/ airflow/www/package.json
additional_dependencies: ['stylelint@13.3.1', 'stylelint-config-standard@20.0.0', 'stylelint-config-prettier@9.0.5']
- id: compile-ui-assets
name: Compile ui assets (manual)
language: node
Expand All @@ -874,15 +853,6 @@ repos:
entry: ./scripts/ci/pre_commit/compile_ui_assets.py
pass_filenames: false
additional_dependencies: ['pnpm@9.7.1']
- id: compile-ui-assets-dev
name: Compile ui assets in dev mode (manual)
language: node
stages: ['manual']
types_or: [javascript, ts, tsx]
files: ^airflow/ui/|^airflow/auth/managers/simple/ui/
entry: ./scripts/ci/pre_commit/compile_ui_assets_dev.py
pass_filenames: false
additional_dependencies: ['pnpm@9.7.1']
- id: compile-fab-assets
name: Compile FAB provider assets
language: node
Expand All @@ -891,24 +861,15 @@ repos:
entry: ./scripts/ci/pre_commit/compile_fab_assets.py
pass_filenames: false
additional_dependencies: [ 'yarn@1.22.21' ]
- id: compile-www-assets
name: Compile www assets (manual)
language: node
stages: ['manual']
'types_or': [javascript, ts, tsx]
files: ^airflow/www/
entry: ./scripts/ci/pre_commit/compile_www_assets.py
pass_filenames: false
additional_dependencies: ['yarn@1.22.21']
- id: compile-www-assets-dev
name: Compile www assets in dev mode (manual)
- id: compile-ui-assets-dev
name: Compile ui assets in dev mode (manual)
language: node
stages: ['manual']
'types_or': [javascript, ts, tsx]
files: ^airflow/www/
entry: ./scripts/ci/pre_commit/compile_www_assets_dev.py
types_or: [javascript, ts, tsx]
files: ^airflow/ui/|^airflow/auth/managers/simple/ui/
entry: ./scripts/ci/pre_commit/compile_ui_assets_dev.py
pass_filenames: false
additional_dependencies: ['yarn@1.22.21']
additional_dependencies: ['pnpm@9.7.1']
- id: check-providers-subpackages-init-file-exist
name: Provider subpackage init files are there
pass_filenames: false
Expand Down Expand Up @@ -1194,15 +1155,6 @@ repos:
additional_dependencies: ['rich>=12.4.4']
pass_filenames: false
files: ^tests/.*\.py$
- id: ts-compile-format-lint-www
name: Compile / format / lint WWW
description: TS types generation / ESLint / Prettier against UI files
language: node
'types_or': [javascript, ts, tsx, yaml, css, json]
files: ^airflow/www/static/(js|css)/|^airflow/api_connexion/openapi/v1\.yaml$
entry: ./scripts/ci/pre_commit/lint_www.py
additional_dependencies: ['yarn@1.22.21', "openapi-typescript@>=6.7.4"]
pass_filenames: false
- id: ts-compile-format-lint-ui
name: Compile / format / lint UI
description: TS types generation / ESLint / Prettier new UI files
Expand Down
Loading