From 63fad933e17219c2d368ab1854459d36ccc752b2 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Wed, 22 Sep 2021 22:50:06 +0300 Subject: [PATCH] Back to JS --- .../docusaurus-plugin-ideal-image/.npmignore | 2 ++ .../copyUntypedFiles.js | 20 +++++++++++++++++++ .../package.json | 5 ++--- .../src/index.ts | 2 +- .../src/plugin-ideal-image.d.ts | 18 ----------------- .../theme/{IdealImage.tsx => IdealImage.js} | 3 +-- .../tsconfig.json | 3 +-- 7 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 packages/docusaurus-plugin-ideal-image/.npmignore create mode 100644 packages/docusaurus-plugin-ideal-image/copyUntypedFiles.js delete mode 100644 packages/docusaurus-plugin-ideal-image/src/plugin-ideal-image.d.ts rename packages/docusaurus-plugin-ideal-image/src/theme/{IdealImage.tsx => IdealImage.js} (90%) diff --git a/packages/docusaurus-plugin-ideal-image/.npmignore b/packages/docusaurus-plugin-ideal-image/.npmignore new file mode 100644 index 000000000000..4978437c5d30 --- /dev/null +++ b/packages/docusaurus-plugin-ideal-image/.npmignore @@ -0,0 +1,2 @@ +src +copyUntypedFiles.js \ No newline at end of file diff --git a/packages/docusaurus-plugin-ideal-image/copyUntypedFiles.js b/packages/docusaurus-plugin-ideal-image/copyUntypedFiles.js new file mode 100644 index 000000000000..3f814cf0990d --- /dev/null +++ b/packages/docusaurus-plugin-ideal-image/copyUntypedFiles.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +const path = require('path'); +const fs = require('fs-extra'); + +/** + * Copy all untyped and static assets files to lib. + */ +const srcDir = path.resolve(__dirname, 'src'); +const libDir = path.resolve(__dirname, 'lib'); +fs.copySync(srcDir, libDir, { + filter(filepath) { + return !/__tests__/.test(filepath) && !/\.ts$/.test(filepath); + }, +}); diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json index b57c1db965bd..5fb7eb7443fc 100644 --- a/packages/docusaurus-plugin-ideal-image/package.json +++ b/packages/docusaurus-plugin-ideal-image/package.json @@ -3,10 +3,9 @@ "version": "2.0.0-beta.6", "description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder).", "main": "lib/index.js", - "types": "src/plugin-ideal-image.d.ts", "scripts": { - "build": "tsc", - "watch": "tsc --watch" + "build": "tsc && node copyUntypedFiles.js", + "watch": "node copyUntypedFiles.js && tsc --watch" }, "publishConfig": { "access": "public" diff --git a/packages/docusaurus-plugin-ideal-image/src/index.ts b/packages/docusaurus-plugin-ideal-image/src/index.ts index aa63532a3bd8..70d3a6631eff 100644 --- a/packages/docusaurus-plugin-ideal-image/src/index.ts +++ b/packages/docusaurus-plugin-ideal-image/src/index.ts @@ -18,7 +18,7 @@ export default function ( name: 'docusaurus-plugin-ideal-image', getThemePath() { - return path.resolve(__dirname, '../lib/theme'); + return path.resolve(__dirname, './theme'); }, configureWebpack(_config: Configuration, isServer: boolean) { diff --git a/packages/docusaurus-plugin-ideal-image/src/plugin-ideal-image.d.ts b/packages/docusaurus-plugin-ideal-image/src/plugin-ideal-image.d.ts deleted file mode 100644 index a97e4fb25459..000000000000 --- a/packages/docusaurus-plugin-ideal-image/src/plugin-ideal-image.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -declare module '@endiliey/react-ideal-image'; - -declare module '@theme/IdealImage' { - export type Props = { - alt?: string; - className?: string; - img?: any; - }; - - export default function IdealImage(props: Props): JSX.Element; -} diff --git a/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage.tsx b/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage.js similarity index 90% rename from packages/docusaurus-plugin-ideal-image/src/theme/IdealImage.tsx rename to packages/docusaurus-plugin-ideal-image/src/theme/IdealImage.js index a49e7baa07a8..7679f53bb2ed 100644 --- a/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage.tsx +++ b/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage.js @@ -7,9 +7,8 @@ import React from 'react'; import IdealImage from '@endiliey/react-ideal-image'; -import type {Props} from '@theme/IdealImage'; -function Image(props: Props): JSX.Element { +function Image(props) { const {alt, className, img} = props; // In dev env just use regular img with original file diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.json b/packages/docusaurus-plugin-ideal-image/tsconfig.json index 347e18c67e6e..f5902ba1089b 100644 --- a/packages/docusaurus-plugin-ideal-image/tsconfig.json +++ b/packages/docusaurus-plugin-ideal-image/tsconfig.json @@ -4,7 +4,6 @@ "incremental": true, "tsBuildInfoFile": "./lib/.tsbuildinfo", "rootDir": "src", - "outDir": "lib", - "noImplicitAny": false + "outDir": "lib" } }