diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4e84a935..c3ad5a65 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/ember-cli-build.js b/ember-cli-build.js
index d23ee99f..dd31d710 100644
--- a/ember-cli-build.js
+++ b/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
+ });
};
diff --git a/package.json b/package.json
index ba54dc6d..bef0b38e 100644
--- a/package.json
+++ b/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",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b32702ce..fd73de87 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -97,8 +97,8 @@ importers:
specifier: ^1.4.6
version: 1.4.9
'@upfluence/oss-components':
- specifier: 4.0.0-beta.2
- version: 4.0.0-beta.2(@ember/test-helpers@5.8.0(@babel/core@7.26.0))(@glint/template@1.5.1)(ember-source@6.12.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(rsvp@4.8.5))(qunit@2.23.1)(typescript@5.9.3)(webpack@5.97.1)
+ specifier: 4.0.0-beta.3
+ version: 4.0.0-beta.3(@ember/test-helpers@5.8.0(@babel/core@7.26.0))(@glint/template@1.5.1)(ember-source@6.12.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(rsvp@4.8.5))(qunit@2.23.1)(typescript@5.9.3)(webpack@5.97.1)
'@upfluence/w-conf':
specifier: ^0.4.0
version: 0.4.0(@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.4))(@typescript-eslint/parser@8.68.0(eslint@10.9.1)(typescript@5.9.3))(eslint@10.9.1)(prettier@3.8.4)(typescript@5.9.3)
@@ -2162,8 +2162,8 @@ packages:
resolution: {integrity: sha512-YR65gGdGvTUAWLldC3xLOvOzamdGzB4A5/N8rehEaHs3Zvoe39BhgY+u0SPch1OvrVTfLcc55wsSgK2NcnTS/A==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@upfluence/oss-components@4.0.0-beta.2':
- resolution: {integrity: sha512-BCiljYbTsog0SQEQ+R81C/QD/VH7ECfX4BNWx+1HUMXCt/dO/VjOKQA0DEUhPbRmJTDvpfgqBiTZtn+A+lS52w==, tarball: https://npm.pkg.github.com/download/@upfluence/oss-components/4.0.0-beta.2/03c6bbe0152016da1ca80fcb60ab56bf8df6a6b6}
+ '@upfluence/oss-components@4.0.0-beta.3':
+ resolution: {integrity: sha512-g5IZudlrvex+c0gJvKmmKPpumOeXYptjnF92GLnW2Z0g40M5mEDXaCFVqRN2odFufp/son3D1CURs3CMuZp5wg==, tarball: https://npm.pkg.github.com/download/@upfluence/oss-components/4.0.0-beta.3/e7511a24550cdd52035bb32a019110cfae64a96f}
engines: {node: 20.* || 22.* || 24.*}
peerDependencies:
qunit: "^2.x ||\_^3.x"
@@ -9596,7 +9596,7 @@ snapshots:
'@typescript-eslint/types': 8.68.0
eslint-visitor-keys: 5.0.1
- '@upfluence/oss-components@4.0.0-beta.2(@ember/test-helpers@5.8.0(@babel/core@7.26.0))(@glint/template@1.5.1)(ember-source@6.12.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(rsvp@4.8.5))(qunit@2.23.1)(typescript@5.9.3)(webpack@5.97.1)':
+ '@upfluence/oss-components@4.0.0-beta.3(@ember/test-helpers@5.8.0(@babel/core@7.26.0))(@glint/template@1.5.1)(ember-source@6.12.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(rsvp@4.8.5))(qunit@2.23.1)(typescript@5.9.3)(webpack@5.97.1)':
dependencies:
'@babel/core': 7.26.0
'@ember/render-modifiers': 2.1.0(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@6.12.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(rsvp@4.8.5))
@@ -10915,7 +10915,7 @@ snapshots:
broccoli-output-wrapper: 3.2.5
fs-merger: 3.2.1
promise-map-series: 0.3.0
- quick-temp: 0.1.8
+ quick-temp: 0.1.9
rimraf: 3.0.2
symlink-or-copy: 1.3.1
transitivePeerDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 8575cc98..2d52fd12 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,2 +1,5 @@
+packages:
+ - '.'
+
onlyBuiltDependencies:
-- '@upfluence/oss-components'
+ - '@upfluence/oss-components'
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
index 1a6cac6d..8ff9a701 100644
--- a/tests/dummy/app/index.html
+++ b/tests/dummy/app/index.html
@@ -1,6 +1,7 @@
+
Dummy
@@ -10,6 +11,7 @@
{{content-for "head"}}
+
{{content-for "head-footer"}}
diff --git a/tests/index.html b/tests/index.html
index 8ddc953b..2f55dec0 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -1,6 +1,7 @@
+
Dummy Tests