Skip to content

Commit

Permalink
fix(v2): fix plugin-ideal-image breaking website (exports not defined) (
Browse files Browse the repository at this point in the history
#2074)

* fix(v2): fix plugin-ideal-image breaking website (exports not defined)

* nits

* add npm ignore

* lint
  • Loading branch information
endiliey authored Dec 1, 2019
1 parent 464d8e5 commit 8a94810
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 43 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ packages/docusaurus-plugin-content-docs/lib/
packages/docusaurus-plugin-content-pages/lib/
packages/docusaurus-plugin-sitemap/lib/
packages/docusaurus-plugin-ideal-image/lib/
packages/docusaurus-plugin-ideal-image/copyUntypedFiles.js
2 changes: 2 additions & 0 deletions packages/docusaurus-plugin-ideal-image/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src
copyUntypedFiles.js

This file was deleted.

19 changes: 19 additions & 0 deletions packages/docusaurus-plugin-ideal-image/copyUntypedFiles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* Copyright (c) 2017-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.
*/
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);
},
});
5 changes: 3 additions & 2 deletions packages/docusaurus-plugin-ideal-image/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
"description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder)",
"main": "lib/index.js",
"scripts": {
"tsc": "tsc"
"tsc": "tsc && node copyUntypedFiles.js"
},
"publishConfig": {
"access": "public"
},
"license": "MIT",
"devDependencies": {
"@docusaurus/types": "^2.0.0-alpha.37"
"@docusaurus/types": "^2.0.0-alpha.37",
"fs-extra": "^8.1.0"
},
"dependencies": {
"@endiliey/lqip-loader": "^3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/docusaurus-plugin-ideal-image/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {Configuration} from 'webpack';

import path from 'path';

export = function(_context: LoadContext, options: PluginOptions) {
export default function(_context: LoadContext, options: PluginOptions) {
const isProd = process.env.NODE_ENV === 'production';
return {
name: 'docusaurus-plugin-ideal-image',
Expand Down Expand Up @@ -47,4 +47,4 @@ export = function(_context: LoadContext, options: PluginOptions) {
};
},
};
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from 'react';
import {ImageProps} from '../types';
import IdealImage from '@endiliey/react-ideal-image';

const Image: React.FC<ImageProps> = props => {
function Image(props) {
const {alt, className, img} = props;
return (
<IdealImage
Expand All @@ -20,12 +18,12 @@ const Image: React.FC<ImageProps> = props => {
width={img.src.width || 100}
placeholder={{lqip: img.preSrc}}
src={img.src.src}
srcSet={img.src.images.map((image: any) => ({
srcSet={img.src.images.map(image => ({
...image,
src: image.path,
}))}
/>
);
};
}

export default Image;
4 changes: 0 additions & 4 deletions packages/docusaurus-plugin-ideal-image/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,3 @@ export interface PluginOptions {
*/
quality?: number;
}

export interface ImageProps extends React.ImgHTMLAttributes<{}> {
img: any;
}
2 changes: 0 additions & 2 deletions packages/docusaurus-plugin-ideal-image/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
"tsBuildInfoFile": "./lib/.tsbuildinfo",
"rootDir": "src",
"outDir": "lib",
"jsx": "react",
"typeRoots": ["@types"],
}
}

1 comment on commit 8a94810

@yangshun
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much Endi!

Please sign in to comment.