Skip to content

Commit 86ac937

Browse files
arch1995arch1995
committed
use multiple inputs directly
1 parent 5f1e015 commit 86ac937

File tree

20 files changed

+441
-404
lines changed

20 files changed

+441
-404
lines changed

‎packages/modal/rollup.config.mjs‎

Lines changed: 72 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ import url from "@rollup/plugin-url";
44
import svgr from "@svgr/rollup";
55
import path from "path";
66
import postcss from "rollup-plugin-postcss";
7-
import resolve from "@rollup/plugin-node-resolve";
8-
import tsconfigPaths from "rollup-plugin-tsconfig-paths";
7+
// import resolve from "@rollup/plugin-node-resolve";
8+
// import tsconfigPaths from "rollup-plugin-tsconfig-paths";
99

10-
const appModuleFileExtensions = ["js", "ts", "json", "mjs", "jsx", "tsx"];
10+
// const appModuleFileExtensions = ["js", "ts", "json", "mjs", "jsx", "tsx"];
1111

1212
export const externalDeps = ["vue"]
1313

1414
export const baseConfig = {
15-
output: [{ dir: path.resolve("./dist/"), format: "es", sourcemap: true }],
15+
input: [
16+
"./src/index.ts",
17+
"./src/react/index.ts",
18+
"./src/vue/index.ts",
19+
],
1620
plugins: [
1721
postcss({
1822
config: {
@@ -27,71 +31,71 @@ export const baseConfig = {
2731
],
2832
};
2933

30-
export const reactConfigOriginalEsm = {
31-
taskName: 'react.esm',
32-
input: "./src/react/index.ts",
33-
output: {
34-
preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
35-
},
36-
plugins: [
37-
tsconfigPaths(),
38-
// Allows node_modules resolution
39-
resolve({
40-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
41-
modulesOnly: true,
42-
preferBuiltins: false,
43-
}),
44-
]
45-
};
34+
// export const reactConfigOriginalEsm = {
35+
// taskName: 'react.esm',
36+
// input: "./src/react/index.ts",
37+
// output: {
38+
// preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
39+
// },
40+
// plugins: [
41+
// tsconfigPaths(),
42+
// // Allows node_modules resolution
43+
// resolve({
44+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
45+
// modulesOnly: true,
46+
// preferBuiltins: false,
47+
// }),
48+
// ]
49+
// };
4650

47-
export const reactConfigOriginalCjs = {
48-
taskName: 'react.cjs',
49-
input: "./src/react/index.ts",
50-
output: {
51-
preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
52-
},
53-
plugins: [
54-
tsconfigPaths(),
55-
// Allows node_modules resolution
56-
resolve({
57-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
58-
modulesOnly: true,
59-
preferBuiltins: false,
60-
}),
61-
]
62-
};
51+
// export const reactConfigOriginalCjs = {
52+
// taskName: 'react.cjs',
53+
// input: "./src/react/index.ts",
54+
// output: {
55+
// preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
56+
// },
57+
// plugins: [
58+
// tsconfigPaths(),
59+
// // Allows node_modules resolution
60+
// resolve({
61+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
62+
// modulesOnly: true,
63+
// preferBuiltins: false,
64+
// }),
65+
// ]
66+
// };
6367

6468

65-
export const vueOriginalEsm = {
66-
taskName: 'vue.esm',
67-
input: "./src/vue/index.ts",
68-
output: {
69-
preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
70-
},
71-
plugins: [
72-
tsconfigPaths(),
73-
// Allows node_modules resolution
74-
resolve({
75-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
76-
modulesOnly: true,
77-
preferBuiltins: false,
78-
}),
79-
]
80-
};
69+
// export const vueOriginalEsm = {
70+
// taskName: 'vue.esm',
71+
// input: "./src/vue/index.ts",
72+
// output: {
73+
// preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
74+
// },
75+
// plugins: [
76+
// tsconfigPaths(),
77+
// // Allows node_modules resolution
78+
// resolve({
79+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
80+
// modulesOnly: true,
81+
// preferBuiltins: false,
82+
// }),
83+
// ]
84+
// };
8185

82-
export const vueOriginalCjs = {
83-
taskName: 'vue.cjs',
84-
input: "./src/vue/index.ts",
85-
output: {
86-
preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
87-
},
88-
plugins: [
89-
tsconfigPaths(),
90-
// Allows node_modules resolution
91-
resolve({
92-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
93-
modulesOnly: true,
94-
preferBuiltins: false,
95-
}),
96-
]
97-
};
86+
// export const vueOriginalCjs = {
87+
// taskName: 'vue.cjs',
88+
// input: "./src/vue/index.ts",
89+
// output: {
90+
// preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
91+
// },
92+
// plugins: [
93+
// tsconfigPaths(),
94+
// // Allows node_modules resolution
95+
// resolve({
96+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
97+
// modulesOnly: true,
98+
// preferBuiltins: false,
99+
// }),
100+
// ]
101+
// };

packages/modal/assets/arrow-left-dark.svg renamed to packages/modal/src/ui/assets/arrow-left-dark.svg

File renamed without changes.

packages/modal/assets/arrow-left-light.svg renamed to packages/modal/src/ui/assets/arrow-left-light.svg

File renamed without changes.

packages/modal/assets/x-dark.svg renamed to packages/modal/src/ui/assets/x-dark.svg

File renamed without changes.

packages/modal/assets/x-light.svg renamed to packages/modal/src/ui/assets/x-light.svg

File renamed without changes.

‎packages/modal/src/ui/components/Icon.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import ArrowDark from "../../../assets/arrow-left-dark.svg";
2-
import ArrowLight from "../../../assets/arrow-left-light.svg";
3-
import XDark from "../../../assets/x-dark.svg";
4-
import XLight from "../../../assets/x-light.svg";
1+
import ArrowDark from "../assets/arrow-left-dark.svg";
2+
import ArrowLight from "../assets/arrow-left-light.svg";
3+
import XDark from "../assets/x-dark.svg";
4+
import XLight from "../assets/x-light.svg";
55

66
interface IconProps {
77
iconName: string;

packages/modal/css/web3auth.css renamed to packages/modal/src/ui/css/web3auth.css

File renamed without changes.

‎packages/modal/src/ui/loginModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import "../../css/web3auth.css";
1+
import "./css/web3auth.css";
22

33
import { applyWhiteLabelTheme, LANGUAGES, SafeEventEmitter } from "@web3auth/auth";
44
import {

‎packages/modal/tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"extends": "../../tsconfig.json",
3-
"include": ["src", "css", "assets"],
3+
"include": ["src"],
44
"compilerOptions": {
5-
// "resolveJsonModule": true,
5+
"resolveJsonModule": true,
66
"jsx": "react-jsx",
77
}
88
}

‎packages/no-modal/rollup.config.mjs‎

Lines changed: 74 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,82 @@
1-
import resolve from "@rollup/plugin-node-resolve";
2-
import tsconfigPaths from "rollup-plugin-tsconfig-paths";
1+
// import resolve from "@rollup/plugin-node-resolve";
2+
// import tsconfigPaths from "rollup-plugin-tsconfig-paths";
33

4-
const appModuleFileExtensions = ["js", "ts", "json", "mjs", "jsx", "tsx"];
4+
// const appModuleFileExtensions = ["js", "ts", "json", "mjs", "jsx", "tsx"];
55

66
export const externalDeps = ["react", "vue"]
77

8-
export const reactConfigOriginalEsm = {
9-
taskName: 'react.esm',
10-
input: "./src/react/index.ts",
11-
output: {
12-
preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
13-
},
14-
plugins: [
15-
tsconfigPaths(),
16-
// Allows node_modules resolution
17-
resolve({
18-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
19-
modulesOnly: true,
20-
preferBuiltins: false,
21-
}),
22-
]
23-
};
8+
// export const reactConfigOriginalEsm = {
9+
// taskName: 'react.esm',
10+
// input: "./src/react/index.ts",
11+
// output: {
12+
// preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
13+
// },
14+
// plugins: [
15+
// tsconfigPaths(),
16+
// // Allows node_modules resolution
17+
// resolve({
18+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
19+
// modulesOnly: true,
20+
// preferBuiltins: false,
21+
// }),
22+
// ]
23+
// };
2424

25-
export const reactConfigOriginalCjs = {
26-
taskName: 'react.cjs',
27-
input: "./src/react/index.ts",
28-
output: {
29-
preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
30-
},
31-
plugins: [
32-
tsconfigPaths(),
33-
// Allows node_modules resolution
34-
resolve({
35-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
36-
modulesOnly: true,
37-
preferBuiltins: false,
38-
}),
39-
]
40-
};
25+
// export const reactConfigOriginalCjs = {
26+
// taskName: 'react.cjs',
27+
// input: "./src/react/index.ts",
28+
// output: {
29+
// preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
30+
// },
31+
// plugins: [
32+
// tsconfigPaths(),
33+
// // Allows node_modules resolution
34+
// resolve({
35+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
36+
// modulesOnly: true,
37+
// preferBuiltins: false,
38+
// }),
39+
// ]
40+
// };
4141

4242

43-
export const vueOriginalEsm = {
44-
taskName: 'vue.esm',
45-
input: "./src/vue/index.ts",
46-
output: {
47-
preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
48-
},
49-
plugins: [
50-
tsconfigPaths(),
51-
// Allows node_modules resolution
52-
resolve({
53-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
54-
modulesOnly: true,
55-
preferBuiltins: false,
56-
}),
57-
]
58-
};
43+
// export const vueOriginalEsm = {
44+
// taskName: 'vue.esm',
45+
// input: "./src/vue/index.ts",
46+
// output: {
47+
// preserveModules: true, dir: "./dist/lib.esm", format: "es", sourcemap: process.env.NODE_ENV === "development"
48+
// },
49+
// plugins: [
50+
// tsconfigPaths(),
51+
// // Allows node_modules resolution
52+
// resolve({
53+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
54+
// modulesOnly: true,
55+
// preferBuiltins: false,
56+
// }),
57+
// ]
58+
// };
5959

60-
export const vueOriginalCjs = {
61-
taskName: 'vue.cjs',
62-
input: "./src/vue/index.ts",
63-
output: {
64-
preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
65-
},
66-
plugins: [
67-
tsconfigPaths(),
68-
// Allows node_modules resolution
69-
resolve({
70-
extensions: appModuleFileExtensions.map((x) => `.${x}`),
71-
modulesOnly: true,
72-
preferBuiltins: false,
73-
}),
74-
]
75-
};
60+
// export const vueOriginalCjs = {
61+
// taskName: 'vue.cjs',
62+
// input: "./src/vue/index.ts",
63+
// output: {
64+
// preserveModules: true, dir: "./dist/lib.cjs", format: "cjs", sourcemap: process.env.NODE_ENV === "development"
65+
// },
66+
// plugins: [
67+
// tsconfigPaths(),
68+
// // Allows node_modules resolution
69+
// resolve({
70+
// extensions: appModuleFileExtensions.map((x) => `.${x}`),
71+
// modulesOnly: true,
72+
// preferBuiltins: false,
73+
// }),
74+
// ]
75+
// };
76+
export const baseConfig = {
77+
input: [
78+
"./src/index.ts",
79+
"./src/react/index.ts",
80+
"./src/vue/index.ts",
81+
],
82+
}

0 commit comments

Comments
 (0)