Merge pull request #67 from ufabc-next/fix/extension-on-matriculas

Corrigindo a extensao na parte de Matricula da UFABC
ufabc-next · Feb 23, 2024 · 3a26ba1 · 3a26ba1
2 parents b82ab46 + 49826a9
commit 3a26ba1
Show file tree

Hide file tree

Showing 41 changed files with 644 additions and 734 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,13 @@ npm-debug.log
 
 dist/
 packages/
-extension
+
+src/components.d.ts
+extension/manifest.json
+
+*.crx
+*.local
+*.log
+*.pem
+*.xpi
+*.zip
diff --git a/src/assets/error.svg → extension/assets/error.svg b/src/assets/error.svg → extension/assets/error.svg
diff --git a/src/assets/icon-128.png → extension/assets/icon-128.png b/src/assets/icon-128.png → extension/assets/icon-128.png
diff --git a/src/assets/icon-16.png → extension/assets/icon-16.png b/src/assets/icon-16.png → extension/assets/icon-16.png
diff --git a/src/assets/icon-19.png → extension/assets/icon-19.png b/src/assets/icon-19.png → extension/assets/icon-19.png
diff --git a/src/assets/icon-38.png → extension/assets/icon-38.png b/src/assets/icon-38.png → extension/assets/icon-38.png
diff --git a/src/assets/loading.svg → extension/assets/loading.svg b/src/assets/loading.svg → extension/assets/loading.svg
diff --git a/src/assets/logo-white.svg → extension/assets/logo-white.svg b/src/assets/logo-white.svg → extension/assets/logo-white.svg
diff --git a/src/assets/logo.svg → extension/assets/logo.svg b/src/assets/logo.svg → extension/assets/logo.svg
diff --git a/src/assets/refresh.png → extension/assets/refresh.png b/src/assets/refresh.png → extension/assets/refresh.png
diff --git a/src/assets/refresh_small.png → extension/assets/refresh_small.png b/src/assets/refresh_small.png → extension/assets/refresh_small.png
diff --git a/src/assets/ring.gif → extension/assets/ring.gif b/src/assets/ring.gif → extension/assets/ring.gif
diff --git a/extension/pages/iframe.html b/extension/pages/iframe.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+  <head>
+    <script src="../dist/lib/xdLocalStoragePostMessageApi.min.js"></script>
+  </head>
+  <body>
+    Next Storage
+  </body>
+</html>
diff --git a/src/pages/matricula/corte.html → extension/pages/matricula/corte.html b/src/pages/matricula/corte.html → extension/pages/matricula/corte.html
diff --git a/...matricula/fragments/matriculasNumber.html → ...matricula/fragments/matriculasNumber.html b/...matricula/fragments/matriculasNumber.html → ...matricula/fragments/matriculasNumber.html
diff --git a/...matricula/fragments/professorPopover.html → ...matricula/fragments/professorPopover.html b/...matricula/fragments/professorPopover.html → ...matricula/fragments/professorPopover.html
diff --git a/jsconfig.json b/jsconfig.json
@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    }
+  },
+  "include": ["src/**/*.js"],
+  "exclude": ["node_modules", "**/node_modules", "dist"]
+}
diff --git a/package.json b/package.json
@@ -5,30 +5,29 @@
   "type": "module",
   "description": "Adiciona funcionalidades novas ao sistema de matricula da UFABC",
   "scripts": {
-    "dev": "rimraf extension/dev && run-p dev:*",
-    "dev:prepare": "node --no-warnings=ExperimentalWarning tasks/prepare.dev.js dev",
+    "dev": "yarn clear && NODE_ENV=dev run-p dev:*",
+    "dev:prepare": "node tasks/prepare.js",
+    "dev:background": "yarn build:background --mode dev",
     "dev:web": "vite",
-    "dev:js": "yarn run build:dev --watch src",
-    "build": "NODE_ENV=prod run-s clear build:web build:prepare build:prod",
-    "build:prepare": "node tasks/prepare.prod.js build",
+    "dev:js": "yarn run build:js --mode dev",
+    "dev:general": "yarn run build:general --mode dev",
+    "build": "NODE_ENV=prod run-s clear build:web build:prepare build:background build:js",
+    "build:prepare": "node tasks/prepare.js",
+    "build:background": "vite build --config vite.config.background.js",
     "build:web": "vite build",
-    "build:dev": "tsup --onSuccess 'node --no-warnings=ExperimentalWarning tasks/mvsw.dev.js'",
-    "build:prod": "tsup --onSuccess 'node --no-warnings=ExperimentalWarning tasks/mvsw.prod.js'",
-    "clear": "rimraf extension/prod"
-  },
-  "standard": {
-    "globals": [
-      "chrome"
-    ]
+    "build:js": "vite build --config vite.config.content.js",
+    "build:general": "vite build --config vite.config.files.js",
+    "clear": "rimraf --glob extension/dist extension/manifest.json extension.*"
   },
   "devDependencies": {
     "@vitejs/plugin-vue2": "^2.3.1",
     "chokidar": "^3.6.0",
     "fs-extra": "^11.2.0",
     "kolorist": "^1.8.0",
     "npm-run-all": "^4.1.5",
+    "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "tsup": "^8.0.1",
+    "unplugin-vue-components": "^0.26.0",
     "vite": "^5.1.1"
   },
   "dependencies": {

diff --git a/prettier.config.js b/prettier.config.js
@@ -0,0 +1,8 @@
+export default {
+  printWidth: 80,
+  tabWidth: 2,
+  singleQuote: false,
+  trailingComma: "all",
+  arrowParens: "always",
+  semi: true,
+};
diff --git a/src/lib/init.cjs b/src/lib/init.cjs
@@ -1,6 +1,6 @@
-import { extensionUtils } from "../utils/extensionUtils";
+import { extensionUtils } from "@/utils/extensionUtils";
 
-xdLocalStorage.init({
+window.xdLocalStorage.init({
   /* required */
   iframeUrl: extensionUtils.extensionURL("pages/iframe.html"),
   //an option function to be called right after the iframe was loaded and ready for action

diff --git a/src/manifest.js b/src/manifest.js
@@ -1,6 +1,5 @@
 import pkg from "../package.json" with { type: "json" };
-
-const isDev = process.env.NODE_ENV !== "prod";
+import { isDev, PORT } from "../tasks/utils.js";
 
 export async function getManifest() {
   // update this file to update this manifest.json
@@ -11,11 +10,11 @@ export async function getManifest() {
     version: pkg.version,
     description: pkg.description,
     icons: {
-      16: "./assets/icon-16.png",
-      128: "./assets/icon-128.png",
+      16: "assets/icon-16.png",
+      128: "assets/icon-128.png",
     },
     background: {
-      service_worker: "background.js",
+      service_worker: "dist/background/background.mjs",
     },
     permissions: ["storage"],
     host_permissions: [
@@ -28,7 +27,7 @@ export async function getManifest() {
     content_scripts: [
       {
         all_frames: true,
-        js: ["contentscript.js"],
+        js: ["dist/contentScripts/contentscript.global.js"],
         matches: [
           "http://*.ufabc.edu.br/*",
           "https://*.ufabc.edu.br/*",
@@ -55,24 +54,20 @@ export async function getManifest() {
         38: "assets/icon-38.png",
       },
       default_title: "Next Extension",
-      default_popup: "./views/Popup/index.html",
+      default_popup: "dist/views/Popup/index.html",
     },
     content_security_policy: {
-      extension_pages: "script-src 'self'; object-src 'self'",
+      extension_pages: isDev
+        ? `script-src 'self' http://localhost:${PORT}; object-src 'self'`
+        : "script-src 'self'; object-src 'self'",
     },
     web_accessible_resources: [
       {
         resources: [
-          "components/*",
           "assets/*",
-          "lib/*",
           "pages/*",
-          "scripts/*",
-          "services/*",
-          "styles/*",
-          "utils/*",
-          "views/*",
-          "html/*",
+          "dist/contentScripts/style.css",
+          "dist/lib/*",
         ],
         matches: [
           "http://*.ufabc.edu.br/*",
@@ -85,11 +80,5 @@ export async function getManifest() {
     ],
   };
 
-  if (isDev) {
-    manifest.content_security_policy = {
-      extension_pages: `script-src 'self' http://localhost:${5001}; object-src 'self'`,
-    };
-  }
-
   return manifest;
 }
diff --git a/src/pages/iframe.html b/src/pages/iframe.html