Skip to content

Commit a9e6c89

Browse files
authored
Merge pull request #969 from rvsia/updateTemplateGenerator
Update template generator
2 parents bedc6bd + 8cc2681 commit a9e6c89

Some content is hidden

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

81 files changed

+136
-240
lines changed

scripts/copy-css.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const packagePath = process.cwd();
66
const src = path.resolve(packagePath, './src');
77

88
function copyCss() {
9-
const directories = glob.sync(`${src}/*/`).filter((name) => !name.includes('/tests/') && !name.includes('/common/'));
9+
const directories = glob.sync(`${src}/*/`).filter((name) => !name.includes('/tests/'));
1010

1111
directories.forEach((dir) => {
1212
const cssFiles = glob.sync(`${dir}/**/*.css`);

scripts/copy-files.js

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

scripts/generate-files.js

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

scripts/generate-mapper.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ inquirer.prompt(QUESTIONS).then(async ({ componentmapper, typescript }) => {
2929
3030
1. Update styles in "packages/${componentmapper}-component-mapper/demo/index.html"
3131
2. Add dependencies in "packages/${componentmapper}-component-mapper/package.json",
32-
3. Mark the dependencies as globals/external in "packages/${componentmapper}-component-mapper/rollup.config.js"
33-
4. (optional) Transform import to allow threeshake (bundle size optimization) in "packages/common/babel.config.js"
34-
5. Have a fun and make some magic! :-)
32+
3. (optional) Transform imports to allow threeshake (bundle size optimization) in "packages/common/babel.config.js"
33+
4. Have a fun and make some magic! :-)
3534
3635
Please visit https://data-driven-forms.org for more information.
3736
@@ -48,7 +47,6 @@ inquirer.prompt(QUESTIONS).then(async ({ componentmapper, typescript }) => {
4847
files: [
4948
path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/README.md`),
5049
path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/package.json`),
51-
path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/rollup.config.js`),
5250
path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/demo/index.js`)
5351
],
5452
from: /\{\{componentmapper\}\}/g,
@@ -64,7 +62,7 @@ inquirer.prompt(QUESTIONS).then(async ({ componentmapper, typescript }) => {
6462
const optionTypeScriptPath = {
6563
files: [path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/package.json`)],
6664
from: /\{\{typingspath\}\}/g,
67-
to: typescript ? '\n "typings": "dist/cjs/index.d.ts",' : ''
65+
to: typescript ? '\n "typings": "index.d.ts",' : ''
6866
};
6967
const optionTypeScriptCommand = {
7068
files: [path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/package.json`)],
@@ -74,7 +72,7 @@ inquirer.prompt(QUESTIONS).then(async ({ componentmapper, typescript }) => {
7472
const optionTypeScriptScript = {
7573
files: [path.resolve(__dirname, `../packages/${componentmapper}-component-mapper/package.json`)],
7674
from: /\{\{buildtypingsscript\}\}/g,
77-
to: typescript ? '\n "build:typings": "node ../../scripts/copy-files.js",' : ''
75+
to: typescript ? '\n "build:typings": "node ../../scripts/generate-typings.js",' : ''
7876
};
7977

8078
try {

scripts/generate-packages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const src = path.resolve(packagePath, './src');
88
async function generatePackages() {
99
const directories = glob
1010
.sync(`${src}/*/`)
11-
.filter((name) => !name.includes('/tests/') && !name.includes('/common/'))
11+
.filter((name) => !name.includes('/tests/'))
1212
.map((path) =>
1313
path
1414
.replace(/\/$/, '')

templates/component-mapper/demo/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import FormRenderer from '@data-driven-forms/react-form-renderer';
3+
import { FormRenderer } from '@data-driven-forms/react-form-renderer';
44
import { arraySchemaDDF } from './demo-schemas/widget-schema';
55
import { componentMapper, FormTemplate } from '../src';
66
import { wizardSchema } from './demo-schemas/wizard-schema';

templates/component-mapper/package.json

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
"name": "@data-driven-forms/{{componentmapper}}-component-mapper",
33
"version": "0.0.0",
44
"description": "{{componentmapper}}-component-mapper for data-driven-forms.",
5-
"main": "dist/cjs/index.js",
6-
"module": "dist/esm/index.js",{{typingspath}}
7-
"files": [
8-
"dist/"
9-
],
5+
"main": "index.js",
6+
"module": "esm/index.js",{{typingspath}}
107
"license": "Apache-2.0",
118
"scripts": {
129
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
13-
"build": "yarn build:cjs && yarn build:esm && yarn build:umd{{buildtypingscmd}}",
14-
"build:cjs": "BABEL_ENV=cjs rollup -c ./rollup.config.js --format=cjs --environment FORMAT:cjs",
15-
"build:esm": "BABEL_ENV=esm rollup -c ./rollup.config.js --format=esm --environment FORMAT:esm",
16-
"build:umd": "rollup -c ./rollup.config.js --format=umd --environment FORMAT:umd",{{buildtypingsscript}}
10+
"build": "yarn build:cjs && yarn build:esm{{buildtypingscmd}} && yarn build:packages && yarn build:css",
11+
"build:cjs": "BABEL_ENV=cjs babel src --out-dir ./ --ignore \"src/tests/*\"",
12+
"build:esm": "BABEL_ENV=esm babel src --out-dir ./esm --ignore \"src/tests/*\"",
13+
"build:packages": "node ../../scripts/generate-packages.js",
14+
"build:css": "node ../../scripts/copy-css.js",{{buildtypingsscript}}
1715
"release": "semantic-release"
1816
},
1917
"repository": "[email protected]:data-driven-forms/react-forms.git",
@@ -47,18 +45,6 @@
4745
"react-dom": "^16.13.1",
4846
"regenerator-runtime": "^0.12.1",
4947
"resolve-url-loader": "^3.0.0",
50-
"rollup": "^1.23.1",
51-
"rollup-plugin-async": "^1.2.0",
52-
"rollup-plugin-babel": "^4.3.3",
53-
"rollup-plugin-commonjs": "^10.1.0",
54-
"rollup-plugin-node-globals": "^1.4.0",
55-
"rollup-plugin-node-resolve": "^5.2.0",
56-
"rollup-plugin-replace": "^2.2.0",
57-
"rollup-plugin-sass": "^1.2.2",
58-
"rollup-plugin-size-snapshot": "^0.10.0",
59-
"rollup-plugin-sourcemaps": "^0.5.0",
60-
"rollup-plugin-terser": "^5.1.2",
61-
"rollup-pluginutils": "^2.8.2",
6248
"sass-loader": "^7.1.0",
6349
"semantic-release": "^16.0.4",
6450
"style-loader": "^0.23.1",

templates/component-mapper/rollup.config.js

Lines changed: 0 additions & 79 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { default } from './checkbox';
2+
export * from './checkbox';

0 commit comments

Comments
 (0)