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.

Sign up for GitHub

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

Jump to bottom

Set a require alias for the webapp directory #9014

Merged
merged 2 commits into from
Mar 1, 2019
Merged

Set a require alias for the webapp directory #9014

merged 2 commits into from
Mar 1, 2019

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Mar 1, 2019 •
edited
Loading

So languagehandler can pull the languages json from there

matrix-org/matrix-react-sdk#2730

@dbkr
Set a resuire alias for the webapp directory
53e25ff 
So languagehandler can pull the languages json from there
@dbkr dbkr requested a review from a team March 1, 2019 11:34
@dbkr dbkr mentioned this pull request Mar 1, 2019
Merged
@dbkr dbkr changed the title Set a resuire alias for the webapp directory Set a require alias for the webapp directory Mar 1, 2019
jryans
jryans reviewed Mar 1, 2019
View reviewed changes
webpack.config.js Outdated
@@ -157,14 +151,15 @@ module.exports = {

// same goes for js-sdk
"matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),

"Webapp": path.resolve('./webapp'),
Copy link
Collaborator

@jryans jryans Mar 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Out of curiosity... why capital "W" here? The capital seems a bit out of place, since I don't think any other paths will have them... If you want the name to suggest it's a special keyword, maybe prefix the alias with some token like $webapp?

Copy link
Member Author

Choose a reason for hiding this comment

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

Mostly just as it seemed to be a semi-convention with other people who used resolve.alias, to distinguish it from a real npm module which are generally lowercase. I assume $ would work too.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah okay, I see that's the convention described in Webpack docs, for example. Well, whichever seems best to you then.

jryans
jryans approved these changes Mar 1, 2019
View reviewed changes
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

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

Looks good to me, assuming CI agrees! Seems easier to work with now.

(Thanks for indulging my naming nit... 😁)

@dbkr dbkr merged commit 4a5a735 into release-v1.0.2 Mar 1, 2019
@t3chguy t3chguy deleted the dbkr/langs_file_resolve_alias branch May 12, 2022 09:03
su-ex added a commit to SchildiChat/element-web that referenced this pull request Aug 1, 2022
@su-ex
Merge tag 'v1.11.1' into sc
6655778 
* Enable URL tooltips on hover for Element Desktop ([\element-hq#22286](element-hq#22286)). Fixes undefined/element-web#6532.
* Hide screenshare button in video rooms on Desktop ([\element-hq#9045](matrix-org/matrix-react-sdk#9045)).
* Add a developer command to reset Megolm and Olm sessions ([\element-hq#9044](matrix-org/matrix-react-sdk#9044)).
* add spaces to TileErrorBoundary ([\element-hq#9012](matrix-org/matrix-react-sdk#9012)). Contributed by @HarHarLinks.
* Location sharing - add localised strings to map ([\element-hq#9025](matrix-org/matrix-react-sdk#9025)). Fixes element-hq#21443. Contributed by @kerryarchibald.
* Added trim to ignore whitespaces in email check ([\#9027](matrix-org/matrix-react-sdk#9027)). Contributed by @ankur12-1610.
* Improve _GenericEventListSummary.scss ([\element-hq#9005](matrix-org/matrix-react-sdk#9005)). Contributed by @luixxiul.
* Live location share - tiles without tile server (PSG-591) ([\element-hq#8962](matrix-org/matrix-react-sdk#8962)). Contributed by @kerryarchibald.
* Add option to display tooltip on link hover ([\element-hq#8394](matrix-org/matrix-react-sdk#8394)). Fixes element-hq#21907.
* Support a module API surface for custom functionality ([\element-hq#8246](matrix-org/matrix-react-sdk#8246)).
* Adjust encryption copy when creating a video room ([\element-hq#8989](matrix-org/matrix-react-sdk#8989)). Fixes element-hq#22737.
* Add bidirectonal isolation for pills ([\element-hq#8985](matrix-org/matrix-react-sdk#8985)). Contributed by @sha-265.
* Delabs `Show current avatar and name for users in message history` ([\element-hq#8764](matrix-org/matrix-react-sdk#8764)). Fixes element-hq#22336.
* Live location share - open latest location in map site ([\element-hq#8981](matrix-org/matrix-react-sdk#8981)). Contributed by @kerryarchibald.
* Improve LinkPreviewWidget ([\element-hq#8881](matrix-org/matrix-react-sdk#8881)). Fixes element-hq#22634. Contributed by @luixxiul.
* Render HTML topics in rooms on space home ([\element-hq#8939](matrix-org/matrix-react-sdk#8939)).
* Hide timestamp on event tiles being edited on every layout ([\element-hq#8956](matrix-org/matrix-react-sdk#8956)). Contributed by @luixxiul.
* Introduce new copy icon ([\element-hq#8942](matrix-org/matrix-react-sdk#8942)).
* Allow finding group DMs by members in spotlight ([\element-hq#8922](matrix-org/matrix-react-sdk#8922)). Fixes element-hq#22564. Contributed by @justjanne.
* Live location share - explicitly stop beacons replaced beacons ([\element-hq#8933](matrix-org/matrix-react-sdk#8933)). Contributed by @kerryarchibald.
* Remove unpin from widget kebab menu ([\element-hq#8924](matrix-org/matrix-react-sdk#8924)).
* Live location share - redact related locations on beacon redaction ([\element-hq#8926](matrix-org/matrix-react-sdk#8926)). Contributed by @kerryarchibald.
* Live location share - disallow message pinning ([\element-hq#8928](matrix-org/matrix-react-sdk#8928)). Contributed by @kerryarchibald.
* Remove the ability to hide yourself in video rooms ([\element-hq#22806](element-hq#22806)). Fixes element-hq#22805.
* Unbreak in-app permalink tooltips  ([\element-hq#9100](matrix-org/matrix-react-sdk#9100)).
* Add space for the stroke on message editor on IRC layout ([\element-hq#9030](matrix-org/matrix-react-sdk#9030)). Fixes element-hq#22785. Contributed by @luixxiul.
* Fix pinned messages not re-linkifying on edit ([\element-hq#9042](matrix-org/matrix-react-sdk#9042)). Fixes element-hq#22726.
* Don't unnecessarily persist the host signup dialog ([\element-hq#9043](matrix-org/matrix-react-sdk#9043)). Fixes element-hq#22778.
* Fix URL previews causing messages to become unrenderable ([\element-hq#9028](matrix-org/matrix-react-sdk#9028)). Fixes element-hq#22766.
* Fix event list summaries including invalid events ([\element-hq#9041](matrix-org/matrix-react-sdk#9041)). Fixes element-hq#22790.
* Correct accessibility labels for unread rooms in spotlight ([\element-hq#9003](matrix-org/matrix-react-sdk#9003)). Contributed by @justjanne.
* Enable search strings highlight on bubble layout ([\element-hq#9032](matrix-org/matrix-react-sdk#9032)). Fixes element-hq#22786. Contributed by @luixxiul.
* Unbreak URL preview for formatted links with tooltips ([\element-hq#9022](matrix-org/matrix-react-sdk#9022)). Fixes element-hq#22764.
* Re-add margin to tiles based on EventTileBubble ([\element-hq#9015](matrix-org/matrix-react-sdk#9015)). Fixes element-hq#22772. Contributed by @luixxiul.
* Fix Shortcut prompt for Search showing in minimized Roomlist ([\element-hq#9014](matrix-org/matrix-react-sdk#9014)). Fixes element-hq#22739. Contributed by @justjanne.
* Fix avatar position on event info line for hidden events on a thread ([\element-hq#9019](matrix-org/matrix-react-sdk#9019)). Fixes element-hq#22777. Contributed by @luixxiul.
* Fix lost padding of event tile info line ([\element-hq#9009](matrix-org/matrix-react-sdk#9009)). Fixes element-hq#22754 and element-hq#22759. Contributed by @luixxiul.
* Align verification bubble with normal event tiles on IRC layout ([\element-hq#9001](matrix-org/matrix-react-sdk#9001)). Fixes element-hq#22758. Contributed by @luixxiul.
* Ensure timestamp on generic event list summary is not hidden from TimelineCard ([\element-hq#9000](matrix-org/matrix-react-sdk#9000)). Fixes element-hq#22755. Contributed by @luixxiul.
* Fix headings margin on security user settings tab ([\element-hq#8826](matrix-org/matrix-react-sdk#8826)). Contributed by @luixxiul.
* Fix timestamp position on file panel ([\element-hq#8976](matrix-org/matrix-react-sdk#8976)). Fixes element-hq#22718. Contributed by @luixxiul.
* Stop using :not() pseudo class for mx_GenericEventListSummary ([\element-hq#8944](matrix-org/matrix-react-sdk#8944)). Fixes element-hq#22602. Contributed by @luixxiul.
* Don't show the same user twice in Spotlight ([\element-hq#8978](matrix-org/matrix-react-sdk#8978)). Fixes element-hq#22697.
* Align the right edge of expand / collapse link buttons of generic event list summary in bubble layout with a variable ([\element-hq#8992](matrix-org/matrix-react-sdk#8992)). Fixes element-hq#22743. Contributed by @luixxiul.
* Display own avatars on search results panel in bubble layout ([\element-hq#8990](matrix-org/matrix-react-sdk#8990)). Contributed by @luixxiul.
* Fix text flow of thread summary content on threads list ([\element-hq#8991](matrix-org/matrix-react-sdk#8991)). Fixes element-hq#22738. Contributed by @luixxiul.
* Fix the size of the clickable area of images ([\element-hq#8987](matrix-org/matrix-react-sdk#8987)). Fixes element-hq#22282.
* Fix font size of MessageTimestamp on TimelineCard ([\element-hq#8950](matrix-org/matrix-react-sdk#8950)). Contributed by @luixxiul.
* Improve security room settings tab style rules ([\element-hq#8844](matrix-org/matrix-react-sdk#8844)). Fixes element-hq#22575. Contributed by @luixxiul.
* Align E2E icon and avatar of info tile in compact modern layout ([\element-hq#8965](matrix-org/matrix-react-sdk#8965)). Fixes element-hq#22652. Contributed by @luixxiul.
* Fix clickable area of general event list summary toggle ([\element-hq#8979](matrix-org/matrix-react-sdk#8979)). Fixes element-hq#22722. Contributed by @luixxiul.
* Fix resizing room topic ([\element-hq#8966](matrix-org/matrix-react-sdk#8966)). Fixes element-hq#22689.
* Dismiss the search dialogue when starting a DM ([\element-hq#8967](matrix-org/matrix-react-sdk#8967)). Fixes element-hq#22700.
* Fix "greyed out" text style inconsistency on search result panel ([\element-hq#8974](matrix-org/matrix-react-sdk#8974)). Contributed by @luixxiul.
* Add top padding to EventTilePreview loader ([\element-hq#8977](matrix-org/matrix-react-sdk#8977)). Fixes element-hq#22719. Contributed by @luixxiul.
* Fix read receipts group position on TimelineCard in compact modern/group layout ([\element-hq#8971](matrix-org/matrix-react-sdk#8971)). Fixes element-hq#22715. Contributed by @luixxiul.
* Fix calls on homeservers without the unstable thirdparty endpoints. ([\element-hq#8931](matrix-org/matrix-react-sdk#8931)). Fixes element-hq#21680. Contributed by @deepbluev7.
* Enable ReplyChain text to be expanded on IRC layout ([\element-hq#8959](matrix-org/matrix-react-sdk#8959)). Fixes element-hq#22709. Contributed by @luixxiul.
* Fix hidden timestamp on message edit history dialog ([\element-hq#8955](matrix-org/matrix-react-sdk#8955)). Fixes element-hq#22701. Contributed by @luixxiul.
* Enable ReplyChain text to be expanded on bubble layout ([\element-hq#8958](matrix-org/matrix-react-sdk#8958)). Fixes element-hq#22709. Contributed by @luixxiul.
* Fix expand/collapse state wrong in metaspaces ([\element-hq#8952](matrix-org/matrix-react-sdk#8952)). Fixes element-hq#22632.
* Location (live) share replies now provide a fallback content ([\element-hq#8949](matrix-org/matrix-react-sdk#8949)).
* Fix space settings not opening for script-created spaces ([\element-hq#8957](matrix-org/matrix-react-sdk#8957)). Fixes element-hq#22703.
* Respect `filename` field on `m.file` events ([\element-hq#8951](matrix-org/matrix-react-sdk#8951)).
* Fix PlatformSettingsHandler always returning true due to returning a Promise ([\element-hq#8954](matrix-org/matrix-react-sdk#8954)). Fixes element-hq#22616.
* Improve high-contrast support for spotlight ([\element-hq#8948](matrix-org/matrix-react-sdk#8948)). Fixes element-hq#22481. Contributed by @justjanne.
* Fix wrong assertions that all media events have a mimetype ([\element-hq#8946](matrix-org/matrix-react-sdk#8946)). Fixes matrix-org/element-web-rageshakes#13727.
* Make invite dialogue fixed height ([\element-hq#8934](matrix-org/matrix-react-sdk#8934)). Fixes element-hq#22659.
* Fix all megolm error reported as unknown ([\element-hq#8916](matrix-org/matrix-react-sdk#8916)).
* Remove line-height declarations from _ReplyTile.scss ([\element-hq#8932](matrix-org/matrix-react-sdk#8932)). Fixes element-hq#22687. Contributed by @luixxiul.
* Reduce video rooms log spam ([\element-hq#8913](matrix-org/matrix-react-sdk#8913)).
* Correct new search input’s rounded corners ([\element-hq#8921](matrix-org/matrix-react-sdk#8921)). Fixes element-hq#22576. Contributed by @justjanne.
* Align unread notification dot on threads list in compact modern=group layout ([\element-hq#8911](matrix-org/matrix-react-sdk#8911)). Fixes element-hq#22677. Contributed by @luixxiul.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jryans jryans jryans approved these changes

Assignees

@dbkr dbkr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dbkr @jryans