Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating dependencies #1046

Merged
merged 13 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: yarn


- name: playwright
run: npx playwright install --with-deps
- name: build
run: make deps build-staging

Expand All @@ -44,7 +46,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: yarn

- name: build
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: yarn

- name: playwright
run: npx playwright install --with-deps
- name: build
run: make deps build-staging

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: yarn
- run: make deps test
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ deps:
yarn --silent --frozen-lockfile

.PHONY: test
test:
test: deps
yarn run test

.PHONY: serve
serve: deps
yarn start
GOOGLE_ANALYTICS_TRACKING_ID=fake_token yarn start

.PHONY: build-staging
build-staging:
yarn build-staging

.PHONY: build-production
build-production:
yarn build
yarn build
7 changes: 2 additions & 5 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = {
title: "kURL.sh",
apiUrl: process.env.API_URL
},
trailingSlash: "ignore",
plugins: [
`gatsby-plugin-react-helmet`,
`gatsby-plugin-netlify`,
Expand Down Expand Up @@ -46,13 +47,9 @@ module.exports = {
{
resolve: `gatsby-plugin-env-variables`,
options: {
whitelist: ["KURL_INSTALLER_URL", "KURL_BUNDLE_URL"]
allowList: ["KURL_INSTALLER_URL", "KURL_BUNDLE_URL"]
},
},
{
resolve: `gatsby-plugin-create-client-paths`,
options: { prefixes: [`/index/*`, `/download/*`, `/docs/*`, `/add-ons/*`] },
},
{
resolve: `gatsby-transformer-remark`,
options: {
Expand Down
25 changes: 2 additions & 23 deletions gatsby-node.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const path = require('path');
const MonacoWebpackPlugin = require(`monaco-editor-webpack-plugin`);

exports.onCreateWebpackConfig = ({ stage, loaders, actions }) => {
if (stage === 'build-html') {
Expand All @@ -11,24 +10,7 @@ exports.onCreateWebpackConfig = ({ stage, loaders, actions }) => {
use: loaders.null(),
},
],
},
plugins: [
new MonacoWebpackPlugin({
languages: [
"yaml",
"json"
],
features: [
"coreCommands",
"folding",
"bracketMatching",
"clipboard",
"find",
"colorDetector",
"codelens"
]
})
]
}
});
}
};
Expand Down Expand Up @@ -71,10 +53,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
const releaseNotesListTemplate = path.resolve(__dirname, 'src/templates/ReleaseNotesListTemplate.js');
const results = await graphql(`
{
allMarkdownRemark(
sort: { order: DESC, fields: [frontmatter___weight] }
limit: 1000
) {
allMarkdownRemark(sort: {frontmatter: {weight: DESC}}, limit: 1000) {
edges {
node {
fields {
Expand Down
97 changes: 25 additions & 72 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,60 +12,63 @@
"author": "Jelena <[email protected]>",
"license": "MIT",
"dependencies": {
"@babel/plugin-proposal-decorators": "^7.6.0",
"@bugsnag/js": "^7.1.0",
"@bugsnag/plugin-react": "^7.16.2",
"@docsearch/react": "3",
"classnames": "^2.2.6",
"core-js": "^2.6.5",
"gatsby": "^2.15.22",
"gatsby-cli": "^2.7.50",
"gatsby-plugin-create-client-paths": "^2.1.11",
"gatsby-plugin-env-variables": "^1.0.1",
"gatsby-plugin-google-analytics": "^2.1.31",
"gatsby-plugin-netlify": "^2.1.17",
"gatsby-plugin-react-helmet": "^3.1.8",
"gatsby-plugin-sass": "^2.1.15",
"gatsby-remark-autolink-headers": "^2.11.0",
"gatsby-remark-mermaid": "^2.1.0",
"gatsby-source-filesystem": "^2.1.26",
"gatsby-transformer-remark": "^2.16.0",
"eslint-config-react-app": "7.0.1",
"gatsby": "5.14.0",
"gatsby-plugin-env-variables": "^2.3.0",
"gatsby-plugin-google-analytics": "^5.14.0",
"gatsby-plugin-netlify": "^5.1.1",
"gatsby-plugin-react-helmet": "6.14.0",
"gatsby-plugin-sass": "6.14.0",
"gatsby-remark-autolink-headers": "6.14.0",
"gatsby-remark-mermaid": "^5.0.0",
"gatsby-source-filesystem": "^5.14.0",
"gatsby-transformer-remark": "6.14.0",
"json2yaml": "^1.1.0",
"lodash": "^4.17.19",
"monaco-editor": "^0.18.1",
"monaco-editor-webpack-plugin": "^1.7.0",
"monaco-editor": "^0.52.0",
"monaco-editor-webpack-plugin": "^7.1.0",
"playwright": "^1.49.0",
"prop-types": "^15.7.2",
"puppeteer": "^7.0.4",
"query-string": "^6.12.1",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react": "18.3.1",
"react-dom": "18.3.1",
Comment on lines +39 to +40
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should these have a ^?
There's a 19.0.0 release as of last week but there might still be eventual bugfix updates in the 18.x series

"react-github-button": "^0.1.11",
"react-helmet": "^5.2.1",
"react-modal": "^3.11.2",
"react-monaco-editor": "^0.31.0",
"react-router-dom": "^5.0.1",
"react-monaco-editor": "^0.56.2",
"react-router-dom": "7.0.2",
"react-select": "^3.0.5",
"react-tooltip": "^3.11.1",
"semver": "^7.5.2"
},
"devDependencies": {
"@babel/core": "^7.19.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.6.0",
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.6.2",
"babel-jest": "^29.1.0",
"babel-loader": "^8.0.6",
"babel-preset-gatsby": "^0.2.36",
"babel-preset-gatsby": "^3.14.0",
"chai": "^4.3.6",
"copy-webpack-plugin": "^5.0.4",
"css-hot-loader": "^1.4.4",
"css-loader": "^3.2.0",
"file-loader": "^4.2.0",
"gatsby-cli": "5.14.0",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"html-webpack-template": "^6.2.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.1.1",
"jest": "^29.7.0",
"mocha": "^10.0.0",
"postcss-loader": "^3.0.0",
"prettier": "^1.18.2",
Expand All @@ -74,57 +77,7 @@
"sass": "^1.49.9",
"sass-loader": "^11.1.1",
"style-loader": "^1.0.0",
"webpack": "^4.39.3",
"webpack-cli": "^3.3.8",
"webpack": "5.97.0",
"webpack-dev-server": "^3.8.0"
},
"resolutions": {
"minimist": "^1.2.8",
"flat": "^5.0.2",
"socket.io-parser": "^3.4.2",
"loader-utils": "^1.4.1",
"parse-url": "^8.1.0",
"shell-quote": "^1.7.3",
"eventsource": "^1.1.1",
"xmlhttprequest-ssl": "^1.6.1",
"body-parser": "^1.20.3",
"glob-parent": "^5.1.2",
"socket.io": "^2.5.1",
"node-forge": "^1.3.0",
"follow-redirects": "^1.14.7",
"sanitize-html": "^2.7.1",
"ws": "^7.5.10",
"axios": "^0.21.2",
"mermaid": "^8.13.8",
"object-path": "^0.11.8",
"@braintree/sanitize-url": "^6.0.1",
"ansi-regex": "^5.0.1",
"debug": "^4.3.4",
"engine.io": "^3.6.1",
"express": "^4.20.0",
"hosted-git-info": "^3.0.8",
"is-svg": "^4.3.0",
"json5": "^2.2.2",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"semver": "^7.5.2",
"@hapi/hoek": "^8.5.1",
"acorn": "^6.4.1",
"ansi-html": "^0.0.8",
"braces": "^3.0.3",
"d3-color": "^3.1.0",
"dns-packet": "^1.3.2",
"graphql-playground-html": "^1.6.22",
"http-cache-semantics": "^4.1.1",
"kind-of": "^6.0.3",
"minimatch": "^3.0.5",
"node-fetch": "^2.6.7",
"nth-check": "^2.0.1",
"serialize-javascript": "^6.0.0",
"terser": "^4.8.1",
"trim": "^0.0.3",
"websocket-extensions": "^0.1.4",
"y18n": "^5.0.5",
"dompurify": "2.4.2"
}
}
2 changes: 1 addition & 1 deletion src/components/DownloadAirgapBundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { Link } from "@reach/router";
import { Link } from "gatsby";

import CodeSnippet from "./shared/CodeSnippet";
import Loader from "./shared/Loader";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Kurlsh.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { Link } from "@reach/router";
import { Link } from "gatsby";

import ReactTooltip from "react-tooltip";
import json2yaml from "json2yaml";
Expand Down
4 changes: 2 additions & 2 deletions src/components/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export default class Sidebar extends Component {
query={graphql`
{
allMarkdownRemark(
filter: { fields: { collection: { eq: "markdown-pages" } } }
sort: { fields: [frontmatter___weight], order: ASC }
filter: {fields: {collection: {eq: "markdown-pages"}}}
sort: {frontmatter: {weight: ASC}}
) {
edges {
node {
Expand Down
4 changes: 2 additions & 2 deletions src/components/SidebarReleaseNotes.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export default class Sidebar extends Component {
query={graphql`
{
allMarkdownRemark(
filter: { fields: { collection: { eq: "release-notes" } } }
sort: { fields: [frontmatter___weight], order: DESC }
filter: {fields: {collection: {eq: "release-notes"}}}
sort: {frontmatter: {weight: DESC}}
) {
edges {
node {
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/Footer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Link } from "@reach/router";
import { Link } from "gatsby";
import "../../scss/components/shared/Footer.scss";

const Footer = ({isMobile}) => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/MobileNavBar.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as React from "react";
import * as PropTypes from "prop-types";
import { Link } from "@reach/router";
import { Link } from "gatsby";
import GitHubButton from "react-github-button";

import "../../scss/components/shared/NavBar.scss";
require("react-github-button/assets/style.css");
import("react-github-button/assets/style.css");

export default class MobileNavBar extends React.Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/shared/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import MobileNavBar from "./MobileNavBar";
import Search from "../Search";

import "../../scss/components/shared/NavBar.scss";
require("react-github-button/assets/style.css");
import("react-github-button/assets/style.css");

export class NavBar extends React.Component {
state = {
Expand Down
8 changes: 4 additions & 4 deletions src/components/shared/SidebarFileTree.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export default class SidebarFileTree extends Component {
if (!item.directory) {
return item;
}

return {
...item,
open: item.directory.includes(this.props.pathname.split("/")[2]),
Expand Down Expand Up @@ -100,7 +99,7 @@ export default class SidebarFileTree extends Component {
}

render() {
const { depth = 0, data, type, className, open, children, path, isReleaseNotes } = this.props;
const { depth = 0, data, type, className, open, children, path, isReleaseNotes, pathname } = this.props;
const { treeState } = this.state;

if (treeState.length === 0 && depth === 0) {
Expand All @@ -127,10 +126,11 @@ export default class SidebarFileTree extends Component {
key={`${depth}-${idx}`}
depth={depth + 1}
type="directory"
open={entry.open}
open={pathname?.includes(entry.path)}
path={entry.path}
onDirectoryClick={onDirectoryClick}
data={entry.links}
pathname={pathname}
>
<span className={classNames({ "sub-directory": depth > 0 })}>
{titleize(entry.directory)}
Expand Down Expand Up @@ -165,4 +165,4 @@ export default class SidebarFileTree extends Component {
</div>
);
}
}
}
4 changes: 2 additions & 2 deletions src/templates/ReleaseNotesListTemplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const pageQuery = graphql`
}
}
allMarkdownRemark(
filter: { fields: { collection: { eq: "release-notes" } } }
sort: { fields: [frontmatter___weight], order: DESC }
filter: {fields: {collection: {eq: "release-notes"}}}
sort: {frontmatter: {weight: DESC}}
limit: $limit
skip: $skip
) {
Expand Down
Loading