diff --git a/flavors/swagger-ui-react/index.jsx b/flavors/swagger-ui-react/index.jsx index 2f1b4ba5..00b20801 100644 --- a/flavors/swagger-ui-react/index.jsx +++ b/flavors/swagger-ui-react/index.jsx @@ -1,8 +1,8 @@ import React from "react" 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) { super(props) this.SwaggerUIComponent = null @@ -10,14 +10,14 @@ export default class SwaggerUI extends React.Component { } componentDidMount() { - const ui = swaggerUIConstructor({ + const ui = SwaggerUIConstructor({ plugins: this.props.plugins, spec: this.props.spec, url: this.props.url, layout: this.props.layout, defaultModelsExpandDepth: this.props.defaultModelsExpandDepth, defaultModelRendering: this.props.defaultModelRendering, - presets: [swaggerUIConstructor.presets.apis, ...this.props.presets], + presets: [SwaggerUIConstructor.presets.apis, ...this.props.presets], requestInterceptor: this.props.requestInterceptor, responseInterceptor: this.props.responseInterceptor, onComplete: this.onComplete, @@ -169,5 +169,7 @@ SwaggerUI.defaultProps = { oauth2RedirectUrl: undefined, } -SwaggerUI.presets = swaggerUIConstructor.presets -SwaggerUI.plugins = swaggerUIConstructor.plugins +SwaggerUI.presets = SwaggerUIConstructor.presets +SwaggerUI.plugins = SwaggerUIConstructor.plugins + +export default SwaggerUI diff --git a/flavors/swagger-ui-react/release/create-manifest.js b/flavors/swagger-ui-react/release/create-manifest.js index 7ffe441c..498fba07 100644 --- a/flavors/swagger-ui-react/release/create-manifest.js +++ b/flavors/swagger-ui-react/release/create-manifest.js @@ -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 } diff --git a/flavors/swagger-ui-react/release/run.sh b/flavors/swagger-ui-react/release/run.sh index 04fb682d..b45cf9bc 100755 --- a/flavors/swagger-ui-react/release/run.sh +++ b/flavors/swagger-ui-react/release/run.sh @@ -11,6 +11,12 @@ mkdir -p ../dist # 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.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.map ../dist @@ -18,8 +24,8 @@ cp ../../../dist/swagger-ui.css.map ../dist node create-manifest.js > ../dist/package.json # 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=es ../../../node_modules/.bin/babel --config-file ../../../babel.config.js ../index.jsx > ../dist/index.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.mjs # Copy our README into the dist folder for npm cp ../README.md ../dist diff --git a/flavors/swagger-ui-react/release/template.json b/flavors/swagger-ui-react/release/template.json index 733ddc36..19da35c9 100644 --- a/flavors/swagger-ui-react/release/template.json +++ b/flavors/swagger-ui-react/release/template.json @@ -13,39 +13,39 @@ "devDependencies": { "$remove": true }, - "bundlesize": { - "$remove": true - }, - "nyc": { - "$remove": true - }, - "browserslist": { - "$remove": true - }, "config": { "$remove": true }, "name": "swagger-ui-react", - "main": "commonjs.js", - "module": "index.js", + "main": "index.cjs", + "module": "index.mjs", "exports": { - "./swagger-ui.css": "./swagger-ui.css", - ".": { - "import": "./index.js", - "require": "./commonjs.js" + "$replace": { + "./swagger-ui.css": "./swagger-ui.css", + ".": { + "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 ", - "Buu Nguyen ", - "Josh Ponelat ", - "Kyle Shockey ", - "Robert Barnwell ", - "Sahar Jafari " - ], - "license": "Apache-2.0", "peerDependencies": { "react": ">=17.0.0", "react-dom": ">=17.0.0"