feat(gatsby-cli): remove feature flag for new interactive `gatsby new…

…` experience (#28125)
gatsbyjs · Nov 26, 2020 · 911d5e3 · 911d5e3
1 parent c993d52
commit 911d5e3
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 29 deletions.
diff --git a/docs/docs/gatsby-cli.md b/docs/docs/gatsby-cli.md
@@ -27,11 +27,60 @@ You can also use the `package.json` script variant of these commands, typically
 
 ### `new`
 
+#### Usage
+
+```shell
+gatsby new
+```
+
+The CLI will run an interactive shell asking for these options before creating a Gatsby site for you:
+
+```shell
+gatsby new
+
+What would you like to name the folder where your site will be created?
+my-gatsby-site
+
+Will you be using a CMS? (single choice)
+  No (or I'll add it later)
+  –
+  WordPress
+  Contentful
+  Sanity
+  DatoCMS
+  Shopify
+
+Would you like to install a styling system? (single choice)
+  No (or I'll add it later)
+  –
+  CSS Modules/PostCSS
+  styled-components
+  Emotion
+  Sass
+  Theme UI
+
+Would you like to install additional features with other plugins? (multiple choice)
+  ◯ Add the Google Analytics tracking script
+  ◯ Add responsive images
+  ◯ Add page meta tags with React Helmet
+  ◯ Add an automatic sitemap
+  ◯ Enable offline functionality
+  ◯ Generate a manifest file
+  ◯ Add Markdown support (without MDX)
+  ◯ Add Markdown and MDX support
+```
+
+#### Creating a site from a starter
+
+To create a site from a starter instead, run the command while immediately specifying your site name and starter URL:
+
 ```shell
 gatsby new [<site-name> [<starter-url>]]
 ```
 
-#### Arguments
+Note that this will not prompt you to create a custom setup, but only clone the starter from the URL you specified.
+
+##### Arguments
 
 | Argument    | Description                                                                                                                                                                                              |
 | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -40,7 +89,7 @@ gatsby new [<site-name> [<starter-url>]]
 
 > Note: The `site-name` should only consist of letters and numbers. If you specify a `.`, `./` or a `<space>` in the name, `gatsby new` will throw an error.
 
-#### Examples
+##### Examples
 
 - Create a Gatsby site named `my-awesome-site` using the default starter:
 
@@ -54,20 +103,6 @@ gatsby new my-awesome-site
 gatsby new my-awesome-blog-site https://github.com/gatsbyjs/gatsby-starter-blog
 ```
 
-- If you leave out both of the arguments, the CLI will run an interactive shell asking for these inputs:
-
-```shell
-gatsby new
-? What is your project called? › my-gatsby-project
-? What starter would you like to use? › - Use arrow-keys. Return to submit.
-❯  gatsby-starter-default
-   gatsby-starter-hello-world
-   gatsby-starter-blog
-   (Use a different starter)
-```
-
-_Note: you can try out the experimental interactive experience from the `create-gatsby` package with the `GATSBY_EXPERIMENTAL_GATSBY_NEW_FLOW=true` flag, which will prompt you with questions about the kind of site you're building, and install the plugins you'll need automatically._
-
 See the [Gatsby starters docs](/docs/gatsby-starters/) for more details.
 
 ### `develop`

diff --git a/integration-tests/gatsby-cli/__tests__/new.js b/integration-tests/gatsby-cli/__tests__/new.js
@@ -79,14 +79,7 @@ describe(`gatsby new`, () => {
     expect(code).toBe(1)
   })
 
-  it(`runs the prompted starter selection process when no arguments are passed`, () => {
-    const [_, logs] = GatsbyCLI.from(cwd).invoke([`new`])
-
-    logs.should.contain(`What is your project called?`)
-  })
-
-  it(`runs create-gatsby when no arguments are provided to gatsby new with the GATSBY_EXPERIMENTAL_GATSBY_NEW_FLOW flag set`, () => {
-    process.env.GATSBY_EXPERIMENTAL_GATSBY_NEW_FLOW = true // when this flag is removed we can remove this line
+  it(`runs create-gatsby when no arguments are provided to gatsby new`, () => {
     const [_, logs] = GatsbyCLI.from(cwd).invoke([`new`])
 
     logs.should.contain(`Welcome to Gatsby!`)

diff --git a/packages/gatsby-cli/src/create-cli.ts b/packages/gatsby-cli/src/create-cli.ts
@@ -504,11 +504,7 @@ export const createCli = (argv: Array<string>): yargs.Arguments => {
         const rootPathStr = rootPath ? String(rootPath) : undefined
 
         // We only run the interactive CLI when there are no arguments passed in
-        if (
-          process.env.GATSBY_EXPERIMENTAL_GATSBY_NEW_FLOW &&
-          !starterStr &&
-          !rootPathStr
-        ) {
+        if (!starterStr && !rootPathStr) {
           await runCreateGatsby()
         } else {
           await initStarter(starterStr, rootPathStr)