Rebase main.

adobe · Jan 21, 2025 · 69dcdf2 · 69dcdf2
1 parent 0cfaf99
commit 69dcdf2
Show file tree

Hide file tree

Showing 22 changed files with 1,000 additions and 2,513 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,6 @@ coverage
 .sandbox
 .eslintcache
 .parcel-cache
+.token-cache.json
 extension.json
-package-adobe-alloy-*.zip
+.DS_Store
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactor-extension-alloy",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "description": "The Adobe Experience Platform Web SDK allows for streaming data into the platform, syncing identities, personalizing content, and more.",
   "author": {
     "name": "Adobe",
@@ -10,31 +10,34 @@
   "license": "Apache-2.0",
   "scripts": {
     "add-license": "./scripts/add-license.mjs",
+    "build:alloy": "./scripts/buildAlloy.mjs",
+    "build:componentFixtures": "./scripts/buildComponentFixtures.mjs",
+    "build:extensionManifest": "./scripts/buildExtensionManifest.mjs",
+    "build:lib": "./scripts/buildLib.mjs",
+    "build:views": "./scripts/buildViews.mjs",
+    "build": "npm-run-all -p build:alloy build:componentFixtures build:extensionManifest build:lib build:views",
+    "watch:lib": "./scripts/buildLib.mjs --watch",
+    "watch:views": "./scripts/buildViews.mjs --watch",
+    "watch": "npm-run-all -p build:alloy build:componentFixtures build:extensionManifest watch:lib watch:views",
     "clean": "rimraf dist extension.json",
-    "prepare": "husky install",
-    "prepush-msg": "echo 'Running pre-push scripts...' && exit 0",
-    "precommit-msg": "echo 'Running pre-commit scripts...' && exit 0",
-    "sandbox": "npm run build:json && reactor-sandbox",
-    "build": "./scripts/build.mjs",
-    "build:prod": "npm run clean && NODE_ENV=production npm run build",
-    "build:json": "./scripts/buildExtensionManifest.mjs",
-    "package": "./scripts/createExtensionPackage.mjs",
-    "dev": "./scripts/dev.mjs",
-    "lint": "eslint \"*.{js,jsx}\" \"{src,test,scripts}/**/*.{js,jsx}\" --cache --fix",
+    "dev": "npm-run-all -p watch sandbox",
     "format": "prettier --write \"*.{js,jsx,html,mjs,cjs}\" \"{src,test,scripts}/**/*.{js,jsx,html,mjs,cjs}\"",
-    "test:unit": "karma start --single-run",
-    "test:unit:saucelabs": "karma start karma.saucelabs.conf.js --single-run",
-    "test:unit:coverage": "karma start --single-run --reporters spec,coverage",
-    "test:unit:watch": "karma start",
-    "test:unit:watch:chrome": "karma start --browsers Chrome",
-    "test:functional": "./scripts/functional.mjs",
-    "test:functional:saucelabs:firefox": "./scripts/functional.mjs --firefox",
-    "test:functional:saucelabs:chrome": "./scripts/functional.mjs --chrome",
-    "test:functional:saucelabs:safari": "./scripts/functional.mjs --safari",
-    "test:functional:saucelabs:edge": "./scripts/functional.mjs --edge",
-    "test:functional:watch": "./scripts/functional.mjs --watch",
-    "test:functional:watch:debug": "echo \"open chrome://inspect in Chrome and click 'inspect'\" && node --inspect-brk ./scripts/functional.mjs --watch",
-    "test": "npm-run-all --parallel test:unit test:functional",
+    "lint": "eslint \"*.{js,jsx}\" \"{src,test,scripts}/**/*.{js,jsx}\" --cache --fix",
+    "package": "npm run clean && NODE_ENV=production npm run build && npx @adobe/reactor-packager@latest",
+    "precommit-msg": "echo 'Running pre-commit scripts...' && exit 0",
+    "prepare": "husky",
+    "prepush-msg": "echo 'Running pre-push scripts...' && exit 0",
+    "sandbox": "./scripts/buildExtensionManifest.mjs && reactor-sandbox",
+    "test:unit": "vitest --config ./vitest.config.mjs run",
+    "test:watch": "vitest --config ./vitest.config.mjs",
+    "test:coverage": "vitest run --coverage",
+    "test:unit:watch:chrome": "vitest --config ./vitest.config.mjs --environment jsdom",
+    "test:functional": "npm run build && testcafe chrome --esm test/functional/specs",
+    "test:functional:component": "npm run build:componentFixtures && testcafe --esm chrome test/functional/specs/component",
+    "test:functional:runtime": "npm-run-all -p build:alloy build:lib && testcafe --esm chrome test/functional/specs/runtime",
+    "test:functional:view": "npm-run-all -p build:extensionManifest build:views && testcafe --esm chrome test/functional/specs/view",
+    "test:functional:watch": "testcafe --esm --live chrome test/functional/specs/**/*.spec.mjs",
+    "test": "npm run test:unit; npm run test:functional",
     "token": "node scripts/token.mjs",
     "version": "./scripts/version.sh"
   },
@@ -53,94 +56,86 @@
     ]
   },
   "dependencies": {
-    "@adobe/alloy": "^2.22.0",
-    "@adobe/react-spectrum": "^3.36.3",
-    "@react-stately/data": "^3.11.6",
-    "@spectrum-css/tokens": "^14.3.1",
-    "@spectrum-css/typography": "^6.1.1",
-    "@spectrum-icons/illustrations": "^3.6.15",
-    "@spectrum-icons/workflow": "^4.2.14",
-    "antd": "^5.20.3",
+    "@adobe/alloy": "^2.24.0",
+    "@adobe/react-spectrum": "^3.37.1",
+    "@react-stately/data": "^3.11.7",
+    "@spectrum-css/tokens": "^14.6.0",
+    "@spectrum-css/typography": "^6.1.3",
+    "@spectrum-icons/illustrations": "^3.6.16",
+    "@spectrum-icons/workflow": "^4.2.15",
+    "antd": "^5.21.6",
     "classnames": "^2.5.1",
     "clipboard-copy": "^4.0.1",
-    "commander": "^12.1.0",
     "escape-string-regexp": "^5.0.0",
     "formik": "^2.4.6",
     "once": "^1.4.0",
     "prop-types": "^15.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "uuid": "^10.0.0",
+    "uuid": "^11.0.2",
     "yup": "^1.4.0"
   },
   "devDependencies": {
-    "@adobe/jwt-auth": "^2.0.0",
+    "@adobe/auth-token": "^1.0.0",
     "@adobe/reactor-sandbox": "^13.1.0",
     "@adobe/reactor-turbine": "^28.0.0",
-    "@adobe/reactor-turbine-schemas": "^10.7.0",
-    "@babel/cli": "^7.24.8",
-    "@babel/core": "^7.25.2",
-    "@babel/eslint-parser": "^7.25.1",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
+    "@adobe/reactor-turbine-schemas": "^10.6.0",
+    "@babel/cli": "^7.25.9",
+    "@babel/core": "^7.26.0",
+    "@babel/eslint-parser": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.23.3",
     "@parcel/core": "^2.12.0",
     "@parcel/transformer-stylus": "^2.12.0",
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "adm-zip": "^0.5.15",
+    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@testing-library/react": "^16.0.1",
+    "@testing-library/user-event": "^14.5.2",
+    "@vitejs/plugin-react": "^4.3.4",
+    "@vitest/coverage-v8": "^2.1.8",
     "ajv": "^8.17.1",
     "ajv-draft-04": "^1.0.0",
     "ajv-formats": "^3.0.1",
-    "archiver": "^7.0.1",
     "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
     "babel-plugin-version": "^0.2.3",
     "chalk": "^5.3.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-ban": "^1.6.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.9.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.35.0",
+    "eslint-plugin-react": "^7.37.2",
     "eslint-plugin-testcafe": "^0.2.1",
     "eslint-plugin-unused-imports": "^3.2.0",
+    "eslint-plugin-vitest": "^0.5.4",
     "fs-extra": "^11.2.0",
     "glob": "^11.0.0",
-    "globals": "^15.9.0",
-    "husky": "^9.1.5",
-    "jasmine-core": "^5.2.0",
+    "globals": "^15.11.0",
+    "husky": "^9.1.6",
+    "jsdom": "^25.0.1",
     "json": "^11.0.0",
-    "karma": "^6.4.4",
-    "karma-chrome-launcher": "^3.2.0",
-    "karma-coverage": "^2.2.1",
-    "karma-jasmine": "^5.1.0",
-    "karma-jasmine-html-reporter": "^2.1.0",
-    "karma-jasmine-matchers": "^5.0.0",
-    "karma-rollup-preprocessor": "^7.0.8",
-    "karma-sauce-launcher": "^4.3.6",
-    "karma-spec-reporter": "0.0.36",
-    "lint-staged": "^15.2.9",
+    "lint-staged": "^15.2.10",
     "minimist": "^1.2.8",
     "mockvisitor": "file:test/functional/runtime/mockVisitor",
     "npm-run-all": "^4.1.5",
     "parcel": "^2.12.0",
     "parcel-transformer-extension-name": "file:scripts/helpers/parcel-transformer-extension-name",
     "prettier": "^3.3.3",
     "process": "^0.11.10",
-    "puppeteer": "^23.2.0",
+    "puppeteer": "^23.6.1",
     "rimraf": "^6.0.1",
-    "rollup": "^4.21.1",
+    "rollup": "^4.24.3",
     "rollup-plugin-istanbul": "^5.0.0",
     "staged-git-files": "^1.3.0",
-    "stylus": "^0.63.0",
+    "stylus": "^0.64.0",
     "testcafe": "^3.6.2",
-    "testcafe-browser-provider-saucelabs": "^2.0.0"
-  },
-  "overrides": {
-    "karma-sauce-launcher": {
-      "webdriverio": "^8.35.1"
-    }
+    "testcafe-browser-provider-saucelabs": "^3.0.0",
+    "vite": "^5.4.11",
+    "vitest": "^2.1.8",
+    "whatwg-fetch": "^3.6.20"
   }
 }
diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -19,6 +19,7 @@ export default [
     output: [
       {
         file: "temp/alloy.js",
+        format: "esm",
       },
     ],
     plugins: [
@@ -28,6 +29,10 @@ export default [
       }),
       commonjs(),
     ],
-    external: ["@adobe/reactor-query-string"],
+    external: [
+      "@adobe/reactor-load-script",
+      "@adobe/reactor-object-assign",
+      "@adobe/reactor-query-string",
+    ],
   },
-];
+];