Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamically import locales #2047

Merged
merged 10 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ember-flatpickr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@
},
"ember-addon": {
"app-js": {
"./components/ember-flatpickr.js": "./dist/_app_/components/ember-flatpickr.js"
"./components/ember-flatpickr.js": "./dist/_app_/components/ember-flatpickr.js",
"./initializers/ember-flatpickr.js": "./dist/_app_/initializers/ember-flatpickr.js"
},
"main": "addon-main.cjs",
"type": "addon",
Expand Down
1 change: 1 addition & 0 deletions ember-flatpickr/rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export default {
'helpers/**/*.js',
'modifiers/**/*.js',
'services/**/*.js',
'initializers/**/*.js',
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved
]),

// Follow the V2 Addon rules about dependencies. Your code can import from
Expand Down
11 changes: 11 additions & 0 deletions ember-flatpickr/src/initializers/ember-flatpickr.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import flatpickr from "flatpickr";
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved

export function initialize() {
if (window) {
window.flatpickr = flatpickr;
}
};

export default {
initialize
};
7 changes: 7 additions & 0 deletions ember-flatpickr/unpublished-development-types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
import "ember-source/types/stable";
import "ember-source/types/preview";
import type flatpickr from "flatpickr";
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved

declare global {
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved
interface Window {
flatpickr: flatpickr;
}
}
4 changes: 4 additions & 0 deletions test-app/app/controllers/docs/components/ember-flatpickr.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import Controller from '@ember/controller';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
import { next } from '@ember/runloop';
import 'flatpickr/dist/l10n/fr';
import 'flatpickr/dist/l10n/de';
import 'flatpickr/dist/l10n/ru';
import 'flatpickr/dist/l10n/uk';

export default class EmberFlatpickr extends Controller {
@tracked dateValue = null;
Expand Down
12 changes: 12 additions & 0 deletions test-app/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,16 @@ module.exports = function (defaults) {
const { maybeEmbroider } = require('@embroider/test-setup');

return maybeEmbroider(app);

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this commented out code?

// bundle analyzer
// const { Webpack } = require('@embroider/webpack');
// const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');

// return require('@embroider/compat').compatBuild(app, Webpack, {
// packagerOptions: {
// webpackConfig: {
// plugins: [new BundleAnalyzerPlugin()],
// },
// },
// });
};
28 changes: 28 additions & 0 deletions test-app/tests/integration/components/ember-flatpickr-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
setFlatpickrDate,
} from 'ember-flatpickr/test-support/helpers';
import langs from 'flatpickr/dist/l10n';
import 'flatpickr/dist/l10n/fr';

const clickDay = async (index) => {
await triggerEvent(findAll('.flatpickr-days .flatpickr-day')[index], 'click');
Expand Down Expand Up @@ -456,6 +457,33 @@ module('Integration | Component | ember flatpickr', function (hooks) {
);
});

test('locale as string works correctly', async function (assert) {
assert.expect(1);

this.set('dateValue', '2080-12-01T16:16:22.585Z');
this.set('maxDate', '2080-12-31T16:16:22.585Z');
this.set('minDate', '2080-12-01T16:16:22.585Z');

this.set('locale', 'fr');

await render(hbs`<EmberFlatpickr
@date={{this.dateValue}}
@locale={{this.locale}}
@maxDate={{this.maxDate}}
@minDate={{this.minDate}}
@onChange={{null}}
placeholder="Pick date"
/>`);

assert.strictEqual(
find(
'.flatpickr-current-month .flatpickr-monthDropdown-month',
).textContent.trim(),
'décembre',
'French locale applied successfully',
);
});

test('onLocaleUpdated fired', async function (assert) {
assert.expect(1);

Expand Down
38 changes: 38 additions & 0 deletions test-app/tests/unit/initializers/ember-flatpickr-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import Application from '@ember/application';
import config from 'test-app/config/environment';
import { module, test } from 'qunit';
import Resolver from 'ember-resolver';
import { run } from '@ember/runloop';
import { initialize } from 'ember-flatpickr/initializers/ember-flatpickr';

module('Unit | Initializer | ember-flatpickr', function (hooks) {
hooks.beforeEach(function () {
this.TestApplication = class TestApplication extends Application {
modulePrefix = config.modulePrefix;
podModulePrefix = config.podModulePrefix;
Resolver = Resolver;
};

this.TestApplication.initializer({
name: 'initializer under test',
initialize,
});

this.application = this.TestApplication.create({
autoboot: false,
});
});

hooks.afterEach(function () {
run(this.application, 'destroy');
});

test('window.flatpickr is available after boot', async function (assert) {
await this.application.boot();
assert.ok(window.flatpickr, 'flatpickr is available on the window');
assert.ok(
window.flatpickr.l10ns,
'flatpickr locales are available on the window',
);
});
});
6 changes: 6 additions & 0 deletions test-app/types/test-app/index.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
import 'ember-source/types/stable';

declare global {
RobbieTheWagner marked this conversation as resolved.
Show resolved Hide resolved
interface Window {
flatpickr: flatpickr;
}
}
Loading