react-workspaces · xcv58 · Jan 4, 2021 · Jan 4, 2021 · Jan 5, 2021 · Jan 11, 2021
diff --git a/README.md b/README.md
@@ -2,12 +2,12 @@
 
 ![Join us on Slack](https://img.shields.io/badge/Slack-React--Workpaces-EBB424?style=for-the-badge&logo=slack)
 
-> 💥 Now supports TypeScript and React-App-Rewired!  
+> 💥 Now supports TypeScript and React-App-Rewired!
 
 ## Features
 
 - ⚛️ Create React App 3 (React 16.8)
-- 📖 Storybook 5
+- 📖 Storybook 6
 - 🐈 Yarn Workspaces
 - 🐉 Lerna 3
 - ✨ Host Multiple CRA Apps, Component Libraries & Storybooks in one Monorepo

diff --git a/packages/apps/app-ant-design/package.json b/packages/apps/app-ant-design/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@project/components": "1.0.0",
-    "@react-workspaces/react-scripts": "^3.3.0-alpha-08",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },

diff --git a/packages/apps/app-multi-comps/package.json b/packages/apps/app-multi-comps/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@project/components": "1.0.0",
-    "@react-workspaces/react-scripts": "^3.3.0-alpha-08",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },

diff --git a/packages/apps/app-single-comp/package.json b/packages/apps/app-single-comp/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@project/components": "1.0.0",
-    "@react-workspaces/react-scripts": "^3.3.0-alpha-08",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },

diff --git a/packages/apps/app-typescript/package.json b/packages/apps/app-typescript/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@project/components-typescript": "1.0.0",
-    "@react-workspaces/react-scripts": "^3.3.0-alpha-08",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.4.0",
     "@testing-library/user-event": "^8.0.3",

diff --git a/packages/apps/app-typescript/src/assets/index.d.ts b/packages/apps/app-typescript/src/assets/index.d.ts
@@ -0,0 +1,6 @@
+declare module '*.svg' {
+  import React = require('react')
+  export const ReactComponent: React.SFC<React.SVGProps<SVGSVGElement>>
+  const src: string
+  export default src
+}
diff --git a/packages/apps/app-typescript/src/serviceWorker.ts b/packages/apps/app-typescript/src/serviceWorker.ts
@@ -12,51 +12,17 @@
 
 const isLocalhost = Boolean(
   window.location.hostname === 'localhost' ||
-    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
-    // 127.0.0.0/8 are considered localhost for IPv4.
-    window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/),
+  // [::1] is the IPv6 localhost address.
+  window.location.hostname === '[::1]' ||
+  // 127.0.0.0/8 are considered localhost for IPv4.
+  window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/),
 );
 
 type Config = {
   onSuccess?: (registration: ServiceWorkerRegistration) => void;
   onUpdate?: (registration: ServiceWorkerRegistration) => void;
 };
 
-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);
-    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/facebook/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. Let's check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl, config);
-
-        // 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://bit.ly/CRA-PWA',
-          );
-        });
-      } else {
-        // Is not localhost. Just register service worker
-        registerValidSW(swUrl, config);
-      }
-    });
-  }
-}
-
 function registerValidSW(swUrl: string, config?: Config) {
   navigator.serviceWorker
     .register(swUrl)
@@ -74,7 +40,7 @@ function registerValidSW(swUrl: string, config?: Config) {
               // content until all client tabs are closed.
               console.log(
                 'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.',
+                'tabs for this page are closed. See https://bit.ly/CRA-PWA.',
               );
 
               // Execute callback
@@ -126,6 +92,40 @@ function checkValidServiceWorker(swUrl: string, config?: 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);
+    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/facebook/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. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // 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://bit.ly/CRA-PWA',
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
 export function unregister() {
   if ('serviceWorker' in navigator) {
     navigator.serviceWorker.ready.then(registration => {

diff --git a/packages/components-typescript/package.json b/packages/components-typescript/package.json
@@ -3,13 +3,14 @@
   "version": "1.0.0",
   "main": "src/index.tsx",
   "main:src": "src/index.tsx",
+  "private": true,
   "scripts": {
     "test": "react-scripts test",
     "lint": "eslint ./src/**/*.tsx --max-warnings=0 --format=codeframe"
   },
   "dependencies": {
-    "@react-workspaces/react-scripts": "3.3.0-alpha-08",
-    "@storybook/react": "^5.2.8",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
+    "@storybook/react": "^6.1.11",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.4.0",
     "@testing-library/user-event": "^8.0.3",
@@ -21,7 +22,6 @@
     "@typescript-eslint/parser": "^2.15.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-scripts": "3.3.0",
     "typescript": "~3.7.4"
   },
   "eslintConfig": {

diff --git a/packages/components-typescript/src/CompOne/CompOne.stories.tsx b/packages/components-typescript/src/CompOne/CompOne.stories.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
 
 import CompOne from '.';
 
-storiesOf('CompOne', module).add('Default', () => <CompOne />);
+export default {
+  title: 'CompOne',
+};
+
+export const Default = () => <CompOne />;
diff --git a/packages/components-typescript/src/CompTwo/CompTwo.stories.tsx b/packages/components-typescript/src/CompTwo/CompTwo.stories.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
 
 import CompTwo from '.';
 
-storiesOf('CompTwo', module).add('Default', () => <CompTwo />);
+export default {
+  title: 'CompTwo',
+};
+
+export const Default = () => <CompTwo />;
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -9,8 +9,7 @@
     "lint": "eslint ./src/**/*.js --max-warnings=0 --format=codeframe"
   },
   "dependencies": {
-    "@react-workspaces/react-scripts": "3.3.0-alpha-08",
-    "@storybook/react": "^5.2.8",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },

diff --git a/packages/components/src/CompOne/CompOne.stories.js b/packages/components/src/CompOne/CompOne.stories.js
@@ -1,6 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
 
 import CompOne from '.';
 
-storiesOf('CompOne', module).add('Default', () => <CompOne />);
+export default {
+  title: 'CompOne',
+};
+
+export const Default = () => <CompOne />;
diff --git a/packages/components/src/CompTwo/CompTwo.stories.js b/packages/components/src/CompTwo/CompTwo.stories.js
@@ -1,6 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
 
 import CompTwo from '.';
 
-storiesOf('CompTwo', module).add('Default', () => <CompTwo />);
+export default {
+  title: 'CompTwo',
+};
+
+export const Default = () => <CompTwo />;
diff --git a/packages/storybook-typescript/.storybook/.babelrc b/packages/storybook-typescript/.storybook/.babelrc
diff --git a/packages/storybook-typescript/.storybook/addons.js b/packages/storybook-typescript/.storybook/addons.js
diff --git a/packages/storybook-typescript/.storybook/config.js b/packages/storybook-typescript/.storybook/config.js
diff --git a/packages/storybook-typescript/.storybook/main.js b/packages/storybook-typescript/.storybook/main.js
@@ -0,0 +1,10 @@
+module.exports = {
+  "stories": [
+    "../../components-typescript/src/**/*.stories.mdx",
+    "../../components-typescript/src/**/*.stories.@(js|jsx|ts|tsx)",
+  ],
+  "addons": [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials"
+  ]
+}
diff --git a/packages/storybook-typescript/.storybook/preset.js b/packages/storybook-typescript/.storybook/preset.js
diff --git a/packages/storybook-typescript/.storybook/preview.js b/packages/storybook-typescript/.storybook/preview.js
@@ -0,0 +1,3 @@
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+}
diff --git a/packages/storybook-typescript/package.json b/packages/storybook-typescript/package.json
@@ -1,28 +1,22 @@
 {
   "name": "@project/storybook-typescript",
   "version": "1.0.0",
-  "private": true,
   "scripts": {
     "storybook": "start-storybook -p 9009",
     "build-storybook": "build-storybook"
   },
   "dependencies": {
     "@project/components-typescript": "1.0.0",
-    "@react-workspaces/react-scripts": "3.3.0-alpha-08",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.7",
-    "@storybook/addon-actions": "^5.2.8",
-    "@storybook/addon-docs": "^5.2.8",
-    "@storybook/addon-info": "^5.2.8",
-    "@storybook/addon-links": "^5.2.8",
-    "@storybook/addons": "^5.2.8",
-    "@storybook/preset-create-react-app": "^1.5.0",
-    "@storybook/react": "^5.2.8",
-    "@storybook/theming": "^5.2.8",
-    "babel-loader": "^8.0.6",
-    "cross-env": "6.0.3"
+    "@storybook/addon-actions": "^6.1.11",
+    "@storybook/addon-docs": "^6.1.11",
+    "@storybook/addon-links": "^6.1.11",
+    "@storybook/addons": "^6.1.11",
+    "@storybook/theming": "^6.1.11",
+    "babel-loader": "^8.2.2"
   }
 }
diff --git a/packages/storybook-typescript/tsconfig.json b/packages/storybook-typescript/tsconfig.json
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -9,17 +9,17 @@
   "dependencies": {
     "@project/components": "1.0.0",
     "@babel/core": "^7.7.7",
-    "@react-workspaces/react-scripts": "3.3.0-alpha-08",
+    "@react-workspaces/react-scripts": "3.4.0-alpha-01",
     "babel-loader": "^8.0.6",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "cross-env": "6.0.3"
   },
   "devDependencies": {
-    "@storybook/react": "^5.2.8",
-    "@storybook/addon-actions": "^5.2.8",
-    "@storybook/addon-links": "^5.2.8",
-    "@storybook/addons": "^5.2.8",
-    "@storybook/theming": "^5.2.8"
+    "@storybook/react": "^6.1.11",
+    "@storybook/addon-actions": "^6.1.11",
+    "@storybook/addon-links": "^6.1.11",
+    "@storybook/addons": "^6.1.11",
+    "@storybook/theming": "^6.1.11"
   }
 }