Simplify dependencies and package type (#868)

* Simplify dependencies and package type * remove old placeholder file * updated to beta.2
equinor · Nov 13, 2020 · dd8a0cd · dd8a0cd
1 parent 5f74c33
commit dd8a0cd
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 25 deletions.
diff --git a/libraries/.placeholder b/libraries/.placeholder
diff --git a/libraries/core-react/package.json b/libraries/core-react/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@equinor/eds-core-react",
-  "version": "0.7.0-beta.3",
+  "version": "0.7.0-beta.4",
   "description": "The React implementation of the Equinor Design System",
   "main": "src/index.ts",
   "publishConfig": {
     "main": "dist/core-react.cjs.js",
-    "module": "dist/core-react.es.js",
+    "module": "dist/core-react.esm.js",
     "browser": "dist/core-react.umd.js"
   },
   "types": "dist/types/index.d.ts",
@@ -76,14 +76,14 @@
     "typescript": "^4.0.2"
   },
   "peerDependencies": {
-    "prop-types": "^15.7.2",
-    "react": ">=16.8.6",
-    "react-dom": ">=16.8.6",
-    "styled-components": "^4.2.0"
+    "prop-types": ">=15.7.2",
+    "react": ">=16.8",
+    "react-dom": ">=16.8",
+    "styled-components": ">=4.2"
   },
   "dependencies": {
-    "@equinor/eds-icons": "0.5.0-beta.1",
-    "@equinor/eds-tokens": "0.5.1-beta.1"
+    "@equinor/eds-icons": "0.5.0-beta.2",
+    "@equinor/eds-tokens": "0.5.1-beta.2"
   },
   "engines": {
     "pnpm": ">=4",

diff --git a/libraries/core-react/pnpm-lock.yaml b/libraries/core-react/pnpm-lock.yaml
diff --git a/libraries/icons/package.json b/libraries/icons/package.json
@@ -1,9 +1,8 @@
 {
   "name": "@equinor/eds-icons",
-  "version": "0.5.0-beta.1",
+  "version": "0.5.0-beta.2",
   "description": "Icons from the Equinor Design System",
-  "type": "module",
-  "main": "dist/icons.esm.js",
+  "main": "dist/icons.cjs.js",
   "module": "dist/icons.esm.js",
   "browser": "dist/icons.umd.js",
   "types": "dist/types/index.d.ts",

diff --git a/libraries/icons/rollup.config.js b/libraries/icons/rollup.config.js
@@ -15,7 +15,7 @@ export default [
       {
         file: pkg.module,
         name: pkg.name,
-        format: 'esm',
+        format: 'es',
         exports: 'named',
       },
       {

diff --git a/libraries/tokens/commonjs/package.json b/libraries/tokens/commonjs/package.json
@@ -1,4 +1,4 @@
 {
   "type": "commonjs",
-  "main": "../dist/tokens.cjs"
+  "main": "../dist/tokens.cjs.js"
 }
diff --git a/libraries/tokens/package.json b/libraries/tokens/package.json
@@ -1,12 +1,11 @@
 {
   "name": "@equinor/eds-tokens",
-  "version": "0.5.1-beta.1",
+  "version": "0.5.1-beta.2",
   "description": "Design tokens for the Equinor Design System",
-  "main": "dist/tokens.esm.js",
+  "main": "dist/tokens.cjs.js",
   "module": "dist/tokens.esm.js",
   "browser": "dist/tokens.umd.js",
   "types": "dist/types/index.d.ts",
-  "type": "module",
   "license": "MIT",
   "author": {
     "name": "EDS Core Team",

diff --git a/libraries/tokens/rollup.config.js b/libraries/tokens/rollup.config.js
@@ -15,7 +15,7 @@ export default [
       {
         file: pkg.module,
         name: pkg.name,
-        format: 'esm',
+        format: 'es',
         exports: 'named',
       },
       {