Skip to content

Commit bc3bc1e

Browse files
authored
Merge pull request #909 from data-driven-forms/new-build-process
[WIP] New build process
2 parents fdfaae5 + 7fbf43e commit bc3bc1e

File tree

827 files changed

+2403
-3002
lines changed

Some content is hidden

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

827 files changed

+2403
-3002
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ In order to Data Driven Forms in your component you need the renderer and a comp
138138

139139
```jsx
140140
import React from 'react';
141-
import FormRenderer, { componentTypes } from '@data-driven-forms/react-form-renderer';
141+
import { FormRenderer, componentTypes } from '@data-driven-forms/react-form-renderer';
142142
import { componentMapper, FormTemplate } from '@data-driven-forms/pf4-component-mapper';
143143

144144
const schema = {
@@ -165,7 +165,7 @@ You can also use custom mapper.
165165

166166
```jsx
167167
import React from 'react';
168-
import FormRenderer, { componentTypes, useFieldApi } from '@data-driven-forms/react-form-renderer';
168+
import { FormRenderer, componentTypes, useFieldApi } from '@data-driven-forms/react-form-renderer';
169169

170170
const TextField = props => {
171171
const {label, input, meta, ...rest} = useFieldApi(props)

__mocks__/with-provider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable react/prop-types */
22
import React from 'react';
33
import { RendererContext } from '@data-driven-forms/react-form-renderer';
4-
import Form from '@data-driven-forms/react-form-renderer/dist/cjs/form';
4+
import Form from '@data-driven-forms/react-form-renderer/form';
55

66
const RenderWithProvider = ({ value = { formOptions: {} }, children, onSubmit = () => {} }) => {
77
return (

babel.config.js

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,19 @@ const camelToSnake = (string) => {
88

99
module.exports = {
1010
presets: ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
11-
plugins: ["@babel/plugin-transform-runtime", "@babel/plugin-syntax-dynamic-import", "lodash", "@babel/plugin-proposal-class-properties" ],
12-
env: {
13-
cjs: {
14-
plugins: [
15-
[
16-
'transform-imports',
17-
{
18-
'@data-driven-forms/react-form-renderer': {
19-
transform: (importName) => `@data-driven-forms/react-form-renderer/dist/cjs/${camelToSnake(importName)}`,
20-
preventFullImport: true
21-
}
22-
},
23-
'@data-driven-forms/react-form-renderer-CJS'
24-
],
25-
]
11+
plugins: [
12+
"@babel/plugin-transform-runtime",
13+
"@babel/plugin-syntax-dynamic-import",
14+
"lodash",
15+
"@babel/plugin-proposal-class-properties",
16+
[
17+
'transform-imports',
18+
{
19+
'@data-driven-forms/react-form-renderer': {
20+
transform: (importName) => `@data-driven-forms/react-form-renderer/${camelToSnake(importName)}`,
21+
preventFullImport: true
22+
}
2623
},
27-
esm: {
28-
plugins: [
29-
[
30-
'transform-imports',
31-
{
32-
'@data-driven-forms/react-form-renderer': {
33-
transform: (importName) => `@data-driven-forms/react-form-renderer/dist/esm/${camelToSnake(importName)}`,
34-
preventFullImport: true
35-
}
36-
},
37-
'@data-driven-forms/react-form-renderer-ESM'
38-
],
39-
]
40-
}
41-
}
24+
'@data-driven-forms/react-form-renderer'
25+
]]
4226
}

package.json

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,29 @@
88
"private": true,
99
"scripts": {
1010
"bootstrap": "lerna bootstrap",
11-
"build": "lerna run build --concurrency 1 --ignore @data-driven-forms/react-renderer-demo",
11+
"build": "yarn clean-build && lerna run build --concurrency 1 --ignore @data-driven-forms/react-renderer-demo --ignore @data-driven-forms/pf3-component-mapper",
1212
"vendor": "lerna run vendor",
1313
"test": "jest --coverage",
1414
"test:ci": "jest --coverage --runInBand",
1515
"test:update": "jest -u",
1616
"release": "semantic-release",
1717
"codecov": "codecov",
1818
"start-demo": "lerna run start --scope=@data-driven-forms/react-render-demo",
19-
"lint": "yarn eslint .",
19+
"lint": "yarn eslint ./packages/*/src",
2020
"lint:ts": "tslint -c ./tslint.json 'packages/**/*.d.ts'",
21-
"generate-template": "node ./scripts/generate-mapper.js"
21+
"generate-template": "node ./scripts/generate-mapper.js",
22+
"clean-build": "node ./scripts/clean-build.js",
23+
"preinstall": "node ./scripts/clean-build.js"
2224
},
2325
"workspaces": [
2426
"packages/**"
2527
],
2628
"jest": {
2729
"verbose": true,
30+
"testPathIgnorePatterns": [
31+
"/node_modules/",
32+
"/pf3-component-mapper/"
33+
],
2834
"setupFiles": [
2935
"<rootDir>/config/jest.setup.js"
3036
],
@@ -33,8 +39,10 @@
3339
"<rootDir>/packages/**/src/**/*.ts",
3440
"!<rootDir>/packages/**/src/**/*.d.ts",
3541
"!<rootDir>/packages/react-renderer-demo/**/*.js",
42+
"!<rootDir>/packages/pf3-component-mapper/**/*.js",
3643
"!<rootDir>/packages/**/dist",
37-
"!<rootDir>/templates/**/*.js"
44+
"!<rootDir>/templates/**/*.js",
45+
"!<rootDir>/packages/**/src/**/index.js"
3846
],
3947
"moduleNameMapper": {
4048
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
@@ -72,6 +80,7 @@
7280
"eslint-plugin-prettier": "^3.1.2",
7381
"eslint-plugin-react": "^7.18.3",
7482
"eslint-plugin-react-hooks": "^2.4.0",
83+
"fs-extra": "^9.0.1",
7584
"glob": "^7.1.6",
7685
"identity-obj-proxy": "^3.0.0",
7786
"inquirer": "^7.1.0",
@@ -91,7 +100,20 @@
91100
},
92101
"release": {
93102
"monorepo": "./packages",
94-
"branches": ["+([0-9])?(.{+([0-9]),x}).x", "master", "next", "next-major", {"name": "beta", "prerelease": true}, {"name": "alpha", "prerelease": true}],
103+
"branches": [
104+
"+([0-9])?(.{+([0-9]),x}).x",
105+
"master",
106+
"next",
107+
"next-major",
108+
{
109+
"name": "beta",
110+
"prerelease": true
111+
},
112+
{
113+
"name": "alpha",
114+
"prerelease": true
115+
}
116+
],
95117
"plugins": [
96118
"@khala/npm-release-monorepo",
97119
[
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../common/.gitignore
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../common/.npmignore

packages/ant-component-mapper/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For using Data Driven Forms in your component you need the renderer and a compon
5656

5757
```jsx
5858
import React from 'react';
59-
import FormRenderer, { componentTypes } from '@data-driven-forms/react-form-renderer';
59+
import { FormRenderer, componentTypes } from '@data-driven-forms/react-form-renderer';
6060
import { componentMapper, layoutMapper } from '@data-driven-forms/ant-component-mapper';
6161

6262
const schema = {

packages/ant-component-mapper/demo/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* eslint-disable */
22
import React, { useState } from 'react';
33
import ReactDOM from 'react-dom';
4-
import FormRenderer from '@data-driven-forms/react-form-renderer';
4+
import { FormRenderer } from '@data-driven-forms/react-form-renderer';
55
import 'antd/dist/antd.css';
66
import './style.css';
7-
import demoSchema from '@data-driven-forms/common/src/demoschema';
7+
import demoSchema from '@data-driven-forms/common/demoschema';
88
import dualListSelectSchema from './demo-schemas/dual-list-select-schema'
99
import { componentMapper, FormTemplate } from '../src';
1010
import wizardSchema from './demo-schemas/wizard-schema';

packages/ant-component-mapper/package.json

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,20 @@
22
"name": "@data-driven-forms/ant-component-mapper",
33
"version": "2.17.0",
44
"description": "Component mapper for Ant Design component mapper form data-driven-forms.",
5-
"main": "dist/cjs/index.js",
6-
"module": "dist/esm/index.js",
7-
"typings": "dist/cjs/index.d.ts",
5+
"main": "index.js",
6+
"module": "esm/index.js",
7+
"typings": "index.d.ts",
88
"license": "Apache-2.0",
99
"scripts": {
1010
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
11-
"build": "yarn build:cjs && yarn build:esm && yarn build:umd && yarn build:typings",
12-
"build:cjs": "BABEL_ENV=cjs rollup -c ./rollup.config.js --format=cjs --environment FORMAT:cjs",
13-
"build:esm": "BABEL_ENV=esm rollup -c ./rollup.config.js --format=esm --environment FORMAT:esm",
14-
"build:umd": "rollup -c ./rollup.config.js --format=umd --environment FORMAT:umd",
11+
"build": "yarn build:cjs && yarn build:esm && yarn build:typings && yarn build:packages",
12+
"build:cjs": "BABEL_ENV=cjs babel src --out-dir ./ --ignore \"src/tests/*\"",
13+
"build:esm": "BABEL_ENV=esm babel src --out-dir ./esm --ignore \"src/tests/*\"",
14+
"build:typings": "node ../../scripts/generate-typings.js",
15+
"build:packages": "node ../../scripts/generate-packages.js",
1516
"vendor": "webpack --env vendor --config ./config/webpack.config.js",
16-
"release": "semantic-release",
17-
"build:typings": "node ../../scripts/copy-files.js"
17+
"release": "semantic-release"
1818
},
19-
"files": [
20-
"dist/"
21-
],
2219
"repository": "[email protected]:data-driven-forms/react-forms.git",
2320
"devDependencies": {
2421
"@babel/core": "^7.1.6",
@@ -48,8 +45,6 @@
4845
"react-dom": "^16.13.0",
4946
"regenerator-runtime": "^0.12.1",
5047
"resolve-url-loader": "^3.0.0",
51-
"rollup-plugin-sourcemaps": "^0.5.0",
52-
"rollup-pluginutils": "^2.8.2",
5348
"sass-loader": "^7.1.0",
5449
"semantic-release": "17.2.3",
5550
"style-loader": "^0.23.1",
@@ -72,6 +67,8 @@
7267
"react": ">=16.13.0",
7368
"react-dom": ">=16.13.0"
7469
},
75-
"dependencies": {},
70+
"dependencies": {
71+
"@data-driven-forms/common": "*"
72+
},
7673
"postpublish": "export RELEASE_DEMO=true"
7774
}

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

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

0 commit comments

Comments
 (0)