Merge branch 'main' into alias-output-doc

.github/workflows/preview.yml

@@ -10,6 +10,10 @@ on:
   issue_comment:
     types: [created]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   preview:
     if: |

.github/workflows/publish.yaml

@@ -4,6 +4,11 @@ on:
   pull_request:
     branches:
       - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   publish:
     strategy:

.github/workflows/test.yml

@@ -5,6 +5,11 @@ on:
   pull_request:
     branches:
       - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   consistency:
     runs-on: ubuntu-latest

articleRedirects.js

@@ -414,35 +414,35 @@ exports.articleRedirects = [
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-chains',
-    to: '/learn/smart-contracts/core_concepts/isc-architecture',
+    to: '/learn/smart-contracts/isc-architecture',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-community-tutorials',
-    to: '/smart-contracts/overview',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-consensus',
-    to: '/learn/smart-contracts/core_concepts/smart-contracts',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-dapps',
-    to: '/smart-contracts/overview',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-introduction',
-    to: '/smart-contracts/overview',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-tangle',
-    to: '/smart-contracts/overview',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-validators',
-    to: '/smart-contracts/overview',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/smart-contracts/smart-contracts-VM-and-languages',
-    to: '/smart-contracts/overview',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/learn/tangle',
@@ -460,25 +460,37 @@ exports.articleRedirects = [
     from: '/shimmer/search',
     to: '/search',
   },
+  {
+    from: '/smart-contracts',
+    to: '/learn/smart-contracts/introduction',
+  },
+  {
+    from: '/shimmer/smart-contracts',
+    to: '/learn/smart-contracts/introduction',
+  },
+  {
+    from: '/next/smart-contracts',
+    to: '/learn/smart-contracts/introduction',
+  },
   {
     from: '/shimmer/smart-contracts/configuration',
     to: '/wasp/configuration',
   },
   {
     from: '/shimmer/smart-contracts/contribute',
-    to: '/smart-contracts/contribute',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/smart-contracts/guide/example_projects/fair_roulette',
-    to: '/smart-contracts/guide/wasm_vm/example_projects/fair_roulette',
+    to: '/wasp-wasm/tutorials/fair_roulette',
   },
   {
     from: '/shimmer/smart-contracts/metrics',
     to: '/wasp/metrics',
   },
   {
-    from: '/shimmer/smart-contracts/overview',
-    to: '/smart-contracts/overview',
+    from: '/shimmer/learn/smart-contracts/introduction',
+    to: '/learn/smart-contracts/introduction',
   },
   {
     from: '/shimmer/use/wallets/firefly/faq-and-troubleshooting',

banners/identity-stronghold-migration.mdx

@@ -1 +1 @@
-With Identity Rust 0.6.3 and Wasm 0.6.1 a breaking change was introduced that requires a migration of existing Stardust Snapshot files. You can find migration instructions [here](/identity.rs/tutorials/migrate-stronghold/).
+With Identity Rust 0.6.3 and Wasm 0.6.1 a breaking change was introduced that requires a migration of existing Stronghold Snapshot files. You can find migration instructions [here](/identity.rs/tutorials/migrate-stronghold/).

banners/iota-streams-deprecated.mdx

@@ -0,0 +1 @@
+Streams and this documentation are no longer actively maintained.

cli/package.json

@@ -15,7 +15,7 @@
     "clean": "rm -rf ./dist",
     "build": "npx tsc --build && tsc-alias && yarn copy",
     "copy:internal": "copyfiles \"src/**/!(*.ts|*.js|*.tsx)\" dist/cli",
-    "copy:external": "copyfiles \"../src/common/css/**/!(*.ts|*.js|*.tsx)\" \"../src/common/icons/**/!(*.ts|*.js|*.tsx)\" \"../src/next/css/**/!(*.ts|*.js|*.tsx)\" dist/cli",
+    "copy:external": "copyfiles \"../src/common/css/**/!(*.ts|*.js|*.tsx)\" \"../src/icons/**/(*.ts|*.js|*.tsx)\" \"../static/icons/**/!(*.ts|*.js|*.tsx)\" \"../src/next/css/**/!(*.ts|*.js|*.tsx)\" dist/cli",
     "copy": "yarn copy:internal && yarn copy:external",
     "watch": "nodemon --watch src --ext '*' --exec yarn build",
     "prepack": "yarn build"

cli/src/commands/check.tsx

@@ -1,10 +1,11 @@
 import { Command, Option } from 'clipanion';
 import path from 'path';
 
-const internalConfig = require.resolve('../docusaurus/config/build.js');
+const buildConfig = require.resolve('../docusaurus/config/build.js');
 const SUPPORTED_PLUGINS = [
   '@docusaurus/plugin-content-docs',
   '@docusaurus/plugin-content-pages',
+  '@iota-wiki/plugin-docs',
 ];
 
 export class Check extends Command {
@@ -25,7 +26,8 @@ export class Check extends Command {
     const directory = this.directory || process.cwd();
 
     process.env['IOTA_WIKI_DIRECTORY'] = directory;
-    const { plugins = [] } = require(internalConfig);
+    const config = require(buildConfig);
+    const { plugins = [] } = await config();
 
     const pluginPaths = plugins.reduce((pluginPaths, plugin) => {
       if (Array.isArray(plugin)) {

cli/src/docusaurus/config/common.js

@@ -63,10 +63,7 @@ module.exports = async () => {
 
   // Get relative configuration path and import it.
   const configPath = path
-    .relative(
-      __dirname,
-      path.join(process.cwd(), IOTA_WIKI_DIRECTORY, 'docusaurus.config.js'),
-    )
+    .relative(__dirname, path.join(IOTA_WIKI_DIRECTORY, 'docusaurus.config.js'))
     .split(path.sep)
     .join(path.posix.sep);
   const config = require(configPath);

common/community/contribute-to-wiki/how_tos/add_a_quiz.mdx

@@ -5,7 +5,7 @@ description: How to add a Quiz for the IOTA Wiki.
 image: /img/iota-wiki.png
 ---
 
-import Quiz from '@site/src/common/components/Quiz';
+import Quiz from '@site/src/components/Quiz';
 import questions from './example-questions.json';
 
 # How To Add A Quiz
@@ -21,7 +21,7 @@ You can simply add a Quiz to every page you like in the Wiki!
 Just add the following lines on top of the page.
 
 ```javascript
-import Quiz from '@site/src/common/components/Quiz';
+import Quiz from '@site/src/components/Quiz';
 import questions from './example-questions.json';
 ```
 

common/community/funding/community-treasury.md

@@ -7,7 +7,7 @@ description: A Decentralized Community governed Fund to support projects in the
 
 ![Community Treasury](https://github.com/iota-community/Community-Governance/raw/main/assets/iota_community_treasury.png)
 
-The IOTA community treasury will be set up as soon as the IOTA network gets upgraded with the Stardust ledger, and smart contracts can be executed on the Mainnet. The IOTA Community will be able to use a budget of 50 TI to support the ecosystem via grants. Until this is possible, the community is also deciding on setting up a [Community Treasury Grant Committee](https://govern.iota.org/t/sgp-0005-shimmer-community-treasury-grant-committee/1576) for the Shimmer network.
+The IOTA community treasury will be set up as soon as the IOTA network gets upgraded with the Stardust ledger, and smart contracts can be executed on the Mainnet. The IOTA Community will be able to use a budget of 50,000,000 IOTA to support the ecosystem via grants. Until this is possible, the community is also deciding on setting up a [Community Treasury Grant Committee](https://govern.iota.org/t/sgp-0005-shimmer-community-treasury-grant-committee/1576) for the Shimmer network.
 
 ## Initial Voting
 

common/community/funding/edf-funding.md

@@ -1,12 +1,12 @@
 ---
 title: EDF - Funding
 description: IOTA's Ecosystem Development Fund is setup to support community based Projects that aim to build an support IOTA. Apply for your Project.
-image: /img/participate/banner/banner_edf.png
+image: /img/banner/banner_edf.png
 ---
 
 # Ecosystem Development Fund
 
-![Ecosystem Development Fund](/img/participate/banner/banner_edf.png)
+![Ecosystem Development Fund](/img/banner/banner_edf.png)
 
 The EDF is a fund to help get new innovation and ideas from the community off the ground. If you have an idea that is
 beneficial for the IOTA ecosystem, you can apply for funding.

common/community/the-community/x-teams.md

@@ -4,12 +4,12 @@ description: The IOTA X - Teams is where community engagement and the IOTA
   Foundation meet each other to work together on solutions. A lot of real
   progress in the Protocol evolves out of this amazing collaborations. Take part
   in it!
-image: /img/participate/banner/banner_x_team.png
+image: /img/banner/banner_x_team.png
 ---
 
 # The IOTA X-Teams
 
-![IOTA X-Teams](/img/participate/banner/banner_x_team.png)
+![IOTA X-Teams](/img/banner/banner_x_team.png)
 
 Sustainable open source software is always, first and foremost, a community effort. By its very nature, the health of every project in this domain has as much to do with those consuming the code as it has to do with those maintaining it.
 

common/docusaurus.config.js

@@ -40,13 +40,6 @@ module.exports = {
   },
   plugins: [
     'plugin-image-zoom',
-    [
-      '@docusaurus/plugin-content-pages',
-      {
-        id: 'common',
-        path: path.resolve(__dirname, '../src/common/pages'),
-      },
-    ],
     [
       '@docusaurus/plugin-content-docs',
       {