Skip to content

Commit 2c35532

Browse files
author
epriestley
committed
Drive all Celerity operations from the new map
Summary: Ref T4222. - Removes the old map and changes the CelerityResourceMap API to be entirely driven by the new map. - The new map is about 50% smaller and organized more sensibly. - This removes the `/pkg/` URI component. All resources are now required to have unique names, so we can tell if a resource is a package or not by looking at the name. - Removes some junky old APIs. - Cleans up some other APIs. - Added some feedback for `bin/celerity map`. - `CelerityResourceMap` is still a singleton which is inextricably bound to the Phabricator map; this will change in the future. Test Plan: - Reloaded pages. - Verified packaging works by looking at generated includes. - Forced minification on and verified it worked. - Forced no-timestamps on and verified it worked. - Rebuilt map. - Ran old script and verified error message. - Checked logs. Reviewers: btrahan, hach-que Reviewed By: hach-que CC: chad, aran Maniphest Tasks: T4222 Differential Revision: https://secure.phabricator.com/D7872
1 parent 60cb65b commit 2c35532

19 files changed

+2666
-5335
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.DS_Store
22
._*
3-
/webroot/rsrc/custom
43
.#*
54
*#
65
*~

‎resources/celerity/map.php

Lines changed: 2173 additions & 0 deletions
Large diffs are not rendered by default.

‎resources/celerity/packages.php

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<?php
2+
3+
return array(
4+
'javelin.pkg.js' => array(
5+
'javelin-util',
6+
'javelin-install',
7+
'javelin-event',
8+
'javelin-stratcom',
9+
'javelin-behavior',
10+
'javelin-resource',
11+
'javelin-request',
12+
'javelin-vector',
13+
'javelin-dom',
14+
'javelin-json',
15+
'javelin-uri',
16+
'javelin-workflow',
17+
'javelin-mask',
18+
'javelin-typeahead',
19+
'javelin-typeahead-normalizer',
20+
'javelin-typeahead-source',
21+
'javelin-typeahead-preloaded-source',
22+
'javelin-typeahead-ondemand-source',
23+
'javelin-tokenizer',
24+
'javelin-history',
25+
),
26+
'core.pkg.js' => array(
27+
'javelin-behavior-aphront-basic-tokenizer',
28+
'javelin-behavior-workflow',
29+
'javelin-behavior-aphront-form-disable-on-submit',
30+
'phabricator-keyboard-shortcut-manager',
31+
'phabricator-keyboard-shortcut',
32+
'javelin-behavior-phabricator-keyboard-shortcuts',
33+
'javelin-behavior-refresh-csrf',
34+
'javelin-behavior-phabricator-watch-anchor',
35+
'javelin-behavior-phabricator-autofocus',
36+
'phabricator-menu-item',
37+
'phabricator-dropdown-menu',
38+
'phabricator-phtize',
39+
'javelin-behavior-phabricator-oncopy',
40+
'phabricator-tooltip',
41+
'javelin-behavior-phabricator-tooltips',
42+
'phabricator-prefab',
43+
'javelin-behavior-device',
44+
'javelin-behavior-toggle-class',
45+
'javelin-behavior-lightbox-attachments',
46+
'phabricator-busy',
47+
'javelin-aphlict',
48+
'phabricator-notification',
49+
'javelin-behavior-aphlict-listen',
50+
'javelin-behavior-phabricator-search-typeahead',
51+
'javelin-behavior-konami',
52+
'javelin-behavior-aphlict-dropdown',
53+
'javelin-behavior-history-install',
54+
'javelin-behavior-phabricator-gesture',
55+
56+
'javelin-behavior-phabricator-active-nav',
57+
'javelin-behavior-phabricator-nav',
58+
'javelin-behavior-phabricator-remarkup-assist',
59+
'phabricator-textareautils',
60+
'phabricator-file-upload',
61+
'javelin-behavior-global-drag-and-drop',
62+
'javelin-behavior-phabricator-reveal-content',
63+
'phabricator-hovercard',
64+
'javelin-behavior-phabricator-hovercards',
65+
'javelin-color',
66+
'javelin-fx',
67+
),
68+
'core.pkg.css' => array(
69+
'phabricator-core-css',
70+
'phabricator-zindex-css',
71+
'phui-button-css',
72+
'phabricator-standard-page-view',
73+
'aphront-dialog-view-css',
74+
'phui-form-view-css',
75+
'aphront-panel-view-css',
76+
'aphront-table-view-css',
77+
'aphront-tokenizer-control-css',
78+
'aphront-typeahead-control-css',
79+
'aphront-list-filter-view-css',
80+
81+
'phabricator-jump-nav',
82+
83+
'phabricator-remarkup-css',
84+
'syntax-highlighting-css',
85+
'aphront-pager-view-css',
86+
'phabricator-transaction-view-css',
87+
'aphront-tooltip-css',
88+
'phabricator-flag-css',
89+
'aphront-error-view-css',
90+
91+
'sprite-icons-css',
92+
'sprite-gradient-css',
93+
'sprite-menu-css',
94+
'sprite-apps-large-css',
95+
'sprite-status-css',
96+
97+
'phabricator-main-menu-view',
98+
'phabricator-notification-css',
99+
'phabricator-notification-menu-css',
100+
'lightbox-attachment-css',
101+
'phui-header-view-css',
102+
'phabricator-filetree-view-css',
103+
'phabricator-nav-view-css',
104+
'phabricator-side-menu-view-css',
105+
'phabricator-crumbs-view-css',
106+
'phui-object-item-list-view-css',
107+
'global-drag-and-drop-css',
108+
'phui-spacing-css',
109+
'phui-form-css',
110+
'phui-icon-view-css',
111+
112+
'phabricator-application-launch-view-css',
113+
'phabricator-action-list-view-css',
114+
'phui-property-list-view-css',
115+
'phabricator-tag-view-css',
116+
'phui-list-view-css',
117+
),
118+
'differential.pkg.css' => array(
119+
'differential-core-view-css',
120+
'differential-changeset-view-css',
121+
'differential-results-table-css',
122+
'differential-revision-history-css',
123+
'differential-revision-list-css',
124+
'differential-table-of-contents-css',
125+
'differential-revision-comment-css',
126+
'differential-revision-add-comment-css',
127+
'differential-revision-comment-list-css',
128+
'phabricator-object-selector-css',
129+
'phabricator-content-source-view-css',
130+
'differential-local-commits-view-css',
131+
'inline-comment-summary-css',
132+
),
133+
'differential.pkg.js' => array(
134+
'phabricator-drag-and-drop-file-upload',
135+
'phabricator-shaped-request',
136+
137+
'javelin-behavior-differential-feedback-preview',
138+
'javelin-behavior-differential-edit-inline-comments',
139+
'javelin-behavior-differential-populate',
140+
'javelin-behavior-differential-show-more',
141+
'javelin-behavior-differential-diff-radios',
142+
'javelin-behavior-differential-accept-with-errors',
143+
'javelin-behavior-differential-comment-jump',
144+
'javelin-behavior-differential-add-reviewers-and-ccs',
145+
'javelin-behavior-differential-keyboard-navigation',
146+
'javelin-behavior-aphront-drag-and-drop-textarea',
147+
'javelin-behavior-phabricator-object-selector',
148+
'javelin-behavior-repository-crossreference',
149+
'javelin-behavior-load-blame',
150+
151+
'differential-inline-comment-editor',
152+
'javelin-behavior-differential-dropdown-menus',
153+
'javelin-behavior-differential-toggle-files',
154+
'javelin-behavior-differential-user-select',
155+
),
156+
'diffusion.pkg.css' => array(
157+
'diffusion-commit-view-css',
158+
'diffusion-icons-css',
159+
),
160+
'diffusion.pkg.js' => array(
161+
'javelin-behavior-diffusion-pull-lastmodified',
162+
'javelin-behavior-diffusion-commit-graph',
163+
'javelin-behavior-audit-preview',
164+
),
165+
'maniphest.pkg.css' => array(
166+
'maniphest-task-summary-css',
167+
'phabricator-project-tag-css',
168+
),
169+
'maniphest.pkg.js' => array(
170+
'javelin-behavior-maniphest-batch-selector',
171+
'javelin-behavior-maniphest-transaction-controls',
172+
'javelin-behavior-maniphest-transaction-preview',
173+
'javelin-behavior-maniphest-transaction-expand',
174+
'javelin-behavior-maniphest-subpriority-editor',
175+
),
176+
'darkconsole.pkg.js' => array(
177+
'javelin-behavior-dark-console',
178+
'javelin-behavior-error-log',
179+
),
180+
);

‎scripts/celerity/install_merge.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/sh
22

3-
echo "src/__celerity_resource_map__.php merge=celerity" \
3+
echo "resources/celerity/map.php merge=celerity" \
44
>> `dirname "$0"`/../../.git/info/attributes
55

66
git config merge.celerity.name "Celerity Mapper"
77

88
git config merge.celerity.driver \
9-
'php $GIT_DIR/../scripts/celerity_mapper.php $GIT_DIR/../webroot'
9+
'php $GIT_DIR/../bin/celerity map'

0 commit comments

Comments
 (0)