Skip to content

Commit

Permalink
deps(workspace): bump @azure/static-web-apps & @storybook/* dev deps …
Browse files Browse the repository at this point in the history
…to address cve's (#279)

* chore(playgrounds): tidy

* deps(workspace): bump @azure/static-web-apps dev dep to address cve in @azure/indentity

* deps(workspace): bump @storybook/*** dev dep to address cve in ip
  • Loading branch information
dominicegginton committed Jul 8, 2024
1 parent 0626234 commit fb95430
Show file tree
Hide file tree
Showing 14 changed files with 1,328 additions and 1,946 deletions.
2 changes: 1 addition & 1 deletion lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ in
# this workspace is a monorepo and all dependencies
# are resolved via the workspace root package.json
src = cleanSource ./.;
npmDepsHash = "sha256-yOPTApvCIRcPaeLWblpUpFBi998jZTBqTJfzBiFe7X4=";
npmDepsHash = "sha256-1fyI0OCCi9tnB0iGTo2xQjHrJigD/+F3O6InsCtmLyE=";

# dont run the build scripts when rebuilding
# npm dependencies as node-keytar will fail
Expand Down
3,134 changes: 1,291 additions & 1,843 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@angular/platform-browser-dynamic": "16.2.0",
"@angular/router": "16.2.0",
"@azure/msal-browser": "2.28.1",
"@azure/static-web-apps-cli": "1.1.7",
"@azure/static-web-apps-cli": "1.1.10",
"@commitlint/cli": "17.6.5",
"@commitlint/config-conventional": "17.6.5",
"@custom-elements-manifest/analyzer": "0.9.4",
Expand All @@ -47,15 +47,15 @@
"@open-wc/eslint-config": "12.0.0",
"@open-wc/testing": "3.2.0",
"@phosphor-icons/core": "2.0.3",
"@storybook/addon-essentials": "8.0.5",
"@storybook/addon-links": "8.0.5",
"@storybook/addon-storysource": "8.0.5",
"@storybook/addon-essentials": "8.1.11",
"@storybook/addon-links": "8.1.11",
"@storybook/addon-storysource": "8.1.11",
"@storybook/addons": "7.6.17",
"@storybook/core-common": "8.0.5",
"@storybook/core-events": "8.0.5",
"@storybook/core-server": "8.0.5",
"@storybook/theming": "8.0.5",
"@storybook/web-components-vite": "8.0.5",
"@storybook/core-common": "8.1.11",
"@storybook/core-events": "8.1.11",
"@storybook/core-server": "8.1.11",
"@storybook/theming": "8.1.11",
"@storybook/web-components-vite": "8.1.11",
"@types/koa": "2.13.9",
"@types/koa-router": "7.4.5",
"@types/koa-static": "4.0.2",
Expand Down
10 changes: 1 addition & 9 deletions playgrounds/angular/src/app.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
<arc-container>
<arc-navbar slot="nav" logo="assets/arc-red.svg">
<span slot="name">ARC Playground</span>
</arc-navbar>

<section id="playground">
<arc-checkbox>hello</arc-checkbox>
</section>
</arc-container>
<arc-container></arc-container>
4 changes: 1 addition & 3 deletions playgrounds/angular/src/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import '@arc-web/components';
import '@arc-web/components/src/components/ph-icon/house/ph-icon-house';
import '@arc-web/components/src/components/ph-icon/gear/ph-icon-gear';
import '@arc-web/components/src/components/container/arc-container';

@Component({
standalone: true,
Expand Down
9 changes: 2 additions & 7 deletions playgrounds/lit/src/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import { html, LitElement } from 'lit';
import { customElement } from 'lit/decorators.js';
import '@arc-web/components/src/components/container/arc-container';

@customElement('app-root')
export class AppComponent extends LitElement {
render() {
return html`<arc-container>
<arc-navbar slot="nav" logo="assets/arc-red.svg">
<span slot="name">ARC Playground</span>
</arc-navbar>
<section id="playground"></section>
</arc-container>`;
return html`<arc-container></arc-container>`;
}
}
1 change: 0 additions & 1 deletion playgrounds/lit/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
import '@arc-web/components/themes/index.css';
import '@arc-web/components';
import './app.component';
8 changes: 1 addition & 7 deletions playgrounds/node-prerender/src/pages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,7 @@ export function* renderIndex() {
<head>
`;

yield* render(html`
<arc-container>
<section id="playground" style="padding: var(--arc-spacing-small)">
<p>Hello Arc!</p>
</section>
</arc-container>
`);
yield* render(html`<arc-container></arc-container>`);

yield `
</body>
Expand Down
7 changes: 1 addition & 6 deletions playgrounds/node-ssr/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,8 @@ app.use(nodeResolve());
app.use(KoaStatic(process.cwd()));

router.get('/', (ctx) => {
const name = ctx.query['name']
? Array.isArray(ctx.query['name'])
? ctx.query['name'][0]
: ctx.query['name']
: 'ARC';
ctx.type = 'text/html';
ctx.body = new RenderResultReadable(renderIndex({ name }));
ctx.body = new RenderResultReadable(renderIndex({}));
});

app.use(router.routes());
Expand Down
31 changes: 13 additions & 18 deletions playgrounds/node-ssr/src/pages/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { render } from '@lit-labs/ssr';
import { html } from 'lit';

import '@arc-web/components';
import '@arc-web/components/src/components/container/arc-container';

export interface IndexProps {
name: string;
}
export interface IndexProps {}

export function* renderIndex({ name }: IndexProps) {
export function* renderIndex({}: IndexProps) {
yield `
<!doctype html>
<html>
Expand All @@ -32,22 +30,19 @@ export function* renderIndex({ name }: IndexProps) {
</script>
`;

yield* render(html`<arc-button color="primary">Hello ${name}</arc-button>`);
yield* render(html`<arc-container></arc-container>`);

yield `
<script type="module">
const hydrateSupport = import('@lit-labs/ssr-client/lit-element-hydrate-support.js');
if (!HTMLTemplateElement.prototype.hasOwnProperty('shadowRoot')) {
const { hydrateShadowRoots } = await import('@webcomponents/template-shadowroot/template-shadowroot.js');
hydrateShadowRoots(document.body);
document.body.removeAttribute('hydration-pending');
}
await hydrateSupport;
<script type="module">
const hydrateSupport = import('@lit-labs/ssr-client/lit-element-hydrate-support.js');
if (!HTMLTemplateElement.prototype.hasOwnProperty('shadowRoot')) {
const { hydrateShadowRoots } = await import('@webcomponents/template-shadowroot/template-shadowroot.js');
hydrateShadowRoots(document.body);
document.body.removeAttribute('hydration-pending');
// IMPORT ROOT COMPONENTS
import('./dist/packages/components/src/index.js');
</script>
await hydrateSupport;
import('./dist/packages/components/src/components/container/arc-container.js');
}
</script>
</body>
</html>
`;
Expand Down
18 changes: 2 additions & 16 deletions playgrounds/react/src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
import React from 'react';
import { ArcContainer, ArcNavbar } from '@arc-web/react';

import { PhIconHouse } from '@arc-web/react/src/components/ph-icon/house/ph-icon-house';
import { ArcContainer } from '@arc-web/react';

export function App() {
return (
<ArcContainer>
<ArcNavbar slot="nav" logo="assets/arc-red.svg">
<span slot="name">ARC Playground</span>
</ArcNavbar>

<section id="playground">

<PhIconHouse />

</section>
</ArcContainer>
);
return <ArcContainer></ArcContainer>;
}
19 changes: 1 addition & 18 deletions playgrounds/vanilla/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
import '@arc-web/components/themes/index.css';
import '@arc-web/components';
import '@arc-web/components/src/components/container/arc-container';

const app = document.querySelector('app-root')!;
const container = document.createElement('arc-container');
const table = document.createElement('arc-table');

Object.assign(table, {
columns: [
'Name',
'LastName',
'Email',
],
data: [
['John', 'Doe', '[email protected]'],
['Jane', 'Doe', '[email protected]'],
['Joe', 'Doakes', '[email protected]'],
['Juan', 'Perez', '[email protected]'],
['Fred', 'Nerk', '[email protected]'],
],
});

container.appendChild(table);
app.appendChild(container);
12 changes: 5 additions & 7 deletions playgrounds/vue/src/app.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<template>
<arc-container>
<arc-navbar slot="nav" logo="assets/arc-red.svg">
<span slot="name">ARC Playground</span>
</arc-navbar>

<section id="playground" />
</arc-container>
<arc-container />
</template>

<script lang="ts">
import '@arc-web/components/src/components/container/arc-container';
</script>
1 change: 0 additions & 1 deletion playgrounds/vue/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import '@arc-web/components/themes/index.css';
import '@arc-web/components';

import { createApp } from 'vue';
import App from './app.vue';
Expand Down

0 comments on commit fb95430

Please sign in to comment.