Skip to content

Commit 1721bfe

Browse files
authored
Merge pull request #215 from rvsia/circleci-next-conf
Merge nextdocs to master
2 parents 3b8f154 + 7f69184 commit 1721bfe

File tree

160 files changed

+1804
-16294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+1804
-16294
lines changed

.circleci/config.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
build:
66
working_directory: ~/react-forms
77
docker:
8-
- image: circleci/node
8+
- image: circleci/node:10
99
steps:
1010
- checkout
1111
- run:
@@ -29,7 +29,7 @@ jobs:
2929
release:
3030
working_directory: ~/react-forms
3131
docker:
32-
- image: circleci/node
32+
- image: circleci/node:10
3333
steps:
3434
- attach_workspace:
3535
at: ~/react-forms
@@ -41,7 +41,7 @@ jobs:
4141
deploy:
4242
working_directory: ~/react-forms
4343
docker:
44-
- image: circleci/node
44+
- image: circleci/node:10
4545
steps:
4646
- attach_workspace:
4747
at: ~/react-forms
@@ -50,10 +50,9 @@ jobs:
5050
command: |
5151
npm install --prefix=./firebase-deploy firebase-tools
5252
- run:
53-
name: Deploy docs to firebase
53+
name: Deploy demo
5454
command: |
55-
./firebase-deploy/node_modules/.bin/firebase deploy --token=$FIREBASE_TOKEN
56-
55+
yarn --cwd packages/react-renderer-demo/ deploy --token=$FIREBASE_TOKEN
5756
5857
workflows:
5958
version: 2

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ pids
1010
*.pid
1111
*.seed
1212
*.pid.lock
13+
package-lock.json
1314

1415
# Directory for instrumented libs generated by jscoverage/JSCover
1516
lib-cov
@@ -71,4 +72,4 @@ packages/react-renderer-demo/public/vendor.css
7172
.firebase
7273

7374
# Rollup build info
74-
**/size-snapshot.json
75+
packages/**/size-snapshot.json

firebase.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"private": true,
99
"scripts": {
1010
"bootstrap": "lerna bootstrap",
11-
"build": "lerna run build",
11+
"build": "lerna run build --ignore @data-driven-forms/react-render-demo",
1212
"vendor": "lerna run vendor",
1313
"test": "jest --coverage",
1414
"test:ci": "jest --coverage --runInBand",
@@ -69,5 +69,8 @@
6969
"successComment": ":tada: This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:\n\nThe release is available on \n\n- [react-form-renderer (@latest dist-tag)](/https://www.npmjs.com/package/@data-driven-forms/react-form-renderer)\n\n- [pf3-component-mapper (@latest dist-tag)](/https://www.npmjs.com/package/@data-driven-forms/pf3-component-mapper)\n\n- [pf4-component-mapper (@latest dist-tag)](/https://www.npmjs.com/package/@data-driven-forms/pf4-component-mapper)\n\n- [mui-component-mapper (@latest dist-tag)](/https://www.npmjs.com/package/@data-driven-forms/mui-component-mapper)\n\nDemo can be found [here](http://data-driven-forms.org/)!"
7070
}
7171
]
72+
},
73+
"dependencies": {
74+
"n": "^6.0.1"
7275
}
7376
}

packages/mui-component-mapper/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"@babel/preset-env": "^7.1.6",
1919
"@babel/preset-react": "^7.0.0",
2020
"@data-driven-forms/react-form-renderer": "*",
21-
"@material-ui/core": "^4.2.1",
22-
"@material-ui/icons": "^4.2.1",
23-
"@material-ui/styles": "^4.2.1",
21+
"@material-ui/core": "^4.5.2",
22+
"@material-ui/icons": "^4.5.1",
23+
"@material-ui/styles": "^4.5.2",
2424
"@semantic-release/git": "^7.0.5",
2525
"@semantic-release/npm": "^5.1.1",
2626
"babel-core": "^7.0.0-bridge.0",
@@ -60,9 +60,9 @@
6060
},
6161
"peerDependencies": {
6262
"@data-driven-forms/react-form-renderer": "^1.9.3",
63-
"@material-ui/core": "^4.2.1",
64-
"@material-ui/icons": "^4.2.1",
65-
"@material-ui/styles": "^4.2.1",
63+
"@material-ui/core": "^4.5.2",
64+
"@material-ui/icons": "^4.5.1",
65+
"@material-ui/styles": "^4.5.2",
6666
"material-ui-pickers": "^2.1.1",
6767
"react": "^16.8.6",
6868
"react-dom": "^16.8.6"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"dist/index.js": {
3+
"bundled": 633496,
4+
"minified": 264412,
5+
"gzipped": 74673
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"dist/index.js": {
3+
"bundled": 669922,
4+
"minified": 271580,
5+
"gzipped": 74248
6+
}
7+
}

packages/pf4-component-mapper/config/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const externals = {
5858
};
5959

6060
const prodConfig = {
61-
mode: 'production',
61+
mode: 'development',
6262
entry: './src/index.js',
6363
optimization: {
6464
minimizer: [
@@ -78,6 +78,7 @@ const prodConfig = {
7878
libraryTarget: 'umd',
7979
filename: 'index.js',
8080
umdNamedDefine: true,
81+
globalObject: 'this',
8182
},
8283
externals,
8384
};

packages/pf4-component-mapper/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"@babel/preset-react": "^7.0.0",
2424
"@data-driven-forms/react-form-renderer": "*",
2525
"@patternfly/react-core": "^3.104.0",
26-
"@patternfly/react-icons": "^3.14.2",
2726
"@semantic-release/git": "^7.0.5",
2827
"@semantic-release/npm": "^5.1.1",
2928
"babel-core": "^7.0.0-bridge.0",
@@ -85,8 +84,7 @@
8584
},
8685
"peerDependencies": {
8786
"@data-driven-forms/react-form-renderer": "^1.11.0",
88-
"@patternfly/react-core": "^3.104.0",
89-
"@patternfly/react-icons": "^3.14.2"
87+
"@patternfly/react-core": "^3.104.0"
9088
},
9189
"dependencies": {
9290
"@patternfly/patternfly-next": "^1.0.175",

packages/pf4-component-mapper/rollup.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const globals = {
1212
react: 'React',
1313
'react-dom': 'ReactDOM',
1414
'@patternfly/react-core': 'PatternflyReact',
15-
'@patternfly/react-icons': 'PatternflyReactIcons',
1615
'@data-driven-forms/react-form-renderer': '@data-driven-forms/react-form-renderer',
1716
};
1817

0 commit comments

Comments
 (0)