Merge branch 'minor' into major

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Something not working as it should
 title: ''
 labels: "type: bug \U0001F41B"
-assignees: michaelbromley
+assignees: ''
 
 ---
 

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+# Description
+
+Please include a summary of the changes and the related issue.
+
+# Breaking changes
+
+Does this PR include any breaking changes we should be aware of?
+
+# Screenshots
+
+You can add screenshots here if applicable.
+
+# Checklist
+
+📌 Always:
+- [ ] I have set a clear title
+- [ ] My PR is small and contains a single feature
+- [ ] I have [checked my own PR](## "Fix typo's and remove unused or commented out code")
+
+👍 Most of the time:
+- [ ] I have added or updated test cases
+- [ ] I have updated the README if needed

.github/workflows/build_and_test.yml

@@ -14,7 +14,7 @@ on:
       - minor
 env:
   CI: true
-  node: 18.x
+  node: 20.x
 jobs:
   build:
     name: build
@@ -25,18 +25,12 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: ${{ env.node }}
-#    - uses: actions/cache@v3
-#      id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-#      with:
-#        path: '**/node_modules'
-#        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-#        restore-keys: |
-#          ${{ runner.os }}-yarn-
-    - name: Yarn install
-#      if: steps.yarn-cache.outputs.cache-hit != 'true'
-      run: yarn install
+    - name: npm install
+      run: |
+        npm install
+        npm install --os=linux --cpu=x64 sharp
     - name: Build
-      run: yarn build
+      run: npm run build
   unit-tests:
     name: unit tests
     runs-on: ubuntu-latest
@@ -46,20 +40,14 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node }}
-#      - uses: actions/cache@v3
-#        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-#        with:
-#          path: '**/node_modules'
-#          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-yarn-
-      - name: Yarn install
-#        if: steps.yarn-cache.outputs.cache-hit != 'true'
-        run: yarn install --prefer-offline
+      - name: npm install
+        run: |
+          npm install
+          npm install --os=linux --cpu=x64 sharp
       - name: Build
-        run: yarn lerna run ci
+        run: lerna run ci
       - name: Unit tests
-        run: yarn test
+        run: npm run test
   e2e-tests:
     name: e2e tests
     runs-on: ubuntu-latest
@@ -113,18 +101,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node }}
-#      - uses: actions/cache@v3
-#        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-#        with:
-#          path: '**/node_modules'
-#          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-yarn-
-      - name: Yarn install
-#        if: steps.yarn-cache.outputs.cache-hit != 'true'
-        run: yarn install --prefer-offline
+      - name: npm install
+        run: |
+          npm install
+          npm install --os=linux --cpu=x64 sharp
       - name: Build
-        run: yarn lerna run ci
+        run: lerna run ci
       - name: df
         run: |
           df -h
@@ -136,4 +118,4 @@ jobs:
           E2E_POSTGRES_PORT: ${{ job.services.postgres.ports['5432'] }}
           E2E_ELASTIC_PORT: ${{ job.services.elastic.ports['9200'] }}
           DB: ${{ matrix.db }}
-        run: yarn e2e
+        run: npm run e2e

.github/workflows/publish_and_install.yml

@@ -19,12 +19,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        # Temporarily disabled Node v18 because of this issue:
-        # https://github.com/vendure-ecommerce/vendure/actions/runs/5200017548/jobs/9378196658#step:4:48
-        # which is related to our Verdaccio setup. Will need some investigation.
-        #node-version: [16.x, 18.x]
-        node-version: [16.x]
+        os: [ubuntu-latest, windows-latest]
+        node-version: [18.x, 20.x]
       fail-fast: false
     steps:
     - uses: actions/checkout@v3
@@ -35,42 +31,38 @@ jobs:
     - name: Install Verdaccio
       run: |
         npm install -g verdaccio
-        npm install -g verdaccio-auth-memory
-        npm install -g verdaccio-memory
-        npm install -g [email protected]
+        npm install -g wait-on
         tmp_registry_log=`mktemp`
         mkdir -p $HOME/.config/verdaccio
         cp -v ./.github/workflows/verdaccio/config.yaml $HOME/.config/verdaccio/config.yaml
-        nohup verdaccio --config $HOME/.config/verdaccio/config.yaml &>$tmp_registry_log &
-        npm-auth-to-token -u test -p test -e [email protected] -r http://0.0.0.0:4873
+        nohup verdaccio --config $HOME/.config/verdaccio/config.yaml &
+        wait-on http://localhost:4873
+        TOKEN_RES=$(curl -XPUT \
+          -H "Content-type: application/json" \
+          -d '{ "name": "test", "password": "test" }' \
+          'http://localhost:4873/-/user/org.couchdb.user:test')
+        TOKEN=$(echo "$TOKEN_RES" | jq -r '.token')
+        npm set //localhost:4873/:_authToken $TOKEN
     - name: Windows dependencies
       if: matrix.os == 'windows-latest'
       run: npm install -g @angular/cli
-#    - name: Get yarn cache directory path
-#      id: yarn-cache-dir-path
-#      run: echo "::set-output name=dir::$(yarn cache dir)"
-#    - uses: actions/cache@v3
-#      id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-#      with:
-#        path: '**/node_modules'
-#        key: ${{ runner.os }}-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
-#        restore-keys: |
-#          ${{ runner.os }}-${{ matrix.node-version }}-yarn-
-    - name: Yarn install
-#      if: steps.yarn-cache.outputs.cache-hit != 'true'
+    - name: npm install
       run: |
-        yarn config set unsafe-perm true
-        yarn install --network-timeout 1000000 --prefer-offline
+        npm install
       env:
         CI: true
     - name: Publish to Verdaccio
       run: |
-        yarn lerna publish prepatch --preid ci --no-push --no-git-tag-version --no-commit-hooks --force-publish "*" --yes --dist-tag ci --registry http://0.0.0.0:4873
+        nohup verdaccio --config $HOME/.config/verdaccio/config.yaml &
+        wait-on http://localhost:4873
+        lerna publish prepatch --preid ci --no-push --no-git-tag-version --no-commit-hooks --force-publish "*" --yes --dist-tag ci --registry http://localhost:4873
     - name: Install via @vendure/create
       run: |
         mkdir -p $HOME/install
         cd $HOME/install
-        npm set registry=http://0.0.0.0:4873
+        nohup verdaccio --config $HOME/.config/verdaccio/config.yaml &
+        wait-on http://localhost:4873
+        npm set registry=http://localhost:4873
         npm dist-tag ls @vendure/create
         npx @vendure/create@ci test-app --ci --use-npm --log-level info
     - name: Server smoke tests

.github/workflows/verdaccio/config.yaml

@@ -10,7 +10,7 @@ plugins: ./plugins
 max_body_size: 1000mb
 web:
   # WebUI is enabled as default, if you want disable it, just uncomment this line
-  enable: false
+  enable: true
   title: Verdaccio
 
 auth:

.gitignore

@@ -18,7 +18,6 @@ docs/static/intro.js*
 docs/static/intro.css*
 docs/public
 docs/data/build.json
-.vscode/
 yarn-error.log
 e2e-common/ports.json
 
@@ -388,3 +387,4 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
+__admin-ui/

.lintstagedrc.json

@@ -1,16 +1,16 @@
 {
   "admin-ui/**/*.ts": [
-    "yarn lint",
-    "yarn format",
+    "npm run lint",
+    "npm run format",
     "git add"
   ],
   "admin-ui/**/*.html": [
-    "yarn format",
+    "npm run format",
     "git add"
   ],
-  "packages/**/*.ts": [
-    "yarn lint",
-    "yarn format",
+  "packages/!(dev-server)/**/*.ts": [
+    "npm run lint",
+    "npm run format",
     "git add"
   ]
 }

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "vivaxy.vscode-conventional-commits"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,22 @@
+{
+    "conventionalCommits.scopes": [
+        "admin-ui",
+        "admin-ui-plugin",
+        "asset-server-plugin",
+        "cli",
+        "common",
+        "core",
+        "create",
+        "dev-server",
+        "elasticsearch-plugin",
+        "email-plugin",
+        "harden-plugin",
+        "job-queue-plugin",
+        "sentry-plugin",
+        "stellate-plugin",
+        "testing",
+        "ui-devkit",
+        "repo"
+    ],
+    "conventionalCommits.gitmoji": false
+}