Skip to content

Commit 3a0acd1

Browse files
committed
Merge branch 'main' into add-storybook-ng18
# Conflicts: # package-lock.json # package.json # projects/date-picker/CHANGELOG.md # projects/date-picker/package.json # projects/demo-app/src/app/date-picker/date-picker-demo.component.html # projects/demo-app/src/app/message-box/message-box-demo.component.html # projects/demo-app/src/app/numeric-stepper/numeric-stepper-demo.component.html # projects/demo-app/src/app/snackbar/snackbar-demo.component.html # projects/demo-app/src/app/time-picker/time-picker-demo.component.html # projects/message-box-dialog/src/message-box-dialog.component.html # projects/overlay/src/overlay.component.html # projects/status/src/status-detail/status-detail.component.html # projects/time-picker/src/time-picker.component.html # projects/time-picker/src/time-picker.component.ts # projects/user-card/src/user-card.component.html
2 parents 2aa36f0 + 6ce3362 commit 3a0acd1

Some content is hidden

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

52 files changed

+881
-1140
lines changed

.husky/commit-msg

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
printf "> Validating commit message... "
22
npx --no -- commitlint --edit "$1"
33
printf "OK\n"
4-
5-
printf "> Linting staged files... "
6-
npx --no -- lint-staged --quiet
7-
printf "OK\n"

README.md

+42-19
Large diffs are not rendered by default.

angular.json

+31-61
Original file line numberDiff line numberDiff line change
@@ -198,67 +198,6 @@
198198
}
199199
}
200200
},
201-
"numeric-stepper": {
202-
"projectType": "library",
203-
"root": "projects/numeric-stepper",
204-
"sourceRoot": "projects/numeric-stepper/src",
205-
"prefix": "numeric-stepper",
206-
"architect": {
207-
"build": {
208-
"builder": "@angular-devkit/build-angular:ng-packagr",
209-
"options": {
210-
"project": "projects/numeric-stepper/ng-package.json"
211-
},
212-
"configurations": {
213-
"production": {
214-
"tsConfig": "projects/numeric-stepper/tsconfig.lib.prod.json"
215-
},
216-
"development": {
217-
"tsConfig": "projects/numeric-stepper/tsconfig.lib.json"
218-
}
219-
},
220-
"defaultConfiguration": "production"
221-
},
222-
"test": {
223-
"builder": "@angular-devkit/build-angular:karma",
224-
"options": {
225-
"main": "projects/numeric-stepper/src/test.ts",
226-
"tsConfig": "projects/numeric-stepper/tsconfig.spec.json",
227-
"karmaConfig": "projects/numeric-stepper/karma.conf.js"
228-
}
229-
},
230-
"storybook": {
231-
"builder": "@storybook/angular:start-storybook",
232-
"options": {
233-
"configDir": "projects/numeric-stepper/.storybook",
234-
"browserTarget": "numeric-stepper:build",
235-
"compodoc": true,
236-
"compodocArgs": [
237-
"-e",
238-
"json",
239-
"-d",
240-
"projects/numeric-stepper"
241-
],
242-
"port": 6006
243-
}
244-
},
245-
"build-storybook": {
246-
"builder": "@storybook/angular:build-storybook",
247-
"options": {
248-
"configDir": "projects/numeric-stepper/.storybook",
249-
"browserTarget": "numeric-stepper:build",
250-
"compodoc": true,
251-
"compodocArgs": [
252-
"-e",
253-
"json",
254-
"-d",
255-
"projects/numeric-stepper"
256-
],
257-
"outputDir": "dist/storybook/numeric-stepper"
258-
}
259-
}
260-
}
261-
},
262201
"core": {
263202
"projectType": "library",
264203
"root": "projects/core",
@@ -352,6 +291,37 @@
352291
}
353292
}
354293
},
294+
"numeric-stepper": {
295+
"projectType": "library",
296+
"root": "projects/numeric-stepper",
297+
"sourceRoot": "projects/numeric-stepper/src",
298+
"prefix": "numeric-stepper",
299+
"architect": {
300+
"build": {
301+
"builder": "@angular-devkit/build-angular:ng-packagr",
302+
"options": {
303+
"project": "projects/numeric-stepper/ng-package.json"
304+
},
305+
"configurations": {
306+
"production": {
307+
"tsConfig": "projects/numeric-stepper/tsconfig.lib.prod.json"
308+
},
309+
"development": {
310+
"tsConfig": "projects/numeric-stepper/tsconfig.lib.json"
311+
}
312+
},
313+
"defaultConfiguration": "production"
314+
},
315+
"test": {
316+
"builder": "@angular-devkit/build-angular:karma",
317+
"options": {
318+
"main": "projects/numeric-stepper/src/test.ts",
319+
"tsConfig": "projects/numeric-stepper/tsconfig.spec.json",
320+
"karmaConfig": "projects/numeric-stepper/karma.conf.js"
321+
}
322+
}
323+
}
324+
},
355325
"overlay": {
356326
"projectType": "library",
357327
"root": "projects/overlay",
File renamed without changes.

package.json

+22-58
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
{
22
"private": true,
33
"scripts": {
4-
"ncu": "npx npm-check-updates -i --target=minor --dep=dev,peer,optional,prod --format=group --packageFile='{,projects/**/}package.json'",
4+
"ncu": "npx npm-check-updates -i --dep=dev,peer,optional,prod --format=group --packageFile='{,projects/**/}package.json'",
55
"prepare": "husky || true",
66
"new-package": "ng g .:new-package",
77
"lint": "nx run-many -t lint",
8+
"prettier": "prettier . --write",
89
"test:ci": "nx run-many -t test:ci",
910
"build": "nx run-many -t build:ng --verbose",
1011
"release": "node -r @swc-node/register ./scripts/release.ts --verbose",
1112
"release:dry-run": "npm run release -- --dry-run",
12-
"postinstall": "patch-package",
13-
"start": "ng serve",
14-
"prettier": "npx prettier . --write",
15-
"demo": "ng run storybook:storybook",
16-
"nx": "nx"
13+
"postinstall": "patch-package"
1714
},
1815
"workspaces": [
1916
"projects/core",
2017
"projects/date-picker",
18+
"projects/demo-app",
2119
"projects/layout",
2220
"projects/list-loader",
2321
"projects/message-box",
@@ -34,68 +32,34 @@
3432
"projects/user-card",
3533
"projects/user-tooltip"
3634
],
37-
"dependencies": {
38-
"@angular/animations": "~18.1.3",
39-
"@angular/cdk": "~18.1.3",
40-
"@angular/common": "~18.1.3",
41-
"@angular/compiler": "~18.1.3",
42-
"@angular/core": "~18.1.3",
43-
"@angular/forms": "~18.1.3",
44-
"@angular/material": "~18.1.3",
45-
"@angular/material-date-fns-adapter": "18.1.3",
46-
"@angular/platform-browser": "~18.1.3",
47-
"@angular/platform-browser-dynamic": "~18.1.3",
48-
"@angular/router": "~18.1.3",
49-
"@fontsource-variable/material-symbols-outlined": "~5.0.19",
50-
"@fontsource/material-icons": "4.5.4",
51-
"@fontsource/roboto": "4.5.8",
52-
"date-fns": "~2.30.0",
53-
"lodash-es": "~4.17.21",
54-
"rxjs": "~7.8.1",
55-
"tslib": "~2.6.3",
56-
"zone.js": "~0.14.8"
57-
},
5835
"devDependencies": {
59-
"@angular-devkit/build-angular": "~18.1.3",
60-
"@angular/cli": "~18.1.3",
61-
"@angular/compiler-cli": "~18.1.3",
62-
"@chromatic-com/storybook": "^1.6.1",
63-
"@commitlint/cli": "~18.6.1",
64-
"@commitlint/config-conventional": "~18.6.3",
65-
"@compodoc/compodoc": "^1.1.25",
66-
"@hug/eslint-config": "~17.0.3",
36+
"@angular-devkit/build-angular": "~14.2.13",
37+
"@angular/cli": "~14.2.13",
38+
"@angular/compiler-cli": "~14.3.0",
39+
"@commitlint/cli": "~19.4.1",
40+
"@commitlint/config-conventional": "~19.4.1",
41+
"@hug/eslint-config": "~20.2.1",
6742
"@hug/ngx-schematics-utilities": "^7.0.0",
68-
"@nx/js": "^19.3.2",
69-
"@storybook/addon-docs": "^8.2.8",
70-
"@storybook/addon-essentials": "^8.2.8",
71-
"@storybook/addon-interactions": "^8.2.8",
72-
"@storybook/addon-knobs": "^8.0.1",
73-
"@storybook/addon-links": "^8.2.8",
74-
"@storybook/angular": "^8.2.8",
75-
"@storybook/blocks": "^8.2.8",
76-
"@storybook/test": "^8.2.8",
77-
"@swc-node/register": "^1.9.2",
78-
"@swc/core": "^1.6.5",
43+
"@nx/js": "^19.6.4",
44+
"@swc-node/register": "^1.10.9",
45+
"@swc/core": "^1.7.22",
7946
"@types/jasmine": "~5.1.4",
8047
"@types/lodash-es": "^4.17.12",
8148
"detect-indent": "^7.0.1",
82-
"eslint-plugin-deprecation": "~1.5.0",
83-
"eslint-plugin-storybook": "^0.8.0",
84-
"husky": "~9.0.11",
49+
"husky": "~9.1.5",
8550
"jasmine-core": "~4.6.1",
86-
"karma": "~6.4.3",
51+
"karma": "~6.4.4",
8752
"karma-chrome-launcher": "~3.2.0",
8853
"karma-coverage": "~2.2.1",
8954
"karma-jasmine": "~5.1.0",
9055
"karma-jasmine-html-reporter": "~2.1.0",
91-
"lint-staged": "~15.2.7",
92-
"ng-packagr": "~18.1.0",
93-
"nx": "^19.3.2",
56+
"lint-staged": "~15.2.10",
57+
"ng-packagr": "~14.2.2",
58+
"nx": "^19.6.4",
9459
"patch-package": "^8.0.0",
9560
"prettier": "3.3.3",
9661
"prettier-plugin-multiline-arrays": "^3.0.6",
97-
"storybook": "^8.2.8",
98-
"typescript": "~5.4.5"
62+
"typescript": "~4.7.4"
9963
},
10064
"schematics": "./scripts/new-package/collection.json",
10165
"commitlint": {
@@ -124,11 +88,11 @@
12488
}
12589
},
12690
"lint-staged": {
127-
"**/*.{js,json,ts,html}": [
91+
"**/*.{js,ts,html,json}": [
12892
"eslint --fix"
12993
],
130-
"**/*.{html,scss,json}": [
131-
"npx prettier . --check"
94+
"**/*.{scss,html,json}": [
95+
"prettier . --check"
13296
]
13397
}
13498
}

patches/nx+19.3.2.patch patches/nx+19.6.4.patch

+30-26
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1+
diff --git a/node_modules/nx/.DS_Store b/node_modules/nx/.DS_Store
2+
new file mode 100644
3+
index 0000000..5008ddf
4+
Binary files /dev/null and b/node_modules/nx/.DS_Store differ
5+
diff --git a/node_modules/nx/bin/nx-cloud.js b/node_modules/nx/bin/nx-cloud.js
6+
old mode 100755
7+
new mode 100644
18
diff --git a/node_modules/nx/src/command-line/release/changelog.js b/node_modules/nx/src/command-line/release/changelog.js
2-
index 13e2e34..5dc0610 100644
9+
index 8200613..1505b5e 100644
310
--- a/node_modules/nx/src/command-line/release/changelog.js
411
+++ b/node_modules/nx/src/command-line/release/changelog.js
5-
@@ -310,6 +310,7 @@ async function releaseChangelog(args) {
6-
}
7-
if (!commits) {
8-
commits = await getCommits(fromRef, toSHA);
9-
+ commits = commits.filter((c) => c.affectedFiles.find((f) => f.startsWith(project.data.root)));
10-
}
11-
const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
12-
const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
12+
@@ -335,6 +335,7 @@ function createAPI(overrideReleaseConfig) {
13+
}
14+
if (!commits) {
15+
commits = await getCommits(fromRef, toSHA);
16+
+ commits = commits.filter((c) => c.affectedFiles.find((f) => f.startsWith(project.data.root)));
17+
}
18+
const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
19+
const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
1320
diff --git a/node_modules/nx/src/command-line/release/utils/git.js b/node_modules/nx/src/command-line/release/utils/git.js
14-
index c5c7d90..bb882ad 100644
21+
index 4beeea0..1c8a2af 100644
1522
--- a/node_modules/nx/src/command-line/release/utils/git.js
1623
+++ b/node_modules/nx/src/command-line/release/utils/git.js
17-
@@ -281,7 +281,8 @@ function parseConventionalCommitsMessage(message) {
18-
exports.parseConventionalCommitsMessage = parseConventionalCommitsMessage;
24+
@@ -283,7 +283,8 @@ function parseConventionalCommitsMessage(message) {
25+
}
1926
// https://www.conventionalcommits.org/en/v1.0.0/
2027
// https://regex101.com/r/FSfNvA/1
2128
-const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
@@ -25,10 +32,10 @@ index c5c7d90..bb882ad 100644
2532
const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
2633
const IssueRE = /(#\d+)/gm;
2734
diff --git a/node_modules/nx/src/command-line/release/utils/shared.js b/node_modules/nx/src/command-line/release/utils/shared.js
28-
index e08aff8..de3cdc7 100644
35+
index 0cfae24..7ba3b15 100644
2936
--- a/node_modules/nx/src/command-line/release/utils/shared.js
3037
+++ b/node_modules/nx/src/command-line/release/utils/shared.js
31-
@@ -209,8 +209,9 @@ async function getCommitsRelevantToProjects(projectGraph, commits, projects) {
38+
@@ -213,7 +213,8 @@ async function getCommitsRelevantToProjects(projectGraph, commits, projects) {
3239
* - touch project files which are contained within the list of projects directly
3340
* - touch non-project files and the commit is not scoped
3441
*/
@@ -40,42 +47,39 @@ index e08aff8..de3cdc7 100644
4047
+ // fileMap.nonProjectFiles.some((nonProjectFile) => nonProjectFile.file === f))));
4148
+ return commits.filter((c) => c.affectedFiles.some((f) => filesInReleaseGroup.has(f)));
4249
}
43-
exports.getCommitsRelevantToProjects = getCommitsRelevantToProjects;
4450
diff --git a/node_modules/nx/src/generators/utils/json.js b/node_modules/nx/src/generators/utils/json.js
45-
index 7db40ce..5e69931 100644
51+
index a59bc2c..a8387f4 100644
4652
--- a/node_modules/nx/src/generators/utils/json.js
4753
+++ b/node_modules/nx/src/generators/utils/json.js
48-
@@ -1,6 +1,8 @@
49-
"use strict";
50-
Object.defineProperty(exports, "__esModule", { value: true });
51-
exports.updateJson = exports.writeJson = exports.readJson = void 0;
54+
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
55+
exports.readJson = readJson;
56+
exports.writeJson = writeJson;
57+
exports.updateJson = updateJson;
5258
+let detectIndent_1;
5359
+(async () => detectIndent_1 = ((await import('detect-indent')).default))();
5460
const json_1 = require("../../utils/json");
5561
/**
5662
* Reads a json file, removes all comments and parses JSON.
57-
@@ -30,7 +32,10 @@ exports.readJson = readJson;
63+
@@ -31,7 +33,9 @@ function readJson(tree, path, options) {
5864
* @param options Optional JSON Serialize Options
5965
*/
6066
function writeJson(tree, path, value, options) {
6167
- const serialized = (0, json_1.serializeJson)(value, options);
6268
+ // const serialized = (0, json_1.serializeJson)(value, options);
63-
+ // tree.write(path, `${serialized}\n`);
6469
+ const indent = options?.indent ?? detectIndent_1(tree.read(path, 'utf-8')).indent;
6570
+ const serialized = (0, json_1.serializeJson)(value, { ...options, indent });
6671
tree.write(path, `${serialized}\n`);
6772
}
68-
exports.writeJson = writeJson;
73+
/**
6974
diff --git a/node_modules/nx/src/utils/json.js b/node_modules/nx/src/utils/json.js
70-
index 9ea1345..7b1be5b 100644
75+
index 2ace40e..c415390 100644
7176
--- a/node_modules/nx/src/utils/json.js
7277
+++ b/node_modules/nx/src/utils/json.js
73-
@@ -57,6 +57,7 @@ function formatParseError(input, parseError) {
78+
@@ -58,5 +58,6 @@ function formatParseError(input, parseError) {
7479
* @returns the formatted JSON representation of the object
7580
*/
7681
function serializeJson(input, options) {
7782
- return JSON.stringify(input, null, options?.spaces ?? 2);
7883
+ // return JSON.stringify(input, null, options?.spaces ?? 2);
7984
+ return JSON.stringify(input, null, options?.indent ?? 2);
8085
}
81-
exports.serializeJson = serializeJson;

0 commit comments

Comments
 (0)