chore(build): Fix several issues (#249)

MarcusNotheis · web-flow · commit c8c0b180c6f9 · 2019-12-11T16:10:18.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -5,13 +5,9 @@ yarn-error.log
 .idea
 coverage
 /.env
-dist/
 @types
 .cache
-build
-/packages/*/npm/**/*.d.ts
 .out
 lerna-debug.log
 packages/main/scripts/wrapperGeneration/json
 .awcache
-.nyc_output
diff --git a/lerna.json b/lerna.json
@@ -10,15 +10,16 @@
       "allowBranch": "master",
       "conventionalCommits": true,
       "yes": true,
+      "exact": true,
       "preid": "rc",
-      "message": "chore(release): publish %s [ci skip]"
+      "message": "chore(release): publish new version [ci skip]"
     },
     "publish": {
       "allowBranch": "master",
       "conventionalCommits": true,
       "yes": true,
       "preid": "rc",
-      "message": "chore(release): publish %s [ci skip]"
+      "message": "chore(release): publish new version [ci skip]"
     }
   }
 }
diff --git a/packages/base/.gitignore b/packages/base/.gitignore
@@ -1,12 +1,12 @@
-cjs
-Device
-hooks
-lib
-polyfill
-styling
-types
-utils
-LICENSE
-NOTICE.txt
-index.esm.js
-index.d.ts
+/cjs
+/Device
+/hooks
+/lib
+/polyfill
+/styling
+/types
+/utils
+/LICENSE
+/NOTICE.txt
+/index.esm.js
+/index.d.ts
diff --git a/packages/charts/.gitignore b/packages/charts/.gitignore
@@ -1,12 +1,12 @@
-cjs
-components
-interfaces
-internal
-lib
-themes
-util
-config.d.ts
-index.d.ts
-index.esm.js
-LICENSE
-NOTICE.txt
+/cjs
+/components
+/interfaces
+/internal
+/lib
+/themes
+/util
+/config.d.ts
+/index.d.ts
+/index.esm.js
+/LICENSE
+/NOTICE.txt
diff --git a/packages/charts/package.json b/packages/charts/package.json
@@ -16,12 +16,12 @@
     "@ui5/webcomponents/dist/Label"
   ],
   "scripts": {
-    "clean": "rimraf cjs components interfaces internal lib themes util index.esm.js index.d.ts",
+    "clean": "rimraf cjs components interfaces internal lib themes util index.esm.js index.d.ts config.d.ts",
     "postbuild": "rollup -c rollup.config.js"
   },
   "dependencies": {
-    "@ui5/webcomponents-react": "^0.7.0-rc.2",
-    "@ui5/webcomponents-react-base": "^0.7.0-rc.2",
+    "@ui5/webcomponents-react": "0.7.0-rc.2",
+    "@ui5/webcomponents-react-base": "0.7.0-rc.2",
     "chart.js": "^2.8.0",
     "chartjs-plugin-datalabels": "^0.6.0",
     "get-best-contrast-color": "^0.3.1",
diff --git a/packages/charts/src/lib/BarChartPlaceholder.ts b/packages/charts/src/lib/BarChartPlaceholder.ts
diff --git a/packages/charts/src/lib/ColumnChartPlaceholder.ts b/packages/charts/src/lib/ColumnChartPlaceholder.ts
diff --git a/packages/charts/src/lib/LineChartPlaceholder.ts b/packages/charts/src/lib/LineChartPlaceholder.ts
diff --git a/packages/charts/src/lib/PieChartPlaceholder.ts b/packages/charts/src/lib/PieChartPlaceholder.ts
diff --git a/packages/main/.gitignore b/packages/main/.gitignore
@@ -1,11 +1,12 @@
-cjs
-components
-enums
-interfaces
-internal
-lib
-webComponents
-index.d.ts
-index.esm.js
-LICENSE
-NOTICE.txt
+/cjs
+/components
+/enums
+/interfaces
+/internal
+/lib
+/webComponents
+/index.d.ts
+/index.esm.js
+/LICENSE
+/NOTICE.txt
+/scripts/wrapperGeneration/dist
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -23,9 +23,9 @@
   },
   "dependencies": {
     "@ui5/webcomponents": "1.0.0-rc.5",
-    "@ui5/webcomponents-fiori": "^1.0.0-rc.5",
-    "@ui5/webcomponents-icons": "^1.0.0-rc.5",
-    "@ui5/webcomponents-react-base": "^0.7.0-rc.2",
+    "@ui5/webcomponents-fiori": "1.0.0-rc.5",
+    "@ui5/webcomponents-icons": "1.0.0-rc.5",
+    "@ui5/webcomponents-react-base": "0.7.0-rc.2",
     "lodash.debounce": "^4.0.8",
     "react-content-loader": "^4.3.2",
     "react-jss": "10.0.0",
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
@@ -4,43 +4,43 @@
       "filename": "charts.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "charts",
-      "size": 18281,
-      "gzip": 5215
+      "size": 23008,
+      "gzip": 5476
     },
     {
       "filename": "charts.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "charts",
-      "size": 18281,
-      "gzip": 5215
+      "size": 23008,
+      "gzip": 5476
     },
     {
       "filename": "base.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "base",
-      "size": 55682,
-      "gzip": 12200
+      "size": 55937,
+      "gzip": 12255
     },
     {
       "filename": "base.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "base",
-      "size": 55682,
-      "gzip": 12200
+      "size": 55937,
+      "gzip": 12255
     },
     {
       "filename": "main.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "main",
-      "size": 134004,
-      "gzip": 35468
+      "size": 142087,
+      "gzip": 35949
     },
     {
       "filename": "main.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "main",
-      "size": 134004,
-      "gzip": 35468
+      "size": 142087,
+      "gzip": 35949
     }
   ]
 }
diff --git a/shared/rollup/configFactory.js b/shared/rollup/configFactory.js
@@ -31,6 +31,7 @@ const rollupConfigFactory = (pkgName, externals = []) => {
       'react',
       'react-dom',
       'react-jss',
+      pkg.name,
       ...Object.keys(pkg.dependencies || {}),
       ...Object.keys(pkg.peerDependencies || {}),
       ...externals

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,16 @@`
`10`	`10`	`"allowBranch": "master",`
`11`	`11`	`"conventionalCommits": true,`
`12`	`12`	`"yes": true,`
	`13`	`+ "exact": true,`
`13`	`14`	`"preid": "rc",`
`14`		`- "message": "chore(release): publish %s [ci skip]"`
	`15`	`+ "message": "chore(release): publish new version [ci skip]"`
`15`	`16`	`},`
`16`	`17`	`"publish": {`
`17`	`18`	`"allowBranch": "master",`
`18`	`19`	`"conventionalCommits": true,`
`19`	`20`	`"yes": true,`
`20`	`21`	`"preid": "rc",`
`21`		`- "message": "chore(release): publish %s [ci skip]"`
	`22`	`+ "message": "chore(release): publish new version [ci skip]"`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`