Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add TypeScript app creation #5550

Merged
merged 20 commits into from
Oct 24, 2018
Merged

Add TypeScript app creation #5550

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2fa636f
Add TypeScript app creation
Timer Oct 24, 2018
49c1638
Actually specify new extension
Timer Oct 24, 2018
88e7d42
Check for ts and tsx
Timer Oct 24, 2018
9e8e995
Fix types in default service worker file
Timer Oct 24, 2018
9782cb9
Mirror changes in JS version of SW
Timer Oct 24, 2018
16ff63d
Separate templates
Timer Oct 24, 2018
15146b3
Use separate template directory
Timer Oct 24, 2018
8aa369b
Remove unused function
Timer Oct 24, 2018
9497925
Add a tsconfig file to the template
Timer Oct 24, 2018
753a594
Test install of typescript
Timer Oct 24, 2018
9152c6a
Add e2e for TypeScript
Timer Oct 24, 2018
9c8ee63
Check for index.tsx to make sure we're not in the JS template
Timer Oct 24, 2018
d2817b9
Ensure TypeScript doesn't leak into normal installs
Timer Oct 24, 2018
8cc6e26
Ignore some files
Timer Oct 24, 2018
1904888
Print version of CRA
Timer Oct 24, 2018
a8ec5da
Fix script
Timer Oct 24, 2018
aac605b
Add new template
Timer Oct 24, 2018
e068b89
Move test to correct location
Timer Oct 24, 2018
8f454b1
Use `verifyTypeScriptSetup` routine to populate files
Timer Oct 24, 2018
6eda0d5
Ensure tsconfig is created
Timer Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix types in default service worker file
  • Loading branch information
@Timer
Timer committed Oct 24, 2018
commit 9e8e99587c7b93e3098df2db8d1882f160ce92e8
15 changes: 11 additions & 4 deletions packages/react-scripts/template/src/serviceWorker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ type Config = {
export function register(config: Config) {
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.href);
const publicUrl = new URL(
(process as { env: { [key: string]: string } }).env.PUBLIC_URL,
window.location.href
);
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
Expand Down Expand Up @@ -59,12 +62,15 @@ export function register(config: Config) {
}
}

function registerValidSW(swUrl, config) {
function registerValidSW(swUrl: string, config: Config) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
Expand Down Expand Up @@ -100,14 +106,15 @@ function registerValidSW(swUrl, config) {
});
}

function checkValidServiceWorker(swUrl, config) {
function checkValidServiceWorker(swUrl: string, config: Config) {
// 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.
const contentType = response.headers.get('content-type');
if (
response.status === 404 ||
response.headers.get('content-type').indexOf('javascript') === -1
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
Expand Down