Move oojs-router into core, to allow archiving of npm module

Doing this should make it easier for us to fix bugs and maintain
this, there seems little benefit in having this published on
npm.

Bug: T358813
Change-Id: I515e415a129da881eecdb86d8e6a274bf7584b4a
This commit is contained in:
Jon Robson 2024-02-29 14:47:26 -08:00 committed by James D. Forrester
parent aed5b52caa
commit e5eaf49989
9 changed files with 18 additions and 69 deletions

View file

@ -59,6 +59,9 @@ For notes on 1.42.x and older releases, see HISTORY.
=== External library changes in 1.43 ===
* The OOjs Router library has been merged into core and will be archived
upstream.
==== New external libraries ====
* …

View file

@ -28,6 +28,10 @@ module.exports = {
source: {
include: [
'resources/src/'
],
exclude: [
// Will be fixed in I03750273f08dd04c349fa27be30fb8f3a7c3ff55
'resources/src/mediawiki.router/oojs-router.js'
]
},
templates: {

View file

@ -3049,9 +3049,9 @@ return [
],
'mediawiki.router' => [
'scripts' => [
'resources/lib/oojs-router/oojs-router.js',
'packageFiles' => [
'resources/src/mediawiki.router/index.js',
'resources/src/mediawiki.router/oojs-router.js',
],
'dependencies' => [
'oojs',

View file

@ -349,20 +349,6 @@ oojs:
package/LICENSE-MIT:
package/README.md:
oojs-router:
license: MIT
homepage: https://www.mediawiki.org/wiki/OOjs_Router
authors: OOjs Team and other contributors
version: 0.5.0
type: tar
src: https://registry.npmjs.org/oojs-router/-/oojs-router-0.5.0.tgz
integrity: sha384-DhU20g/ayQzVWBjtflLRbk+deM1YBsIvYzjFthUOfQCXrYWJLH9bgm12eQZsC1gy
dest:
package/dist/oojs-router.js:
package/LICENSE:
package/AUTHORS.txt:
package/History.md:
ooui:
license: MIT
homepage: https://www.mediawiki.org/wiki/OOUI

View file

@ -1,7 +0,0 @@
Ed Sanders <esanders@wikimedia.org>
James D. Forrester <jforrester@wikimedia.org>
Jon Robson <jdlrobson@gmail.com>
Kunal Mehta <legoktm@member.fsf.org>
MarcoAurelio <maurelio@tools.wmflabs.org>
Prateek Saxena <prtksxna@gmail.com>
Timo Tijhof <krinklemail@gmail.com>

View file

@ -1,22 +0,0 @@
# OOjs Router Release History
## v0.5.0 / 2024/03/04
* [BREAKING CHANGE] Require oojs 7.0.1, up from 6.0.0 (James D. Forrester)
* [BREAKING CHANGE] Re-write to require ES6, up from ES5 (James D. Forrester)
* [BREAKING CHANGE] Raise jQuery requirement from v3.6.0 to v3.7.1 (James D. Forrester)
* Clean up parent->super (Ed Sanders)
## v0.4.0 / 2023-08-30
* Use native event handling (Jon Robson)
## v0.3.0 / 2021-09-09
* [BREAKING CHANGE] Require OOjs v6.0.0, up from v2.0.0 (James D. Forrester)
* [BREAKING CHANGE] Require jQuery v3.6.0, up from v3.3.1 (James D. Forrester)
## v0.2.0 / 2019-02-06
* Add OO.Router `navigateTo()` method for accessing replaceState (Jon Robson)
* build: Add AUTHORS.txt to package manifest (James D. Forrester)
## v0.1.0 / 2016-05-05
* Initial commit (Jon Robson)
* Add build, CI infrastructure (James D. Forrester)

View file

@ -1,20 +0,0 @@
Copyright 2011-2016 OOjs Team and other contributors.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View file

@ -1 +1,3 @@
require( './oojs-router.js' );
module.exports = new OO.Router();

View file

@ -7,9 +7,14 @@
* http://oojs.mit-license.org
*
* Date: 2024-03-04T20:48:16Z
* @author Ed Sanders <esanders@wikimedia.org>
* @author James D. Forrester <jforrester@wikimedia.org>
* @author Jon Robson <jdlrobson@gmail.com>
* @author Kunal Mehta <legoktm@member.fsf.org>
* @author MarcoAurelio <maurelio@tools.wmflabs.org>
* @author Prateek Saxena <prtksxna@gmail.com>
* @author Timo Tijhof <krinklemail@gmail.com>
*/
( function ( $ ) {
'use strict';
/**
@ -227,5 +232,3 @@ OO.Router.prototype.isSupported = OO.Router.static.isSupported;
if ( typeof module !== 'undefined' && module.exports ) {
module.exports = OO.Router;
}
}( jQuery ) );