Skip to content

Commit 03df194

Browse files
rvsiarvsia
authored
Merge pull request #1156 from rvsia/updateRepo
Update repo
2 parents 00b381b + 6b4fb1a commit 03df194

File tree

7 files changed

+48
-56
lines changed

7 files changed

+48
-56
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 4 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:16
8+
- image: circleci/node:14
99
steps:
1010
- checkout
1111
- run:
@@ -33,7 +33,7 @@ jobs:
3333
release:
3434
working_directory: ~/react-forms
3535
docker:
36-
- image: circleci/node:16
36+
- image: circleci/node:14
3737
steps:
3838
- attach_workspace:
3939
at: ~/react-forms
@@ -45,7 +45,7 @@ jobs:
4545
predeploy:
4646
working_directory: ~/react-forms
4747
docker:
48-
- image: circleci/node:16
48+
- image: circleci/node:14
4949
steps:
5050
- attach_workspace:
5151
at: ~/react-forms
@@ -60,7 +60,7 @@ jobs:
6060
deploy:
6161
working_directory: ~/react-forms
6262
docker:
63-
- image: circleci/node:16
63+
- image: circleci/node:14
6464
steps:
6565
- attach_workspace:
6666
at: ~/react-forms

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Data Driven Forms is a monorepo that uses [Lerna](https://github.com/lerna/lerna
241241

242242
## Requirements
243243

244-
- **○ NodeJS 16**
244+
- **○ NodeJS 14**
245245

246246
- **○ Unix like OS (MacOS, Linux)**
247247

‎packages/carbon-component-mapper/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"javascript"
3030
],
3131
"devDependencies": {
32-
"@carbon/icons-react": "^10.19.0",
33-
"@types/carbon-components-react": "^7.10.9",
34-
"carbon-components": "^10.22.0",
35-
"carbon-components-react": "^7.22.0",
32+
"@carbon/icons-react": "^10.41.0",
33+
"@types/carbon-components-react": "^7.44.1",
34+
"carbon-components": "^10.46.0",
35+
"carbon-components-react": "^7.46.0",
3636
"carbon-icons": "^7.0.7"
3737
},
3838
"peerDependencies": {},

‎packages/common/babel.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ const createCarbonCJSTransform = (env) => [
181181
let res;
182182
const files = glob.sync(
183183
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
184-
);
184+
).filter(path => !path.includes('/next/'));
185185
if (files.length > 0) {
186186
res = files[0];
187187
} else {
@@ -200,7 +200,7 @@ const createCarbonCJSTransform = (env) => [
200200
let res;
201201
const files = glob.sync(
202202
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
203-
);
203+
).filter(path => !path.includes('/next/'));
204204
if (files.length > 0) {
205205
res = files[0];
206206
} else {
@@ -219,7 +219,7 @@ const createCarbonCJSTransform = (env) => [
219219
let res;
220220
const files = glob.sync(
221221
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
222-
);
222+
).filter(path => !path.includes('/next/'));
223223
if (files.length > 0) {
224224
res = files[0];
225225
} else {

‎packages/react-renderer-demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"directory": "packages/react-renderer-demo"
1212
},
1313
"engines": {
14-
"node": "16"
14+
"node": "14"
1515
},
1616
"private": true,
1717
"scripts": {
@@ -42,7 +42,7 @@
4242
"clsx": "^1.1.1",
4343
"codesandbox": "2.2.1",
4444
"docsearch.js": "^2.6.3",
45-
"firebase-admin": "^10.0.0",
45+
"firebase-admin": "^9.12.0",
4646
"firebase-functions": "^3.15.7",
4747
"markdown-to-jsx": "^7.1.1",
4848
"next": "11.1.2",

‎packages/react-renderer-demo/src/pages/development-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Data Driven Forms is a monorepo that uses [Lerna](https://github.com/lerna/lerna
1010

1111
## Requirements
1212

13-
- **○ NodeJS 16**
13+
- **○ NodeJS 14**
1414

1515
- **○ Unix like OS (MacOS, Linux)**
1616

‎yarn.lock

Lines changed: 33 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,31 +1191,17 @@
11911191
resolved "https://registry.yarnpkg.com/@carbon/feature-flags/-/feature-flags-0.6.0.tgz#9452194af71b56dab0f2b9c75db3ddf6196453f1"
11921192
integrity sha512-Y1jQC30PBEzfVLoZF6Fj4sTez2XqPCY+kVsaXjYWDysTc64+GFVkfGqvcBS+vZB9QTCSlGouaMKppfakdNwUqw==
11931193

1194-
"@carbon/icon-helpers@^10.21.0":
1195-
version "10.21.0"
1196-
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.21.0.tgz#446223e26afe436455cfffcc4da235e6a23dfe3f"
1197-
integrity sha512-axRNtdg5PAIpPFXGYAHRk2JudHhgHlu/o00BkFlsbMhgsLhEgsUddLZoVjCByBCEPxLwt9CSk048VmcKuJzm7w==
1198-
1199-
"@carbon/icon-helpers@^10.22.0":
1200-
version "10.22.0"
1201-
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.22.0.tgz#5992c75850ace09f9cf5015ebec652ccce96c23e"
1202-
integrity sha512-00HRYbb0P1v1L3XI+KuBqHoSzbeTZTYMiBWqMvITGm6y2bdE6++Xbp4eIQbZZypEYzuiJ0UmJf+VMx+ypBOjiw==
1203-
1204-
"@carbon/icons-react@^10.19.0":
1205-
version "10.37.0"
1206-
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.37.0.tgz#3d4355eb03c2165ddd7705ce977df03d6beaea78"
1207-
integrity sha512-13wHwN9BikOj9RhT/m8jeJQ61l5yNXiXQ0KR//9rFnz27gWO0huWb8qiBnHsicbQdl4oe+TVcm/WKF3PcJwUJA==
1208-
dependencies:
1209-
"@carbon/icon-helpers" "^10.21.0"
1210-
"@carbon/telemetry" "0.0.0-alpha.6"
1211-
prop-types "^15.7.2"
1194+
"@carbon/icon-helpers@^10.24.0":
1195+
version "10.24.0"
1196+
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.24.0.tgz#2f3fbc8b0b64090c21833cd81eabadc41d56b684"
1197+
integrity sha512-kmzN2Zjyp4EmCAlGu561+dJVABH96n5+RnjmsPdv4wrSx+FNyzbxnKYV1x2FYrTxtZ9LB+pd3EofEyVuQM6V0Q==
12121198

1213-
"@carbon/icons-react@^10.38.0":
1214-
version "10.38.0"
1215-
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.38.0.tgz#fd5050f3a630a20a2d46a21ba2b141adcd65c548"
1216-
integrity sha512-Ww02MHIdA2q5hskZVmzEZQByT8lQ743JGWzIl5oolPp+E38wJopEm3+SZsM1lwDrimP7Nm4+GifOMNddoHmplA==
1199+
"@carbon/icons-react@^10.41.0":
1200+
version "10.41.0"
1201+
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.41.0.tgz#d9e411f21cc93dbfa68520b32955fde439d7b159"
1202+
integrity sha512-34+zTinj8fA6QOwlw35zMCVdto5uMKr6W0DNKHBLNM3omqAxS3RUIy4qxVjVNCk3mFnL7Knpun25haEaOnAcqw==
12171203
dependencies:
1218-
"@carbon/icon-helpers" "^10.22.0"
1204+
"@carbon/icon-helpers" "^10.24.0"
12191205
"@carbon/telemetry" "0.0.0-alpha.6"
12201206
prop-types "^15.7.2"
12211207

@@ -3529,13 +3515,13 @@
35293515
"@types/node" "*"
35303516
"@types/responselike" "*"
35313517

3532-
"@types/carbon-components-react@^7.10.9":
3533-
version "7.36.3"
3534-
resolved "https://registry.yarnpkg.com/@types/carbon-components-react/-/carbon-components-react-7.36.3.tgz#4c81a8d64c3a4a8bd5451b7e2cb718b27bb7f1ba"
3535-
integrity sha512-v7LG2p2FxoPUC5bF+xB05OCqzSqhkZ8ZT+aLVfhg/RCwWmPNFzh7HGXs2O0GvNTHqYrjyZxixYtH5Tm6dBcXPg==
3518+
"@types/carbon-components-react@^7.44.1":
3519+
version "7.44.1"
3520+
resolved "https://registry.yarnpkg.com/@types/carbon-components-react/-/carbon-components-react-7.44.1.tgz#54653d9d55c7570a8133a54ce3e975d1ff1ec923"
3521+
integrity sha512-uwHujoYT1Wrdr0zvJNPlTT99LDmAZpcV973O09Xd8gw4muolTybS1Yqdz4ydAFDrJTv037J3Lf7BGqJkhSF93w==
35363522
dependencies:
35373523
"@types/react" "*"
3538-
flatpickr "4.6.1"
3524+
flatpickr "4.6.9"
35393525

35403526
"@types/cheerio@^0.22.22":
35413527
version "0.22.30"
@@ -5818,13 +5804,13 @@ capture-stack-trace@^1.0.0:
58185804
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
58195805
integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
58205806

5821-
carbon-components-react@^7.22.0:
5822-
version "7.43.0"
5823-
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.43.0.tgz#bc7dedfb7d4687a63aa3c566ea0e30754bd9cf14"
5824-
integrity sha512-+ZFP9fmNqMogjG9ALnAci2UA+jOUoSZL7Ga03aRSBEE9v0olkj7e12+B+PYMPw8FxRLBao1deCcvor804WmZoQ==
5807+
carbon-components-react@^7.46.0:
5808+
version "7.46.0"
5809+
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.46.0.tgz#dc44f4ba2fb180aa7fd5be80e16b3123ae05252c"
5810+
integrity sha512-y7TjG8TE8XZLe/IuE5iSdXjT7pnNkthi9V7XI4hWG9S1td8NQoccgInxt6T3dIFKzvhHkeNJEx7TnUJt/bYL5A==
58255811
dependencies:
58265812
"@carbon/feature-flags" "^0.6.0"
5827-
"@carbon/icons-react" "^10.38.0"
5813+
"@carbon/icons-react" "^10.41.0"
58285814
"@carbon/telemetry" "0.0.0-alpha.6"
58295815
classnames "2.3.1"
58305816
copy-to-clipboard "^3.3.1"
@@ -5838,12 +5824,13 @@ carbon-components-react@^7.22.0:
58385824
lodash.throttle "^4.1.1"
58395825
react-is "^16.8.6"
58405826
use-resize-observer "^6.0.0"
5827+
wicg-inert "^3.1.1"
58415828
window-or-global "^1.0.1"
58425829

5843-
carbon-components@^10.22.0:
5844-
version "10.43.0"
5845-
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.43.0.tgz#d36ecc5b968fbb46a4d588017d09a58d5929f4e2"
5846-
integrity sha512-OqqNzsQTZTNNblf1geV2t8Mvr9rlTnUN7kkKRcp4mwRLJdAHQweLqn3gI/cbDEX/Bipr2+c9+mNipONmd6g2fQ==
5830+
carbon-components@^10.46.0:
5831+
version "10.46.0"
5832+
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.46.0.tgz#f167baa23bbc08a0e53a312eca835a2414b67d21"
5833+
integrity sha512-BWO1d/CBGZgyMjGN+nOkjqlfRek56/uFpyKMs443IeaJGvhZ0r7SFC5aeipxlg/BCwhxl5dcruzQ9d0MykNxSw==
58475834
dependencies:
58485835
"@carbon/telemetry" "0.0.0-alpha.6"
58495836
flatpickr "4.6.1"
@@ -9036,10 +9023,10 @@ find-versions@^4.0.0:
90369023
dependencies:
90379024
semver-regex "^3.1.2"
90389025

9039-
firebase-admin@^10.0.0:
9040-
version "10.0.0"
9041-
resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-10.0.0.tgz#0638cd50d2395fddc9d8af4e1699d0a10b1b22d8"
9042-
integrity sha512-EOAk5ZaqXhBBvx9ZyXd28kw8glMTt3xl0g3BepGRCy0RSSUPGOzfAqjGhc65guSKgFOpT5mAUycYcJbqullKUQ==
9026+
firebase-admin@^9.12.0:
9027+
version "9.12.0"
9028+
resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.12.0.tgz#d7e889e97c9c31610efbcd131bb6d06a783af757"
9029+
integrity sha512-AtA7OH5RbIFGoc0gZOQgaYC6cdjdhZv4w3XgWoupkPKO1HY+0GzixOuXDa75kFeoVyhIyo4PkLg/GAC1dC1P6w==
90439030
dependencies:
90449031
"@firebase/database-compat" "^0.1.1"
90459032
"@firebase/database-types" "^0.7.2"
@@ -20617,6 +20604,11 @@ which@^2.0.1, which@^2.0.2:
2061720604
dependencies:
2061820605
isexe "^2.0.0"
2061920606

20607+
wicg-inert@^3.1.1:
20608+
version "3.1.1"
20609+
resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.1.tgz#b033fd4fbfb9e3fd709e5d84becbdf2e06e5c229"
20610+
integrity sha512-PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A==
20611+
2062020612
wide-align@^1.1.0, wide-align@^1.1.2:
2062120613
version "1.1.3"
2062220614
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"

0 commit comments

Comments
 (0)