diff --git a/.gitignore b/.gitignore index 79ce88915d7..1489f3d04c3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ npm-debug.log* yarn-debug.log* yarn-error.log* /.changelog +packages/react-scripts-packaged/bin/react-scripts-macos +packages/react-scripts-packaged/bin/react-scripts-linux +packages/react-scripts-packaged/bin/react-scripts-win.exe \ No newline at end of file diff --git a/package.json b/package.json index 9a32bc1350f..5ed2bb1cbe4 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ ], "scripts": { "build": "cd packages/react-scripts && node scripts/build.js", + "package": "cd packages/react-scripts-packaged && npm run package", "changelog": "lerna-changelog", "create-react-app": "node tasks/cra.js", "e2e": "tasks/e2e-simple.sh", @@ -12,6 +13,7 @@ "postinstall": "cd packages/react-error-overlay/ && yarn build:prod", "publish": "tasks/publish.sh", "start": "cd packages/react-scripts && node scripts/start.js", + "start:packaged": "cd packages/react-scripts-packaged/test && npm install && npm start", "screencast": "svg-term --cast hItN7sl5yfCPTHxvFg5glhhfp --out screencast.svg --window", "test": "cd packages/react-scripts && node scripts/test.js --env=jsdom", "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'", @@ -27,12 +29,7 @@ "svg-term-cli": "^2.0.3" }, "lint-staged": { - "*.js": [ - "prettier --trailing-comma es5 --single-quote --write", - "git add" - ], - "yarn.lock": [ - "git rm --cached" - ] + "*.js": ["prettier --trailing-comma es5 --single-quote --write", "git add"], + "yarn.lock": ["git rm --cached"] } } diff --git a/packages/react-scripts-packaged/bin/react-scripts-packaged.js b/packages/react-scripts-packaged/bin/react-scripts-packaged.js new file mode 100644 index 00000000000..89eeda15792 --- /dev/null +++ b/packages/react-scripts-packaged/bin/react-scripts-packaged.js @@ -0,0 +1,15 @@ +#!/usr/bin/env node +/** + * Copyright (c) 2015-present, Facebook, Inc. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +'use strict'; +const path = require('path'); +const args = process.argv; +console.log(args); +const execFileSync = require('child_process').execFileSync; +const result = execFileSync(path.join(__dirname, 'react-scripts-macos'), args); +console.log(result.toString()); diff --git a/packages/react-scripts-packaged/package.json b/packages/react-scripts-packaged/package.json new file mode 100644 index 00000000000..aaa31010a6e --- /dev/null +++ b/packages/react-scripts-packaged/package.json @@ -0,0 +1,26 @@ +{ + "private": true, + "scripts": { + "start": "cd ./test && npm install && npm start", + "package": "pkg ../react-scripts --out-path bin --debug" + }, + "dependencies": { + "pkg": "^4.3.0-beta.5" + }, + "bin": { + "react-scripts-packaged": "./bin/react-scripts-packaged.js" + }, + "name": "react-scripts-packaged", + "description": "Packaged react-scripts", + "version": "0.0.1", + "repository": { + "type": "git", + "url": "git+https://github.com/viankakrisna/create-react-app.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/viankakrisna/create-react-app/issues" + }, + "homepage": "https://github.com/viankakrisna/create-react-app#readme" +} diff --git a/packages/react-scripts-packaged/test/gitignore b/packages/react-scripts-packaged/test/gitignore new file mode 100644 index 00000000000..d30f40ef442 --- /dev/null +++ b/packages/react-scripts-packaged/test/gitignore @@ -0,0 +1,21 @@ +# See https://help.github.com/ignore-files/ for more about ignoring files. + +# dependencies +/node_modules + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/packages/react-scripts-packaged/test/package.json b/packages/react-scripts-packaged/test/package.json new file mode 100644 index 00000000000..9593c701542 --- /dev/null +++ b/packages/react-scripts-packaged/test/package.json @@ -0,0 +1,9 @@ +{ + "scripts": { + "start": "../bin/react-scripts-macos start" + }, + "dependencies": { + "react": "^16.2.0", + "react-dom": "^16.2.0" + } +} diff --git a/packages/react-scripts-packaged/test/public/favicon.ico b/packages/react-scripts-packaged/test/public/favicon.ico new file mode 100644 index 00000000000..a11777cc471 Binary files /dev/null and b/packages/react-scripts-packaged/test/public/favicon.ico differ diff --git a/packages/react-scripts-packaged/test/public/index.html b/packages/react-scripts-packaged/test/public/index.html new file mode 100644 index 00000000000..ed0ebafa1b7 --- /dev/null +++ b/packages/react-scripts-packaged/test/public/index.html @@ -0,0 +1,40 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + <meta name="theme-color" content="#000000"> + <!-- + manifest.json provides metadata used when your web app is added to the + homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ + --> + <link rel="manifest" href="%PUBLIC_URL%/manifest.json"> + <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico"> + <!-- + Notice the use of %PUBLIC_URL% in the tags above. + It will be replaced with the URL of the `public` folder during the build. + Only files inside the `public` folder can be referenced from the HTML. + + Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will + work correctly both with client-side routing and a non-root public URL. + Learn how to configure a non-root public URL by running `npm run build`. + --> + <title>React App</title> + </head> + <body> + <noscript> + You need to enable JavaScript to run this app. + </noscript> + <div id="root"></div> + <!-- + This HTML file is a template. + If you open it directly in the browser, you will see an empty page. + + You can add webfonts, meta tags, or analytics to this file. + The build step will place the bundled scripts into the <body> tag. + + To begin the development, run `npm start` or `yarn start`. + To create a production bundle, use `npm run build` or `yarn build`. + --> + </body> +</html> diff --git a/packages/react-scripts-packaged/test/public/manifest.json b/packages/react-scripts-packaged/test/public/manifest.json new file mode 100644 index 00000000000..ef19ec243e7 --- /dev/null +++ b/packages/react-scripts-packaged/test/public/manifest.json @@ -0,0 +1,15 @@ +{ + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + } + ], + "start_url": "./index.html", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/packages/react-scripts-packaged/test/src/App.css b/packages/react-scripts-packaged/test/src/App.css new file mode 100644 index 00000000000..c5c6e8a68ad --- /dev/null +++ b/packages/react-scripts-packaged/test/src/App.css @@ -0,0 +1,28 @@ +.App { + text-align: center; +} + +.App-logo { + animation: App-logo-spin infinite 20s linear; + height: 80px; +} + +.App-header { + background-color: #222; + height: 150px; + padding: 20px; + color: white; +} + +.App-title { + font-size: 1.5em; +} + +.App-intro { + font-size: large; +} + +@keyframes App-logo-spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } +} diff --git a/packages/react-scripts-packaged/test/src/App.js b/packages/react-scripts-packaged/test/src/App.js new file mode 100644 index 00000000000..203067e4d75 --- /dev/null +++ b/packages/react-scripts-packaged/test/src/App.js @@ -0,0 +1,21 @@ +import React, { Component } from 'react'; +import logo from './logo.svg'; +import './App.css'; + +class App extends Component { + render() { + return ( + <div className="App"> + <header className="App-header"> + <img src={logo} className="App-logo" alt="logo" /> + <h1 className="App-title">Welcome to React</h1> + </header> + <p className="App-intro"> + To get started, edit <code>src/App.js</code> and save to reload. + </p> + </div> + ); + } +} + +export default App; diff --git a/packages/react-scripts-packaged/test/src/App.test.js b/packages/react-scripts-packaged/test/src/App.test.js new file mode 100644 index 00000000000..a754b201bf9 --- /dev/null +++ b/packages/react-scripts-packaged/test/src/App.test.js @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import App from './App'; + +it('renders without crashing', () => { + const div = document.createElement('div'); + ReactDOM.render(<App />, div); + ReactDOM.unmountComponentAtNode(div); +}); diff --git a/packages/react-scripts-packaged/test/src/index.css b/packages/react-scripts-packaged/test/src/index.css new file mode 100644 index 00000000000..b4cc7250b98 --- /dev/null +++ b/packages/react-scripts-packaged/test/src/index.css @@ -0,0 +1,5 @@ +body { + margin: 0; + padding: 0; + font-family: sans-serif; +} diff --git a/packages/react-scripts-packaged/test/src/index.js b/packages/react-scripts-packaged/test/src/index.js new file mode 100644 index 00000000000..fae3e3500cf --- /dev/null +++ b/packages/react-scripts-packaged/test/src/index.js @@ -0,0 +1,8 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import './index.css'; +import App from './App'; +import registerServiceWorker from './registerServiceWorker'; + +ReactDOM.render(<App />, document.getElementById('root')); +registerServiceWorker(); diff --git a/packages/react-scripts-packaged/test/src/logo.svg b/packages/react-scripts-packaged/test/src/logo.svg new file mode 100644 index 00000000000..6b60c1042f5 --- /dev/null +++ b/packages/react-scripts-packaged/test/src/logo.svg @@ -0,0 +1,7 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"> + <g fill="#61DAFB"> + <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/> + <circle cx="420.9" cy="296.5" r="45.7"/> + <path d="M520.5 78.1z"/> + </g> +</svg> diff --git a/packages/react-scripts-packaged/test/src/registerServiceWorker.js b/packages/react-scripts-packaged/test/src/registerServiceWorker.js new file mode 100644 index 00000000000..a3e6c0cfc10 --- /dev/null +++ b/packages/react-scripts-packaged/test/src/registerServiceWorker.js @@ -0,0 +1,117 @@ +// In production, we register a service worker to serve assets from local cache. + +// This lets the app load faster on subsequent visits in production, and gives +// it offline capabilities. However, it also means that developers (and users) +// will only see deployed updates on the "N+1" visit to a page, since previously +// cached resources are updated in the background. + +// To learn more about the benefits of this model, read https://goo.gl/KwvDNy. +// This link also includes instructions on opting out of this behavior. + +const isLocalhost = Boolean( + window.location.hostname === 'localhost' || + // [::1] is the IPv6 localhost address. + window.location.hostname === '[::1]' || + // 127.0.0.1/8 is considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) +); + +export default function register() { + if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL(process.env.PUBLIC_URL, window.location); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374 + return; + } + + window.addEventListener('load', () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + + if (isLocalhost) { + // This is running on localhost. Lets check if a service worker still exists or not. + checkValidServiceWorker(swUrl); + + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + 'This web app is being served cache-first by a service ' + + 'worker. To learn more, visit https://goo.gl/SC7cgQ' + ); + }); + } else { + // Is not local host. Just register service worker + registerValidSW(swUrl); + } + }); + } +} + +function registerValidSW(swUrl) { + navigator.serviceWorker + .register(swUrl) + .then(registration => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + installingWorker.onstatechange = () => { + if (installingWorker.state === 'installed') { + if (navigator.serviceWorker.controller) { + // At this point, the old content will have been purged and + // the fresh content will have been added to the cache. + // It's the perfect time to display a "New content is + // available; please refresh." message in your web app. + console.log('New content is available; please refresh.'); + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log('Content is cached for offline use.'); + } + } + }; + }; + }) + .catch(error => { + console.error('Error during service worker registration:', error); + }); +} + +function checkValidServiceWorker(swUrl) { + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl) + .then(response => { + // Ensure service worker exists, and that we really are getting a JS file. + if ( + response.status === 404 || + response.headers.get('content-type').indexOf('javascript') === -1 + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then(registration => { + registration.unregister().then(() => { + window.location.reload(); + }); + }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl); + } + }) + .catch(() => { + console.log( + 'No internet connection found. App is running in offline mode.' + ); + }); +} + +export function unregister() { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready.then(registration => { + registration.unregister(); + }); + } +} diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index f6bff1deaa6..5ab8f02799d 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -19,7 +19,11 @@ ], "bin": { "react-scripts": "./bin/react-scripts.js" - }, + }, + "pkg": { + "scripts": "*.js", + "assets": "./**/*" + }, "dependencies": { "autoprefixer": "7.1.6", "babel-core": "6.26.0",