Bladeren bron

refactor(swagger-client): fix import of helpers (#6190)

Import of helpers from swagger-client worked because of the fact
that commonjs exports are basically an objects that can be destructured.
Whenever swagger-client switches to ES6 imports as primary mechanism
of webpack consuptions imports like that will fail. This change makes
sure that import mechanism is both compatible with ES6 and commonjs
import systems.

Along with that rename default import of swagger-client
to more appropriate SwaggerClient.
bubble
Vladimir Gorej 4 jaren geleden
committed by GitHub
bovenliggende
commit
95c3da19cc
Geen bekende sleutel gevonden voor deze handtekening in de database GPG sleutel-ID: 4AEE18F83AFDEB23
2 gewijzigde bestanden met toevoegingen van 10 en 10 verwijderingen
  1. +2
    -2
      src/core/containers/OperationContainer.jsx
  2. +8
    -8
      src/core/plugins/swagger-js/index.js

+ 2
- 2
src/core/containers/OperationContainer.jsx Bestand weergeven

@@ -1,10 +1,10 @@
import React, { PureComponent } from "react"
import PropTypes from "prop-types"
import ImPropTypes from "react-immutable-proptypes"
import { helpers } from "swagger-client"
import SwaggerClient from "swagger-client"
import { Iterable, fromJS, Map } from "immutable"

const { opId } = helpers
const { opId } = SwaggerClient.helpers

export default class OperationContainer extends PureComponent {
constructor(props, context) {


+ 8
- 8
src/core/plugins/swagger-js/index.js Bestand weergeven

@@ -1,13 +1,13 @@
import Swagger from "swagger-client"
import SwaggerClient from "swagger-client"
import * as configsWrapActions from "./configs-wrap-actions"

export default function({ configs, getConfigs }) {
return {
fn: {
fetch: Swagger.makeHttp(configs.preFetch, configs.postFetch),
buildRequest: Swagger.buildRequest,
execute: Swagger.execute,
resolve: Swagger.resolve,
fetch: SwaggerClient.makeHttp(configs.preFetch, configs.postFetch),
buildRequest: SwaggerClient.buildRequest,
execute: SwaggerClient.execute,
resolve: SwaggerClient.resolve,
resolveSubtree: (obj, path, opts, ...rest) => {
if(opts === undefined) {
const freshConfigs = getConfigs()
@@ -19,10 +19,10 @@ export default function({ configs, getConfigs }) {
}
}

return Swagger.resolveSubtree(obj, path, opts, ...rest)
return SwaggerClient.resolveSubtree(obj, path, opts, ...rest)
},
serializeRes: Swagger.serializeRes,
opId: Swagger.helpers.opId
serializeRes: SwaggerClient.serializeRes,
opId: SwaggerClient.helpers.opId
},
statePlugins: {
configs: {


Laden…
Annuleren
Opslaan