fix: update July 2023 feeds (#438)

* feat: update feeds * fix: lock file outdated error * fix: lock file outdated error in campus * fix: lock file outdated error in other apps * fix: downgrade pnpm version * fix: update feeds submodule commit * fix: install esbuild in root app * fix: css import path in index.html
wasedatime · Jul 31, 2023 · 442f2df · 442f2df
1 parent ad31242
commit 442f2df
Show file tree

Hide file tree

Showing 10 changed files with 9,362 additions and 9,361 deletions.
diff --git a/.github/actions/microapp/action.yml b/.github/actions/microapp/action.yml
@@ -12,7 +12,7 @@ runs:
       shell: bash
       working-directory: ${{ inputs.path }}
       run: |
-        npm install -g pnpm
+        npm install -g pnpm@6
         pnpm install --filter .
 
 #    - name: Test

diff --git a/campus/package.json b/campus/package.json
@@ -84,9 +84,6 @@
     "vite": "^2.9.9",
     "vite-plugin-dynamic-import": "^0.7.1"
   },
-  "resolutions": {
-    "esbuild": "0.14.43"
-  },
   "peerDependencies": {
     "@babel/plugin-syntax-flow": "^7.16.7",
     "@babel/plugin-transform-react-jsx": "^7.17.3",

diff --git a/campus/pnpm-lock.yaml b/campus/pnpm-lock.yaml
diff --git a/career/pnpm-lock.yaml b/career/pnpm-lock.yaml
diff --git a/feeds/pnpm-lock.yaml b/feeds/pnpm-lock.yaml
diff --git a/feeds/public/feeds b/feeds/public/feeds
diff --git a/root/package.json b/root/package.json
@@ -38,6 +38,7 @@
     "concurrently": "7.2.1",
     "cssnano": "5.1.11",
     "dotenv": "16.0.1",
+    "esbuild": "^0.18.6",
     "eslint": "8.17.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-prettier": "8.5.0",

diff --git a/root/pnpm-lock.yaml b/root/pnpm-lock.yaml
diff --git a/root/src/index.html b/root/src/index.html
@@ -41,9 +41,9 @@
   <% if (isLocal) { %>
     <link rel="stylesheet" href="./src/styles/tailwind-build-output.css" type="css">
   <% } else { %>
-    <link rel="preload" href="<%= env.VITE_MF_SYLLABUS_BASE_PATH %>/assets/style.css" as="style" onload="this.rel='stylesheet'">
-    <link rel="preload" href="<%= env.VITE_MF_CAMPUS_BASE_PATH %>/assets/style.css" as="style" onload="this.rel='stylesheet'">
-
+    <link rel="preload" href="<%= env.VITE_MF_SYLLABUS_BASE_PATH || "http://localhost:8080" %>/assets/style.css" as="style" onload="this.rel='stylesheet'">
+    <link rel="preload" href="<%= env.VITE_MF_CAMPUS_BASE_PATH || "http://localhost:8081" %>/assets/style.css" as="style" onload="this.rel='stylesheet'">
+    
     <link rel="preload" as="font" href="/fonts/segoe-ui.ttf" type="font/ttf" crossorigin="anonymous" />
     <link rel="preload" as="font" href="/fonts/yugothic-medium.otf" type="font/otf" crossorigin="anonymous" />
     <link rel="preload" as="font" href="/fonts/Lato-Regular.ttf" type="font/ttf" crossorigin="anonymous" />

diff --git a/syllabus/pnpm-lock.yaml b/syllabus/pnpm-lock.yaml