Skip to content

Commit 7858431

Browse files
committed
netteForms: restructured package, includes UMD and ESM (BC break)
1 parent 37fb3f8 commit 7858431

File tree

6 files changed

+49
-17
lines changed

6 files changed

+49
-17
lines changed

eslint.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default [
77
{
88
ignores: [
99
'*/', '!src/', '!tests/',
10-
'**/netteForms*.*',
10+
'**/dist/',
1111
],
1212
},
1313

rollup.config.js

+34-7
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ function spaces2tabs() {
3434

3535

3636
export default [
37-
{
37+
{ // TODO: consider the possibility of cutting off the UMD versions completely due to collision
3838
input: 'src/assets/index.umd.ts',
3939
output: [
4040
{
4141
format: 'umd',
4242
name: 'Nette',
43-
dir: 'src/assets',
44-
entryFileNames: 'netteForms.js',
43+
dir: 'src/assets/dist',
44+
entryFileNames: 'nette-forms.umd.js',
4545
generatedCode: 'es2015',
4646
},
4747
{
4848
format: 'umd',
4949
name: 'Nette',
50-
dir: 'src/assets',
51-
entryFileNames: 'netteForms.min.js',
50+
dir: 'src/assets/dist',
51+
entryFileNames: 'nette-forms.umd.min.js',
5252
generatedCode: 'es2015',
5353
plugins: [
5454
terser(),
@@ -65,9 +65,36 @@ export default [
6565
},
6666

6767
{
68-
input: 'src/assets/index.umd.ts',
68+
input: 'src/assets/index.esm.ts',
69+
output: [
70+
{
71+
format: 'es',
72+
dir: 'src/assets/dist',
73+
entryFileNames: 'nette-forms.esm.js',
74+
generatedCode: 'es2015',
75+
},
76+
{
77+
format: 'es',
78+
dir: 'src/assets/dist',
79+
entryFileNames: 'nette-forms.esm.min.js',
80+
generatedCode: 'es2015',
81+
plugins: [
82+
terser(),
83+
],
84+
},
85+
],
86+
plugins: [
87+
json(),
88+
nodeResolve(),
89+
typescript(),
90+
spaces2tabs(),
91+
],
92+
},
93+
94+
{
95+
input: 'src/assets/index.esm.ts',
6996
output: [{
70-
file: 'src/assets/netteForms.d.ts',
97+
file: 'src/assets/dist/nette-forms.d.ts',
7198
format: 'es',
7299
}],
73100
plugins: [

src/assets/package.json renamed to src/assets/dist/package.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nette-forms",
3-
"version": "3.5.3",
3+
"version": "4.0.0",
44
"description": "Client side script for Nette Forms Component",
55
"keywords": [
66
"nette",
@@ -10,12 +10,10 @@
1010
"homepage": "https://nette.org",
1111
"author": "David Grudl (https://davidgrudl.com)",
1212
"license": "BSD-3-Clause",
13-
"main": "src/assets/netteForms.js",
14-
"types": "src/assets/netteForms.d.ts",
15-
"unpkg": "src/assets/netteForms.min.js",
16-
"files": [
17-
"src/assets"
18-
],
13+
"main": "nette-forms.umd.js",
14+
"module": "nette-forms.esm.js",
15+
"types": "nette-forms.d.ts",
16+
"unpkg": "nette-forms.umd.min.js",
1917
"repository": {
2018
"type": "git",
2119
"url": "git+https://github.com/nette/forms.git",

src/assets/index.esm.ts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { FormValidator } from './formValidator';
2+
3+
// TODO
4+
export function initialize() {
5+
}
6+
7+
export { FormValidator };

src/assets/index.umd.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FormValidator } from './formValidator';
22
import { webalize } from './webalize';
3-
import { version } from './package.json';
3+
import { version } from './dist/package.json';
44

55
type NetteForms = FormValidator & { version: string; webalize: typeof webalize };
66
let nette = new FormValidator as NetteForms;

tests/netteForms/karma.conf.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = function (config) {
44
frameworks: ['jasmine'],
55
browsers: ['ChromeHeadless'],
66
files: [
7-
'../../src/assets/netteForms.js',
7+
'../../src/assets/dist/nette-forms.umd.js',
88
'spec/*Spec.js',
99
],
1010
autoWatch: false,

0 commit comments

Comments
 (0)