aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Morton <apmorton@users.noreply.github.com>2022-02-02 04:49:05 +0000
committerGitHub <noreply@github.com>2022-02-02 04:49:05 +0000
commit8756671bb68bdb7912475524352d050f49e2f002 (patch)
treeba0a416504076bfbdfd932687a4d874faa9af7dc
parent426aa40279adc4945c924c3313d85489163bde87 (diff)
parent15681da50f71752c7a44192a9a5f51b41936aecd (diff)
downloadcompiler-explorer-gh-1821.tar.gz
compiler-explorer-gh-1821.zip
Merge 15681da50f71752c7a44192a9a5f51b41936aecd into 426aa40279adc4945c924c3313d85489163bde87gh-1821
-rw-r--r--package-lock.json50
-rw-r--r--package.json2
-rw-r--r--views/_layout.pug6
-rw-r--r--webpack.config.esm.js9
4 files changed, 0 insertions, 67 deletions
diff --git a/package-lock.json b/package-lock.json
index 7d8ac8efa..6569de76d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,6 @@
"compression": "^1.7.1",
"cross-env": "^7.0.3",
"es6-promise": "^4.2.8",
- "es6-shim": "^0.35.6",
"eslint-plugin-header": "^3.1.1",
"esm": "^3.2.25",
"express": "^4.17.2",
@@ -93,7 +92,6 @@
"chai-http": "^4.2.1",
"cheerio": "^1.0.0-rc.10",
"codecov": "^3.8.3",
- "copy-webpack-plugin": "^9.1.0",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.3.1",
"deep-equal-in-any-order": "^1.1.15",
@@ -3673,30 +3671,6 @@
"integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
"dev": true
},
- "node_modules/copy-webpack-plugin": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
- "integrity": "sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==",
- "dev": true,
- "dependencies": {
- "fast-glob": "^3.2.7",
- "glob-parent": "^6.0.1",
- "globby": "^11.0.3",
- "normalize-path": "^3.0.0",
- "schema-utils": "^3.1.1",
- "serialize-javascript": "^6.0.0"
- },
- "engines": {
- "node": ">= 12.13.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/webpack"
- },
- "peerDependencies": {
- "webpack": "^5.1.0"
- }
- },
"node_modules/core-util-is": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -4647,11 +4621,6 @@
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
"integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
},
- "node_modules/es6-shim": {
- "version": "0.35.6",
- "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz",
- "integrity": "sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA=="
- },
"node_modules/escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -17232,20 +17201,6 @@
"integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==",
"dev": true
},
- "copy-webpack-plugin": {
- "version": "9.1.0",
- "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
- "integrity": "sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==",
- "dev": true,
- "requires": {
- "fast-glob": "^3.2.7",
- "glob-parent": "^6.0.1",
- "globby": "^11.0.3",
- "normalize-path": "^3.0.0",
- "schema-utils": "^3.1.1",
- "serialize-javascript": "^6.0.0"
- }
- },
"core-util-is": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -17948,11 +17903,6 @@
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
"integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
},
- "es6-shim": {
- "version": "0.35.6",
- "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz",
- "integrity": "sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA=="
- },
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
diff --git a/package.json b/package.json
index 116ac5def..d4d7efc5b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
"compression": "^1.7.1",
"cross-env": "^7.0.3",
"es6-promise": "^4.2.8",
- "es6-shim": "^0.35.6",
"eslint-plugin-header": "^3.1.1",
"esm": "^3.2.25",
"express": "^4.17.2",
@@ -104,7 +103,6 @@
"chai-http": "^4.2.1",
"cheerio": "^1.0.0-rc.10",
"codecov": "^3.8.3",
- "copy-webpack-plugin": "^9.1.0",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.3.1",
"deep-equal-in-any-order": "^1.1.15",
diff --git a/views/_layout.pug b/views/_layout.pug
index e75113327..18ef51317 100644
--- a/views/_layout.pug
+++ b/views/_layout.pug
@@ -51,12 +51,6 @@ html(lang="en")
block scripts
script(src=`${httpRoot}client-options.js?hash=${optionsHash}`)
div#config(extraOptions=encodeURIComponent(compilerExplorerOptions), httpRoot=httpRoot, staticRoot=staticRoot)
- script
- | if (window.navigator.userAgent.indexOf("Trident/") > 0) {
- | var s = document.createElement("script");
- | s.src = "!{require("es6-shim.min.js")}";
- | document.head.appendChild(s);
- | }
script(src=require("runtime.js"))
script(src=require("vendor.js"))
script(src=require("main.js"))
diff --git a/webpack.config.esm.js b/webpack.config.esm.js
index 62277d6b8..9f6803ffb 100644
--- a/webpack.config.esm.js
+++ b/webpack.config.esm.js
@@ -26,7 +26,6 @@ import path from 'path';
import {fileURLToPath} from 'url';
/* eslint-disable node/no-unpublished-import */
-import CopyWebpackPlugin from 'copy-webpack-plugin';
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import MonacoEditorWebpackPlugin from 'monaco-editor-webpack-plugin';
@@ -51,14 +50,6 @@ const plugins = [
'kotlin', 'scala', 'ruby', 'csharp', 'fsharp', 'vb'],
filename: isDev ? '[name].worker.js' : `[name]${webjackJsHack}worker.[contenthash].js`,
}),
- new CopyWebpackPlugin({
- patterns: [
- {
- from: 'node_modules/es6-shim/es6-shim.min.js',
- to: path.join(staticPath, '[name].[contenthash][ext]'),
- },
- ],
- }),
new ProvidePlugin({
$: 'jquery',
jQuery: 'jquery',