Skip to content

Commit bb608dc

Browse files
committed
chore: fix update modules
1 parent 9300af7 commit bb608dc

29 files changed

Lines changed: 3913 additions & 2781 deletions

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"intercept-stdout": "0.1.2",
7171
"lerna": "^4.0.0",
7272
"lerna-changelog": "2.2.0",
73-
"typescript": "^4.5.0 <4.6.0"
73+
"typescript": "^4.8 <4.9"
7474
},
7575
"workspaces": {
7676
"packages": [
@@ -97,7 +97,7 @@
9797
"resolutions": {
9898
"@daybrush/utils": "^1.13.0",
9999
"@types/react": "^16.9.17",
100-
"typescript": "^4.5.0 <4.6.0",
100+
"typescript": "^4.8 <4.9",
101101
"@storybook/react": "^6.4.22",
102102
"@storybook/addon-actions": "^6.4.22",
103103
"@storybook/addon-controls": "^6.4.22",
@@ -121,7 +121,7 @@
121121
"overrides": {
122122
"@daybrush/utils": "^1.13.0",
123123
"@types/react": "^16.9.17",
124-
"typescript": "^4.5.0 <4.6.0",
124+
"typescript": "^4.8 <4.9",
125125
"@storybook/react": "^6.4.22",
126126
"@storybook/addon-actions": "^6.4.22",
127127
"@storybook/addon-controls": "^6.4.22",

packages/croact-moveable/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"sideEffects": false,
88
"types": "declaration/index.d.ts",
99
"scripts": {
10-
"lint": "tslint -c tslint.json 'src/**/*.ts'",
1110
"start": "open ./demo/index.html && rollup -c rollup.config.demo.js -w",
1211
"build": "rollup -c && npm run declaration && print-sizes ./dist ",
1312
"declaration": "rm -rf declaration && tsc -p tsconfig.declaration.json",
@@ -56,16 +55,15 @@
5655
},
5756
"homepage": "https://daybrush.com/moveable",
5857
"devDependencies": {
59-
"@daybrush/builder": "^0.1.2",
58+
"@daybrush/builder": "^0.2.4",
6059
"@types/react": "^16.9.17",
6160
"croact": "^1.0.4",
6261
"keycon": "^0.3.0",
6362
"print-sizes": "^0.2.0",
6463
"pvu": "^0.6.1",
6564
"rollup-plugin-css-bundle": "^1.0.4",
6665
"rollup-plugin-react-compat": "^0.1.1",
67-
"tslint": "^5.16.0",
68-
"typescript": "^4.5.0 <4.6.0"
66+
"typescript": "^4.8 <4.9"
6967
},
7068
"peerDependencies": {
7169
"croact": "^1.0.4"

packages/croact-moveable/rollup.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ module.exports = builder([
4141
format: "es",
4242
plugins: [reactPlugin],
4343
external,
44+
typescript2: true,
4445
},
4546
{
4647
sourcemap: false,
@@ -50,5 +51,6 @@ module.exports = builder([
5051
plugins: [reactPlugin],
5152
format: "cjs",
5253
external,
54+
typescript2: true,
5355
},
5456
]);

packages/helper/package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,13 @@
5757
"homepage": "https://daybrush.com/moveable",
5858
"devDependencies": {
5959
"@babel/core": "^7.7.2",
60-
"@daybrush/builder": "^0.1.2",
60+
"@daybrush/builder": "^0.2.4",
6161
"@daybrush/tester": "^0.1.3",
6262
"@types/node": "^14.6.0",
6363
"@types/react": "^16.9.17",
6464
"@types/react-dom": "^16.9.4",
65-
"@types/jest": "^24.0.13",
66-
"@typescript-eslint/eslint-plugin": "^3.9.1",
67-
"@typescript-eslint/parser": "^3.9.1",
6865
"babel-loader": "^8.0.6",
6966
"css-loader": "^5.0.1",
70-
"eslint": "^7.7.0",
71-
"eslint-plugin-import": "^2.22.1",
72-
"eslint-plugin-react": "^7.22.0",
7367
"gh-pages": "^2.1.1",
7468
"jest": "^24.8.0",
7569
"ts-jest": "^24.0.2",
@@ -79,9 +73,8 @@
7973
"raw-loader": "^4.0.2",
8074
"react": "^16.8.6",
8175
"react-dom": "^16.8.6",
82-
"ts-loader": "^8.3.0",
8376
"tslib": "^2.3.1",
84-
"typescript": "^4.5.0 <4.6.0"
77+
"typescript": "^4.8 <4.9"
8578
},
8679
"dependencies": {
8780
"@daybrush/utils": "^1.13.0"

packages/helper/rollup.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const builder = require("@daybrush/builder");
22

33
const defaultOptions = {
4+
typescript2: true,
45
tsconfig: "tsconfig.build.json",
56
};
67

packages/lit-moveable/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@
5757
"declaration": "rm -rf declaration && tsc -p tsconfig.declaration.json"
5858
},
5959
"devDependencies": {
60-
"@daybrush/builder": "^0.1.2",
60+
"@daybrush/builder": "^0.2.4",
6161
"lit": "^2.0",
62-
"tslint": "^5.20.1",
63-
"typescript": "^4.5.0 <4.6.0"
62+
"typescript": "^4.8 <4.9"
6463
},
6564
"dependencies": {
6665
"@daybrush/utils": "^1.13.0",

packages/moveable/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
"react-moveable": "~0.52.0"
7272
},
7373
"devDependencies": {
74-
"@daybrush/builder": "^0.1.2",
75-
"@daybrush/demo": "0.0.2",
74+
"@daybrush/builder": "^0.2.4",
7675
"@types/react": "^16.9.17",
7776
"@types/react-dom": "^16.9.4",
7877
"gh-pages": "^2.0.1",
@@ -83,7 +82,6 @@
8382
"rollup-plugin-css-bundle": "^1.0.4",
8483
"rollup-plugin-react-compat": "^0.1.1",
8584
"tslib": "^2.3.1",
86-
"tslint": "^6.1.3",
87-
"typescript": "^4.5.0 <4.6.0"
85+
"typescript": "^4.8 <4.9"
8886
}
8987
}

packages/moveable/rollup.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ module.exports = builder([
4646
format: "umd",
4747
minifyPrototype: true,
4848
plugins: [resolveCompatPlugin],
49+
typescript2: true,
4950
},
5051
{
5152
name: "Moveable",
@@ -56,6 +57,7 @@ module.exports = builder([
5657
minifyPrototype: true,
5758
plugins: [resolveCompatPlugin],
5859
uglify: true,
60+
typescript2: true,
5961
},
6062
{
6163
input: "src/index.ts",
@@ -65,6 +67,7 @@ module.exports = builder([
6567
minifyPrototype: true,
6668
plugins: [compatPlugin],
6769
external,
70+
typescript2: true,
6871
},
6972
{
7073
input: "src/index.cjs.ts",
@@ -74,5 +77,6 @@ module.exports = builder([
7477
minifyPrototype: true,
7578
plugins: [compatPlugin],
7679
external,
80+
7781
},
7882
]);

packages/moveable/src/utils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function getElementInfo(
1111
export function makeAble<
1212
Name extends string,
1313
AbleObject extends Partial<Able<any, any>>,
14-
Props extends DefaultProps<Name, AbleObject>,
1514
>(name: Name, able: AbleObject) {
16-
return makeAbleFunction<Name, AbleObject, Props>(name, able);
15+
return makeAbleFunction<Name, AbleObject>(name, able);
1716
}

packages/ngx-moveable/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"prefix": "lib",
122122
"architect": {
123123
"build": {
124-
"builder": "@angular-devkit/build-ng-packagr:build",
124+
"builder": "@angular-devkit/build-angular:ng-packagr",
125125
"options": {
126126
"tsConfig": "projects/ngx-moveable/tsconfig.lib.json",
127127
"project": "projects/ngx-moveable/ng-package.json"

0 commit comments

Comments
 (0)