Skip to content

Commit aabd60d

Browse files
committed
Merge branch 'release/2.3.0'
2 parents c8ee987 + aeab252 commit aabd60d

File tree

90 files changed

+8446
-8795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+8446
-8795
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ jobs:
6969
with:
7070
github_token: ${{ secrets.GITHUB_TOKEN }}
7171
build_script: npm run build-for-export-size
72-
paths: dist
72+
paths: ./dist

package-lock.json

Lines changed: 7005 additions & 7542 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/js-toolkit-workspace",
3-
"version": "2.2.3",
3+
"version": "2.3.0",
44
"private": true,
55
"workspaces": [
66
"packages/*"
@@ -27,15 +27,15 @@
2727
"@studiometa/prettier-config": "^2.1.1",
2828
"@studiometa/stylelint-config": "^2.0.0",
2929
"@types/estree": "^0.0.51",
30-
"@types/jest": "^27.5.1",
31-
"@types/node": "^17.0.35",
32-
"@typescript-eslint/eslint-plugin": "^5.26.0",
33-
"@typescript-eslint/parser": "^5.26.0",
34-
"esbuild": "^0.14.39",
30+
"@types/jest": "^27.5.2",
31+
"@types/node": "^17.0.42",
32+
"@typescript-eslint/eslint-plugin": "^5.27.1",
33+
"@typescript-eslint/parser": "^5.27.1",
34+
"esbuild": "^0.14.43",
3535
"eslint": "^8.16.0",
36-
"eslint-plugin-jest": "^26.2.2",
36+
"eslint-plugin-jest": "^26.5.3",
3737
"fast-glob": "^3.2.11",
38-
"prettier": "^2.6.2",
38+
"prettier": "^2.7.1",
3939
"typescript": "^4.7.2"
4040
}
4141
}

packages/demo/meta.config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@ module.exports = {
66
webpack(config, isDev) {
77
config.resolve.alias = {
88
...(config.resolve.alias || {}),
9-
vue$: 'vue/dist/vue.esm.js',
109
'@studiometa/js-toolkit': path.resolve(__dirname, '../js-toolkit'),
1110
};
1211

12+
// Remove Vue loader and plugin.
13+
config.plugins = config.plugins.filter((plugin) => {
14+
return plugin.constructor.name !== 'VueLoaderPlugin';
15+
});
16+
config.module.rules = config.module.rules.filter((rule) => {
17+
return !(rule.use && rule.use.includes('vue-loader'));
18+
});
19+
1320
config.plugins.push(
1421
new webpack.DefinePlugin({
1522
__DEV__: JSON.stringify(isDev),

packages/demo/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/js-toolkit-demo",
3-
"version": "2.2.3",
3+
"version": "2.3.0",
44
"private": true,
55
"type": "commonjs",
66
"scripts": {
@@ -15,10 +15,9 @@
1515
"@studiometa/webpack-config": "^3.1.2",
1616
"eslint": "^8.16.0",
1717
"postcss": "^8.4.14",
18-
"prettier": "^2.6.2",
18+
"prettier": "^2.7.1",
1919
"stylefire": "^7.0.3",
20-
"stylelint": "^14.8.5",
21-
"tailwindcss": "^3.0.24",
22-
"vue": "^2.6.14"
20+
"stylelint": "^13.13.1",
21+
"tailwindcss": "^3.1.3"
2322
}
2423
}

packages/demo/src/js/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import {
99
} from '@studiometa/js-toolkit';
1010
import { matrix } from '@studiometa/js-toolkit/utils/css';
1111
import ScrollToDemo from './components/ScrollToDemo.js';
12-
import MyVueComponent from './components/MyVueComponent.js';
1312
import Parallax from './components/Parallax.js';
1413
import ResponsiveOptions from './components/ResponsiveOptions.js';
1514
import AnimateTest from './components/AnimateTest.js';
1615
import AnimateScrollTest from './components/AnimateScrollTest.js';
1716
import AnimateTestMultiple from './components/AnimateTestMultiple.js';
17+
import ParentNativeEvent from './components/ParentNativeEvent/index.js';
1818

1919
/**
2020
* App class.
@@ -28,6 +28,7 @@ class App extends Base {
2828
refs: ['modal'],
2929
log: false,
3030
components: {
31+
ParentNativeEvent,
3132
AnimateTest,
3233
AnimateScrollTest,
3334
AnimateTestMultiple,
@@ -106,7 +107,6 @@ class App extends Base {
106107
app
107108
),
108109
ScrollToDemo,
109-
MyVueComponent,
110110
Parallax,
111111
},
112112
};

packages/demo/src/js/components/AnimateTest.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Base } from '@studiometa/js-toolkit';
2-
import { animate, ease } from '@studiometa/js-toolkit/utils';
2+
import { animate, ease, domScheduler } from '@studiometa/js-toolkit/utils';
33

44
/**
55
* AnimateTest class.
@@ -35,7 +35,9 @@ export default class AnimateTest extends Base {
3535
duration: this.$options.duration,
3636
easing: ease[this.$options.easing],
3737
onProgress: (progress) => {
38-
this.$refs.progress.value = progress;
38+
domScheduler.write(() => {
39+
this.$refs.progress.value = progress;
40+
});
3941
},
4042
}
4143
);

packages/demo/src/js/components/CustomComponent.vue

Lines changed: 0 additions & 26 deletions
This file was deleted.

packages/demo/src/js/components/MyVueComponent.js

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Base } from '@studiometa/js-toolkit';
2+
3+
/**
4+
* Child class.
5+
*/
6+
export default class Child extends Base {
7+
/**
8+
* Config.
9+
*/
10+
static config = {
11+
name: 'Child',
12+
};
13+
}

0 commit comments

Comments
 (0)