Merge pull request #152 from jhipster/upgrade-libs

Upgrade libs
jhipster · Aug 23, 2023 · f1f7bf4 · f1f7bf4
2 parents f96091c + a80cc6c
commit f1f7bf4
Show file tree

Hide file tree

Showing 24 changed files with 12,999 additions and 13,788 deletions.
diff --git a/README.md b/README.md
@@ -66,6 +66,8 @@ If you want to contribute to the project more info is available in [CONTRIBUTING
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). There are two important GIT branches. `src` branch holds the source code and all development needs to be done against that branch. `gh-pages` branch holds the deployable static site that is built from `src`.
 
+Use `npm i --legacy-peer-deps` when installing to avoid peer dependency conflicts
+
 ## Deploy to production
 
 In order to deploy to production run `npm run deploy`, this will build the `src` branch and move the assets to the gh-pages branch and push it to GitHub, it will update the `https://www.jhipster.tech/jdl-studio/` version and will create a PR to update the `https://start.jhipster.tech`

diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -16,15 +16,15 @@
     <!-- iOS Safari -->
     <meta name="apple-mobile-web-app-status-bar-style" content="#282C34" />
 
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="/src/favicon.ico" />
+    <link rel="shortcut icon" href="/src/favicon.ico" />
 
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo-jhipster.svg" />
+    <link rel="apple-touch-icon" href="/src/resources/logo-jhipster.svg" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/src/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -37,6 +37,7 @@
     <title>JDL-Studio</title>
   </head>
   <body>
+    <!-- <script>window.global = window;</script> -->
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <!--
@@ -49,6 +50,7 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
+    <script type="module" src="/src/index.tsx"></script>
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-4L9RJVPGJT"></script>
     <script>
     window.dataLayer = window.dataLayer || [];