Merge master and move to oss-components 4.0.0-beta.3

.github/workflows/ci.yml

@@ -93,6 +93,7 @@ jobs:
         id: pkg_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
       - name: Trigger upfluence-web/deploy
+        if: ${{ !contains(github.ref, '-') }}
         uses: benc-uk/workflow-dispatch@v1
         with:
           repo: upfluence/upfluence-web

ember-cli-build.js

@@ -1,9 +1,15 @@
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+const { injectAssetMap } = require('@upfluence/oss-components/build/classic-asset-map.cjs');
 
 module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
+    fingerprint: {
+      generateAssetMap: true,
+      assetMapPath: 'assets/upfluence-asset-map.json',
+      extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'ico', 'woff', 'woff2', 'ttf', 'eot']
+    }
     // Add options here
   });
 
@@ -15,11 +21,15 @@ module.exports = function (defaults) {
   */
 
   const { maybeEmbroider } = require('@embroider/test-setup');
-  return maybeEmbroider(app, {
+  const tree = maybeEmbroider(app, {
     skipBabel: [
       {
         package: 'qunit'
       }
     ]
   });
+  return injectAssetMap(tree, {
+    fingerprint: app.options.fingerprint,
+    rootURL: app.project.config(app.env).rootURL
+  });
 };

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@upfluence/hypertable",
-  "version": "3.17.3",
+  "version": "4.0.0-beta.0",
   "description": "Datatable under steroïds.",
   "keywords": [
     "ember-addon"
   ],
   "repository": "https://github.com/upfluence/hypertable",
   "publishConfig": {
-    "registry": "https://npm.pkg.github.com"
+    "registry": "https://npm.pkg.github.com",
+    "tag": "beta"
   },
   "license": "MIT",
   "author": "",
@@ -51,7 +52,7 @@
     "tether": "^1.4.7"
   },
   "peerDependencies": {
-    "@upfluence/oss-components": "^3.x"
+    "@upfluence/oss-components": "^4.0.0-beta.0"
   },
   "devDependencies": {
     "@ember/jquery": "^2.0.0",
@@ -68,7 +69,7 @@
     "@types/rsvp": "^4.0.4",
     "@types/sinon": "^10.0.6",
     "@types/tether": "^1.4.6",
-    "@upfluence/oss-components": "4.0.0-beta.2",
+    "@upfluence/oss-components": "4.0.0-beta.3",
     "@upfluence/w-conf": "^0.4.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~6.12.0",

pnpm-workspace.yaml

@@ -1,2 +1,5 @@
+packages:
+  - '.'
+
 onlyBuiltDependencies:
-- '@upfluence/oss-components'
+  - '@upfluence/oss-components'

tests/dummy/app/index.html

@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <meta name="upfluence:asset-map" content="__UPFLUENCE_ASSET_MAP__" />
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title>Dummy</title>
@@ -10,6 +11,7 @@
     {{content-for "head"}}
 
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
+    <link rel="stylesheet" href="https://uweb.s3.us-east-1.amazonaws.com/fa-current/css/all.min.css" />
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css" />
 
     {{content-for "head-footer"}}

tests/index.html

@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <meta name="upfluence:asset-map" content="__UPFLUENCE_ASSET_MAP__" />
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title>Dummy Tests</title>