merge and add support for dev deployment branch changes

ramp4-pcar4 · Jun 20, 2024 · dd0cde7 · dd0cde7
1 parent 9253d69
commit dd0cde7
Show file tree

Hide file tree

Showing 23 changed files with 6,194 additions and 36,369 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
-VUE_APP_API_URL=#{API_URL}#
-VUE_APP_CURR_ENV=#{CURR_ENV}#
-VUE_APP_NET_API_URL=#{NET_API_URL}#
+VITE_APP_API_URL=#{API_URL}#
+VITE_APP_CURR_ENV=#{CURR_ENV}#
+VITE_APP_NET_API_URL=#{NET_API_URL}#
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,8 +1,7 @@
 module.exports = {
     root: true,
     env: {
-        node: true,
-        es2022: true
+        node: true
     },
     extends: [
         'plugin:vue/essential',
@@ -15,8 +14,8 @@ module.exports = {
         ecmaVersion: 2020
     },
     rules: {
-        'no-console': import.meta.env.NODE_ENV === 'production' ? 'warn' : 'off',
-        'no-debugger': import.meta.env.NODE_ENV === 'production' ? 'warn' : 'off',
+        'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+        'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
         'prettier/prettier': ['error', { endOfLine: 'auto' }],
         'sort-imports': ['error', {"ignoreCase": true, "ignoreDeclarationSort": true }],
         '@typescript-eslint/no-var-requires': 'off'

diff --git a/index-ca-en.html b/index-ca-en.html
@@ -20,24 +20,21 @@
             src="https://www.canada.ca/etc/designs/canada/cdts/gcweb/rn/cdts/compiled/wet-en.js"
         ></script>
         <link rel="stylesheet" href="scripts/highcharts-editor/highcharts-editor.min.css" />
-        <link rel="stylesheet" href="scripts/ramp4/ramp.css" />
 
-        <!-- top reference links and no-script fallback -->
-        <noscript> <%= require('html-loader!../src/assets/static/cdts/refTop.html') %> </noscript>
         <script type="text/javascript">
             document.write(wet.builder.refTop({}));
         </script>
     </head>
     <body>
         <!-- template top and no-script fallback -->
-        <div id="def-top">d<%= require('html-loader!../src/assets/static/cdts/top-en.html') %></div>
+        <div id="def-top"></div>
 
         <div id="wb-cont">
             <div id="app"></div>
         </div>
 
         <!-- template footer and no-script fallback -->
-        <div id="def-footer"><%= require('html-loader!../src/assets/static/cdts/footer-en.html') %></div>
+        <div id="def-footer"></div>
 
         <script type="text/javascript">
             // URL Parsing for Language Switch
@@ -104,8 +101,8 @@
             document.write(wet.builder.refFooter({}));
         </script>
 
-        <script src="scripts/highcharts-editor/highcharts-editor.complete.js"></script>
-        <script src="scripts/ramp4/ramp.js"></script>
+        <script type="module" src="/src/main.ts"></script>
+        <script type="module" src="scripts/highcharts-editor/highcharts-editor.complete.js"></script>
 
         <style>
             html {

diff --git a/index-ca-fr.html b/index-ca-fr.html
@@ -22,22 +22,20 @@
         <link rel="stylesheet" href="scripts/highcharts-editor/highcharts-editor.min.css" />
         <link rel="stylesheet" href="scripts/ramp4/ramp.css" />
 
-        <!-- top reference links and no-script fallback -->
-        <noscript> <%= require('html-loader!../src/assets/static/cdts/refTop.html') %> </noscript>
         <script type="text/javascript">
             document.write(wet.builder.refTop({}));
         </script>
     </head>
     <body>
         <!-- template top and no-script fallback -->
-        <div id="def-top">d<%= require('html-loader!../src/assets/static/cdts/top-fr.html') %></div>
+        <div id="def-top"></div>
 
         <div id="wb-cont">
             <div id="app"></div>
         </div>
 
         <!-- template footer and no-script fallback -->
-        <div id="def-footer"><%= require('html-loader!../src/assets/static/cdts/footer-fr.html') %></div>
+        <div id="def-footer"></div>
 
         <script type="text/javascript">
             // URL Parsing for Language Switch
@@ -104,8 +102,8 @@
             document.write(wet.builder.refFooter({}));
         </script>
 
-        <script src="scripts/highcharts-editor/highcharts-editor.complete.js"></script>
-        <script src="scripts/ramp4/ramp.js"></script>
+        <script type="module" src="/src/main.ts"></script>
+        <script type="module" src="scripts/highcharts-editor/highcharts-editor.complete.js"></script>
 
         <style>
             html {

diff --git a/index.html b/index.html
@@ -19,8 +19,7 @@
         <!-- built files will be auto injected -->
 
         <script type="module" src="/src/main.ts"></script>
-        <script src="scripts/highcharts-editor/highcharts-editor.complete.js"></script>
-        <script src="scripts/ramp4/ramp.js"></script>
+        <script type="module" src="scripts/highcharts-editor/highcharts-editor.complete.js"></script>
     </body>
 </html>
 <noscript>