Bug 1560689 - Remove react-intl dependencies and script loading r=dmose

Depends on D36764

Differential Revision: https://phabricator.services.mozilla.com/D36835

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ed Lee 2019-07-03 23:48:14 +00:00
Родитель 475d41e647
Коммит 9dab7f6b37
12 изменённых файлов: 0 добавлений и 113 удалений

Просмотреть файл

@ -145,7 +145,6 @@ AboutNewTabService.prototype = {
`${BASE_URL}vendor/react${debugString}.js`,
`${BASE_URL}vendor/react-dom${debugString}.js`,
`${BASE_URL}vendor/prop-types.js`,
`${BASE_URL}vendor/react-intl.js`,
`${BASE_URL}vendor/redux.js`,
`${BASE_URL}vendor/react-redux.js`,
`${BASE_URL}prerendered/${this.activityStreamLocale}/activity-stream-strings.js`,

Просмотреть файл

@ -71,7 +71,6 @@ function templateHTML(options) {
`${options.baseUrl}vendor/react${debugString}.js`,
`${options.baseUrl}vendor/react-dom${debugString}.js`,
`${options.baseUrl}vendor/prop-types.js`,
`${options.baseUrl}vendor/react-intl.js`,
`${options.baseUrl}vendor/redux.js`,
`${options.baseUrl}vendor/react-redux.js`,
`${options.baseUrl}prerendered/${options.locale}/activity-stream-strings.js`,

Просмотреть файл

@ -13,8 +13,6 @@ const filesToVendor = {
"react/umd/react.development.js": "react-dev.js",
"react-dom/umd/react-dom.production.min.js": "react-dom.js",
"react-dom/umd/react-dom.development.js": "react-dom-dev.js",
"react-intl/LICENSE.md": "REACT_INTL_LICENSE",
"react-intl/dist/react-intl.min.js": "react-intl.js",
"react-redux/LICENSE.md": "REACT_REDUX_LICENSE",
"react-redux/dist/react-redux.min.js": "react-redux.js",
};

Просмотреть файл

@ -14,7 +14,6 @@ browser.jar:
res/activity-stream/vendor/react-dom-dev.js (./vendor/react-dom-dev.js)
#endif
res/activity-stream/vendor/prop-types.js (./vendor/prop-types.js)
res/activity-stream/vendor/react-intl.js (./vendor/react-intl.js)
res/activity-stream/vendor/redux.js (./vendor/redux.js)
res/activity-stream/vendor/react-redux.js (./vendor/react-redux.js)
res/activity-stream/data/content/assets/ (./data/content/assets/*)

38
browser/components/newtab/package-lock.json сгенерированный
Просмотреть файл

@ -5361,32 +5361,6 @@
"integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
"dev": true
},
"intl-format-cache": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.2.tgz",
"integrity": "sha512-B5XmTTcF7Yz5VACwVLmAUkqK27RnOCvgi0kwA6Al/vzVPHy+h+G8J7SCyzZDMjb/UB8fqBEyrzecyn1ksRIi9A=="
},
"intl-messageformat": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
"integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=",
"requires": {
"intl-messageformat-parser": "1.4.0"
}
},
"intl-messageformat-parser": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
"integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU="
},
"intl-relativeformat": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.1.1.tgz",
"integrity": "sha512-bAhhgiCiN+MVjQeK2v9YqCRJQ8FfV0tk9WVh1RYkRJerpYhmpBe2I4XxpneY232Cp9ujHVl3Q465UJkHQEQdmQ==",
"requires": {
"intl-messageformat": "^2.0.0"
}
},
"invariant": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@ -8718,18 +8692,6 @@
}
}
},
"react-intl": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
"integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==",
"requires": {
"hoist-non-react-statics": "^3.3.0",
"intl-format-cache": "^2.0.5",
"intl-messageformat": "^2.1.0",
"intl-relativeformat": "^2.1.0",
"invariant": "^2.1.1"
}
},
"react-is": {
"version": "16.8.4",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz",

Просмотреть файл

@ -11,7 +11,6 @@
"fluent-react": "0.8.4",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-intl": "2.9.0",
"react-redux": "7.0.3",
"redux": "4.0.1",
"reselect": "4.0.0"

Просмотреть файл

@ -19,7 +19,6 @@
<script src="resource://activity-stream/vendor/react.js"></script>
<script src="resource://activity-stream/vendor/react-dom.js"></script>
<script src="resource://activity-stream/vendor/prop-types.js"></script>
<script src="resource://activity-stream/vendor/react-intl.js"></script>
<script src="resource://activity-stream/vendor/redux.js"></script>
<script src="resource://activity-stream/vendor/react-redux.js"></script>
<script src="resource://activity-stream/prerendered/en-US/activity-stream-strings.js"></script>

Просмотреть файл

@ -19,7 +19,6 @@
<script src="resource://activity-stream/vendor/react-dev.js"></script>
<script src="resource://activity-stream/vendor/react-dom-dev.js"></script>
<script src="resource://activity-stream/vendor/prop-types.js"></script>
<script src="resource://activity-stream/vendor/react-intl.js"></script>
<script src="resource://activity-stream/vendor/redux.js"></script>
<script src="resource://activity-stream/vendor/react-redux.js"></script>
<script src="resource://activity-stream/prerendered/en-US/activity-stream-strings.js"></script>

Просмотреть файл

@ -1,27 +0,0 @@
Copyright 2014 Yahoo Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Yahoo Inc. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -49,7 +49,6 @@ module.exports = (env = {}) => ({
"prop-types": "PropTypes",
"react": "React",
"react-dom": "ReactDOM",
"react-intl": "ReactIntl",
"redux": "Redux",
"react-redux": "ReactRedux",
},

Просмотреть файл

@ -157,7 +157,6 @@
<li><a href="about:license#raven-js">Raven.js License</a></li>
<li><a href="about:license#react">React License</a></li>
<li><a href="about:license#react-mit">React MIT License</a></li>
<li><a href="about:license#react-intl">React Intl License</a></li>
<li><a href="about:license#react-redux">React-Redux License</a></li>
<li><a href="about:license#react-router">React Router License</a></li>
<li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
@ -5723,42 +5722,6 @@ SOFTWARE.
<hr>
<h1><a id="react-intl"></a>React Intl License</h1>
<p>This license applies to the files
<code>browser/components/newtab/vendor/react-intl.js</code>.</p>
<pre>
Copyright 2014 Yahoo Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Yahoo Inc. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre>
<hr>
<h1><a id="react-redux"></a>React-Redux License</h1>
<p>This license applies to the files