Skip to content

Commit

Permalink
TRA-4100 audit (#34)
Browse files Browse the repository at this point in the history
* WIP

* migrate to webpack 5 (part of auditing)
  • Loading branch information
RamiBerm authored Jan 13, 2022
1 parent 6035457 commit a343634
Show file tree
Hide file tree
Showing 8 changed files with 18,156 additions and 8,251 deletions.
7,982 changes: 7,982 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

10,146 changes: 10,146 additions & 0 deletions src/webview/package-lock.json

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions src/webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,16 @@
"@types/react-dom": "^17.0.11",
"@types/vscode": "^1.62.0",
"@types/vscode-webview": "^1.57.0",
"css-loader": "^4.3.0",
"extract-loader": "^5.1.0",
"file-loader": "^6.2.0",
"css-loader": "^6.5.1",
"html-inline-css-webpack-plugin": "^1.11.1",
"html-webpack-inline-source-plugin": "0.0.10",
"html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^1.6.2",
"style-loader": "^0.23.1",
"ts-loader": "^8.3.0",
"webpack": "^4.37.0",
"html-webpack-plugin": "^5.5.0",
"mini-css-extract-plugin": "^2.4.6",
"react-dev-utils": "^12.0.0",
"ts-loader": "^9.2.6",
"typescript": "^4.5.4",
"webpack": "^5.66.0",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.4.0"
"webpack-dev-server": "^4.7.3"
},
"dependencies": {
"ace-builds": "^1.4.13",
Expand Down
5 changes: 2 additions & 3 deletions src/webview/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
crossorigin="anonymous"
/>
<link rel="stylesheet" href="main.css"/>

/>
<!-- <link rel="stylesheet" href="main.css"/> -->
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion src/webview/src/providers/extensionConnectionProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ export const getDebugReply = (apiMessageType: ApiMessageType): Promise < any > =
response = ["rb-reg", "test", "workspace-b", "super-long-name-that-doesnt-end"];
break;
case ApiMessageType.Swagger:
response = {"http://httpbin2.trdemo":{"info":{"title":"http://httpbin.trdemo - rami schema-test all","version":"0.0.3"},"openapi":"3.1.0","paths":{"/":{"get":{"operationId":"e8913aae-0fe7-404e-928a-03bbe1f15f42","parameters":[],"responses":{"200":{"content":{"text/html":{"example":"<!DOCTYPE html>\n<html lang=\"en\">\n\n<head>\n <meta charset=\"UTF-8\">\n <title>httpbin.org</title>\n <link href=\"https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700\"\n rel=\"stylesheet\">\n <link rel=\"stylesheet\" type=\"text/css\" href=\"/flasgger_static/swagger-ui.css\">\n <link rel=\"icon\" type=\"image/png\" href=\"/static/favicon.ico\" sizes=\"64x64 32x32 16x16\" />\n <style>\n html {\n box-sizing: border-box;\n overflow: -moz-scrollbars-vertical;\n overflow-y: scroll;\n }\n\n *,\n *:before,\n *:after {\n box-sizing: inherit;\n }\n\n body {\n margin: 0;\n background: #fafafa;\n }\n </style>\n</head>\n\n<body>\n <a href=\"https://github.com/requests/httpbin\" class=\"github-corner\" aria-label=\"View source on Github\">\n <svg width=\"80\" height=\"80\" viewBox=\"0 0 250 250\" style=\"fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;\"\n aria-hidden=\"true\">\n <path d=\"M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z\"></path>\n <path d=\"M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2\"\n fill=\"currentColor\" style=\"transform-origin: 130px 106px;\" class=\"octo-arm\"></path>\n <path d=\"M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z\"\n fill=\"currentColor\" class=\"octo-body\"></path>\n </svg>\n </a>\n <svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" style=\"position:absolute;width:0;height:0\">\n <defs>\n <symbol viewBox=\"0 0 20 20\" id=\"unlocked\">\n <path d=\"M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z\"></path>\n </symbol>\n\n <symbol viewBox=\"0 0 20 20\" id=\"locked\">\n <path d=\"M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z\"\n />\n </symbol>\n\n <symbol viewBox=\"0 0 20 20\" id=\"close\">\n <path d=\"M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z\"\n />\n </symbol>\n\n <symbol viewBox=\"0 0 20 20\" id=\"large-arrow\">\n <path d=\"M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z\"\n />\n </symbol>\n\n <symbol viewBox=\"0 0 20 20\" id=\"large-arrow-down\">\n <path d=\"M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z\"\n />\n </symbol>\n\n\n <symbol viewBox=\"0 0 24 24\" id=\"jump-to\">\n <path d=\"M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z\" />\n </symbol>\n\n <symbol viewBox=\"0 0 24 24\" id=\"expand\">\n <path d=\"M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z\" />\n </symbol>\n\n </defs>\n </svg>\n\n\n <div id=\"swagger-ui\">\n <div data-reactroot=\"\" class=\"swagger-ui\">\n <div>\n <div class=\"information-container wrapper\">\n <section class=\"block col-12\">\n <div class=\"info\">\n <hgroup class=\"main\">\n <h2 class=\"title\">httpbin.org\n <small>\n <pre class=\"version\">0.9.2</pre>\n </small>\n </h2>\n <pre class=\"base-url\">[ Base URL: httpbin.org/ ]</pre>\n </hgroup>\n <div class=\"description\">\n <div class=\"markdown\">\n <p>A simple HTTP Request &amp; Response Service.\n <br>\n <br>\n <b>Run locally: </b>\n <code>$ docker run -p 80:80 kennethreitz/httpbin</code>\n </p>\n </div>\n </div>\n <div>\n <div>\n <a href=\"https://kennethreitz.org\" target=\"_blank\">the developer - Website</a>\n </div>\n <a href=\"mailto:[email protected]\">Send email to the developer</a>\n </div>\n </div>\n <!-- ADDS THE LOADER SPINNER -->\n <div class=\"loading-container\">\n <div class=\"loading\"></div>\n </div>\n\n </section>\n </div>\n </div>\n </div>\n </div>\n\n\n <div class='swagger-ui'>\n <div class=\"wrapper\">\n <section class=\"clear\">\n <span style=\"float: right;\">\n [Powered by\n <a target=\"_blank\" href=\"https://github.com/rochacbruno/flasgger\">Flasgger</a>]\n <br>\n </span>\n </section>\n </div>\n </div>\n\n\n\n <script src=\"/flasgger_static/swagger-ui-bundle.js\"> </script>\n <script src=\"/flasgger_static/swagger-ui-standalone-preset.js\"> </script>\n <script src='/flasgger_static/lib/jquery.min.js' type='text/javascript'></script>\n <script>\n\n window.onload = function () {\n \n\n fetch(\"/spec.json\")\n .then(function (response) {\n response.json()\n .then(function (json) {\n var current_protocol = window.location.protocol.slice(0, -1);\n if (json.schemes[0] != current_protocol) {\n // Switches scheme to the current in use\n var other_protocol = json.schemes[0];\n json.schemes[0] = current_protocol;\n json.schemes[1] = other_protocol;\n\n }\n json.host = window.location.host; // sets the current host\n\n const ui = SwaggerUIBundle({\n spec: json,\n validatorUrl: null,\n dom_id: '#swagger-ui',\n deepLinking: true,\n jsonEditor: true,\n docExpansion: \"none\",\n apisSorter: \"alpha\",\n //operationsSorter: \"alpha\",\n presets: [\n SwaggerUIBundle.presets.apis,\n // yay ES6 modules \u2198\n Array.isArray(SwaggerUIStandalonePreset) ? SwaggerUIStandalonePreset : SwaggerUIStandalonePreset.default\n ],\n plugins: [\n SwaggerUIBundle.plugins.DownloadUrl\n ],\n \n // layout: \"StandaloneLayout\" // uncomment to enable the green top header\n })\n\n window.ui = ui\n\n // uncomment to rename the top brand if layout is enabled\n // $(\".topbar-wrapper .link span\").replaceWith(\"<span>httpbin</span>\");\n })\n })\n}\n </script> <div class='swagger-ui'>\n <div class=\"wrapper\">\n <section class=\"block col-12 block-desktop col-12-desktop\">\n <div>\n\n <h2>Other Utilities</h2>\n\n <ul>\n <li>\n <a href=\"/forms/post\">HTML form</a> that posts to /post /forms/post</li>\n </ul>\n\n <br />\n <br />\n </div>\n </section>\n </div>\n</div>\n</body>\n\n</html>"}},"description":"OK"}},"summary":"Seen 1 requests","x-endpoints":["e8913aae-0fe7-404e-928a-03bbe1f15f42"],"x-kpis":{"avg_rt":1.0,"entries":1,"err_rate":0.0,"failures":0,"first_seen":1638437398.302,"hits_rate":35.71413731150109,"last_active":1638437398.3300002,"last_seen":1638437398.3300002,"sessions":1,"sum_duration":0.0280001163482666,"sum_rt":0.0280001163482666}},"parameters":[]},"/anything":{"parameters":[],"post":{"operationId":"b6c1f298-489d-4283-a8bc-c313bb0c5cb9","parameters":[{"examples":["b2ecf022-b748-4889-a7c0-fa926e0e2576","71f4a365-8a51-45e8-8540-a8118a31ef13","ee94009c-16ce-4e83-92d0-ef25a5d33597","1755af01-6085-42b9-a65e-f410876299e9","58ffbfc2-2d96-4ccd-ae74-0311a7a5c73f"],"in":"header","name":"postman-token","required":false,"schema":{"type":"string"}}],"requestBody":{"content":{"application/json":{"schema":{"properties":{"password":{"type":"string"},"token":{"type":"string"},"username":{"type":"string"}},"type":"object"}}},"required":true},"responses":{"200":{"content":{"application/json":{"example":{"args":{},"data":"{\n \"token\": \"0e2bd42e-eacb-4051-8dfb-ed8fa2d15b9a\"\n}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Cache-Control":"no-cache","Connection":"keep-alive","Content-Length":"55","Content-Type":"application/json","Host":"34.140.55.41","Postman-Token":"c2083746-6970-4229-99de-892a891a604f","User-Agent":"PostmanRuntime/7.28.4"},"json":{"token":"0e2bd42e-eacb-4051-8dfb-ed8fa2d15b9a"},"method":"POST","origin":"10.132.0.14","url":"http://34.140.55.41/anything"},"schema":{"properties":{"args":{"type":"object"},"data":{"type":"string"},"files":{"type":"object"},"form":{"type":"object"},"headers":{"properties":{"Accept":{"type":"string"},"Accept-Encoding":{"type":"string"},"Cache-Control":{"type":"string"},"Connection":{"type":"string"},"Content-Length":{"type":"string"},"Content-Type":{"type":"string"},"Host":{"type":"string"},"Postman-Token":{"type":"string"},"User-Agent":{"type":"string"}},"required":["Accept","Accept-Encoding","Cache-Control","Connection","Content-Length","Content-Type","Host","Postman-Token","User-Agent"],"type":"object"},"json":{"properties":{"password":{"type":"string"},"token":{"type":"string"},"username":{"type":"string"}},"type":"object"},"method":{"type":"string"},"origin":{"type":"string"},"url":{"type":"string"}},"required":["args","data","files","form","headers","json","method","origin","url"],"type":"object"}}},"description":"OK"}},"summary":"Seen 56 requests","x-endpoints":["b6c1f298-489d-4283-a8bc-c313bb0c5cb9"],"x-kpis":{"avg_rt":0.002233250678250769,"entries":56,"err_rate":0.0,"failures":0,"first_seen":1638431928.639,"hits_rate":0.7719665842863462,"last_active":1638432001.95,"last_seen":1638432001.95,"sessions":2,"sum_duration":72.54200005531311,"sum_rt":0.1620044708251953}}}},"tags":[],"x-ignoredTarget":false}};
response = null;
}
return Promise.resolve(response);
}
Expand Down
25 changes: 17 additions & 8 deletions src/webview/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const HtmlWebPackPlugin = require("html-webpack-plugin");
const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin');
const HTMLInlineCSSWebpackPlugin = require("html-inline-css-webpack-plugin").default;
const path = require("path");
const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');

const htmlWebpackPlugin = new HtmlWebPackPlugin({
template: "./src/index.html",
filename: "./index.html",
inlineSource: '.(js|css)$'
inlineSource: '.(js|css)$',
inject: 'body',
});
const htmlWebpackInlineSourcePlugin = new HtmlWebpackInlineSourcePlugin();

const contextDir = path.join(__dirname, "src");

module.exports = {
entry: ['./src/index.tsx', './src/main.css'],
Expand All @@ -33,8 +30,20 @@ module.exports = {
MiniCssExtractPlugin.loader,
"css-loader"
]
},
}
],
},
plugins: [htmlWebpackPlugin, htmlWebpackInlineSourcePlugin, new MiniCssExtractPlugin({filename: "[name].css",chunkFilename: "[id].css"}), HTMLInlineCSSWebpackPlugin]
output: {
filename: 'bundle.js',
publicPath: '',
},
plugins: [
new MiniCssExtractPlugin({
filename: "main.css",
chunkFilename: "mainc.css"
}),
htmlWebpackPlugin,
new HTMLInlineCSSWebpackPlugin(),
new InlineChunkHtmlPlugin(HtmlWebPackPlugin, [/bundle/]),
]
};
Loading

0 comments on commit a343634

Please sign in to comment.