Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify dependencies and package type #868

Merged
merged 3 commits into from
Nov 13, 2020
Merged

Simplify dependencies and package type #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17ce2d4
Simplify dependencies and package type
Nov 13, 2020
d1b36a1
remove old placeholder file
Nov 13, 2020
0f54b26
updated to beta.2
Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed libraries/.placeholder
View file
Open in desktop
Empty file.
16 changes: 8 additions & 8 deletions libraries/core-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions libraries/core-react/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions libraries/icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libraries/icons/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default [
{
file: pkg.module,
name: pkg.name,
format: 'esm',
format: 'es',
exports: 'named',
},
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/tokens/commonjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"type": "commonjs",
"main": "../dist/tokens.cjs"
"main": "../dist/tokens.cjs.js"
}
5 changes: 2 additions & 3 deletions libraries/tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libraries/tokens/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default [
{
file: pkg.module,
name: pkg.name,
format: 'esm',
format: 'es',
exports: 'named',
},
{
Expand Down