Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update dependencies #1076

Merged
merged 1 commit into from
Oct 2, 2023
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
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
13 changes: 13 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ jobs:
runs-on: [ubuntu-latest]
timeout-minutes: 10

# https://github.com/embroider-build/embroider/issues/1532
env:
UV_USE_IO_URING: 0

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -71,6 +75,10 @@ jobs:
runs-on: [ubuntu-latest]
timeout-minutes: 10

# https://github.com/embroider-build/embroider/issues/1532
env:
UV_USE_IO_URING: 0

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand All @@ -90,10 +98,15 @@ jobs:
runs-on: [ubuntu-latest]
timeout-minutes: 10

# https://github.com/embroider-build/embroider/issues/1532
env:
UV_USE_IO_URING: 0

strategy:
fail-fast: false
matrix:
scenario:
- ember-lts-4.12
- ember-lts-4.8
- ember-lts-4.4
- ember-release
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
Expand All @@ -26,7 +20,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
6 changes: 0 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -23,7 +19,6 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -34,7 +29,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
2 changes: 1 addition & 1 deletion addon/-private/color.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default createDecorator(function (
options = Object.values(COLOR_OPTIONS),
defaultValue = COLOR_OPTIONS.DEFAULT,
...args
} = {}
} = {},
) {
return validatedDecorator(target, property, descriptor, {
template,
Expand Down
6 changes: 3 additions & 3 deletions addon/-private/flex.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default createDecorator(function (
target,
property,
descriptor,
{ prefix = "flex" } = {}
{ prefix = "flex" } = {},
) {
const propConfig = [
{
Expand Down Expand Up @@ -81,8 +81,8 @@ export default createDecorator(function (
{
template: template ?? `uk-flex-$value$`,
options,
}
)
},
),
);
});

Expand Down
2 changes: 1 addition & 1 deletion addon/-private/size.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default createDecorator(function (
target,
property,
descriptor,
{ options = Object.values(SIZE_OPTIONS), ...args } = {}
{ options = Object.values(SIZE_OPTIONS), ...args } = {},
) {
return validatedDecorator(target, property, descriptor, {
options,
Expand Down
14 changes: 7 additions & 7 deletions addon/-private/validated.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function validateValue(value, name, options) {
value &&
!options.some((v) => {
const re = new RegExp(
`^${v}(${Object.values(MEDIA_OPTIONS).join("|")})?$`
`^${v}(${Object.values(MEDIA_OPTIONS).join("|")})?$`,
);

return re.test(value);
Expand All @@ -26,7 +26,7 @@ export function validateValue(value, name, options) {
`\`${name}\` must be one of ${opts}. Passed was '${value}', which will therefore be ignored.`,
{
id: "ember-uikit.invalid-property",
}
},
);

return null;
Expand All @@ -39,16 +39,16 @@ export function validatedDecorator(
target,
property,
descriptor,
{ argument, options, defaultValue, template, sanitize = (val) => val || "" }
{ argument, options, defaultValue, template, sanitize = (val) => val || "" },
) {
return {
get() {
const value = sanitize(
validateValue(
this.args[argument ?? property] ?? defaultValue,
property,
options
)
options,
),
);

return value && template.replace("$value$", value).trim();
Expand All @@ -67,7 +67,7 @@ export function validatedArrayDecorator(
template,
separator = " ",
sanitize = (val) => val || "",
}
},
) {
return {
get() {
Expand All @@ -79,7 +79,7 @@ export function validatedArrayDecorator(

return value && template.replace(`$value$`, value);
}),
{ separator }
{ separator },
);
},
};
Expand Down
8 changes: 4 additions & 4 deletions addon/-private/width.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ export const GRID_OPTIONS = Array.from(
return `${n / gcd(n, of)}-${of / gcd(n, of)}`;
}),
];
}, [])
)
}, []),
),
).reduce(
(obj, val) => Object.assign(obj, { [val.replace(/-/, "_OF_")]: val }),
{}
{},
);

export const FIXED_OPTIONS = {
Expand Down Expand Up @@ -50,7 +50,7 @@ export default createDecorator(function (
template = "uk-width-$value$",
options = Object.values(WIDTH_OPTIONS),
...args
} = {}
} = {},
) {
return validatedArrayDecorator(target, property, descriptor, {
template,
Expand Down
2 changes: 1 addition & 1 deletion addon/components/-private/linked-list-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Component from "@glimmer/component";

function getParams(currentRouteInfo) {
const params = currentRouteInfo.paramNames.map(
(key) => currentRouteInfo.params[key]
(key) => currentRouteInfo.params[key],
);

if (currentRouteInfo.parent) {
Expand Down
2 changes: 1 addition & 1 deletion addon/components/uk-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default class UkModal extends Component {

assert(
`Your specified @container query selector ${this.args.container} did not return an element. Check your query selector and check if the element actually exists.`,
containerElement
containerElement,
);

return containerElement;
Expand Down
2 changes: 1 addition & 1 deletion addon/components/uk-switcher/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class UkSwitcherNavComponent extends Component {

assert(
`The @type argument can of the \`UkSwitcher\` component be "tab" or "subnav", "${this.args.type}" was passed`,
component
component,
);

return component;
Expand Down
2 changes: 1 addition & 1 deletion addon/modifiers/register-uikit-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export default modifier(
UIkit.util.on(element, name, (...args) => run(() => fn(...args)));
});
},
{ eager: false }
{ eager: false },
);
2 changes: 1 addition & 1 deletion addon/modifiers/uk-tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ export default modifier(

return () => tooltip.$destroy();
},
{ eager: false }
{ eager: false },
);
10 changes: 5 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module.exports = {

uikitScripts = map(
uikitScripts,
(content) => `if (typeof FastBoot === 'undefined') { ${content} }`
(content) => `if (typeof FastBoot === 'undefined') { ${content} }`,
);

const appTree = this._super.treeForVendor.call(this, tree);
Expand All @@ -81,7 +81,7 @@ module.exports = {

const options = Object.assign(
Object.assign({}, DEFAULT_OPTIONS),
this.app.options["ember-uikit"]
this.app.options["ember-uikit"],
);

this.uikitOptions = options;
Expand All @@ -91,7 +91,7 @@ module.exports = {
this.uikitOptions.blacklist.length
) {
this.ui.writeWarnLine(
"[ember-uikit]: `blacklist` and `whitelist` should not be used simultaneously - ignoring whitelist."
"[ember-uikit]: `blacklist` and `whitelist` should not be used simultaneously - ignoring whitelist.",
);
}

Expand Down Expand Up @@ -141,7 +141,7 @@ module.exports = {
treeForAddonTemplates(tree) {
return this._super.treeForAddonTemplates.call(
this,
this._filterComponents(tree)
this._filterComponents(tree),
);
},

Expand Down Expand Up @@ -201,7 +201,7 @@ module.exports = {
/* eslint-disable n/no-extraneous-require */
require("resolve").sync("uikit/package.json", {
basedir: this.project.root,
})
}),
);
},

Expand Down
Loading