diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3aafce120..642461386 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node_version: [14, 16, 18, 19, 20, 21, 22] + node_version: [18, 19, 20, 21, 22] runs-on: ubuntu-latest diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 085ba24a0..f44f5b81d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -38,8 +38,8 @@ jobs: uses: crazy-max/ghaction-docker-meta@v1 with: images: ${{ github.repository }} - tag-custom: 5.x-next - tag-custom-only: ${{ github.ref == 'refs/heads/5.x' }} + tag-custom: 6.x-next + tag-custom-only: ${{ github.ref == 'refs/heads/6.x' }} tag-semver: | {{version}} {{major}} diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 3933fe7df..1582c81cf 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -1,10 +1,10 @@ -name: Release Canary 5.x +name: Release Canary 6.x on: workflow_dispatch: push: branches: - - 5.x + - 6.x jobs: release: name: Release Snapshot diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbcf21a39..c66167062 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release 5.x +name: Release 6.x on: push: diff --git a/.github/workflows/smok-test-docker.yml b/.github/workflows/smok-test-docker.yml index d3081ed1b..6087fa432 100644 --- a/.github/workflows/smok-test-docker.yml +++ b/.github/workflows/smok-test-docker.yml @@ -1,9 +1,9 @@ -name: Docker Smoke Test 5.x +name: Docker Smoke Test 6.x on: workflow_dispatch: push: branches: - - 5.x + - 6.x permissions: contents: read jobs: @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3 with: - node-version: 18 + node-version: 20 - name: Docker test run: | docker run -d -it --rm --name verdaccio -p 4873:4873 verdaccio/verdaccio:5 diff --git a/.github/workflows/smok-test-module.yml b/.github/workflows/smok-test-module.yml index 6b032cd75..3756dbcc3 100644 --- a/.github/workflows/smok-test-module.yml +++ b/.github/workflows/smok-test-module.yml @@ -1,4 +1,4 @@ -name: Module Smoke Test 5.x +name: Module Smoke Test 6.x on: [push, pull_request] @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - node_version: [14, 16, 18, 19, 20, 21, 22] + node_version: [18, 19, 20, 21, 22] runs-on: ubuntu-latest steps: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40baec17b..4196b1faa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ Full text for contributing can be read [here](https://verdaccio.org/community/contributing). -## Especifics for the branch 5.x +## Especifics for the branch 6.x -The 5.x uses `yarn berry` with Plug and Play enabled, thus some advices are required for helping contributing: +The 6.x uses `yarn berry` with Plug and Play enabled, thus some advices are required for helping contributing: ### Debugging Jest diff --git a/SECURITY.md b/SECURITY.md index 10236c3ce..207ada4df 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,8 +8,9 @@ The following table describes the versions of this project that are currently su | ------- | ---------------------------------------- | | 2.x | :x: | | 3.x | :x: | -| 4.x | :white_check_mark: (until 1st July 2021) | -| 5.x | :white_check_mark: | +| 4.x | :x: | +| 5.x | :white_check_mark: (until end of 2024) | +| 6.x | :white_check_mark: | ## Responsible disclosure security policy diff --git a/babel.config.js b/babel.config.js index 3722f2772..0f2dfdb2e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -4,7 +4,7 @@ module.exports = { '@babel/env', { targets: { - node: '12', + node: '18', }, }, ], diff --git a/conf/default.yaml b/conf/default.yaml index 154152cd9..df6597772 100644 --- a/conf/default.yaml +++ b/conf/default.yaml @@ -4,7 +4,7 @@ # improve security. # # Look here for more config file examples: -# https://github.com/verdaccio/verdaccio/tree/5.x/conf +# https://github.com/verdaccio/verdaccio/tree/6.x/conf # # Read about the best practices # https://verdaccio.org/docs/best diff --git a/conf/docker.yaml b/conf/docker.yaml index d0c09e46a..1de41a894 100644 --- a/conf/docker.yaml +++ b/conf/docker.yaml @@ -8,7 +8,7 @@ # see https://verdaccio.org/docs/en/docker#docker-and-custom-port-configuration # # Look here for more config file examples: -# https://github.com/verdaccio/verdaccio/tree/5.x/conf +# https://github.com/verdaccio/verdaccio/tree/6.x/conf # # Read about the best practices # https://verdaccio.org/docs/best diff --git a/package.json b/package.json index d220feebd..c932cdb38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "verdaccio", - "version": "5.32.2", + "version": "6.0.0-rc.0", "description": "A lightweight private npm proxy registry", "author": { "name": "Verdaccio Maintainers", diff --git a/scripts/publish-prerelease.sh b/scripts/publish-prerelease.sh index caad71cfa..d5d5c6432 100755 --- a/scripts/publish-prerelease.sh +++ b/scripts/publish-prerelease.sh @@ -10,4 +10,4 @@ echo "Bumping version to new tag: ${lastTag}" echo "//$REGISTRY_URL/:_authToken=$REGISTRY_AUTH_TOKEN" > .npmrc # Publish to NPM -npm publish --registry https://$REGISTRY_URL/ --tag canary-5x +npm publish --registry https://$REGISTRY_URL/ --tag canary-6x diff --git a/scripts/publish.sh b/scripts/publish.sh index bddb4bd7a..453d7f472 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -10,4 +10,4 @@ echo "Bumping version to new tag: ${lastTag}" echo "//$REGISTRY_URL/:_authToken=$REGISTRY_AUTH_TOKEN" > .npmrc # Publish to NPM -npm publish --registry https://$REGISTRY_URL/ +npm publish --registry https://$REGISTRY_URL/ --tag latest-6 diff --git a/src/lib/auth.ts b/src/lib/auth.ts index a43a69cbf..1a65c5d6c 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -62,7 +62,7 @@ class Auth { let authConf = { ...config.auth }; if (authConf?.htpasswd) { // special case for htpasswd plugin, the v6 version uses bcrypt by default - // 5.x enforces crypt to avoid breaking changes, but is highly recommended using + // 6.x enforces crypt to avoid breaking changes, but is highly recommended using // bcrypt instead. if (!authConf.htpasswd.algorithm) { authConf.htpasswd.algorithm = 'crypt';