Skip to content

Commit

Permalink
Merge pull request #1770 from OpenC3/package-scripts
Browse files Browse the repository at this point in the history
Update package_audit for vue.global and vuetify-labs
  • Loading branch information
jmthomas authored Dec 17, 2024
2 parents 88594fc + 6a650f2 commit fdba7b2
Show file tree
Hide file tree
Showing 11 changed files with 213 additions and 30,905 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"date-fns": "4.1.0",
"import-map-overrides": "3.1.1",
"systemjs": "6.15.1",
"vuetify": "3.7.1"
"vuetify": "3.7.5"
},
"devDependencies": {
"@babel/plugin-transform-modules-systemjs": "7.25.9",
Expand All @@ -30,5 +30,10 @@
"vite": "5.4.11",
"vue": "3.5.13",
"vue-eslint-parser": "9.4.3"
},
"peerDependencies": {
"single-spa": "6.0.3",
"vue-router": "4.4.4",
"vuex": "4.1.0"
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>OpenC3</title>

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>OpenC3</title>
<link rel="stylesheet" href="/css/roboto.css" />
<link rel="stylesheet" href="/css/materialdesignicons-7.4.47.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.5.min.css" />
<link rel="stylesheet" href="/css/astro-web-components-7.24.0.css" />

<link rel="stylesheet" href="/css/roboto.css" />
<link rel="stylesheet" href="/css/materialdesignicons-7.4.47.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.4.min.css" />
<link rel="stylesheet" href="/css/astro-web-components-7.24.0.css" />
<!-- https://realfavicongenerator.net/ generated favicons -->
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<meta name="theme-color" content="#ffffff" />
<!-- OPENC3EE KEYCLOAK PLACEHOLDER -->

<!-- https://realfavicongenerator.net/ generated favicons -->
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<meta name="theme-color" content="#ffffff" />
<!-- OPENC3EE KEYCLOAK PLACEHOLDER -->

<!--
<!--
This CSP allows any SSL-enabled host and for arbitrary eval(), but you should limit these directives further to increase your app's security.
Learn more about CSP policies at https://content-security-policy.com/#directive
-->
<meta http-equiv="Content-Security-Policy"
content="default-src 'self' blob: data: http: https:; script-src 'unsafe-inline' 'unsafe-eval' http: https: blob:; connect-src blob: http: https: wss: ws:; style-src 'unsafe-inline' http: https:; object-src 'none';" />
<meta
http-equiv="Content-Security-Policy"
content="default-src 'self' blob: data: http: https:; script-src 'unsafe-inline' 'unsafe-eval' http: https: blob:; connect-src blob: http: https: wss: ws:; style-src 'unsafe-inline' http: https:; object-src 'none';"
/>

<meta name="importmap-type" content="systemjs-importmap" />
<!-- If you wish to turn off import-map-overrides for specific environments (prod), uncomment the line below -->
<!-- More info at https://github.com/joeldenning/import-map-overrides/blob/master/docs/configuration.md#domain-list -->
<!-- <meta name="import-map-overrides-domains" content="denylist:prod.example.com" /> -->
<meta name="importmap-type" content="systemjs-importmap" />
<!-- If you wish to turn off import-map-overrides for specific environments (prod), uncomment the line below -->
<!-- More info at https://github.com/joeldenning/import-map-overrides/blob/master/docs/configuration.md#domain-list -->
<!-- <meta name="import-map-overrides-domains" content="denylist:prod.example.com" /> -->

<!-- Shared dependencies go into this import map. Your shared dependencies must be of one of the following formats:
<!-- Shared dependencies go into this import map. Your shared dependencies must be of one of the following formats:
1. System.register (preferred when possible) - https://github.com/systemjs/systemjs/blob/master/docs/system-register.md
2. UMD - https://github.com/umdjs/umd
Expand All @@ -41,60 +42,60 @@
Update by downloading latest release from https://github.com/vuetifyjs/vuetify/releases (for example)
and putting the vuetify-vX.Y.Z.min.js in ../public/js (delete the old one)
-->
<script type="systemjs-importmap">
{
"imports": {
"single-spa": "/js/single-spa-6.0.3.min.js",
"vue": "/js/vue.global.prod-3.5.13.js",
"vuetify": "/js/vuetify-labs-3.7.4.js",
"vue-router": "/js/vue-router-4.4.4.min.js",
"vuex": "/js/vuex-4.1.0.min.js"
<script type="systemjs-importmap">
{
"imports": {
"single-spa": "/js/single-spa-6.0.3.min.js",
"vue": "/js/vue.global.prod-3.5.13.min.js",
"vuetify": "/js/vuetify-labs-3.7.5.min.js",
"vue-router": "/js/vue-router-4.4.4.min.js",
"vuex": "/js/vuex-4.1.0.min.js"
}
}
}
</script>
<script type="systemjs-importmap" src="/openc3-api/map.json"></script>
<!-- See note above for how to update these -->
<link rel="preload" href="/js/single-spa-6.0.3.min.js" as="script" />
<link rel="preload" href="/js/vue.global.prod-3.5.13.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.4.js" as="script" />
<link rel="preload" href="/js/vue-router-4.4.4.min.js" as="script" />
<link rel="preload" href="/js/vuex-4.1.0.min.js" as="script" />
<script src="/js/auth.js"></script>
<script src="/js/import-map-overrides-3.1.1.min.js"></script>
<!-- systemjs homepage: https://github.com/systemjs/systemjs/releases
</script>
<script type="systemjs-importmap" src="/openc3-api/map.json"></script>
<!-- See note above for how to update these -->
<link rel="preload" href="/js/single-spa-6.0.3.min.js" as="script" />
<link rel="preload" href="/js/vue.global.prod-3.5.13.min.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.5.min.js" as="script" />
<link rel="preload" href="/js/vue-router-4.4.4.min.js" as="script" />
<link rel="preload" href="/js/vuex-4.1.0.min.js" as="script" />
<script src="/js/auth.js"></script>
<script src="/js/import-map-overrides-3.1.1.min.js"></script>
<!-- systemjs homepage: https://github.com/systemjs/systemjs/releases
We use system.js instead of s.js which includes global and module-types.
We also explicitly use amd (asynchronous module definition) which uses named-register
Note that named-exports, transform and use-default are deprecated.
-->
<script src="/js/systemjs-6.15.1.min.js"></script>
<!-- All the following belong to the system package -->
<script src="/js/amd.min.js"></script>
<script src="/js/named-register.min.js"></script>
</head>

<body>
<div id="openc3-main"></div>
<import-map-overrides-full show-when-local-storage="devtools"></import-map-overrides-full>
<script>
(function () {
Object.getPrototypeOf(System).firstGlobalProp = true;
Promise.all([
System.import('single-spa'),
System.import('vue'),
]).then(function (modules) {
System.set(System.resolve('vue'), window.Vue)
return Promise.all([
System.import('vue-router'),
System.import('vuex'),
System.import('vuetify')
])
}).then(function (modules) {
System.set(System.resolve('vue-router'), window.VueRouter)
System.set(System.resolve('vuex'), window.Vuex)
System.import('@openc3/tool-base')
})
})()
</script>
</body>
<script src="/js/systemjs-6.15.1.min.js"></script>
<!-- All the following belong to the system package -->
<script src="/js/amd.min.js"></script>
<script src="/js/named-register.min.js"></script>
</head>

<body>
<div id="openc3-main"></div>
<import-map-overrides-full
show-when-local-storage="devtools"
></import-map-overrides-full>
<script>
;(function () {
Object.getPrototypeOf(System).firstGlobalProp = true
Promise.all([System.import('single-spa'), System.import('vue')])
.then(function (modules) {
System.set(System.resolve('vue'), window.Vue)
return Promise.all([
System.import('vue-router'),
System.import('vuex'),
System.import('vuetify'),
])
})
.then(function (modules) {
System.set(System.resolve('vue-router'), window.VueRouter)
System.set(System.resolve('vuex'), window.Vuex)
System.import('@openc3/tool-base')
})
})()
</script>
</body>
</html>
147 changes: 74 additions & 73 deletions openc3-cosmos-init/plugins/packages/openc3-tool-base/public/index.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>OpenC3</title>

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>OpenC3</title>
<link rel="stylesheet" href="/css/roboto.css" />
<link rel="stylesheet" href="/css/materialdesignicons-7.4.47.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.5.min.css" />
<link rel="stylesheet" href="/css/astro-web-components-7.24.0.css" />

<link rel="stylesheet" href="/css/roboto.css" />
<link rel="stylesheet" href="/css/materialdesignicons-7.4.47.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.4.min.css" />
<link rel="stylesheet" href="/css/astro-web-components-7.24.0.css" />
<!-- https://realfavicongenerator.net/ generated favicons -->
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<meta name="theme-color" content="#ffffff" />
<!-- OPENC3EE KEYCLOAK PLACEHOLDER -->

<!-- https://realfavicongenerator.net/ generated favicons -->
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<meta name="theme-color" content="#ffffff" />
<!-- OPENC3EE KEYCLOAK PLACEHOLDER -->

<!--
<!--
This CSP allows any SSL-enabled host and for arbitrary eval(), but you should limit these directives further to increase your app's security.
Learn more about CSP policies at https://content-security-policy.com/#directive
-->
<meta http-equiv="Content-Security-Policy"
content="default-src 'self' blob: data: https: http://localhost:* http://host.docker.internal:* http://*.local:*; script-src 'unsafe-inline' 'unsafe-eval' https: blob: http://localhost:* http://host.docker.internal:* http://*.local:*; connect-src blob: https: wss: http://localhost:* http://host.docker.internal:* http://*.local:* ws://localhost:* ws://host.docker.internal:* ws://*.local:*; style-src 'unsafe-inline' https: http://localhost:* http://host.docker.internal:* http://*.local:*; object-src 'none';" />
<meta
http-equiv="Content-Security-Policy"
content="default-src 'self' blob: data: https: http://localhost:* http://host.docker.internal:* http://*.local:*; script-src 'unsafe-inline' 'unsafe-eval' https: blob: http://localhost:* http://host.docker.internal:* http://*.local:*; connect-src blob: https: wss: http://localhost:* http://host.docker.internal:* http://*.local:* ws://localhost:* ws://host.docker.internal:* ws://*.local:*; style-src 'unsafe-inline' https: http://localhost:* http://host.docker.internal:* http://*.local:*; object-src 'none';"
/>

<meta name="importmap-type" content="systemjs-importmap" />
<!-- If you wish to turn off import-map-overrides for specific environments (prod), uncomment the line below -->
<!-- More info at https://github.com/joeldenning/import-map-overrides/blob/master/docs/configuration.md#domain-list -->
<!-- <meta name="import-map-overrides-domains" content="denylist:prod.example.com" /> -->
<meta name="importmap-type" content="systemjs-importmap" />
<!-- If you wish to turn off import-map-overrides for specific environments (prod), uncomment the line below -->
<!-- More info at https://github.com/joeldenning/import-map-overrides/blob/master/docs/configuration.md#domain-list -->
<!-- <meta name="import-map-overrides-domains" content="denylist:prod.example.com" /> -->

<!-- Shared dependencies go into this import map. Your shared dependencies must be of one of the following formats:
<!-- Shared dependencies go into this import map. Your shared dependencies must be of one of the following formats:
1. System.register (preferred when possible) - https://github.com/systemjs/systemjs/blob/master/docs/system-register.md
2. UMD - https://github.com/umdjs/umd
Expand All @@ -41,60 +42,60 @@
Update by downloading latest release from https://github.com/vuetifyjs/vuetify/releases (for example)
and putting the vuetify-vX.Y.Z.min.js in ../public/js (delete the old one)
-->
<script type="systemjs-importmap">
{
"imports": {
"single-spa": "/js/single-spa-6.0.3.min.js",
"vue": "/js/vue.global.prod-3.5.13.js",
"vuetify": "/js/vuetify-labs-3.7.4.js",
"vue-router": "/js/vue-router-4.4.4.min.js",
"vuex": "/js/vuex-4.1.0.min.js"
<script type="systemjs-importmap">
{
"imports": {
"single-spa": "/js/single-spa-6.0.3.min.js",
"vue": "/js/vue.global.prod-3.5.13.min.js",
"vuetify": "/js/vuetify-labs-3.7.5.min.js",
"vue-router": "/js/vue-router-4.4.4.min.js",
"vuex": "/js/vuex-4.1.0.min.js"
}
}
}
</script>
<script type="systemjs-importmap" src="/openc3-api/map.json"></script>
<!-- See note above for how to update these -->
<link rel="preload" href="/js/single-spa-6.0.3.min.js" as="script" />
<link rel="preload" href="/js/vue.global.prod-3.5.13.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.4.js" as="script" />
<link rel="preload" href="/js/vue-router-4.4.4.min.js" as="script" />
<link rel="preload" href="/js/vuex-4.1.0.min.js" as="script" />
<script src="/js/auth.js"></script>
<script src="/js/import-map-overrides-3.1.1.min.js"></script>
<!-- systemjs homepage: https://github.com/systemjs/systemjs/releases
</script>
<script type="systemjs-importmap" src="/openc3-api/map.json"></script>
<!-- See note above for how to update these -->
<link rel="preload" href="/js/single-spa-6.0.3.min.js" as="script" />
<link rel="preload" href="/js/vue.global.prod-3.5.13.min.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.5.min.js" as="script" />
<link rel="preload" href="/js/vue-router-4.4.4.min.js" as="script" />
<link rel="preload" href="/js/vuex-4.1.0.min.js" as="script" />
<script src="/js/auth.js"></script>
<script src="/js/import-map-overrides-3.1.1.min.js"></script>
<!-- systemjs homepage: https://github.com/systemjs/systemjs/releases
We use system.js instead of s.js which includes global and module-types.
We also explicitly use amd (asynchronous module definition) which uses named-register
Note that named-exports, transform and use-default are deprecated.
-->
<script src="/js/systemjs-6.15.1.min.js"></script>
<!-- All the following belong to the system package -->
<script src="/js/amd.min.js"></script>
<script src="/js/named-register.min.js"></script>
</head>

<body>
<div id="openc3-main"></div>
<import-map-overrides-full show-when-local-storage="devtools"></import-map-overrides-full>
<script>
(function () {
Object.getPrototypeOf(System).firstGlobalProp = true;
Promise.all([
System.import('single-spa'),
System.import('vue'),
]).then(function (modules) {
System.set(System.resolve('vue'), window.Vue)
return Promise.all([
System.import('vue-router'),
System.import('vuex'),
System.import('vuetify')
])
}).then(function (modules) {
System.set(System.resolve('vue-router'), window.VueRouter)
System.set(System.resolve('vuex'), window.Vuex)
System.import('@openc3/tool-base')
})
})()
</script>
</body>
<script src="/js/systemjs-6.15.1.min.js"></script>
<!-- All the following belong to the system package -->
<script src="/js/amd.min.js"></script>
<script src="/js/named-register.min.js"></script>
</head>

<body>
<div id="openc3-main"></div>
<import-map-overrides-full
show-when-local-storage="devtools"
></import-map-overrides-full>
<script>
;(function () {
Object.getPrototypeOf(System).firstGlobalProp = true
Promise.all([System.import('single-spa'), System.import('vue')])
.then(function (modules) {
System.set(System.resolve('vue'), window.Vue)
return Promise.all([
System.import('vue-router'),
System.import('vuex'),
System.import('vuetify'),
])
})
.then(function (modules) {
System.set(System.resolve('vue-router'), window.VueRouter)
System.set(System.resolve('vuex'), window.Vuex)
System.import('@openc3/tool-base')
})
})()
</script>
</body>
</html>

This file was deleted.

Large diffs are not rendered by default.

Loading

0 comments on commit fdba7b2

Please sign in to comment.