Updates based on PR feedback

Author: mrmckeb

docusaurus/docs/adding-typescript.md

@@ -0,0 +1,27 @@
+{
+  "name": "cra-template-typescript",
+  "version": "1.0.0",
+  "keywords": [
+    "react",
+    "create-react-app",
+    "template",
+    "typescript"
+  ],
+  "description": "The base TypeScript template for Create React App.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/facebook/create-react-app.git",
+    "directory": "packages/cra-template-typescript"
+  },
+  "license": "MIT",
+  "engines": {
+    "node": ">=8"
+  },
+  "bugs": {
+    "url": "https://github.com/facebook/create-react-app/issues"
+  },
+  "files": [
+    "template",
+    "template.json"
+  ]
+}

docusaurus/docs/getting-started.md

@@ -0,0 +1,26 @@
+{
+  "name": "cra-template",
+  "version": "1.0.0",
+  "keywords": [
+    "react",
+    "create-react-app",
+    "template"
+  ],
+  "description": "The base template for Create React App.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/facebook/create-react-app.git",
+    "directory": "packages/cra-template"
+  },
+  "license": "MIT",
+  "engines": {
+    "node": ">=8"
+  },
+  "bugs": {
+    "url": "https://github.com/facebook/create-react-app/issues"
+  },
+  "files": [
+    "template",
+    "template.json"
+  ]
+}

packages/cra-template-typescript/README.md

@@ -78,7 +78,7 @@ const program = new commander.Command(packageJson.name)
   )
   .option(
     '--template <path-to-template>',
-    'specify or use a non-standard template'
+    'specify a template for the created project'
   )
   .option('--use-npm')
   .option('--use-pnp')
@@ -443,14 +443,18 @@ function run(
       )
       .then(({ isOnline, packageInfo, templateInfo }) => {
         let packageVersion = packageInfo.version;
+        const templatesVersionMinimum = '3.3.0';
 
         // Assume compatibility if we can't test the version.
         if (!semver.valid(packageVersion)) {
-          packageVersion = '3.2.0';
+          packageVersion = templatesVersionMinimum;
         }
 
         // Only support templates when used alongside new react-scripts versions.
-        const supportsTemplates = semver.gte(packageVersion, '3.2.0');
+        const supportsTemplates = semver.gte(
+          packageVersion,
+          templatesVersionMinimum
+        );
         if (supportsTemplates) {
           allDependencies.push(templateToInstall);
         } else if (template) {
@@ -628,7 +632,7 @@ function getInstallPackage(version, originalDirectory) {
 }
 
 function getTemplateInstallPackage(template, originalDirectory) {
-  let templateToInstall = 'create-react-app-template';
+  let templateToInstall = 'cra-template';
   if (template) {
     if (template.match(/^file:/)) {
       templateToInstall = `file:${path.resolve(
@@ -642,7 +646,7 @@ function getTemplateInstallPackage(template, originalDirectory) {
       // for tar.gz or alternative paths
       templateToInstall = template;
     } else if (!template.startsWith(templateToInstall)) {
-      // Add prefix `create-react-app-template` to non-prefixed templates.
+      // Add prefix `cra-template` to non-prefixed templates.
       templateToInstall += `-${template}`;
     }
   }

packages/cra-template-typescript/package.json

@@ -132,7 +132,7 @@ if (
   !reactScriptsLinked &&
   __dirname.indexOf(path.join('packages', 'react-scripts', 'config')) !== -1
 ) {
-  const templatePath = '../create-react-app-template/template';
+  const templatePath = '../cra-template/template';
   module.exports = {
     dotenv: resolveOwn(`${templatePath}/.env`),
     appPath: resolveApp('.'),

packages/create-react-app-template-typescript/template.json renamed to packages/cra-template-typescript/template.json

@@ -151,11 +151,7 @@ module.exports = function(
       const readme = fs.readFileSync(path.join(appPath, 'README.md'), 'utf8');
       fs.writeFileSync(
         path.join(appPath, 'README.md'),
-        readme
-          .replace(/npm start/g, 'yarn start')
-          .replace(/npm test/g, 'yarn test')
-          .replace(/npm run build/g, 'yarn build')
-          .replace(/npm run eject/g, 'yarn eject'),
+        readme.replace(/(npm run |npm )/g, 'yarn '),
         'utf8'
       );
     } catch (err) {

packages/create-react-app-template-typescript/template/README.md renamed to packages/cra-template-typescript/template/README.md

@@ -162,8 +162,6 @@ exists tsconfig.json
 exists src/react-app-env.d.ts
 checkTypeScriptDependencies
 
-node node_modules/react-scripts/scripts/utils/verifyTypeScriptSetup.js
-
 # Check that the TypeScript template passes smoke tests, build, and normal tests
 yarn start --smoke-test
 yarn build