diff --git a/.changeset/config.json b/.changeset/config.json index f6fb96f87..d54bb160a 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -4,7 +4,7 @@ "commit": false, "linked": [], "access": "public", - "baseBranch": "6.x", + "baseBranch": "master", "updateInternalDependencies": "patch", "ignore": [] } diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml index 87c17b547..59933b7c6 100644 --- a/.github/workflows/changesets.yml +++ b/.github/workflows/changesets.yml @@ -6,7 +6,7 @@ on: push: branches: - - 6.x + - master env: CI: true @@ -17,7 +17,7 @@ jobs: version: timeout-minutes: 14 runs-on: ubuntu-latest - if: github.ref == 'refs/heads/6.x' && github.repository == 'verdaccio/verdaccio' + if: github.ref == 'refs/heads/master' && github.repository == 'verdaccio/verdaccio' steps: - name: checkout code repository uses: actions/checkout@v2 diff --git a/.github/workflows/ci-e2e-ui.yml b/.github/workflows/ci-e2e-ui.yml index 8b18e7e5a..dfcd710c5 100644 --- a/.github/workflows/ci-e2e-ui.yml +++ b/.github/workflows/ci-e2e-ui.yml @@ -3,8 +3,8 @@ name: E2E UI on: push: branches: - - 6.x - - 'changeset-release/6.x' + - master + - 'changeset-release/masters' pull_request: paths: - .github/workflows/ci.yml diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yml index 289787803..6dbe63644 100644 --- a/.github/workflows/ci-e2e.yml +++ b/.github/workflows/ci-e2e.yml @@ -3,8 +3,8 @@ name: E2E CLI on: push: branches: - - 5.x - - 'changeset-release/6.x' + - master + - 'changeset-release/master' pull_request: paths: - .github/workflows/ci.yml diff --git a/.github/workflows/ci-pnpm-dev.yml b/.github/workflows/ci-pnpm-dev.yml deleted file mode 100644 index af52bfdfc..000000000 --- a/.github/workflows/ci-pnpm-dev.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: CI with pnpm 6 - -on: - push: - branches: - - 5.x - - 'changeset-release/6.x' - pull_request: - paths: - - .changeset/** - - .github/workflows/ci.yml - - 'packages/**' - - 'jest/**' - - 'package.json' - - 'pnpm-workspace.yaml' - -jobs: - ci: - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - node_version: [12, 15] - - name: ${{ matrix.os }} / Node ${{ matrix.node_version }} - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v2.3.1 - - name: Use Node ${{ matrix.node_version }} - uses: actions/setup-node@v2 - with: - node_version: ${{ matrix.node_version }} - - name: Install pnpm - run: sudo npm i pnpm@dev -g - - name: Install - run: pnpm recursive install - - name: Format - run: pnpm format:check - - name: Lint - run: pnpm lint - - name: Clean - run: pnpm clean - - name: Build - run: pnpm build - - name: Test - run: pnpm test - env: - DEBUG: verdaccio:web:* diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4215b304..4cc41f5e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,8 @@ name: CI on: push: branches: - - 6.x - - 'changeset-release/6.x' + - master + - 'changeset-release/master' pull_request: paths: - .changeset/** diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2d5c7238c..d4dbad0d6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,8 +3,8 @@ name: 'Code scanning - action' on: push: branches-ignore: - - 5.x - - 'changeset-release/6.x' + - master + - 'changeset-release/master' - 'dev/**' pull_request: paths: diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 5eef6a4a6..8ac4e44ce 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -12,7 +12,7 @@ on: - 'Dockerfile' - '.dockerignore' branches: - - '6.x' + - 'master' tags: - 'v*' jobs: @@ -34,8 +34,8 @@ jobs: uses: crazy-max/ghaction-docker-meta@v1 with: images: ${{ github.repository }} - tag-custom: 6.x-next - tag-custom-only: ${{ github.ref == 'refs/heads/6.x' }} + tag-custom: nightly-master + tag-custom-only: ${{ github.ref == 'refs/heads/master' }} tag-semver: | {{version}} {{major}} diff --git a/README.md b/README.md index c254e7ce4..23401edc5 100644 --- a/README.md +++ b/README.md @@ -135,15 +135,11 @@ Below are the most commonly needed information, every aspect of Docker and verdaccio is [documented separately](https://www.verdaccio.org/docs/en/docker.html) ``` -docker pull verdaccio/verdaccio:6.x-next +docker pull verdaccio/verdaccio:nightly-master ``` Available as [tags](https://hub.docker.com/r/verdaccio/verdaccio/tags/). -``` -docker pull verdaccio/verdaccio:5.x-next -``` - ### Running verdaccio using Docker To run the docker container: diff --git a/test/unit/__helper/.eslintrc b/test/unit/__helper/.eslintrc deleted file mode 100644 index 8ec0114bb..000000000 --- a/test/unit/__helper/.eslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rules": { - "max-len": "off" - } -} diff --git a/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/.eslintrc b/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/.eslintrc deleted file mode 100644 index 8ec0114bb..000000000 --- a/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/.eslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rules": { - "max-len": "off" - } -} diff --git a/test/unit/modules/web/__snapshots__/template.spec.ts.snap b/test/unit/modules/web/__snapshots__/template.spec.ts.snap deleted file mode 100644 index a372acb5e..000000000 --- a/test/unit/modules/web/__snapshots__/template.spec.ts.snap +++ /dev/null @@ -1,151 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`template custom body after 1`] = ` -" - - - - - - - - - - - - - -
- - - - - - - - - - " -`; - -exports[`template custom render 1`] = ` -" - - - - - - - - - - - - - -
- - - - - " -`; - -exports[`template custom title 1`] = ` -" - - - - - - foo title - - - - - - - -
- - - - - " -`; - -exports[`template custom title 2`] = ` -" - - - - - - foo title - - - - - - - -
- - - - - " -`; - -exports[`template meta scripts 1`] = ` -" - - - - - - - - - - - - - -
- - - - - " -`; diff --git a/test/unit/modules/web/partials/manifest/manifest.json b/test/unit/modules/web/partials/manifest/manifest.json deleted file mode 100644 index 4f936f30e..000000000 --- a/test/unit/modules/web/partials/manifest/manifest.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "main.js": "-/static/main.9be80fd172e81558124c.js", - "runtime.js": "-/static/runtime.9be80fd172e81558124c.js", - "NotFound.js": "-/static/NotFound.9be80fd172e81558124c.js", - "Provider.js": "-/static/Provider.9be80fd172e81558124c.js", - "Version.js": "-/static/Version.9be80fd172e81558124c.js", - "Home.js": "-/static/Home.9be80fd172e81558124c.js", - "Versions.js": "-/static/Versions.9be80fd172e81558124c.js", - "UpLinks.js": "-/static/UpLinks.9be80fd172e81558124c.js", - "Dependencies.js": "-/static/Dependencies.9be80fd172e81558124c.js", - "Engines.js": "-/static/Engines.9be80fd172e81558124c.js", - "Dist.js": "-/static/Dist.9be80fd172e81558124c.js", - "Install.js": "-/static/Install.9be80fd172e81558124c.js", - "Repository.js": "-/static/Repository.9be80fd172e81558124c.js", - "vendors.js": "-/static/vendors.9be80fd172e81558124c.js", - "vendors-node_modules_pnpm_material-ui_core_4_11_2_react-dom_16_13_1_react_16_13_1_node_module-2c2376.9be80fd172e81558124c.js": "-/static/vendors-node_modules_pnpm_material-ui_core_4_11_2_react-dom_16_13_1_react_16_13_1_node_module-2c2376.9be80fd172e81558124c.js", - "vendors-node_modules_pnpm_material-ui_core_4_11_2_react-dom_16_13_1_react_16_13_1_node_module-a68215.9be80fd172e81558124c.js": "-/static/vendors-node_modules_pnpm_material-ui_core_4_11_2_react-dom_16_13_1_react_16_13_1_node_module-a68215.9be80fd172e81558124c.js", - "vendors-node_modules_pnpm_material-ui_core_4_11_2_react-dom_16_13_1_react_16_13_1_node_module-3c0585.9be80fd172e81558124c.js": "-/static/vendors-node_modules_pnpm_material-ui_core_4_11_2_react-dom_16_13_1_react_16_13_1_node_module-3c0585.9be80fd172e81558124c.js", - "favicon.ico": "-/static/favicon.ico", - "index.html": "-/static/index.html" -} diff --git a/test/unit/modules/web/template.spec.ts b/test/unit/modules/web/template.spec.ts deleted file mode 100644 index 46b2f16cd..000000000 --- a/test/unit/modules/web/template.spec.ts +++ /dev/null @@ -1,77 +0,0 @@ -import renderTemplate from '../../../../src/api/web/html/template'; - -const manifest = require('./partials/manifest/manifest.json'); - -const exampleManifest = { - css: ['main.css'], - js: ['runtime.js', 'main.js'], - ico: '/static/foo.ico', -}; - -describe('template', () => { - test('custom render', () => { - expect( - renderTemplate( - { options: { base: 'http://domain.com' }, manifest: exampleManifest }, - manifest - ) - ).toMatchSnapshot(); - }); - - test('custom title', () => { - expect( - renderTemplate( - { options: { base: 'http://domain.com', title: 'foo title' }, manifest: exampleManifest }, - manifest - ) - ).toMatchSnapshot(); - }); - - test('custom title', () => { - expect( - renderTemplate( - { options: { base: 'http://domain.com', title: 'foo title' }, manifest: exampleManifest }, - manifest - ) - ).toMatchSnapshot(); - }); - - test('meta scripts', () => { - expect( - renderTemplate( - { - options: { base: 'http://domain.com' }, - metaScripts: [``], - manifest: exampleManifest, - }, - manifest - ) - ).toMatchSnapshot(); - }); - - test('custom body after', () => { - expect( - renderTemplate( - { - options: { base: 'http://domain.com' }, - scriptsBodyAfter: [`