Merge pull request #49 from ilyaagarkov/move-to-solid-js

package.json

@@ -45,9 +45,11 @@
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
     "babel-plugin-module-resolver": "^4.1.0",
+    "babel-preset-solid": "^1.6.2",
     "commitizen": "4.0.3",
     "cz-conventional-changelog": "3.0.2",
-    "effector": "^22.3.0",
+    "effector": "^22.4.0",
+    "effector-solid": "^0.22.6",
     "eslint": "^6.6.0",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-react": "^7.17.0",
@@ -57,6 +59,8 @@
     "prettier": "^1.19.1",
     "rollup": "^2.56.3",
     "rollup-plugin-terser": "^7.0.2",
+    "solid-js": "^1.6.2",
+    "solid-styled-components": "^0.28.5",
     "stylelint": "^13.12.0",
     "stylelint-config-rational-order": "^0.1.2",
     "stylelint-config-recommended": "^4.0.0",
@@ -67,14 +71,5 @@
     "commitizen": {
       "path": "cz-conventional-changelog"
     }
-  },
-  "peerDependencies": {
-    "effector": "^22.1.0"
-  },
-  "dependencies": {
-    "babel-preset-solid": "^1.6.1",
-    "effector-solid": "^0.22.6",
-    "solid-js": "^1.6.1",
-    "solid-styled-components": "^0.28.5"
   }
 }

rollup.config.ts

@@ -3,7 +3,6 @@ import pluginResolve from '@rollup/plugin-node-resolve';
 import { terser } from 'rollup-plugin-terser';
 import { babel } from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
-import Package from './package.json';
 import typescript from '@rollup/plugin-typescript';
 
 const extensions = ['.tsx', '.ts', '.js', '.json'];
@@ -19,30 +18,26 @@ function createBuild(input, format) {
     },
     plugins: [
       commonjs(),
-      pluginResolve({extensions}),
+      pluginResolve({ extensions }),
       typescript({
-        tsconfig: './tsconfig.json'
+        tsconfig: './tsconfig.json',
       }),
       babel({
         babelHelpers: 'bundled',
         extensions,
         skipPreflightCheck: true,
         babelrc: false,
         ...require('./babel.config').generateConfig({
-          isEsm: format === 'esm'
-        })
-      })
+          isEsm: format === 'esm',
+        }),
+      }),
     ],
-    external: ['forest/forest.mjs', 'effector/effector.mjs', 'foliage/index.mjs'].concat(
-      Object.keys(Package.peerDependencies),
-      Object.keys(Package.dependencies),
-    ),
-  }
+  };
 }
 
 const inputs = ['index'];
 const formats = ['cjs', 'esm'];
 
-const config = inputs.map((i) => formats.map(f => createBuild(i, f))).flat();
+const config = inputs.map((i) => formats.map((f) => createBuild(i, f))).flat();
 
 export default config;

yarn.lock

@@ -181,9 +181,9 @@
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
 
 "@babel/helper-plugin-utils@^7.18.6":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
-  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
 "@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
   version "7.15.4"
@@ -956,9 +956,9 @@
     to-fast-properties "^2.0.0"
 
 "@babel/types@^7.16.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479"
-  integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
+  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
@@ -1780,10 +1780,10 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-jsx-dom-expressions@^0.35.2:
-  version "0.35.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.35.2.tgz#5c9daea0dc6605ce41abdf74ae0df1703eacb217"
-  integrity sha512-ES+K+P6n4vjV9FGvCfJtOlJuAntpez+IoD0kzLZPjIfBoOU8IhE6hVYXdP458mJlvHlXiFsLQfvoTTYgPzPOJw==
+babel-plugin-jsx-dom-expressions@^0.35.4:
+  version "0.35.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.35.4.tgz#7160eb703794f7f78fe652726ea40308777da68a"
+  integrity sha512-Ab8W+36+XcNpyb644K537MtuhZRssgE3hmZD/08a1Z99Xfnd38tR2BZaDl7yEQvvHrb46N+eje2YjIg4VGAfVQ==
   dependencies:
     "@babel/helper-module-imports" "7.16.0"
     "@babel/plugin-syntax-jsx" "^7.16.5"
@@ -1834,12 +1834,12 @@ babel-polyfill@6.26.0:
     core-js "^2.5.0"
     regenerator-runtime "^0.10.5"
 
-babel-preset-solid@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-solid/-/babel-preset-solid-1.6.1.tgz#4e8f87c048bcea51962d647fb86740810a2a486d"
-  integrity sha512-Ji/cvYUE2BROsA3zOhaqKjuAEo6YAkmw8ZE11QsMtSEcWJ1rCFC829qWb5FLPl3UymVxh68+dpScPDtyyr/rdA==
+babel-preset-solid@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-solid/-/babel-preset-solid-1.6.2.tgz#ef2593106ab6a8030d699e34e94a7b06f77a9c37"
+  integrity sha512-5sFI34g7Jtp4r04YFWkuC1o+gnekBdPXQTJb5/6lmxi5YwzazVgKAXRwEAToC3zRaPyIYJbZUVLpOi5mDzPEuw==
   dependencies:
-    babel-plugin-jsx-dom-expressions "^0.35.2"
+    babel-plugin-jsx-dom-expressions "^0.35.4"
 
 babel-runtime@^6.11.6, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
   version "6.26.0"
@@ -3208,10 +3208,10 @@ effector-solid@^0.22.6:
   resolved "https://registry.yarnpkg.com/effector-solid/-/effector-solid-0.22.6.tgz#ebf3bacb2c9f1f7720b1143407fde492d46f76a7"
   integrity sha512-cjxjnHA8vJbDHV323vCpZIhRgBE/RLojkgiOx9btpXofEQVNW9mQp5Ci74hnk8Csgo3Bt4IFtoUFBB6RZV/ePw==
 
-effector@^22.3.0:
-  version "22.3.0"
-  resolved "https://registry.yarnpkg.com/effector/-/effector-22.3.0.tgz#c743dd7d934ec3f9a2efac76a563cd0281bc4201"
-  integrity sha512-Nh7IXn8U4emq8YtAZf2+y2Rs6n4W/gjPaNZpZLFOXOIAsRZSNBFjtK1vHTWNKxxmNFZOaZN6XUXdT8FDs0mAdQ==
+effector@^22.4.0:
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/effector/-/effector-22.4.0.tgz#6f94352d30268f644321892167ebe52ebc3e70a6"
+  integrity sha512-WQ0rboUp1fvkzo2rPymtWzR9isUl8v9McGvBA4g8zvQaTgZnXQ1iCbNj2S54bADGpSNl1CYv1/61vvdbc5Goyw==
 
 electron-to-chromium@^1.3.830:
   version "1.3.840"
@@ -7728,10 +7728,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-solid-js@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.6.1.tgz#1b6cd94151a859d9c186a1a3a61e99234a567c77"
-  integrity sha512-i8OmR419Hr0918Or6sm1ET/cgmxTtAB7Bdz/UwhZ7G2THixrvVSO3jd+C7YqMKKfVwmf8PJ2gUSbKE8NKv28GA==
+solid-js@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.6.2.tgz#0030960cf697b3cad0cc9046f4e9388dcd2bc7d2"
+  integrity sha512-AZBsj+Yn1xliniTTeuQKG9V7VQVkQ8lZmSKvBjpcVSoZeF7nvt/N5f7Kcsx6QSufioa2YgvBjkIiA0cM0qhotw==
   dependencies:
     csstype "^3.1.0"