Skip to content

Commit acfe4ee

Browse files
committed
chore(build): use ng-packagr (#37)
Switches the build system for all of the libraries to use ng-packagr. This brings the library in line with the official Angular Package Format. Also adjusts the package peer dependencies to more acurately reflect the reality of each library BREAKING CHANGE: - changes the output to conform to the Angular Package Format. This may cause subtle differences in consumption behaviour - peer dependencies have been corrected to actual dependencies closes #9
1 parent 609334b commit acfe4ee

Some content is hidden

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

55 files changed

+425
-980
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ coverage
44
lerna-debug.log
55
yarn-debug.log
66
yarn-error.log
7+
.vscode

jest.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ module.exports = {
2222
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
2323
'<rootDir>/jest/file.mock.ts',
2424
},
25+
modulePathIgnorePatterns: ['dist'],
2526
reporters: ['default', 'jest-junit'],
2627
collectCoverageFrom: [
2728
'**/packages/**/*.{ts,js}',
2829
'!**/node_modules/**',
2930
'!**/dist/**',
30-
'!**/lib/**',
3131
],
3232
coverageReporters: ['lcov', 'text-summary'],
3333
};

package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
"packages/*"
55
],
66
"scripts": {
7-
"build": "lerna run build",
7+
"build": "npm-run-all build:*",
8+
"build:store": "ng-packagr -p packages/store",
9+
"build:form": "ng-packagr -p packages/form",
10+
"build:router": "ng-packagr -p packages/router",
811
"clean": "npm-run-all -p clean:*",
912
"clean:workspace-deps": "rimraf node_modules",
1013
"clean:package-deps": "rimraf packages/*/node_modules",
1114
"clean:coverage": "rimraf coverage",
12-
"lint": "tslint -p tsconfig.json",
13-
"lint:packages": "lerna run lint",
15+
"clean:package-dist": "rimraf packages/*/dist",
16+
"lint": "npm-run-all -p lint:*",
17+
"lint:packages": "tslint -p tsconfig.json",
1418
"lint:prettier": "prettier -l \"**/*.*(ts|js|css|scss|json|md)\"",
1519
"test": "jest --coverage",
1620
"test:ci": "jest --coverage --ci --maxWorkers=2",
@@ -39,6 +43,7 @@
3943
"jest-zone-patch": "0.0.8",
4044
"lerna": "2.11.0",
4145
"lint-staged": "7.2.0",
46+
"ng-packagr": "3.0.6",
4247
"npm-run-all": "4.1.3",
4348
"prettier": "1.13.7",
4449
"rimraf": "2.6.2",

packages/form/.babelrc

-3
This file was deleted.

packages/form/.gitignore

-52
This file was deleted.

packages/form/.npmignore

-11
This file was deleted.

packages/form/ng-package.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3+
"lib": {
4+
"entryFile": "src/index.ts",
5+
"languageLevel": ["esnext", "dom", "dom.iterable"]
6+
},
7+
"whitelistedNonPeerDependencies": ["tslib", "immutable"]
8+
}

packages/form/package.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
"name": "@angular-redux/form",
33
"version": "9.0.1",
44
"description": "Build Angular 2+ forms with Redux",
5-
"main": "dist/source/index.js",
6-
"typings": "dist/source/index.d.ts",
7-
"repository": "https://github.com/angular-redux/form",
5+
"author": "Chris Bond",
86
"license": "MIT",
9-
"publishConfig": {
10-
"access": "public"
7+
"homepage": "https://github.com/angular-redux/platform",
8+
"repository": {
9+
"type": "git",
10+
"url": "git+https://github.com/angular-redux/platform.git"
1111
},
12-
"engines": {
13-
"node": ">=6.0"
12+
"bugs": {
13+
"url": "https://github.com/angular-redux/platform/issues"
1414
},
15-
"scripts": {
16-
"prebuild": "npm run clean",
17-
"build": "ngc",
18-
"clean": "rimraf dist",
19-
"cover": "istanbul report --include=**/chrome/coverage-final.json text text-summary",
20-
"prepublish": "npm run build"
15+
"keywords": [
16+
"angular",
17+
"redux",
18+
"form",
19+
"forms"
20+
],
21+
"publishConfig": {
22+
"access": "public"
2123
},
2224
"peerDependencies": {
2325
"@angular-redux/store": "^9.0.0",
24-
"@angular/common": "^6.0.0",
25-
"@angular/compiler": "^6.0.0",
2626
"@angular/core": "^6.0.0",
2727
"@angular/forms": "^6.0.0",
28-
"redux": "^4.0.0"
28+
"rxjs": "^6.0.0"
2929
},
3030
"dependencies": {
3131
"immutable": "3.8.2"
@@ -39,19 +39,19 @@
3939
"@angular/forms": "6.0.7",
4040
"@angular/platform-browser": "6.0.7",
4141
"@angular/platform-browser-dynamic": "6.0.7",
42-
"@ngtools/webpack": "6.0.7",
43-
"@types/node": "6.0.114",
44-
"babel-core": "6.26.3",
45-
"babel-loader": "6.4.1",
46-
"babel-preset-es2015": "6.24.1",
47-
"cross-env": "2.0.1",
4842
"redux": "4.0.0",
4943
"redux-logger": "2.10.2",
50-
"reflect-metadata": "0.1.12",
51-
"rimraf": "2.6.2",
5244
"rxjs": "6.2.1",
5345
"typescript": "2.7.2",
54-
"webpack": "2.7.0",
5546
"zone.js": "0.8.26"
56-
}
47+
},
48+
"main": "dist/bundles/angular-redux-form.umd.js",
49+
"module": "dist/fesm5/angular-redux-form.js",
50+
"es2015": "dist/fesm2015/angular-redux-form.js",
51+
"esm5": "dist/esm5/angular-redux-form.js",
52+
"esm2015": "dist/esm2015/angular-redux-form.js",
53+
"fesm5": "dist/fesm5/angular-redux-form.js",
54+
"fesm2015": "dist/fesm2015/angular-redux-form.js",
55+
"typings": "dist/angular-redux-form.d.ts",
56+
"metadata": "dist/angular-redux-form.metadata.json"
5757
}
File renamed without changes.
File renamed without changes.

packages/form/source/connect-array/connect-array.ts packages/form/src/connect-array/connect-array.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ import { ConnectArrayTemplate } from './connect-array-template';
4444
},
4545
],
4646
})
47-
export class ConnectArrayDirective extends ControlContainer implements OnInit, OnDestroy {
47+
export class ConnectArrayDirective extends ControlContainer
48+
implements OnInit, OnDestroy {
4849
private stateSubscription: Unsubscribe;
4950

5051
private array = new FormArray([]);

packages/form/source/connect/connect.spec.ts packages/form/src/connect/connect.spec.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
// export class UpdateTextComponent {}
116116

117117
describe('connect directive', () => {
118-
it('should have a fake test for now until we can fix them...', () => undefined);
118+
it('should have a fake test for now until we can fix them...', () =>
119+
undefined);
119120
// let store: Store<AppState>;
120121

121122
// beforeEach(done => {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/form/source/state.ts packages/form/src/state.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ export type TraverseCallback = (
2121
) => any;
2222

2323
export abstract class State {
24-
static traverse<StateType>(state: StateType, path: string[], fn?: TraverseCallback) {
24+
static traverse<StateType>(
25+
state: StateType,
26+
path: string[],
27+
fn?: TraverseCallback,
28+
) {
2529
let deepValue = state;
2630

2731
for (const k of path) {
@@ -280,15 +284,15 @@ export abstract class State {
280284
if (key != null) {
281285
return { ...parent, [key]: value };
282286
}
283-
return { ...parent, ...value as any };
287+
return { ...parent, ...(value as any) };
284288
},
285289
(parent: any, _: any, value: K) => {
286290
for (const k of Object.keys(value)) {
287291
parent[k] = (value as any)[k];
288292
}
289293
return parent;
290294
},
291-
() => ({ ...object as any }),
295+
() => ({ ...(object as any) }),
292296
);
293297
default:
294298
break;
File renamed without changes.

packages/form/tsconfig.json

-33
This file was deleted.

packages/form/webpack/loaders.js

-32
This file was deleted.

packages/form/webpack/plugins.js

-15
This file was deleted.

packages/router/.gitignore

-8
This file was deleted.

packages/router/.npmignore

-5
This file was deleted.

packages/router/ng-package.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3+
"lib": {
4+
"entryFile": "src/index.ts",
5+
"languageLevel": ["esnext", "dom", "dom.iterable"]
6+
}
7+
}

0 commit comments

Comments
 (0)