Skip to content

Commit b61365f

Browse files
SachaGSachaG
committed
2 parents bb0d307 + 55a6e17 commit b61365f

File tree

54 files changed

+641
-424
lines changed

Some content is hidden

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

54 files changed

+641
-424
lines changed

‎.storybook/main.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import ResolveTypeScriptPlugin from "resolve-typescript-plugin";
12
import { WebpackPluginInstance, Configuration } from "webpack";
23
module.exports = {
34
core: {
@@ -22,6 +23,9 @@ module.exports = {
2223
"@storybook/addon-interactions",
2324
],
2425
webpackFinal: async (config: Configuration, { configType }) => {
26+
if (!config.resolve) {
27+
config.resolve = {};
28+
}
2529
// add magic imports and isomorphic imports to Storybook
2630
// Webpack4
2731
//withVulcan.node = { ...(withVulcan.node || {}), fs: "empty" };
@@ -37,6 +41,17 @@ module.exports = {
3741
https: false,
3842
zlib: false,
3943
};
44+
config.resolve.plugins = [
45+
...(config.resolve.plugins || []),
46+
47+
/**
48+
* See https://github.com/storybookjs/storybook/issues/15962
49+
* and https://github.com/softwareventures/resolve-typescript-plugin
50+
* and https://github.com/evanw/esbuild/issues/622
51+
* and https://github.com/egoist/tsup/issues/736
52+
*/
53+
new ResolveTypeScriptPlugin(),
54+
];
4055
return config;
4156
},
4257
};

‎docusaurus/docs/vulcan-meteor-legacy/features/head-tags.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
title: Head Tags
33
---
44

5+
/!\ In Vulcan Next and Vulcan NPM,
6+
we don't provide Head Tags anymore,
7+
because modern frameworks already provide their own solution at app-level
8+
59
You'll often need to add tags to your app's `<head>` section. There are three ways to do this: using the [Helmet](https://github.com/nfl/react-helmet) library, using the `<Components.HeadTags/>` component, or using the `Head` object.
610

711
## Helmet

‎docusaurus/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/docusaurus",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"private": true,
55
"scripts": {
66
"docusaurus": "docusaurus",

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.7.2-alpha.2",
2+
"version": "0.7.2-alpha.7",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
55
"packages": [

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"operation-name-mock-link": "^0.0.6",
5959
"react": "^17.0.1",
6060
"react-dom": "^17.0.1",
61+
"resolve-typescript-plugin": "^1.2.0",
6162
"tsup": "^6.0.1",
6263
"turbo": "^1.1.5",
6364
"typescript": "4.6",

‎packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/core",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"main": "dist/index.js",
55
"files": [
66
"dist/"
@@ -33,7 +33,7 @@
3333
"access": "public"
3434
},
3535
"dependencies": {
36-
"@vulcanjs/utils": "^0.7.2-alpha.1",
36+
"@vulcanjs/utils": "^0.7.2-alpha.3",
3737
"debug": "^4.3.1",
3838
"lodash": "^4.17.21"
3939
}

‎packages/crud/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/crud",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"main": "./dist/index.js",
55
"files": [
66
"dist/"
@@ -23,11 +23,11 @@
2323
"homepage": "https://github.com/VulcanJS/vulcan-npm#readme",
2424
"license": "MIT",
2525
"dependencies": {
26-
"@vulcanjs/core": "^0.7.2-alpha.1",
27-
"@vulcanjs/model": "^0.7.2-alpha.1",
28-
"@vulcanjs/permissions": "^0.7.2-alpha.1",
29-
"@vulcanjs/schema": "^0.7.2-alpha.1",
30-
"@vulcanjs/utils": "^0.7.2-alpha.1",
26+
"@vulcanjs/core": "^0.7.2-alpha.3",
27+
"@vulcanjs/model": "^0.7.2-alpha.3",
28+
"@vulcanjs/permissions": "^0.7.2-alpha.3",
29+
"@vulcanjs/schema": "^0.7.2-alpha.3",
30+
"@vulcanjs/utils": "^0.7.2-alpha.3",
3131
"debug": "^4.3.1",
3232
"lodash": "^4.17.21"
3333
},

‎packages/eslint-vulcan-internal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "eslint-plugin-vulcan-internal",
33
"description": "A plugin for our custom liniting rules",
44
"private": true,
5-
"version": "0.7.2-alpha.1",
5+
"version": "0.7.2-alpha.3",
66
"main": "index.js"
77
}

‎packages/graphql/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/graphql",
3-
"version": "0.7.2-alpha.2",
3+
"version": "0.7.2-alpha.3",
44
"main": "./dist/index.js",
55
"files": [
66
"dist/"
@@ -27,12 +27,12 @@
2727
"homepage": "https://github.com/VulcanJS/vulcan-npm#readme",
2828
"license": "MIT",
2929
"dependencies": {
30-
"@vulcanjs/crud": "^0.7.2-alpha.1",
31-
"@vulcanjs/i18n": "^0.7.2-alpha.1",
32-
"@vulcanjs/model": "^0.7.2-alpha.1",
33-
"@vulcanjs/permissions": "^0.7.2-alpha.1",
34-
"@vulcanjs/schema": "^0.7.2-alpha.1",
35-
"@vulcanjs/utils": "^0.7.2-alpha.1",
30+
"@vulcanjs/crud": "^0.7.2-alpha.3",
31+
"@vulcanjs/i18n": "^0.7.2-alpha.3",
32+
"@vulcanjs/model": "^0.7.2-alpha.3",
33+
"@vulcanjs/permissions": "^0.7.2-alpha.3",
34+
"@vulcanjs/schema": "^0.7.2-alpha.3",
35+
"@vulcanjs/utils": "^0.7.2-alpha.3",
3636
"apollo-datasource": "^3.3.1",
3737
"debug": "^4.3.1",
3838
"deepmerge": "^4.2.2",

‎packages/i18n/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/i18n",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan i18n helpers",
55
"main": "./dist/index.js",
66
"files": [
@@ -28,8 +28,8 @@
2828
"author": "",
2929
"license": "MIT",
3030
"dependencies": {
31-
"@vulcanjs/schema": "^0.7.2-alpha.1",
32-
"@vulcanjs/utils": "^0.7.2-alpha.1",
31+
"@vulcanjs/schema": "^0.7.2-alpha.3",
32+
"@vulcanjs/utils": "^0.7.2-alpha.3",
3333
"prop-types": "^15.7.2",
3434
"simpl-schema": "^1.12.0"
3535
},

‎packages/mdx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/mdx",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan MDX (Markdown + JSX) helpers",
55
"main": "./dist/index.js",
66
"files": [

‎packages/meteor-legacy/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/meteor-legacy",
3-
"version": "0.7.2-alpha.2",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan Meteor bindings",
55
"main": "./dist/index.js",
66
"files": [
@@ -27,7 +27,7 @@
2727
"url": "https://github.com/VulcanJS/vulcan-npm/issues"
2828
},
2929
"dependencies": {
30-
"@vulcanjs/graphql": "^0.7.2-alpha.2",
30+
"@vulcanjs/graphql": "^0.7.2-alpha.3",
3131
"lodash": "^4.17.21"
3232
},
3333
"peerDependencies": {

‎packages/model/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/model",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan domain models built from schema",
55
"main": "./dist/index.js",
66
"files": [
@@ -29,7 +29,7 @@
2929
"url": "https://github.com/VulcanJS/vulcan-npm/issues"
3030
},
3131
"dependencies": {
32-
"@vulcanjs/schema": "^0.7.2-alpha.1",
32+
"@vulcanjs/schema": "^0.7.2-alpha.3",
3333
"lodash": "^4.17.21"
3434
},
3535
"gitHead": "f4594745e0a5c455a2f0c3e78fa3ff7a35ef4c95",

‎packages/mongo-apollo/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/mongo-apollo",
3-
"version": "0.7.2-alpha.2",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan mongo + Apollo graphql bindings and helpers",
55
"main": "./dist/index.js",
66
"files": [
@@ -36,10 +36,10 @@
3636
"url": "https://github.com/VulcanJS/vulcan-npm/issues"
3737
},
3838
"dependencies": {
39-
"@vulcanjs/crud": "^0.7.2-alpha.1",
40-
"@vulcanjs/graphql": "^0.7.2-alpha.2",
41-
"@vulcanjs/mongo": "^0.7.2-alpha.1",
42-
"@vulcanjs/utils": "^0.7.2-alpha.1",
39+
"@vulcanjs/crud": "^0.7.2-alpha.3",
40+
"@vulcanjs/graphql": "^0.7.2-alpha.3",
41+
"@vulcanjs/mongo": "^0.7.2-alpha.3",
42+
"@vulcanjs/utils": "^0.7.2-alpha.3",
4343
"apollo-datasource-mongodb": "^0.5.2",
4444
"graphql-objectid-scalar": "^1.0.4"
4545
},

‎packages/mongo/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/mongo",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan mongo bindings and helpers",
55
"main": "./dist/index.js",
66
"files": [
@@ -36,11 +36,11 @@
3636
"url": "https://github.com/VulcanJS/vulcan-npm/issues"
3737
},
3838
"dependencies": {
39-
"@vulcanjs/crud": "^0.7.2-alpha.1",
40-
"@vulcanjs/model": "^0.7.2-alpha.1",
41-
"@vulcanjs/permissions": "^0.7.2-alpha.1",
42-
"@vulcanjs/schema": "^0.7.2-alpha.1",
43-
"@vulcanjs/utils": "^0.7.2-alpha.1",
39+
"@vulcanjs/crud": "^0.7.2-alpha.3",
40+
"@vulcanjs/model": "^0.7.2-alpha.3",
41+
"@vulcanjs/permissions": "^0.7.2-alpha.3",
42+
"@vulcanjs/schema": "^0.7.2-alpha.3",
43+
"@vulcanjs/utils": "^0.7.2-alpha.3",
4444
"lodash": "^4.17.20"
4545
},
4646
"peerDependencies": {

‎packages/permissions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/permissions",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.3",
44
"description": "Vulcan permissions",
55
"main": "./dist/index.js",
66
"files": [
@@ -20,8 +20,8 @@
2020
"author": "",
2121
"license": "MIT",
2222
"dependencies": {
23-
"@vulcanjs/model": "^0.7.2-alpha.1",
24-
"@vulcanjs/schema": "^0.7.2-alpha.1",
23+
"@vulcanjs/model": "^0.7.2-alpha.3",
24+
"@vulcanjs/schema": "^0.7.2-alpha.3",
2525
"lodash": "^4.17.21"
2626
},
2727
"peerDependencies": {

‎packages/react-hooks/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/react-hooks",
3-
"version": "0.7.2-alpha.2",
3+
"version": "0.7.2-alpha.3",
44
"description": "Connect to an existing Vulcan backend using hooks",
55
"main": "./dist/index.js",
66
"files": [
@@ -19,9 +19,9 @@
1919
"author": "",
2020
"license": "MIT",
2121
"dependencies": {
22-
"@vulcanjs/crud": "^0.7.2-alpha.1",
23-
"@vulcanjs/graphql": "^0.7.2-alpha.2",
24-
"@vulcanjs/mongo": "^0.7.2-alpha.1",
22+
"@vulcanjs/crud": "^0.7.2-alpha.3",
23+
"@vulcanjs/graphql": "^0.7.2-alpha.3",
24+
"@vulcanjs/mongo": "^0.7.2-alpha.3",
2525
"debug": "^4.3.1",
2626
"lodash": "^4.17.20",
2727
"mingo": "^3.0.6"
@@ -38,7 +38,7 @@
3838
},
3939
"devDependencies": {
4040
"@testing-library/react-hooks": "^3.4.1",
41-
"@vulcanjs/schema": "^0.7.2-alpha.1",
41+
"@vulcanjs/schema": "^0.7.2-alpha.3",
4242
"mock-apollo-client": "^1.1.0",
4343
"react-test-renderer": "^16.13.1"
4444
}

‎packages/react-i18n/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vulcanjs/react-i18n",
3-
"version": "0.7.2-alpha.1",
3+
"version": "0.7.2-alpha.4",
44
"description": "Vulcan i18n React components",
55
"main": "./dist/index.js",
66
"files": [
@@ -24,8 +24,8 @@
2424
"author": "",
2525
"license": "MIT",
2626
"dependencies": {
27-
"@vulcanjs/i18n": "^0.7.2-alpha.1",
28-
"@vulcanjs/utils": "^0.7.2-alpha.1",
27+
"@vulcanjs/i18n": "^0.7.2-alpha.3",
28+
"@vulcanjs/utils": "^0.7.2-alpha.3",
2929
"prop-types": "^15.7.2"
3030
},
3131
"publishConfig": {

‎packages/react-i18n/tsup.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import path from "path";
33

44
const commonConfig = {
55
clean: true,
6-
splitting: false,
76
// Skip until .d.ts.map is also supported https://github.com/egoist/tsup/issues/564
87
// dts: true,
98
sourcemap: true,

‎packages/react-ui-bootstrap/components/VulcanComponents/bootstrapCoreComponents.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ import Dropdown from "../bootstrap/Dropdown";
1111
import { BootstrapModal } from "../bootstrap/Modal";
1212
import { ModalTrigger } from "../bootstrap/ModalTrigger";
1313
import { liteCoreComponents } from "@vulcanjs/react-ui-lite";
14+
import { FormattedMessage } from "@vulcanjs/react-i18n";
1415

1516
export const bootstrapCoreComponents: Partial<PossibleCoreComponents> = {
1617
...defaultCoreComponents,
1718
// TODO: boostrap doesn't include all components so we also
1819
// include the lite versio
1920
...liteCoreComponents,
21+
FormattedMessage,
2022
Alert,
2123
Button,
2224
TooltipTrigger,

‎packages/react-ui-bootstrap/components/VulcanComponents/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { bootstrapCoreComponents } from "./bootstrapCoreComponents";
2-
export { bootstrapFormComponents } from "./bootstrapFormComponents";
3-
export { bootstrapVulcanComponents } from "./bootstrapVulcanComponents";
1+
export { bootstrapCoreComponents } from "./bootstrapCoreComponents.js";
2+
export { bootstrapFormComponents } from "./bootstrapFormComponents.js";
3+
export { bootstrapVulcanComponents } from "./bootstrapVulcanComponents.js";

‎packages/react-ui-bootstrap/components/core/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { Alert } from "./Alert";
1+
export { Alert } from "./Alert.js";

‎packages/react-ui-bootstrap/components/form/inputs/index.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
export { FormComponentCheckboxGroup } from "./Checkboxgroup";
2-
export { FormComponentRadioGroup } from "./Radiogroup";
3-
export { AutocompleteMultiple } from "./AutocompleteMultiple";
1+
export { FormComponentCheckboxGroup } from "./Checkboxgroup.js";
2+
export { FormComponentRadioGroup } from "./Radiogroup.js";
3+
export { AutocompleteMultiple } from "./AutocompleteMultiple.js";
44

5-
export { Autocomplete as FormComponentAutocomplete } from "./Autocomplete";
5+
export { Autocomplete as FormComponentAutocomplete } from "./Autocomplete.js";
66

7-
export { FormComponentDefault } from "./Default";
8-
export { FormComponentEmail } from "./Email";
9-
export { FormComponentNumber } from "./Number";
10-
export { FormComponentPassword } from "./Password";
11-
export { FormComponentSelect } from "./Select";
12-
export { FormComponentSelectMultiple } from "./SelectMultiple";
13-
export { FormComponentUrl } from "./Url";
14-
export { FormComponentStaticText } from "./StaticText";
15-
export { FormComponentTextarea } from "./Textarea";
7+
export { FormComponentDefault } from "./Default.js";
8+
export { FormComponentEmail } from "./Email.js";
9+
export { FormComponentNumber } from "./Number.js";
10+
export { FormComponentPassword } from "./Password.js";
11+
export { FormComponentSelect } from "./Select.js";
12+
export { FormComponentSelectMultiple } from "./SelectMultiple.js";
13+
export { FormComponentUrl } from "./Url.js";
14+
export { FormComponentStaticText } from "./StaticText.js";
15+
export { FormComponentTextarea } from "./Textarea.js";

‎packages/react-ui-bootstrap/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//export * from "./components/form";
2-
export * from "./components/VulcanComponents";
2+
export * from "./components/core/index.js";
3+
export * from "./components/VulcanComponents/index.js";
34

4-
export * from "./components/form/inputs/AutocompleteMultiple";
5+
export * from "./components/form/inputs/AutocompleteMultiple.js";

0 commit comments

Comments
 (0)