diff --git a/lerna.json b/lerna.json index e6dd258..b13dd67 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,9 @@ { - "packages": ["packages/core", "packages/router", "packages/store"], + "packages": ["packages/store", "packages/router", "packages/form"], "version": "0.0.1", "npmClient": "yarn", + "command": { + "npmClient": "yarn" + }, "ignoreChanges": ["**/*.spec.ts", "**/*.md"] } diff --git a/package.json b/package.json index 68c5b51..a92542c 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,11 @@ { "name": "platform", + "private": true, "scripts": { "store": "lerna run --scope=*store* --parallel", "form": "lerna run --scope=*form* --parallel", "router": "lerna run --scope=*router* --parallel", - "build": "lerna run build --stream", + "build": "lerna run build --include-dependencies --stream", "clean": "npm-run-all -p clean:*", "clean:deps": "npm-run-all -p clean:deps:*", "clean:deps:workspace": "rimraf node_modules", @@ -65,7 +66,7 @@ "jest-junit": "6.0.1", "jest-preset-angular": "6.0.2", "jest-zone-patch": "0.0.10", - "lerna": "3.22.1", + "lerna": "^3.22.1", "lint-staged": "8.1.0", "ng-packagr": "^10.1.0", "npm-run-all": "4.1.5", diff --git a/packages/form/package.json b/packages/form/package.json index a251441..dc01345 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -45,6 +45,9 @@ "redux": "^4.0.0", "rxjs": "^6.0.0" }, + "devDependencies": { + "ngredux-store": "*" + }, "dependencies": { "immutable": "^4.0.0-rc.12" } diff --git a/packages/form/src/connect-array/connect-array.directive.ts b/packages/form/src/connect-array/connect-array.directive.ts index e89e26a..756a2c4 100644 --- a/packages/form/src/connect-array/connect-array.directive.ts +++ b/packages/form/src/connect-array/connect-array.directive.ts @@ -87,7 +87,7 @@ export class ConnectArrayDirective extends ControlContainer implements OnInit, O this.formDirective.addControl(this as any); } - get name(): string { + get keyName(): string { return this.key || ''; } diff --git a/packages/form/tsconfig.json b/packages/form/tsconfig.json new file mode 100644 index 0000000..bb16350 --- /dev/null +++ b/packages/form/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "./../../tsconfig.json", + "compilerOptions": { + "skipLibCheck": true + } +} diff --git a/packages/form/yarn.lock b/packages/form/yarn.lock new file mode 100644 index 0000000..e3217aa --- /dev/null +++ b/packages/form/yarn.lock @@ -0,0 +1,8 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +immutable@^4.0.0-rc.12: + version "4.0.0-rc.15" + resolved "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.15.tgz#c30056f05eaaf5650fd15230586688fdd15c54bc" + integrity sha512-v8+A3sNyaieoP9dHegl3tEYnIZa7vqNiSv0U6D7YddiZi34VjKy4GsIxrRHj2d8+CS3MeiVja5QyNe4JO/aEXA== diff --git a/packages/router/package.json b/packages/router/package.json index 4eb0c80..7722164 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -39,6 +39,9 @@ "engines": { "node": ">=8" }, + "devDependencies": { + "ngredux-store": "*" + }, "peerDependencies": { "ngredux-store": "*", "@angular/common": "11.0.5", diff --git a/tsconfig.lib.spec.json b/tsconfig.lib.spec.json index ce7f6be..abee9e8 100644 --- a/tsconfig.lib.spec.json +++ b/tsconfig.lib.spec.json @@ -4,6 +4,5 @@ "outDir": "../../out-tsc/spec", "types": ["jasmine"] }, - "files": ["src/test.ts"], "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/yarn.lock b/yarn.lock index edd1e96..65cb8cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9231,7 +9231,7 @@ left-pad@^1.3.0: resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -lerna@3.22.1: +lerna@^3.22.1: version "3.22.1" resolved "https://registry.npmjs.org/lerna/-/lerna-3.22.1.tgz#82027ac3da9c627fd8bf02ccfeff806a98e65b62" integrity sha512-vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg==