Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,7 @@
<script src="./testem.js"></script>
<script src="./assets/vendor.js"></script>
<script>runningTests = true; Ember.testing=true;</script>
<script src="./assets/dummy.js"></script>
<script>
(function() {
var srcUrl = null;
var host = location.hostname || 'localhost';
var defaultPort = location.protocol === 'https:' ? 443 : 80;
var port = 9999;
var path = '';
var prefixURL = '';
var src = srcUrl || prefixURL + '/_lr/livereload.js?port=' + port + '&host=' + host + path;
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = location.protocol + '//' + host + ':9999' + src;
document.getElementsByTagName('head')[0].appendChild(script);
}());
</script>
<script src="./assets/chunk.vendors-node_modules_popperjs_core_lib_index_js-node_modules_focus-trap_dist_focus-trap_esm_j-4d225a.0ef9609a43ea0b65e992.js"></script>
<script src="./assets/chunk.vendors-node_modules_qunit_qunit_qunit_js-node_modules_rsvp_dist_rsvp_es_js-node_modules_sino-e4bae8.66ca01f9766ca5b8d4e4.js"></script>
<script src="./assets/chunk.tests.7456e6e7d381e166a1af.js"></script>
<script src="./assets/dummy.js"></script>
24 changes: 24 additions & 0 deletions .yarn/patches/broccoli-npm-3.5.2-3d3cc6dd95
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/dist/load_brocfile.js b/dist/load_brocfile.js
index 6af31e59fd0ae447a4eeda52a0149d5cd9f0b9ad..d5c326004b196749cc1ce9efd763bb61dc68cabf 100644
--- a/dist/load_brocfile.js
+++ b/dist/load_brocfile.js
@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
const path_1 = __importDefault(require("path"));
const findup_sync_1 = __importDefault(require("findup-sync"));
-const esm_1 = __importDefault(require("esm"));
-const esmRequire = esm_1.default(module);
/**
* Require a brocfile via either ESM or TypeScript
*
@@ -33,8 +31,8 @@ function requireBrocfile(brocfilePath) {
brocfile = require(brocfilePath);
}
else {
- // Load brocfile via esm shim
- brocfile = esmRequire(brocfilePath);
+ // Load brocfile via native require (esm shim removed for Node 22+ compat)
+ brocfile = require(brocfilePath);
}
// ESM `export default X` is represented as module.exports = { default: X }
// eslint-disable-next-line no-prototype-builtins
77 changes: 0 additions & 77 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

768 changes: 0 additions & 768 deletions .yarn/releases/yarn-3.1.1.cjs

This file was deleted.

940 changes: 940 additions & 0 deletions .yarn/releases/yarn-4.13.0.cjs

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nodeLinker: node-modules
compressionLevel: mixed

enableGlobalCache: false

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: '@yarnpkg/plugin-interactive-tools'
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.1.1.cjs
yarnPath: .yarn/releases/yarn-4.13.0.cjs
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { resolve } = require('path');
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
const postcssParser = require('postcss-scss');
const tailwind = require('tailwindcss');
const sass = require('@mozaic-ds/postcss-sass');
const sass = require('@csstools/postcss-sass');
const autoprefixer = require('autoprefixer');
const colorModFunctions = require('@alexlafroscia/postcss-color-mod-function');

Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@babel/core": "^7.14.6",
"@commitlint/cli": "^17.0.3",
"@commitlint/config-conventional": "^17.0.3",
"@csstools/postcss-sass": "^4.0.0",
"@csstools/postcss-sass": "^5.1.1",
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.7.0",
Expand All @@ -34,7 +34,6 @@
"@movable/prettier-config": "^1.0.0",
"@movable/tailwind-config": "^3.5.2",
"@movable/template-lint-plugin": "^3.0.2",
"@mozaic-ds/postcss-sass": "4.0.0-next.0",
"@percy/cli": "^1.16.0",
"@percy/ember": "^3.0.0",
"@release-it/conventional-changelog": "^4.3.0",
Expand All @@ -50,7 +49,7 @@
"babel-plugin-htmlbars-inline-precompile": "^5.3.1",
"broccoli-asset-rev": "^3.0.0",
"chalk": "^4.1.2",
"ember-auto-import": "^1.12.0",
"ember-auto-import": "^2.12.1",
"ember-cli": "~3.28.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deprecation-workflow": "^2.0.0",
Expand Down Expand Up @@ -89,7 +88,8 @@
"sinon": "^10.0.0",
"tailwindcss": "^2.2.19",
"testdouble": "^3.16.5",
"testdouble-qunit": "^3.0.3"
"testdouble-qunit": "^3.0.3",
"webpack": "^5.105.3"
},
"resolutions": {
"shell-quote": "^1.7.3",
Expand All @@ -98,7 +98,8 @@
"vm2": "^3.9.15",
"tough-cookie": "^4.1.3",
"minimist": "^1.2.6",
"loader-utils": "^2.0.3"
"loader-utils": "^2.0.3",
"broccoli@3.5.2": "patch:broccoli@npm:3.5.2#.yarn/patches/broccoli-npm-3.5.2-3d3cc6dd95"
},
"keywords": [
"ember-addon"
Expand Down Expand Up @@ -153,7 +154,7 @@
"tracked-maps-and-sets": "^3.0.1"
},
"engines": {
"node": ">= 14"
"node": ">= 20"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand All @@ -166,8 +167,8 @@
"*.{hbs,json,md,yml}": "prettier --write"
},
"volta": {
"node": "14.17.1",
"node": "24.14.0",
"yarn": "1.22.10"
},
"packageManager": "yarn@3.1.1"
"packageManager": "yarn@4.13.0"
}
Loading
Loading