Check for both package & package.json in ModuleScopePlugin

facebook · Jun 22, 2017 · 18ee2fc · 18ee2fc
1 parent d382a94
commit 18ee2fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/react-dev-utils/ModuleScopePlugin.js b/packages/react-dev-utils/ModuleScopePlugin.js
@@ -48,7 +48,10 @@ class ModuleScopePlugin {
         request.descriptionFileRoot,
         requestFullPath
       );
-      if (requestRelativeToRoot === 'package.json') {
+      if (
+        requestRelativeToRoot === 'package.json' ||
+        requestRelativeToRoot === 'package'
+      ) {
         return callback();
       }
       // Find path from src to the requested file

diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
+import { version, name } from '../../package.json';
 
 class App extends Component {
   render() {
@@ -9,6 +10,7 @@ class App extends Component {
         <div className="App-header">
           <img src={logo} className="App-logo" alt="logo" />
           <h2>Welcome to React</h2>
+          <p>{`${name} v${version}`}</p>
         </div>
         <p className="App-intro">
           To get started, edit <code>src/App.js</code> and save to reload.