Skip to content

Commit

Permalink
Merge branch 'feature/dependencies-update' into feature/next
Browse files Browse the repository at this point in the history
  • Loading branch information
gius committed Jun 12, 2023
2 parents ba127b3 + 9f61b65 commit 9935503
Show file tree
Hide file tree
Showing 24 changed files with 4,833 additions and 8,462 deletions.
14 changes: 7 additions & 7 deletions examples/complexdemo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
"@frui.ts/validation": "^999.0.0",
"@frui.ts/views": "^999.0.0",
"class-transformer": "^0.5.1",
"mobx": "6.7.0",
"mobx-react-lite": "3",
"mobx": "6.9.0",
"mobx-react-lite": "3.4.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"ts-bus": "^2.3.1"
},
"devDependencies": {
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"@vitejs/plugin-react": "^2.2.0",
"typescript": "^4.9.3",
"vite": "^3.2.4"
"@types/react": "^18.2.11",
"@types/react-dom": "^18.2.4",
"@vitejs/plugin-react": "^4.0.0",
"typescript": "^5.1.3",
"vite": "^4.3.9"
}
}
16 changes: 8 additions & 8 deletions examples/navigation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
"dependencies": {
"@frui.ts/views": "^999.0.0",
"@tanstack/react-router": "^0.0.1-beta.82",
"mobx": "6.7.0",
"mobx-react-lite": "3",
"mobx": "6.9.0",
"mobx-react-lite": "3.4.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.20.2",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"@vitejs/plugin-react": "^2.2.0",
"typescript": "^4.9.3",
"vite": "^3.2.4"
"@babel/plugin-proposal-decorators": "^7.22.5",
"@types/react": "^18.2.11",
"@types/react-dom": "^18.2.4",
"@vitejs/plugin-react": "^4.0.0",
"typescript": "^5.1.3",
"vite": "^4.3.9"
}
}
18 changes: 9 additions & 9 deletions examples/todolist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@frui.ts/htmlcontrols": "^999.0.0",
"@frui.ts/views": "^999.0.0",
"@tanstack/react-router": "^0.0.1-beta.82",
"mobx": "6.7.0",
"mobx-react-lite": "3",
"mobx": "6.9.0",
"mobx-react-lite": "3.4.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"todomvc-app-css": "^2.4.2",
Expand All @@ -22,12 +22,12 @@
},
"devDependencies": {
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.20.2",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"@types/uuid": "^8.3.4",
"@vitejs/plugin-react": "^2.2.0",
"typescript": "^4.9.3",
"vite": "^3.2.4"
"@babel/plugin-proposal-decorators": "^7.22.5",
"@types/react": "^18.2.11",
"@types/react-dom": "^18.2.4",
"@types/uuid": "^9.0.2",
"@vitejs/plugin-react": "^4.0.0",
"typescript": "^5.1.3",
"vite": "^4.3.9"
}
}
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"version": "999.0.0",
"npmClient": "yarn",
"packages": ["packages/*", "stories", "examples/*"],
"useWorkspaces": true,
"command": {
"publish": {
"ignoreChanges": ["ignored-file", "*.md"]
Expand Down
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,18 @@
"validate": "yarn run cleanbuild && yarn run test --run && yarn run lint && yarn run publish:all"
},
"devDependencies": {
"@emanprague/eslint-config": "^3.1.0",
"@testing-library/react": "13.4.0",
"@emanprague/eslint-config": "^3.2.1",
"@testing-library/react": "14.0.0",
"cross-env": "^7.0.3",
"eslint": "^8.28.0",
"happy-dom": "^7.7.0",
"lerna": "^6.0.3",
"lerna-update-wizard": "^1.1.2",
"mobx": "6.7.0",
"prettier": "^2.8.0",
"rimraf": "^3.0.2",
"typedoc": "^0.23.21",
"vite": "^3.2.4",
"vitest": "^0.25.3",
"vitest-mock-extended": "^1.0.7"
"eslint": "^8.42.0",
"happy-dom": "^9.20.3",
"lerna": "^7.0.0",
"mobx": "6.9.0",
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"typedoc": "^0.24.8",
"vite": "^4.3.9",
"vitest": "^0.32.0",
"vitest-mock-extended": "^1.1.3"
}
}
2 changes: 1 addition & 1 deletion packages/apiclient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@frui.ts/helpers": "^999.0.0",
"qs": "^6.11.0"
"qs": "^6.11.2"
},
"devDependencies": {
"@types/qs": "^6.9.7"
Expand Down
4 changes: 2 additions & 2 deletions packages/dataviews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"dependencies": {
"@frui.ts/data": "^999.0.0",
"@frui.ts/helpers": "^999.0.0",
"mobx-react-lite": "3"
"mobx-react-lite": "3.4.3"
},
"devDependencies": {
"@types/react": "^18.0.25",
"@types/react": "^18.2.11",
"copyfiles": "^2.4.1"
},
"peerDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/dirtycheck/src/automaticDirtyWatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export default class AutomaticDirtyWatcher<TEntity extends object = any> extends
const propertyName = name as PropertyName<TEntity>;
if (
(!this._includedProperties || this._includedProperties.includes(propertyName)) &&
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
(!this._excludedProperties || !this._excludedProperties.includes(propertyName))
) {
this._watchedProperties.push(propertyName);
Expand Down
18 changes: 9 additions & 9 deletions packages/generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@
},
"dependencies": {
"@apidevtools/swagger-parser": "^10.1.0",
"cli-progress": "^3.11.2",
"commander": "^9.4.1",
"cli-progress": "^3.12.0",
"commander": "^10.0.1",
"handlebars": "^4.7.7",
"lodash": "^4.17.21",
"openapi-types": "^12.0.2",
"ts-morph": "^17.0.1"
"openapi-types": "^12.1.3",
"ts-morph": "^18.0.0"
},
"devDependencies": {
"@types/cli-progress": "^3.11.0",
"@types/lodash": "4.14.190",
"@types/node": "18.11.9",
"nodemon": "2.0.20",
"rimraf": "^3.0.2",
"@types/lodash": "4.14.195",
"@types/node": "20.3.0",
"nodemon": "2.0.22",
"rimraf": "^5.0.1",
"shx": "^0.3.4",
"ts-node": "^10.9.1",
"vite-plugin-banner": "^0.6.1"
"vite-plugin-banner": "^0.7.0"
}
}
4 changes: 2 additions & 2 deletions packages/htmlcontrols/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"build": "vite build && tsc --noEmit false --emitDeclarationOnly"
},
"devDependencies": {
"@types/react": "^18.0.25"
"@types/react": "^18.2.11"
},
"dependencies": {
"@frui.ts/helpers": "^999.0.0",
"@frui.ts/views": "^999.0.0",
"mobx-react-lite": "3"
"mobx-react-lite": "3.4.3"
},
"peerDependencies": {
"mobx": "6",
Expand Down
2 changes: 1 addition & 1 deletion packages/validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"lodash-es": "^4.17.21"
},
"devDependencies": {
"@types/lodash-es": "4.17.6"
"@types/lodash-es": "4.17.7"
},
"peerDependencies": {
"mobx": "6"
Expand Down
6 changes: 3 additions & 3 deletions packages/views/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"build": "vite build && tsc --noEmit false --emitDeclarationOnly"
},
"devDependencies": {
"@types/lodash": "4.14.190",
"@types/lodash-es": "4.17.6",
"@types/react": "^18.0.25"
"@types/lodash": "4.14.195",
"@types/lodash-es": "4.17.7",
"@types/react": "^18.2.11"
},
"dependencies": {
"@frui.ts/helpers": "^999.0.0",
Expand Down
40 changes: 20 additions & 20 deletions stories/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
const reactPlugin = require("@vitejs/plugin-react");

module.exports = {
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
addons: ["@storybook/addon-links", "@storybook/addon-essentials", "@storybook/addon-interactions"],
framework: "@storybook/react",
core: {
builder: "@storybook/builder-vite",
framework: {
name: "@storybook/react-vite",
options: {}
},

async viteFinal(config, { configType }) {
config.plugins = [
...config.plugins.filter(plugin => {
return !(Array.isArray(plugin) && plugin[0].name === "vite:react-babel");
}),
reactPlugin({
exclude: [/\.stories\.(t|j)sx?$/, /node_modules/],
babel: {
parserOpts: {
plugins: ["decorators-legacy"],
},
},
}),
];
async viteFinal(config, {
configType
}) {
config.plugins = [...config.plugins.filter(plugin => {
return !(Array.isArray(plugin) && plugin[0].name === "vite:react-babel");
}), reactPlugin({
exclude: [/\.stories\.(t|j)sx?$/, /node_modules/],
babel: {
parserOpts: {
plugins: ["decorators-legacy"]
}
}
})];
return config;
},
};
docs: {
autodocs: true
}
};
26 changes: 13 additions & 13 deletions stories/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.20.2",
"@rollup/pluginutils": "^4.2.1",
"@storybook/addon-actions": "^6.5.12",
"@storybook/addon-essentials": "^6.5.12",
"@storybook/addon-interactions": "^6.5.12",
"@storybook/addon-links": "^6.5.12",
"@storybook/builder-vite": "^0.2.4",
"@storybook/react": "^6.5.12",
"@storybook/testing-library": "^0.0.13",
"babel-loader": "^8.2.5"
"@storybook/addon-actions": "^7.0.20",
"@storybook/addon-essentials": "^7.0.20",
"@storybook/addon-interactions": "^7.0.20",
"@storybook/addon-links": "^7.0.20",
"@storybook/react": "^7.0.20",
"@storybook/react-vite": "7.0.20",
"@storybook/testing-library": "^0.1.0",
"react-dom": "^18.2.0",
"storybook": "7.0.20"
},
"dependencies": {
"@frui.ts/dirtycheck": "^999.0.0",
"@frui.ts/helpers": "^999.0.0",
"@frui.ts/htmlcontrols": "^999.0.0",
"@frui.ts/validation": "^999.0.0",
"@frui.ts/views": "^999.0.0",
"mobx": "6.7.0",
"mobx-react-lite": "3",
"mobx": "6.9.0",
"mobx-react-lite": "3.4.3",
"react": "^18.2.0"
},
"scripts": {
"storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 6006",
"build-storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider build-storybook"
"storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider storybook dev -p 6006",
"build-storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider storybook build"
}
}
9 changes: 6 additions & 3 deletions stories/src/binding.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useBinding } from "@frui.ts/views";
import { storiesOf } from "@storybook/react";
import { action, observable } from "mobx";
import { observer, Observer } from "mobx-react-lite";
import React from "react";
Expand All @@ -16,7 +15,11 @@ const MyComponent = observer(() => {
return <input value={name as string} onChange={e => setName(e.target.value)} />;
});

storiesOf("useBinding", module).add("Simple", () => {
export default {
title: "useBinding",
};

export const Simple = () => {
return (
<>
<MyComponent />
Expand All @@ -33,4 +36,4 @@ storiesOf("useBinding", module).add("Simple", () => {
<button onClick={action(() => (observableTarget.name = "John"))}>Reset</button>
</>
);
});
};

0 comments on commit 9935503

Please sign in to comment.