fix(swagger-ui-react): fix corrupted exports field from package.json (#9144)

Refs #9143
This commit is contained in:
Vladimír Gorej
2023-08-17 20:23:04 +02:00
committed by GitHub
parent 303737538d
commit 6aa1b445b9
4 changed files with 45 additions and 37 deletions

View File

@@ -1,8 +1,8 @@
import React from "react" import React from "react"
import PropTypes from "prop-types" import PropTypes from "prop-types"
import swaggerUIConstructor from "./swagger-ui-es-bundle-core" import SwaggerUIConstructor from "#swagger-ui"
export default class SwaggerUI extends React.Component { class SwaggerUI extends React.Component {
constructor (props) { constructor (props) {
super(props) super(props)
this.SwaggerUIComponent = null this.SwaggerUIComponent = null
@@ -10,14 +10,14 @@ export default class SwaggerUI extends React.Component {
} }
componentDidMount() { componentDidMount() {
const ui = swaggerUIConstructor({ const ui = SwaggerUIConstructor({
plugins: this.props.plugins, plugins: this.props.plugins,
spec: this.props.spec, spec: this.props.spec,
url: this.props.url, url: this.props.url,
layout: this.props.layout, layout: this.props.layout,
defaultModelsExpandDepth: this.props.defaultModelsExpandDepth, defaultModelsExpandDepth: this.props.defaultModelsExpandDepth,
defaultModelRendering: this.props.defaultModelRendering, defaultModelRendering: this.props.defaultModelRendering,
presets: [swaggerUIConstructor.presets.apis, ...this.props.presets], presets: [SwaggerUIConstructor.presets.apis, ...this.props.presets],
requestInterceptor: this.props.requestInterceptor, requestInterceptor: this.props.requestInterceptor,
responseInterceptor: this.props.responseInterceptor, responseInterceptor: this.props.responseInterceptor,
onComplete: this.onComplete, onComplete: this.onComplete,
@@ -169,5 +169,7 @@ SwaggerUI.defaultProps = {
oauth2RedirectUrl: undefined, oauth2RedirectUrl: undefined,
} }
SwaggerUI.presets = swaggerUIConstructor.presets SwaggerUI.presets = SwaggerUIConstructor.presets
SwaggerUI.plugins = swaggerUIConstructor.plugins SwaggerUI.plugins = SwaggerUIConstructor.plugins
export default SwaggerUI

View File

@@ -1,8 +1,8 @@
var jsonMerger = require("json-merger") const jsonMerger = require("json-merger")
var result = jsonMerger.mergeFiles(["../../../package.json", "template.json"]) const result = jsonMerger.mergeFiles(["../../../package.json", "template.json"])
if(process.env.REACT_FLAVOR_VERSION_IDENTIFIER) { if (process.env.REACT_FLAVOR_VERSION_IDENTIFIER) {
result.version = process.env.REACT_FLAVOR_VERSION_IDENTIFIER result.version = process.env.REACT_FLAVOR_VERSION_IDENTIFIER
} }

View File

@@ -11,6 +11,12 @@ mkdir -p ../dist
# Copy UI's dist files to our directory # Copy UI's dist files to our directory
cp ../../../dist/swagger-ui-es-bundle-core.js ../dist cp ../../../dist/swagger-ui-es-bundle-core.js ../dist
cp ../../../dist/swagger-ui-es-bundle-core.js.map ../dist cp ../../../dist/swagger-ui-es-bundle-core.js.map ../dist
cp ../../../dist/swagger-ui.js ../dist
cp ../../../dist/swagger-ui.js.map ../dist
cp ../../../dist/swagger-ui-bundle.js ../dist
cp ../../../dist/swagger-ui-bundle.js.map ../dist
cp ../../../dist/swagger-ui-es-bundle.js ../dist
cp ../../../dist/swagger-ui-es-bundle.js.map ../dist
cp ../../../dist/swagger-ui.css ../dist cp ../../../dist/swagger-ui.css ../dist
cp ../../../dist/swagger-ui.css.map ../dist cp ../../../dist/swagger-ui.css.map ../dist
@@ -18,8 +24,8 @@ cp ../../../dist/swagger-ui.css.map ../dist
node create-manifest.js > ../dist/package.json node create-manifest.js > ../dist/package.json
# Transpile our top-level component # Transpile our top-level component
../../../node_modules/.bin/cross-env BABEL_ENV=commonjs ../../../node_modules/.bin/babel --config-file ../../../babel.config.js ../index.jsx > ../dist/commonjs.js ../../../node_modules/.bin/cross-env BABEL_ENV=commonjs ../../../node_modules/.bin/babel --config-file ../../../babel.config.js ../index.jsx > ../dist/index.cjs
../../../node_modules/.bin/cross-env BABEL_ENV=es ../../../node_modules/.bin/babel --config-file ../../../babel.config.js ../index.jsx > ../dist/index.js ../../../node_modules/.bin/cross-env BABEL_ENV=es ../../../node_modules/.bin/babel --config-file ../../../babel.config.js ../index.jsx > ../dist/index.mjs
# Copy our README into the dist folder for npm # Copy our README into the dist folder for npm
cp ../README.md ../dist cp ../README.md ../dist

View File

@@ -13,39 +13,39 @@
"devDependencies": { "devDependencies": {
"$remove": true "$remove": true
}, },
"bundlesize": {
"$remove": true
},
"nyc": {
"$remove": true
},
"browserslist": {
"$remove": true
},
"config": { "config": {
"$remove": true "$remove": true
}, },
"name": "swagger-ui-react", "name": "swagger-ui-react",
"main": "commonjs.js", "main": "index.cjs",
"module": "index.js", "module": "index.mjs",
"exports": { "exports": {
"./swagger-ui.css": "./swagger-ui.css", "$replace": {
".": { "./swagger-ui.css": "./swagger-ui.css",
"import": "./index.js", ".": {
"require": "./commonjs.js" "import": "./index.mjs",
"require": "./index.cjs"
}
}
},
"imports": {
"$replace": {
"#swagger-ui": {
"browser": {
"import": "./swagger-ui-es-bundle-core.js",
"require": "./swagger-ui.js"
},
"node": {
"import": "./swagger-ui-bundle.js",
"require": "./swagger-ui-es-bundle.js"
},
"default": {
"import": "./swagger-ui-bundle.js",
"require": "./swagger-ui-es-bundle.js"
}
}
} }
}, },
"repository": "git@github.com:swagger-api/swagger-ui.git",
"contributors": [
"(in alphabetical order)",
"Anna Bodnia <anna.bodnia@gmail.com>",
"Buu Nguyen <buunguyen@gmail.com>",
"Josh Ponelat <jponelat@gmail.com>",
"Kyle Shockey <kyleshockey1@gmail.com>",
"Robert Barnwell <robert@robertismy.name>",
"Sahar Jafari <shr.jafari@gmail.com>"
],
"license": "Apache-2.0",
"peerDependencies": { "peerDependencies": {
"react": ">=17.0.0", "react": ">=17.0.0",
"react-dom": ">=17.0.0" "react-dom": ">=17.0.0"