Skip to content
Open
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
1,865 changes: 1,011 additions & 854 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"jquery": "^3.7.1",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-router": "^7.5.2",
"react-router-dom": "^7.5.2"
"react-router": "^7.5.2"
},
"scripts": {
"start": "npm run watch-local-changes | react-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ------- components for React
import React, { Component } from "react"
import { Route, Routes } from "react-router-dom"
import { Route, Routes } from "react-router"

// withRouter allows us access to app url history
// and, more importantly here, hook events into url changes
Expand Down
2 changes: 1 addition & 1 deletion src/Page.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from "react"
import { Link, useLocation } from "react-router-dom"
import { useLocation, Link } from "react-router"
import hljs from "highlight.js"

// html-react-parse for parsing strings containing HTML markup into react objects
Expand Down
2 changes: 1 addition & 1 deletion src/_layout/GuidesSidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react"
import { NavLink } from "react-router-dom"
import { NavLink } from "react-router"
import * as bootstrap from "bootstrap"
import $ from "jquery"

Expand Down
2 changes: 1 addition & 1 deletion src/_layout/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react";
import { NavLink } from "react-router-dom";
import { NavLink } from "react-router";


class Header extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/_layout/LuaAPISidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from "react"
import { NavLink } from "react-router-dom"
import { NavLink } from "react-router"
import * as bootstrap from "bootstrap"
import { supportedAPIs, supportedAPIsMap, default_engineString, default_versionString, default_url, getAPIdocURL } from "../LuaAPI/modules/SupportedAPIs.js"

Expand Down
2 changes: 1 addition & 1 deletion src/_layout/Sidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react"
import { Route, Routes } from "react-router-dom"
import { Route, Routes } from "react-router"
import GuidesSidebar from "./GuidesSidebar"
import LuaAPISidebar from "./LuaAPISidebar"

Expand Down
2 changes: 1 addition & 1 deletion src/_layout/TableOfContents.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Route, Routes } from "react-router-dom"
import { Route, Routes } from "react-router"


function TableOfContents(props){
Expand Down
4 changes: 4 additions & 0 deletions src/html-to-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ recursive(path, function(err, files){
if (file.match(regex)){
// transform a string like "src/Pages/Resources.html" to "Resources" to use as an object key
let k = file.replace(regex,"").replace(path,"")
if (process.platform === "win32") {
k = k.replace("src\\Pages", "");
k = k.replaceAll("\\", "/");
}

// special-case to map "Home" to empty string so that it matches the url of "/" instead of "/Home"
if (k==="/Home"){ k="/" }
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import "bootstrap/dist/js/bootstrap.bundle.min"

import React from "react"
import ReactDOM from "react-dom/client"
import { BrowserRouter } from "react-router-dom"
import { BrowserRouter } from "react-router"
import App from "./App"


Expand Down
2 changes: 1 addition & 1 deletion src/withRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
useLocation,
useNavigate,
useParams,
} from "react-router-dom";
} from "react-router";

export function withRouter(Component) {
function ComponentWithRouterProp(props) {
Expand Down