Add support for Yarn 3

.yarnrc.yml

@@ -19,4 +19,4 @@ packageExtensions:
     peerDependencies:
       react-dom: ^16.14.0
 
-yarnPath: .yarn/releases/yarn-2.4.2.cjs
+yarnPath: .yarn/releases/yarn-3.0.0.cjs

packages/api-page-builder/src/graphql/crud/system.crud.ts

@@ -150,12 +150,14 @@ export default {
                             {
                                 title: "Welcome to Webiny",
                                 path: "/welcome-to-webiny",
-                                content: welcomeToWebinyPageContent
+                                content: welcomeToWebinyPageContent,
+                                settings: {}
                             },
                             {
                                 title: "Not Found",
                                 path: "/not-found",
                                 content: notFoundPageData,
+                                settings: {},
                                 // Do not show the page in page lists, only direct get is possible.
                                 visibility: {
                                     get: { latest: true, published: true },

packages/cli/bin.js

@@ -6,17 +6,15 @@ const execa = require("execa");
 const semver = require("semver");
 const { verifyConfig } = require("./config");
 const currentNodeVersion = process.versions.node;
-const majorVersion = parseInt(currentNodeVersion.split(".")[0]);
-const minorVersion = parseInt(currentNodeVersion.split(".")[1]);
 
 (async () => {
-    if (majorVersion < 10 || (majorVersion === 10 && minorVersion < 14)) {
+    if (!semver.satisfies(currentNodeVersion, "^12 || ^14")) {
         console.error(
             chalk.red(
                 "You are running Node " +
                     currentNodeVersion +
                     ".\n" +
-                    "Webiny requires Node 10.14 or higher. \n" +
+                    "Webiny requires Node ^12 or ^14. \n" +
                     "Please update your version of Node."
             )
         );
@@ -25,13 +23,13 @@ const minorVersion = parseInt(currentNodeVersion.split(".")[1]);
 
     try {
         const { stdout } = await execa("yarn", ["--version"]);
-        if (!semver.satisfies(stdout, "^2")) {
-            console.error(chalk.red(`"@webiny/cli" requires yarn@^2 to be installed!`));
+        if (!semver.satisfies(stdout, "^2||^3")) {
+            console.error(chalk.red(`"@webiny/cli" requires yarn ^2 or ^3 to be installed!`));
             process.exit(1);
         }
     } catch (err) {
-        console.error(chalk.red(`"@webiny/cli" requires yarn@^2 to be installed!`));
-        console.log(`Please visit https://yarnpkg.com/ to install "yarn@^2".`);
+        console.error(chalk.red(`"@webiny/cli" requires yarn ^2 or ^3 to be installed!`));
+        console.log(`Please visit https://yarnpkg.com/ to install "yarn".`);
         process.exit(1);
     }
 

packages/create-webiny-project/bin.js

@@ -13,7 +13,7 @@ const verifyConfig = require("./utils/verifyConfig");
             chalk.red(
                 [
                     `You are running Node.js ${nodeVersion}, but Webiny requires version 12 or 14.`,
-                    `Please switch to one of the two and try again.`,
+                    `Please switch to one of the two versions and try again.`,
                     "For more information, please visit https://docs.webiny.com/docs/tutorials/install-webiny#prerequisites."
                 ].join(" ")
             )
@@ -23,10 +23,13 @@ const verifyConfig = require("./utils/verifyConfig");
 
     try {
         const yarnVersion = await getYarnVersion();
-        if (!semver.satisfies(yarnVersion, "^1.22.0 || ^2")) {
+        if (!semver.satisfies(yarnVersion, "^1.22.0 || ^2 || ^3")) {
             console.error(
                 chalk.red(
-                    `Webiny requires yarn@^1.22.0. Please run "npm install -g yarn" to update.`
+                    [
+                        `Webiny requires yarn@^1.22.0 or higher.`,
+                        `Please visit https://yarnpkg.com/ to install ${chalk.green("yarn")}.`
+                    ].join("\n")
                 )
             );
             process.exit(1);

packages/create-webiny-project/utils/createProject.js

@@ -108,13 +108,10 @@ module.exports = async function createProject({
                 }
             },
             {
-                // Setup yarn@2
-                title: "Setup yarn@^2",
+                // Setup yarn
+                title: "Setup yarn",
                 task: async () => {
-                    // We are forcing the 2.x version.
-                    // https://github.com/yarnpkg/berry/issues/3180#issuecomment-887332050
                     await execa("yarn", ["set", "version", "berry"], { cwd: projectRoot });
-                    await execa("yarn", ["set", "version", "2.x"], { cwd: projectRoot });
 
                     const yamlPath = path.join(projectRoot, ".yarnrc.yml");
                     const parsedYaml = yaml.load(fs.readFileSync(yamlPath, "utf-8"));