opendev/gerrit
Code Issues Proposed changes

Manually convert shared components to es6 modules

Browse Source 
gr-diff.html and gr-diff-root.html are shared components. Polymer
modulizer doesn't convert these files automatically because they are not
reachable from the application root (i.e. from gr-app.html).

The gerrit-ci can fail on this change. The tests will be repaired after
conversion to es6 modules.

Change-Id: Icd51889a55f0ead9be953281593246dc75af9a6d
This commit is contained in:
Dmitrii Filippov
2020-03-11 13:28:07 +01:00
parent 23505e90b6
commit 445e9249e6
4 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
polygerrit-ui/app/embed/gr-diff.html
View File

@@ -14,8 +14,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<script>
window.Gerrit = window.Gerrit || {}; <script type="module" src="./gr-diff.js"> </script>
</script>
<link rel="import" href="../elements/diff/gr-diff/gr-diff.html">
<link rel="import" href="../elements/diff/gr-diff-cursor/gr-diff-cursor.html">

20
polygerrit-ui/app/embed/gr-diff.js Normal file
View File

@@ -0,0 +1,20 @@
/**
* @license
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
window.Gerrit = window.Gerrit || {};
import '../elements/diff/gr-diff/gr-diff.js';
import '../elements/diff/gr-diff-cursor/gr-diff-cursor.js';

22
polygerrit-ui/app/gr-diff/gr-diff-root.html
View File

@@ -1,4 +1,18 @@
<script> <!--
window.Gerrit = window.Gerrit || {}; @license
</script> Copyright (C) 2020 The Android Open Source Project
<link rel="import" href="../elements/diff/gr-diff/gr-diff.html">
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<script type="module" src="./gr-diff-root.js"></script>

19
polygerrit-ui/app/gr-diff/gr-diff-root.js Normal file
View File

@@ -0,0 +1,19 @@
/**
* @license
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
window.Gerrit = window.Gerrit || {};
import '../elements/diff/gr-diff/gr-diff.js';