housekeeping: cypress standalone failures (via #5446)

* webpack.dist-style.config.js -> webpack-dist-style.config.js

* correctly generate stylesheets in dev server

* attempt to recover from missing StandalonePlugin in Cypress runner
This commit is contained in:
kyle
2019-07-08 01:15:26 -05:00
committed by GitHub
parent 21bb452cb7
commit 9f10ab1d65
6 changed files with 10 additions and 31 deletions

View File

@@ -49,7 +49,7 @@
plugins: [ plugins: [
SwaggerUIBundle.plugins.DownloadUrl SwaggerUIBundle.plugins.DownloadUrl
], ],
layout: "StandaloneLayout", layout: SwaggerUIStandalonePreset ? "StandaloneLayout" : "BaseLayout",
onComplete: () => { onComplete: () => {
if(window.completeCount) { if(window.completeCount) {
window.completeCount++ window.completeCount++

View File

@@ -1,5 +1,5 @@
const path = require("path") const path = require("path")
const styleRules = require("./webpack.dist-style.config.js") const styleRules = require("./webpack-dist-style.config.js")
let rules = [ let rules = [
{ test: /\.(worker\.js)(\?.*)?$/, { test: /\.(worker\.js)(\?.*)?$/,

View File

@@ -1,5 +1,5 @@
const path = require("path") const path = require("path")
const styleRules = require("./webpack.dist-style.config.js") const styleRules = require("./webpack-dist-style.config.js")
let rules = [ let rules = [
{ test: /\.(worker\.js)(\?.*)?$/, { test: /\.(worker\.js)(\?.*)?$/,

View File

@@ -1,7 +1,7 @@
const path = require("path") const path = require("path")
const fs = require("fs") const fs = require("fs")
const nodeModules = fs.readdirSync("node_modules").filter(function(x) { return x !== ".bin" }) const nodeModules = fs.readdirSync("node_modules").filter(function(x) { return x !== ".bin" })
const styleRules = require("./webpack.dist-style.config.js") const styleRules = require("./webpack-dist-style.config.js")
let rules = [ let rules = [
{ test: /\.(worker\.js)(\?.*)?$/, { test: /\.(worker\.js)(\?.*)?$/,

View File

@@ -1,4 +1,4 @@
const path = require("path") const styleRules = require("./webpack-dist-style.config.js")
const rules = [ const rules = [
{ test: /\.(worker\.js)(\?.*)?$/, { test: /\.(worker\.js)(\?.*)?$/,
@@ -12,44 +12,23 @@ const rules = [
{ loader: "babel-loader?retainLines=true" } { loader: "babel-loader?retainLines=true" }
] ]
}, },
{ test: /\.(css)(\?.*)?$/, ...styleRules
use: [
"style-loader",
"css-loader",
"postcss-loader"
]
},
{ test: /\.(scss)(\?.*)?$/,
use: [
"style-loader",
"css-loader",
{
loader: "postcss-loader",
options: { sourceMap: true }
},
{ loader: "sass-loader",
options: {
outputStyle: "expanded",
sourceMap: true,
sourceMapContents: "true"
}
}
]
}
] ]
module.exports = require("./make-webpack-config")(rules, { module.exports = require("./make-webpack-config")(rules, {
_special: { _special: {
separateStylesheets: false, separateStylesheets: true,
sourcemaps: true, sourcemaps: true,
}, },
entry: { entry: {
"swagger-ui": [
"./src/style/main.scss"
],
"swagger-ui-bundle": [ "swagger-ui-bundle": [
"./src/polyfills", "./src/polyfills",
"./src/core/index.js" "./src/core/index.js"
], ],
"swagger-ui-standalone-preset": [ "swagger-ui-standalone-preset": [
"./src/style/main.scss",
"./src/polyfills", "./src/polyfills",
"./src/standalone/index.js", "./src/standalone/index.js",
] ]