From 7ab8b321c7ccfb54f4b541adccfb1449de412619 Mon Sep 17 00:00:00 2001 From: Ritesh Kumar Date: Tue, 27 Mar 2018 02:00:07 +0530 Subject: [PATCH] Fixes (#71) * carbon-ads * fixes #68 * fixes * fixes #70 --- next.config.js | 34 +++++++++++++++++----------------- package.json | 3 +-- pages/index.js | 22 ++++++++++++++-------- pages/json-to-flow-types.js | 3 ++- pages/json-to-ts-interface.js | 6 +++++- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/next.config.js b/next.config.js index 82ad062..c10550c 100644 --- a/next.config.js +++ b/next.config.js @@ -28,23 +28,23 @@ module.exports = { "babel-core": "babel-standalone" }; - if (!dev) { - config.plugins.push( - new SWPrecacheWebpackPlugin({ - minify: true, - staticFileGlobsIgnorePatterns: [/\.next\//], - staticFileGlobs: [ - "static/**/*" // Precache all static files by default - ], - runtimeCaching: [ - { - handler: "networkFirst", - urlPattern: /^https?.*/ - } - ] - }) - ); - } + // if (!dev) { + // config.plugins.push( + // new SWPrecacheWebpackPlugin({ + // minify: true, + // staticFileGlobsIgnorePatterns: [/\.next\//], + // staticFileGlobs: [ + // "static/**/*" // Precache all static files by default + // ], + // runtimeCaching: [ + // { + // handler: "networkFirst", + // urlPattern: /^https?.*/ + // } + // ] + // }) + // ); + // } if (ANALYZE) { config.plugins.push( diff --git a/package.json b/package.json index 0b759f3..c193143 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "main": "index.js", "scripts": { "start": "next start", - "build": - "rm -rf out && next build && next export -o transform && cp ./.next/service-worker.js ./transform/service-worker.js", + "build": "rm -rf out && next build && next export -o transform", "dev": "next dev", "addContributor": "all-contributors add", "analyze": "cross-env ANALYZE=1 next build", diff --git a/pages/index.js b/pages/index.js index 12c2cbe..0cfca6c 100644 --- a/pages/index.js +++ b/pages/index.js @@ -26,14 +26,20 @@ export default class Main extends PureComponent { componentDidMount() { if ("serviceWorker" in navigator) { - navigator.serviceWorker - .register("/service-worker.js") - .then(registration => { - console.log("service worker registration successful"); - }) - .catch(err => { - console.warn("service worker registration failed"); - }); + // navigator.serviceWorker + // .register("/service-worker.js") + // .then(registration => { + // console.log("service worker registration successful"); + // }) + // .catch(err => { + // console.warn("service worker registration failed"); + // }); + + navigator.serviceWorker.getRegistrations().then(function(registrations) { + for (let registration of registrations) { + registration.unregister(); + } + }); } } diff --git a/pages/json-to-flow-types.js b/pages/json-to-flow-types.js index d102b62..99e04e7 100644 --- a/pages/json-to-flow-types.js +++ b/pages/json-to-flow-types.js @@ -2,10 +2,11 @@ import React, { PureComponent } from "react"; import Layout from "../components/Layout"; import ConversionPanel from "../components/ConversionPanel"; import defaultText from "../utils/dummy-json"; +import { json2ts } from "json-ts"; import PoweredBy from "../components/PoweredBy"; export default class Json2Ts extends PureComponent { - getTransformedValue = code => window.json2ts(code, { flow: true }); + getTransformedValue = code => json2ts(code, { flow: true, prefix: "" }); render() { return ( diff --git a/pages/json-to-ts-interface.js b/pages/json-to-ts-interface.js index 438383c..79e2799 100644 --- a/pages/json-to-ts-interface.js +++ b/pages/json-to-ts-interface.js @@ -2,10 +2,14 @@ import React, { PureComponent } from "react"; import Layout from "../components/Layout"; import ConversionPanel from "../components/ConversionPanel"; import defaultText from "../utils/dummy-json"; +import { json2ts } from "json-ts"; import PoweredBy from "../components/PoweredBy"; export default class Json2Ts extends PureComponent { - getTransformedValue = code => window.json2ts(code); + getTransformedValue = code => + json2ts(code, { + prefix: "" + }); render() { return (