diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index de5c7a55d..2795996ce 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -335,19 +335,19 @@ jobs: path: elixir/_build key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/elixir/mix.lock') }} - uses: actions/cache@v3 - name: Yarn Deps Cache + name: pnpm Deps Cache env: - cache-name: cache-yarn-build-${{ env.MIX_ENV }} + cache-name: cache-pnpm-build-${{ env.MIX_ENV }} with: path: elixir/apps/web/assets/node_modules - key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }} + key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} - uses: actions/cache@v3 name: Assets Cache env: cache-name: cache-assets-build-${{ env.MIX_ENV }} with: path: elixir/apps/web/priv/static/dist - key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }} + key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} - run: | export DISPLAY=:99 sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & diff --git a/.github/workflows/publish_www.yml b/.github/workflows/publish_www.yml deleted file mode 100644 index a2a1390f0..000000000 --- a/.github/workflows/publish_www.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Publish Website -on: - workflow_dispatch: - release: - types: [published] - -jobs: - publish-website: - name: Build Docusaurus 🐲 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: 'yarn' - cache-dependency-path: www/yarn.lock - - run: | - cd www/ - yarn install --frozen-lockfile - yarn build - - name: Publish Latest Website - uses: JamesIves/github-pages-deploy-action@v4.4.1 - with: - branch: gh-pages - folder: www/build - target-folder: . - clean: true - clean-exclude: | - *.*.*/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c2db3f8e0..b959101dd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,12 +6,6 @@ repos: entry: codespell language: system pass_filenames: false - - id: markdownlint - name: "nodejs: markdownlint" - entry: ./docs/node_modules/markdownlint-cli/markdownlint.js - language: system - pass_filenames: true - files: docs/.*\.md$ # Standard pre-commit hooks - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/elixir/Dockerfile b/elixir/Dockerfile index f736ead59..5349692c7 100644 --- a/elixir/Dockerfile +++ b/elixir/Dockerfile @@ -8,7 +8,7 @@ ARG RUNNER_IMAGE="alpine:${ALPINE_VERSION}" FROM ${BUILDER_IMAGE} as builder # install build dependencies -RUN apk add nodejs yarn build-base git python3 +RUN apk add nodejs pnpm build-base git python3 # prepare build dir WORKDIR /app diff --git a/elixir/apps/web/assets/package.json b/elixir/apps/web/assets/package.json index 413f8ef16..43c50b1d1 100644 --- a/elixir/apps/web/assets/package.json +++ b/elixir/apps/web/assets/package.json @@ -1,7 +1,6 @@ { "dependencies": { "@fontsource/source-sans-pro": "^4.5.11", - "flowbite": "^1.6.5", - "yarn": "^1.22.19" + "flowbite": "^1.6.5" } } diff --git a/elixir/apps/web/assets/pnpm-lock.yaml b/elixir/apps/web/assets/pnpm-lock.yaml new file mode 100644 index 000000000..6ecb634de --- /dev/null +++ b/elixir/apps/web/assets/pnpm-lock.yaml @@ -0,0 +1,35 @@ +lockfileVersion: '6.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +dependencies: + '@fontsource/source-sans-pro': + specifier: ^4.5.11 + version: 4.5.11 + flowbite: + specifier: ^1.6.5 + version: 1.6.5 + +packages: + + /@fontsource/source-sans-pro@4.5.11: + resolution: {integrity: sha512-f7iw44q1EjBv3MNcHCGAgrW/QVyweaEouFsJzykPhTOGnZFSwFJRISToXornOmuAy7xUUGiVdqOLiykgZoYB8A==} + dev: false + + /@popperjs/core@2.11.8: + resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + dev: false + + /flowbite@1.6.5: + resolution: {integrity: sha512-eI4h3pIRI9d7grlYq14r0A01KUtw7189sPLLx/O2i7JyPEWpbleScfYuEc48XTeNjk1xxm/JHgZkD9kjyOWAlA==} + dependencies: + '@popperjs/core': 2.11.8 + mini-svg-data-uri: 1.4.4 + dev: false + + /mini-svg-data-uri@1.4.4: + resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} + hasBin: true + dev: false diff --git a/elixir/apps/web/assets/yarn.lock b/elixir/apps/web/assets/yarn.lock deleted file mode 100644 index 06aeb51a3..000000000 --- a/elixir/apps/web/assets/yarn.lock +++ /dev/null @@ -1,31 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@fontsource/source-sans-pro@^4.5.11": - version "4.5.11" - resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-4.5.11.tgz#06b3f08ef1a5250d78c8198e5a0482b5d87a4d52" - integrity sha512-f7iw44q1EjBv3MNcHCGAgrW/QVyweaEouFsJzykPhTOGnZFSwFJRISToXornOmuAy7xUUGiVdqOLiykgZoYB8A== - -"@popperjs/core@^2.9.3": - version "2.11.7" - resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz" - integrity sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw== - -flowbite@^1.6.5: - version "1.6.5" - resolved "https://registry.yarnpkg.com/flowbite/-/flowbite-1.6.5.tgz#a0eb2f3f0cf5098f802004df635e2717efc52bbc" - integrity sha512-eI4h3pIRI9d7grlYq14r0A01KUtw7189sPLLx/O2i7JyPEWpbleScfYuEc48XTeNjk1xxm/JHgZkD9kjyOWAlA== - dependencies: - "@popperjs/core" "^2.9.3" - mini-svg-data-uri "^1.4.3" - -mini-svg-data-uri@^1.4.3: - version "1.4.4" - resolved "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz" - integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg== - -yarn@^1.22.19: - version "1.22.19" - resolved "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz" - integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==