Commit ce55df46 authored by Ryo Yamashita's avatar Ryo Yamashita Committed by Yas Naoi
Browse files

Issue #3324002 by Ryo Yamashita, yas: Change the build tool for Cloud... 

Issue #3324002 by Ryo Yamashita, yas: Change the build tool for Cloud Dashboard, "Create React App" to "Vite"
parent 6992a171

modules/cloud_dashboard/cloud_dashboard.libraries.yml

+2 −5
Changes for modules/cloud_dashboard/cloud_dashboard.libraries.yml: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line 
react_app:

  version: 4.x

  js:

    js/2.chunk.js: { minified: true }

    js/3.chunk.js: { minified: true }

    js/main.chunk.js: { minified: true }

    js/runtime-main.js: { minified: true }

    js/index.js: { minified: true }

  css:

    theme:

      css/2.chunk.css: { minified: true }
 
      css/index.css: { minified: true }

modules/cloud_dashboard/cloud_dashboard/.node-version

deleted100644 → 0
+0 −1
Changes for modules/cloud_dashboard/cloud_dashboard/.node-version: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
v16.0.0

modules/cloud_dashboard/cloud_dashboard/build.sh

+5 −11
Changes for modules/cloud_dashboard/cloud_dashboard/build.sh: 5 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -6,18 +6,12 @@ if [ -e /etc/issue ]; then 
  fi

fi



"${YARN}" react-scripts build

npx vite build



# Remove old files

rm -f ../js/2.chunk.js

rm -f ../js/3.chunk.js

rm -f ../js/main.chunk.js

rm -f ../js/runtime-main.js

rm -f ../css/2.chunk.css

rm -f ../js/index.js

rm -f ../css/index.css



# Copy new files from build directory

cp build/static/js/2.*.chunk.js ../js/2.chunk.js

cp build/static/js/3.*.chunk.js ../js/3.chunk.js

cp build/static/js/main.*.chunk.js ../js/main.chunk.js

cp build/static/js/runtime-main.*.js ../js/runtime-main.js

cp build/static/css/2.*.chunk.css ../css/2.chunk.css
 
cp build/assets/index.*.js ../js/index.js

cp build/assets/index.*.css ../css/index.css

modules/cloud_dashboard/cloud_dashboard/public/index.html→modules/cloud_dashboard/cloud_dashboard/index.html

+2 −0
Changes for modules/cloud_dashboard/cloud_dashboard/index.html: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
  <body>

    <noscript>You need to enable JavaScript to run this app.</noscript>

    <div id="root"></div>

    <script>window.global = window;</script>

    <script type="module" src="/src/index.tsx"></script>

    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>

		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>

  </body>

modules/cloud_dashboard/cloud_dashboard/package.json

+7 −3
Changes for modules/cloud_dashboard/cloud_dashboard/package.json: 7 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -36,10 +36,9 @@ 
    "web-vitals": "^1.0.1"

  },

  "scripts": {

    "start": "react-scripts start",

    "start": "vite",

    "build": "sh build.sh",

    "test": "react-scripts test",

    "eject": "react-scripts eject"

    "test": "react-scripts test"

  },

  "eslintConfig": {

    "extends": [
@@ -61,5 +60,10 @@ 
  },

  "resolutions": {

    "@typescript-eslint/typescript-estree": "5.9.0"

  },

  "devDependencies": {

    "@vitejs/plugin-react": "^2.2.0",

    "vite": "^3.2.4",

    "vite-tsconfig-paths": "^3.6.0"

  }

}