Skip to content

Commit 753b628

Browse files
committed
feat: add date adapter for luxon
Adds the `LuxonDateAdapter` that can be used to work with Luxon dates in the `MatDatepicker`.
1 parent 36db1c0 commit 753b628

39 files changed

+1050
-16
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@
8282
# Moment adapter package
8383
/src/material-moment-adapter/** @mmalerba
8484

85+
# Luxon adapter package
86+
/src/material-luxon-adapter/** @mmalerba @crisbeto
87+
8588
# Material experimental package
8689
/src/material-experimental/** @jelbourn
8790

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"@types/hammerjs": "^2.0.35",
7070
"@types/inquirer": "^0.0.43",
7171
"@types/jasmine": "^3.0.0",
72+
"@types/luxon": "^1.4.1",
7273
"@types/marked": "^0.4.2",
7374
"@types/merge2": "^0.3.30",
7475
"@types/minimist": "^1.2.0",
@@ -114,6 +115,7 @@
114115
"karma-parallel": "^0.3.0",
115116
"karma-sauce-launcher": "^2.0.2",
116117
"karma-sourcemap-loader": "^0.3.7",
118+
"luxon": "^1.8.3",
117119
"magic-string": "^0.22.4",
118120
"marked": "^0.5.1",
119121
"merge2": "^1.2.3",

packages.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ VERSION_PLACEHOLDER_REPLACEMENTS = {
8989
ROLLUP_GLOBALS = {
9090
'tslib': 'tslib',
9191
'moment': 'moment',
92+
'luxon': 'luxon',
9293
'@angular/cdk': 'ng.cdk',
9394
'@angular/cdk-experimental': 'ng.cdkExperimental',
9495
'@angular/material': 'ng.material',

scripts/deploy/publish-build-artifacts.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ if [ -z ${MATERIAL2_BUILDS_TOKEN} ]; then
1616
fi
1717

1818
# Material packages that need to published.
19-
PACKAGES=(cdk material material-moment-adapter)
19+
PACKAGES=(cdk material material-moment-adapter material-luxon-adapter)
20+
21+
## TODO(crisbeto): add luxon to this once we have a repo for `material-luxon-adapter` builds.
2022
REPOSITORIES=(cdk-builds material2-builds material2-moment-adapter-builds)
2123

2224
# Command line arguments.

src/dev-app/system-config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ System.config({
1818
'main': 'main.js',
1919
'tslib': 'node:tslib/tslib.js',
2020
'moment': 'node:moment/min/moment-with-locales.min.js',
21+
'luxon': 'node:luxon/build/amd/luxon.js',
2122

2223
'rxjs': 'node_modules/rxjs/bundles/rxjs.umd.min.js',
2324
'rxjs/operators': 'system-rxjs-operators.js',
@@ -43,6 +44,7 @@ System.config({
4344
'@angular/material-experimental': 'dist/packages/material-experimental/index.js',
4445
'@angular/material-examples': 'dist/packages/material-examples/index.js',
4546
'@angular/material-moment-adapter': 'dist/packages/material-moment-adapter/index.js',
47+
'@angular/material-luxon-adapter': 'dist/packages/material-luxon-adapter/index.js',
4648
'@angular/cdk': 'dist/packages/cdk/index.js',
4749
'@angular/cdk-experimental': 'dist/packages/cdk-experimental/index.js',
4850

src/dev-app/tsconfig-aot.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"@angular/cdk-experimental/*": ["../../dist/releases/cdk-experimental/*"],
3030
"@angular/cdk-experimental": ["../../dist/releases/cdk-experimental"],
3131
"@angular/material-moment-adapter": ["../../dist/releases/material-moment-adapter"],
32+
"@angular/material-luxon-adapter": ["../../dist/releases/material-luxon-adapter"],
3233
"@angular/material-examples": ["../../dist/releases/material-examples"]
3334
}
3435
},

src/dev-app/tsconfig-build.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@angular/cdk-experimental/*": ["../../dist/packages/cdk-experimental/*"],
3737
"@angular/cdk-experimental": ["../../dist/packages/cdk-experimental"],
3838
"@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"],
39+
"@angular/material-luxon-adapter": ["../../dist/packages/material-luxon-adapter"],
3940
"@angular/material-examples": ["../../dist/packages/material-examples"]
4041
}
4142
},

src/dev-app/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"@angular/cdk-experimental/*": ["../cdk-experimental/*"],
1616
"@angular/cdk-experimental": ["../cdk-experimental"],
1717
"@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"],
18+
"@angular/material-luxon-adapter": ["../material-luxon-adapter/public-api.ts"],
1819
"@angular/material-examples": ["../../dist/packages/material-examples"]
1920
}
2021
},

src/e2e-app/system-config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ System.config({
1010
'rxjs': 'node:rxjs',
1111
'main': 'main.js',
1212
'moment': 'node:moment/min/moment-with-locales.min.js',
13+
'luxon': 'node:luxon/build/amd/luxon.js',
1314
'tslib': 'node:tslib/tslib.js',
1415

1516
// Angular specific mappings.
@@ -30,6 +31,7 @@ System.config({
3031
'@angular/material': 'dist/bundles/material.umd.js',
3132
'@angular/material-experimental': 'dist/bundles/material-experimental.umd.js',
3233
'@angular/material-moment-adapter': 'dist/bundles/material-moment-adapter.umd.js',
34+
'@angular/material-luxon-adapter': 'dist/bundles/material-luxon-adapter.umd.js',
3335
'@angular/cdk': 'dist/bundles/cdk.umd.js',
3436
'@angular/cdk-experimental': 'dist/bundles/cdk-experimental.umd.js',
3537

src/e2e-app/tsconfig-build.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@angular/cdk-experimental/*": ["../../dist/releases/cdk-experimental/*"],
3737
"@angular/cdk-experimental": ["../../dist/releases/cdk-experimental/"],
3838
"@angular/material-moment-adapter": ["../../dist/releases/material-moment-adapter"],
39+
"@angular/material-luxon-adapter": ["../../dist/releases/material-luxon-adapter"],
3940
"@angular/material-examples": ["../../dist/releases/material-examples"]
4041
}
4142
},

0 commit comments

Comments
 (0)