fix: resolve PnP and yarn.lock.cache issues

facebook · Oct 19, 2019 · 6998bc6 · 6998bc6
1 parent 923e2cf
commit 6998bc6
Show file tree

Hide file tree

Showing 8 changed files with 1,540 additions and 1,420 deletions.
diff --git a/packages/cra-template-typescript/package.json b/packages/cra-template-typescript/package.json
@@ -8,6 +8,7 @@
     "typescript"
   ],
   "description": "The base TypeScript template for Create React App.",
+  "main": "template.json",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/create-react-app.git",

diff --git a/packages/cra-template/package.json b/packages/cra-template/package.json
@@ -7,6 +7,7 @@
     "template"
   ],
   "description": "The base template for Create React App.",
+  "main": "template.json",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/create-react-app.git",

diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
@@ -216,7 +216,7 @@ function createApp(
   useTypeScript
 ) {
   const unsupportedNodeVersion = !semver.satisfies(process.version, '>=8.10.0');
-  if (unsupportedNodeVersion && useTypescript) {
+  if (unsupportedNodeVersion && useTypeScript) {
     console.log(
       chalk.red(
         `You are using Node ${process.version} with the TypeScript template. Node 8.10 or higher is required to use TypeScript.\n`
@@ -452,7 +452,7 @@ function run(
 
         // Only support templates when used alongside new react-scripts versions.
         const supportsTemplates = semver.gte(
-          packageVersion,
+          semver.coerce(packageVersion),
           templatesVersionMinimum
         );
         if (supportsTemplates) {

diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-react-app",
-  "version": "3.2.0",
+  "version": "3.3.0-beta",
   "keywords": [
     "react"
   ],

diff --git a/packages/create-react-app/yarn.lock.cached b/packages/create-react-app/yarn.lock.cached
diff --git a/packages/react-scripts/fixtures/kitchensink/package.json b/packages/react-scripts/fixtures/kitchensink/package.json
@@ -1,4 +1,5 @@
 {
-    "name": "kitchensink",
-    "version": "1.0.0"
+  "name": "kitchensink",
+  "main": "template.json",
+  "version": "1.0.0"
 }
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts",
-  "version": "3.2.0",
+  "version": "3.3.0-beta",
   "description": "Configuration and scripts for Create React App.",
   "repository": {
     "type": "git",

diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
@@ -100,7 +100,10 @@ module.exports = function(
     return;
   }
 
-  const templatePath = path.join(appPath, 'node_modules', templateName);
+  const templatePath = path.join(
+    require.resolve(templateName, { paths: [appPath] }),
+    '..'
+  );
 
   // Copy over some of the devDependencies
   appPackage.dependencies = appPackage.dependencies || {};