lex 2 年之前
父節點
當前提交
73702360b3
共有 4 個文件被更改,包括 52 次插入28 次删除
  1. 27 11
      package-lock.json
  2. 1 1
      package.json
  3. 14 12
      vite.config.ts
  4. 10 4
      yarn.lock

+ 27 - 11
package-lock.json

@@ -64,7 +64,7 @@
         "prettier": "^2.5.1",
         "typescript": "^4.5.2",
         "vite": "^2.7.3",
-        "vite-plugin-glsl": "^0.4.0",
+        "vite-plugin-glsl": "^0.2.0",
         "vite-plugin-style-import": "^1.4.0",
         "vue-eslint-parser": "^8.0.1",
         "vue-tsc": "^0.29.8",
@@ -8995,18 +8995,25 @@
       }
     },
     "node_modules/vite-plugin-glsl": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/vite-plugin-glsl/-/vite-plugin-glsl-0.4.0.tgz",
-      "integrity": "sha512-Q+g008AWOGOm1Ng63A2YoLEUkONFRNtzwTmK0mgL2V9Pf/omsd2TSrRHCVXa24CmEAxT1VtV5nH2+u/uCNTR9Q==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/vite-plugin-glsl/-/vite-plugin-glsl-0.2.0.tgz",
+      "integrity": "sha512-Sn8ceQHdL3zy8y3MrAKYc28/+R02H/DE/IOqoP7h/DfGypCvOXaU7Cm4pVPU+JMc0LYrK4SCaGrLa/gnCrqwIg==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^4.2.1"
+        "@rollup/pluginutils": "^4.2.1",
+        "tslib": "^2.4.0"
       },
       "engines": {
-        "node": ">= 14.18.0",
-        "npm": ">= 6.14.17"
+        "node": ">= 14.17.0",
+        "npm": ">= 6.14.13"
       }
     },
+    "node_modules/vite-plugin-glsl/node_modules/tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "dev": true
+    },
     "node_modules/vite-plugin-style-import": {
       "version": "1.4.0",
       "resolved": "https://registry.npmmirror.com/vite-plugin-style-import/-/vite-plugin-style-import-1.4.0.tgz",
@@ -15824,12 +15831,21 @@
       }
     },
     "vite-plugin-glsl": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/vite-plugin-glsl/-/vite-plugin-glsl-0.4.0.tgz",
-      "integrity": "sha512-Q+g008AWOGOm1Ng63A2YoLEUkONFRNtzwTmK0mgL2V9Pf/omsd2TSrRHCVXa24CmEAxT1VtV5nH2+u/uCNTR9Q==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/vite-plugin-glsl/-/vite-plugin-glsl-0.2.0.tgz",
+      "integrity": "sha512-Sn8ceQHdL3zy8y3MrAKYc28/+R02H/DE/IOqoP7h/DfGypCvOXaU7Cm4pVPU+JMc0LYrK4SCaGrLa/gnCrqwIg==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^4.2.1"
+        "@rollup/pluginutils": "^4.2.1",
+        "tslib": "^2.4.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.4.1.tgz",
+          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+          "dev": true
+        }
       }
     },
     "vite-plugin-style-import": {

+ 1 - 1
package.json

@@ -76,7 +76,7 @@
     "prettier": "^2.5.1",
     "typescript": "^4.5.2",
     "vite": "^2.7.3",
-    "vite-plugin-glsl": "^0.4.0",
+    "vite-plugin-glsl": "^0.2.0",
     "vite-plugin-style-import": "^1.4.0",
     "vue-eslint-parser": "^8.0.1",
     "vue-tsc": "^0.29.8",

+ 14 - 12
vite.config.ts

@@ -5,11 +5,13 @@ import glsl from 'vite-plugin-glsl'
 import vueJsx from '@vitejs/plugin-vue-jsx'
 import legacy from '@vitejs/plugin-legacy'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require('path')
+// const path = require('path')
 
-function resolve(dir: string) {
-  return path.join(__dirname, dir)
-}
+// function resolve(dir: string) {
+//   return path.join(__dirname, dir)
+// }
+
+const { resolve } = require('path')
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://mstutest.dayaedu.com/';
@@ -37,12 +39,12 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      '@': resolve('./src'),
-      '@common': resolve('./src/common'),
-      '@components': resolve('./src/components'),
-      '@business-components': resolve('./src/business-components'),
-      '@store': resolve('./src/store'),
-      '@views': resolve('./src/views')
+      '@': resolve(__dirname, './src'),
+      '@common': resolve(__dirname, './src/common'),
+      '@components': resolve(__dirname, './src/components'),
+      '@business-components': resolve(__dirname, './src/business-components'),
+      '@store': resolve(__dirname, './src/store'),
+      '@views': resolve(__dirname, './src/views')
     }
   },
   server: {
@@ -88,8 +90,8 @@ export default defineConfig({
   build: {
     rollupOptions: {
       input: {
-        index: resolve('index.html'),
-        teacher: resolve('teacher.html')
+        index: resolve(__dirname, 'index.html'),
+        teacher: resolve(__dirname, 'teacher.html')
       }
     }
   }

+ 10 - 4
yarn.lock

@@ -4530,6 +4530,11 @@
   "resolved" "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz"
   "version" "2.3.0"
 
+"tslib@^2.4.0":
+  "integrity" "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+  "resolved" "https://registry.npmmirror.com/tslib/-/tslib-2.4.1.tgz"
+  "version" "2.4.1"
+
 "tsutils@^3.21.0":
   "integrity" "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="
   "resolved" "https://registry.npmmirror.com/tsutils/-/tsutils-3.21.0.tgz"
@@ -4685,12 +4690,13 @@
     "core-js" "^3.11.0"
     "mutation-observer" "^1.0.3"
 
-"vite-plugin-glsl@^0.4.0":
-  "integrity" "sha512-Q+g008AWOGOm1Ng63A2YoLEUkONFRNtzwTmK0mgL2V9Pf/omsd2TSrRHCVXa24CmEAxT1VtV5nH2+u/uCNTR9Q=="
-  "resolved" "https://registry.npmmirror.com/vite-plugin-glsl/-/vite-plugin-glsl-0.4.0.tgz"
-  "version" "0.4.0"
+"vite-plugin-glsl@^0.2.0":
+  "integrity" "sha512-Sn8ceQHdL3zy8y3MrAKYc28/+R02H/DE/IOqoP7h/DfGypCvOXaU7Cm4pVPU+JMc0LYrK4SCaGrLa/gnCrqwIg=="
+  "resolved" "https://registry.npmmirror.com/vite-plugin-glsl/-/vite-plugin-glsl-0.2.0.tgz"
+  "version" "0.2.0"
   dependencies:
     "@rollup/pluginutils" "^4.2.1"
+    "tslib" "^2.4.0"
 
 "vite-plugin-style-import@^1.4.0":
   "integrity" "sha512-EGAx0zVGUkwAwvDaC66zxgzXyHE0CwAXp4O1xGKnpMcrDT9L1nlojiCjjLRQzL8C3zwY1jn9ilq+m0VABKiiLg=="