Skip to content

Commit eecac2d

Browse files
committed
Merge branch 'main' into icon-refactor
2 parents 5912589 + c4dc90d commit eecac2d

248 files changed

Lines changed: 3749 additions & 2020 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,17 @@
1010
# Order is important. The last matching pattern has the most precedence.
1111

1212
# Specific packages
13-
/packages/angular-workspace/example-client-app @rajsite @atmgrifter00
14-
/packages/angular-workspace/nimble-angular @rajsite @atmgrifter00
15-
/packages/angular-workspace/spright-angular @rajsite @atmgrifter00
16-
/packages/blazor-workspace @rajsite @atmgrifter00 @msmithNI
17-
/packages/nimble-components @rajsite @jattasNI
13+
/packages/angular-workspace @rajsite @mollykreis
14+
/packages/blazor-workspace @rajsite @msmithNI
1815
/packages/nimble-components/build/generate-workers @rajsite @jattasNI @munteannatan
1916
/packages/nimble-components/src/wafer-map @rajsite @jattasNI @munteannatan
2017
/packages/nimble-components/src/rich-text @rajsite @jattasNI @vivinkrishna-ni
2118
/packages/nimble-components/src/rich-text-mention @rajsite @jattasNI @vivinkrishna-ni
2219
/packages/nimble-tokens @rajsite @jattasNI @fredvisser
23-
/packages/site @rajsite @jattasNI
24-
/packages/spright-components @rajsite @jattasNI
2520
/packages/storybook/.storybook @rajsite @jattasNI @fredvisser
26-
/packages/xliff-to-json-converter @rajsite @jattasNI
2721

2822
# Specs (placed after packages to have higher precedence for spec files contained in packages)
29-
specs @rajsite @jattasNI @atmgrifter00 @mollykreis
23+
specs @rajsite @jattasNI @mollykreis
3024

3125
# .snyk security scanning configuration file
3226
/.snyk @chris468 @cameronwaterman @BKnight760 @rbell517 @jattasNI @prestwick

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,13 @@ Tools and utilities hosted in the repository.
6969

7070
[![Nimble Tokens NPM version and repo link](https://img.shields.io/npm/v/@ni/nimble-tokens.svg?label=@ni/nimble-tokens)](https://www.npmjs.com/package/@ni/nimble-tokens)
7171
[![Jasmine parameterized NPM version and repo link](https://img.shields.io/npm/v/@ni/jasmine-parameterized.svg?label=@ni/jasmine-parameterized)](https://www.npmjs.com/package/@ni/jasmine-parameterized)
72+
[![Unit Format NPM version and repo link](https://img.shields.io/npm/v/@ni/unit-format.svg?label=@ni/unit-format)](https://www.npmjs.com/package/@ni/unit-format)
7273
[![XLIFF to JSON Converter for Angular NPM version and repo link](https://img.shields.io/npm/v/@ni/xliff-to-json-converter.svg?label=@ni/xliff-to-json-converter)](https://www.npmjs.com/package/@ni/xliff-to-json-converter)
7374

7475
- [`@ni/nimble-tokens`](/packages/nimble-tokens/) - Base design tokens used by the Nimble and Spright component packages.
75-
- [`@ni/jasmine-parameterized`](/packages/jasmine-parameterized/) - a utility for writing [Jasmine](https://jasmine.github.io/) parameterized tests.
76-
- [`@ni/xliff-to-json-converter`](/packages/xliff-to-json-converter/) - a utility to convert translation files from XLIFF to JSON for Angular localization.
76+
- [`@ni/jasmine-parameterized`](/packages/jasmine-parameterized/) - A utility for writing [Jasmine](https://jasmine.github.io/) parameterized tests.
77+
- [`@ni/unit-format`](/packages/unit-format/) - NumberFormat aligned library to format numbers with scaled units.
78+
- [`@ni/xliff-to-json-converter`](/packages/xliff-to-json-converter/) - A utility to convert translation files from XLIFF to JSON for Angular localization.
7779

7880
The above packages follow [Semantic Versioning](https://semver.org). Consult the `CHANGELOG.md` for each package to see the changes in each version, including instructions for adapting your application in response to breaking changes.
7981

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,10 @@ module.exports = {
1010
return `- ${entry.comment} ([ni/nimble@${entry.commit.substring(0, 7)}](https://github.com/ni/nimble/commit/${entry.commit}))`;
1111
}
1212
}
13-
}
13+
},
14+
ignorePatterns: [
15+
'**/docs/**',
16+
'**/specs/**',
17+
'**/tests/**',
18+
]
1419
};

package-lock.json

Lines changed: 1137 additions & 973 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"performance": "npm run performance --workspaces --if-present",
2525
"storybook": "npm run start -w @ni-private/storybook"
2626
},
27+
"type": "module",
2728
"repository": {
2829
"type": "git",
2930
"url": "git+https://github.com/ni/nimble.git"
@@ -45,6 +46,7 @@
4546
"packages/jasmine-extensions",
4647
"packages/jasmine-parameterized",
4748
"packages/xliff-to-json-converter",
49+
"packages/unit-format",
4850
"packages/nimble-tokens",
4951
"packages/nimble-components",
5052
"packages/spright-components",

packages/angular-workspace/angular.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"options": {
3333
"main": "nimble-angular/test.ts",
3434
"tsConfig": "nimble-angular/tsconfig.spec.json",
35-
"karmaConfig": "nimble-angular/karma.conf.js",
35+
"karmaConfig": "nimble-angular/karma.conf.cjs",
3636
"polyfills": [
3737
"@angular/localize/init"
3838
]
@@ -78,7 +78,7 @@
7878
"options": {
7979
"main": "ok-angular/test.ts",
8080
"tsConfig": "ok-angular/tsconfig.spec.json",
81-
"karmaConfig": "ok-angular/karma.conf.js",
81+
"karmaConfig": "ok-angular/karma.conf.cjs",
8282
"polyfills": [
8383
"@angular/localize/init"
8484
]
@@ -124,7 +124,7 @@
124124
"options": {
125125
"main": "spright-angular/test.ts",
126126
"tsConfig": "spright-angular/tsconfig.spec.json",
127-
"karmaConfig": "spright-angular/karma.conf.js",
127+
"karmaConfig": "spright-angular/karma.conf.cjs",
128128
"polyfills": [
129129
"@angular/localize/init"
130130
]
@@ -257,7 +257,7 @@
257257
"@angular/localize/init"
258258
],
259259
"tsConfig": "example-client-app/tsconfig.spec.json",
260-
"karmaConfig": "example-client-app/karma.conf.js",
260+
"karmaConfig": "example-client-app/karma.conf.cjs",
261261
"inlineStyleLanguage": "scss",
262262
"assets": [
263263
"example-client-app/src/favicon.ico",

packages/angular-workspace/eslint.config.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ export default defineConfig([
66
globalIgnores(['*/']),
77
lintNimbleConfig,
88
{
9-
files: ['**/*.js'],
10-
extends: javascriptNimbleConfig,
9+
files: ['**/*.js', '**/*.cjs', '**/*.mjs'],
10+
extends: [javascriptNimbleConfig],
11+
rules: {
12+
'import/extensions': 'off'
13+
}
1114
},
1215
]);

packages/angular-workspace/example-client-app/build-assets/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
2-
"description": "Dummy package.json for build deployment. DO NOT MODIFY",
32
"name": "@ni-private/example-client-app",
43
"version": "1.0.0",
54
"private":true,
5+
"description": "Dummy package.json for build deployment. DO NOT MODIFY",
6+
"type": "module",
67
"files": [
78
"*",
89
"!*.tgz"

packages/angular-workspace/example-client-app/eslint.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ export default defineConfig([
66
globalIgnores(['**/src/environments']),
77
lintNimbleConfig,
88
{
9-
files: ['**/*.js'],
9+
files: ['**/*.js', '**/*.cjs', '**/*.mjs'],
1010
extends: javascriptNimbleConfig,
1111
rules: {
1212
'import/no-extraneous-dependencies': ['error', { packageDir: resolve(import.meta.dirname, '../') }],
13+
'import/extensions': 'off'
1314
}
1415
},
1516
{

packages/angular-workspace/example-client-app/karma.conf.js renamed to packages/angular-workspace/example-client-app/karma.conf.cjs

File renamed without changes.

0 commit comments

Comments
 (0)