Merge branch 'main' into features/api-token-v2

.github/workflows/nightly.yml

@@ -0,0 +1,23 @@
+name: 'Nightly Releases'
+
+on:
+  schedule:
+    - cron: '0 0 * * 2-6'
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: 'Publish'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup npmrc
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - run: yarn
+      - run: ./scripts/pre-publish.sh --yes
+        env:
+          VERSION: '0.0.0-${{ github.sha }}'
+          DIST_TAG: experimental

.github/workflows/pages.yml

@@ -0,0 +1,44 @@
+name: Deploy static content to Pages
+
+on:
+  push:
+    branches:
+      - 'main'
+
+  workflow_dispatch:
+
+concurrency:
+  group: 'pages'
+  cancel-in-progress: true
+
+defaults:
+  run:
+    working-directory: docs
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Build website
+        run: yarn build
+
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/build
+          user_name: github-actions[bot]
+          user_email: 41898282+github-actions[bot]@users.noreply.github.com

README.md

@@ -22,6 +22,9 @@
   <a href="https://discord.strapi.io">
     <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />
   </a>
+  <a href="https://github.com/strapi/strapi/actions/workflows/nightly.yml">
+    <img src="https://github.com/strapi/strapi/actions/workflows/nightly.yml/badge.svg" alt="Strapi Nightly Release Build Status" />
+  </a>
 </p>
 
 <br>

docs/docusaurus.config.js

@@ -9,12 +9,13 @@ const config = {
   title: 'Doc',
   tagline: 'Dinosaurs are cool',
   url: 'https://your-docusaurus-test-site.com',
-  baseUrl: '/',
+  baseUrl: '/strapi/',
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'warn',
   favicon: 'img/favicon.ico',
   organizationName: 'strapi',
   projectName: 'strapi',
+  trailingSlash: false,
 
   // Even if you don't use internalization, you can use this field to set useful
   // metadata like html lang. For example, if your site is Chinese, you may want

docs/package.json

@@ -14,8 +14,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/core": "2.0.1",
-    "@docusaurus/preset-classic": "2.0.0-beta.21",
+    "@docusaurus/preset-classic": "2.0.1",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.3.3",

package.json

@@ -91,7 +91,7 @@
     "jest-circus": "26.6.3",
     "jest-cli": "26.6.3",
     "jest-watch-typeahead": "0.6.5",
-    "lerna": "5.1.6",
+    "lerna": "5.4.3",
     "lint-staged": "10.5.4",
     "lodash": "4.17.21",
     "npm-run-all": "4.1.5",

scripts/pre-publish.sh

@@ -5,15 +5,18 @@ cd "$(dirname "$0")/.."
 
 set -e
 
-version=""
+version=$VERSION
-distTag=""
+distTag=$DIST_TAG
 
-echo "Please enter the version you want to publish"
+if [[ -z "$version" ]]; then
-read -r version
+  echo "Please enter the version you want to publish"
+  read -r version
+fi
 
-
+if [[ -z "$distTag" ]]; then
-echo "Please enter the dist-tag you want to publish with"
+  echo "Please enter the dist-tag you want to publish with"
-read -r distTag
+  read -r distTag
+fi
 
 # publish packages
-./node_modules/.bin/lerna publish --no-push --no-git-tag-version --force-publish --exact  "$version" --dist-tag "$distTag"
+./node_modules/.bin/lerna publish --no-push --no-git-tag-version --force-publish --exact "$version" --dist-tag "$distTag" $@