Skip to content

Commit

Permalink
Merge branch 'hotfix/2.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
titouanmathis committed Oct 14, 2022
2 parents 506545c + bdd642d commit 30901a4
Show file tree
Hide file tree
Showing 21 changed files with 3,683 additions and 6,206 deletions.
9,665 changes: 3,572 additions & 6,093 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/js-toolkit-workspace",
"version": "2.6.1",
"version": "2.6.2",
"private": true,
"workspaces": [
"packages/*"
Expand All @@ -26,21 +26,21 @@
"devDependencies": {
"@studiometa/eslint-config": "^3.0.5",
"@studiometa/prettier-config": "^2.1.1",
"@studiometa/stylelint-config": "^2.0.0",
"@types/estree": "^0.0.52",
"@types/jest": "^27.5.2",
"@types/node": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.36.0",
"@typescript-eslint/parser": "^5.36.0",
"eslint": "^8.22.0",
"@studiometa/stylelint-config": "^3.0.0",
"@types/estree": "^1.0.0",
"@types/jest": "^29.1.2",
"@types/node": "^18.11.0",
"@typescript-eslint/eslint-plugin": "^5.40.0",
"@typescript-eslint/parser": "^5.40.0",
"eslint": "^8.25.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-jest": "^26.8.3",
"eslint-plugin-jest": "^27.1.1",
"prettier": "^2.7.1",
"typescript": "^4.7.4"
"typescript": "^4.8.4"
},
"dependencies": {
"esbuild": "^0.15.5",
"fast-glob": "^3.2.11",
"esbuild": "^0.15.11",
"fast-glob": "^3.2.12",
"patch-package": "^6.4.7"
}
}
14 changes: 7 additions & 7 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/js-toolkit-demo",
"version": "2.6.1",
"version": "2.6.2",
"private": true,
"type": "commonjs",
"scripts": {
Expand All @@ -9,15 +9,15 @@
},
"dependencies": {
"@studiometa/eslint-config": "^3.0.5",
"@studiometa/stylelint-config": "^2.0.0",
"@studiometa/tailwind-config": "^1.1.0",
"@studiometa/ui": "^0.2.11",
"@studiometa/stylelint-config": "^3.0.0",
"@studiometa/tailwind-config": "^2.0.2",
"@studiometa/ui": "^0.2.16",
"@studiometa/webpack-config": "^4.0.3",
"eslint": "^8.22.0",
"postcss": "^8.4.16",
"eslint": "^8.25.0",
"postcss": "^8.4.18",
"prettier": "^2.7.1",
"stylefire": "^7.0.3",
"stylelint": "^13.13.1",
"stylelint": "^14.13.0",
"tailwindcss": "^3.1.8"
}
}
4 changes: 2 additions & 2 deletions packages/docs/.vitepress/theme/components/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
<KBarProvider :actions="actions" :options="{ placeholder: 'Search docs' }">
<ClientOnly>
<KBarPortal>
<KBarPositioner class="z-goku">
<div class="z-under absolute inset-0 bg-vp-text-1 dark:bg-vp-bg-soft opacity-80"></div>
<KBarPositioner class="z-50">
<div class="z-[-1] absolute inset-0 bg-vp-text-1 dark:bg-vp-bg-soft opacity-80"></div>
<KBarAnimator
class="bg-vp-bg shadow-lg rounded-lg w-full h-full max-w-lg max-h-lg overflow-hidden divide-y"
>
Expand Down
10 changes: 5 additions & 5 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@studiometa/js-toolkit-docs",
"version": "2.6.1",
"version": "2.6.2",
"type": "module",
"private": true,
"scripts": {
"dev": "vitepress dev .",
"build": "vitepress build ."
},
"dependencies": {
"@bytebase/vue-kbar": "^0.1.7",
"@studiometa/tailwind-config": "^1.1.0",
"tailwindcss": "^3.1.6",
"vitepress": "^1.0.0-alpha.15"
"@bytebase/vue-kbar": "^0.1.8",
"@studiometa/tailwind-config": "^2.0.2",
"tailwindcss": "^3.1.8",
"vitepress": "^1.0.0-alpha.21"
}
}
4 changes: 1 addition & 3 deletions packages/js-toolkit/Base/managers/ServicesManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ export class ServicesManager extends AbstractManager {
}
const serviceInstance = this.__services[service]();

serviceInstance.add(this.__base.$id, (...args) => {
this.__base.__callMethod(service, ...args);
});
serviceInstance.add(this.__base.$id, (...args) => this.__base.__callMethod(service, ...args));

return this.disable.bind(this, service);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/js-toolkit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/js-toolkit",
"version": "2.6.1",
"version": "2.6.2",
"description": "A set of useful little bits of JavaScript to boost your project! 🚀",
"publishConfig": {
"access": "public"
Expand Down
28 changes: 14 additions & 14 deletions packages/tests/Base/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`A Base instance config should have a working debug method when active in dev mode 1`] = `
Array [
Array [
[
[
"[debug] [Foo-37]",
"constructor",
Foo {
Expand All @@ -22,38 +22,38 @@ Array [
},
"__refs": RefsManager {},
"__services": ServicesManager {
"__customServices": Object {},
"__customServices": {},
},
},
],
Array [
[
"[debug] [Foo-37]",
"$emit",
"before-mounted",
Array [],
[],
],
Array [
[
"[debug] [Foo-37]",
"$mount",
],
Array [
[
"[debug] [Foo-37]",
"callMethod",
"mounted",
],
Array [
[
"[debug] [Foo-37]",
"$emit",
"mounted",
Array [],
[],
],
]
`;

exports[`A Base instance should inherit from parent config 1`] = `
Object {
"components": Object {},
"emits": Array [
{
"components": {},
"emits": [
"before-mounted",
"mounted",
"updated",
Expand All @@ -79,10 +79,10 @@ Object {
],
"log": false,
"name": "D",
"options": Object {
"options": {
"color": [Function],
"title": [Function],
},
"refs": Array [],
"refs": [],
}
`;
2 changes: 1 addition & 1 deletion packages/tests/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`The package exports should export helpers and the Base class 1`] = `
Array [
[
"Base",
"createApp",
"getClosestParent",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`The withScrolledInView decorator should trigger the \`scrolledInView\` hook when in view 1`] = `
Object {
"current": Object {
{
"current": {
"x": 600,
"y": 600,
},
"end": Object {
"end": {
"x": 600,
"y": 600,
},
"progress": Object {
"progress": {
"x": 1,
"y": 1,
},
"start": Object {
"start": {
"x": -524,
"y": -268,
},
}
`;

exports[`The withScrolledInView decorator should trigger the \`scrolledInView\` hook when in view with the \`useOffsetSizes\` option 1`] = `
Object {
"current": Object {
{
"current": {
"x": 600,
"y": 600,
},
"end": Object {
"end": {
"x": 600,
"y": 600,
},
"progress": Object {
"progress": {
"x": 1,
"y": 1,
},
"start": Object {
"start": {
"x": -524,
"y": -268,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`The \`withVue\` decorator should destroy the vue component 1`] = `
exports[`The \`withVue\` decorator should instantiate the vue component 1`] = `
"
<div>
<div data-ref=\\"vue\\"></div>
<div data-ref="vue"></div>
</div>
"
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/tests/helpers/__snapshots__/index.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`helpers exports 1`] = `
Array [
[
"createApp",
"getClosestParent",
"getDirectChildren",
Expand Down
12 changes: 6 additions & 6 deletions packages/tests/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "@studiometa/js-toolkit-tests",
"version": "2.6.1",
"version": "2.6.2",
"private": true,
"type": "module",
"scripts": {
"test": "NODE_NO_WARNINGS=1 NODE_OPTIONS=--experimental-vm-modules jest"
},
"dependencies": {
"@jest/globals": "^28.1.3",
"babel-jest": "^28.1.3",
"@jest/globals": "^29.2.0",
"babel-jest": "^29.2.0",
"esbuild-jest": "^0.5.0",
"htl": "^0.3.1",
"html-loader-jest": "^0.2.1",
"jest": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"jest": "^29.2.0",
"jest-environment-jsdom": "^29.2.0",
"ts-jest-resolver": "^2.0.0"
},
"devDependencies": {
"@jest/types": "^28.1.3",
"@jest/types": "^29.2.0",
"vue": "2.6"
}
}
Loading

0 comments on commit 30901a4

Please sign in to comment.