move .js and .css files out of the root

.github/labels.yml

@@ -1,10 +1,10 @@
 "Module: twinkle":
-  - twinkle.js
-  - twinkle.css
-  - twinkle-pagestyles.css
+  - modules/twinkle.js
+  - modules/twinkle.css
+  - modules/twinkle-pagestyles.css
 "Module: morebits":
-  - morebits.js
-  - morebits.css
+  - modules/morebits.js
+  - modules/morebits.css
 "Module: arv":
   - modules/twinklearv.js
 "Module: batch":

DEVELOPER.md

@@ -23,13 +23,13 @@ After the files are synced, ensure that [MediaWiki:Gadgets-definition][] contain
 
 Each Twinkle module and dependency lives on the wiki as a separate file. The list of modules and what pages they should be on are as follows:
 
-- `twinkle.js` → [MediaWiki:Gadget-Twinkle.js][]
-- `twinkle.css` → [MediaWiki:Gadget-Twinkle.css][]
-- `twinkle-pagestyles.css` → [MediaWiki:Gadget-Twinkle-pagestyles.css][]
-- `morebits.js` → [MediaWiki:Gadget-morebits.js][]
-- `morebits.css` → [MediaWiki:Gadget-morebits.css][]
-- `select2.min.js` → [MediaWiki:Gadget-select2.min.js][]
-- `select2.min.css` → [MediaWiki:Gadget-select2.min.css][]
+- `modules/twinkle.js` → [MediaWiki:Gadget-Twinkle.js][]
+- `modules/twinkle.css` → [MediaWiki:Gadget-Twinkle.css][]
+- `modules/twinkle-pagestyles.css` → [MediaWiki:Gadget-Twinkle-pagestyles.css][]
+- `modules/morebits.js` → [MediaWiki:Gadget-morebits.js][]
+- `modules/morebits.css` → [MediaWiki:Gadget-morebits.css][]
+- `lib/select2.min.js` → [MediaWiki:Gadget-select2.min.js][]
+- `lib/select2.min.css` → [MediaWiki:Gadget-select2.min.css][]
 - `modules/twinklearv.js` → [MediaWiki:Gadget-twinklearv.js][]
 - `modules/twinklebatchdelete.js` → [MediaWiki:Gadget-twinklebatchdelete.js][]
 - `modules/twinklebatchprotect.js` → [MediaWiki:Gadget-twinklebatchprotect.js][]

README.md

@@ -14,9 +14,9 @@ If you'd like to start contributing, awesome!  Check out [CONTRIBUTING.md](CONTR
 
 ## Layout of this repository
 
-* `morebits.js`: The central library used by Twinkle and many other scripts. Contains code to interact with the MediaWiki API, display forms and dialogs, generate status logs, and do various other useful things. The vast majority of code in here is not Twinkle-specific; see docs ([1](https://wikimedia-gadgets.github.io/twinkle/Morebits.html) and [2](https://github.com/wikimedia-gadgets/twinkle/wiki/morebits))
-* `twinkle.js`: General Twinkle-specific code, mostly related to preferences and exposing Twinkle in the UI. Significantly, it contains the default set of preferences of Twinkle.
-* `modules`: Contains the individual Twinkle modules. Descriptions for these can be found in header comments or in the [Twinkle documentation][]. The module `twinkleconfig.js` powers the [Twinkle preferences panel][WP:TWPREFS].
+* `modules/morebits.js`: The central library used by Twinkle and many other scripts. Contains code to interact with the MediaWiki API, display forms and dialogs, generate status logs, and do various other useful things. The vast majority of code in here is not Twinkle-specific; see docs ([1](https://wikimedia-gadgets.github.io/twinkle/Morebits.html) and [2](https://github.com/wikimedia-gadgets/twinkle/wiki/morebits))
+* `modules/twinkle.js`: General Twinkle-specific code, mostly related to preferences and exposing Twinkle in the UI. Significantly, it contains the default set of preferences of Twinkle.
+* `modules/*.js`: Contains the individual Twinkle modules. Descriptions for these can be found in header comments or in the [Twinkle documentation][]. The module `twinkleconfig.js` powers the [Twinkle preferences panel][WP:TWPREFS].
 
 [select2][] is added under the [MIT license][select2license]. 
 

jest.config.js

@@ -5,8 +5,6 @@ module.exports = {
 	testEnvironment: 'jsdom',
 	setupFilesAfterEnv: ['mock-mediawiki', '<rootDir>/tests/jest.setup.js'],
 	collectCoverageFrom: [
-		'morebits.js',
-		'twinkle.js',
 		'modules/**/*.{js,jsx,ts,tsx}'
 	]
 };

morebits.js → modules/morebits.js

@@ -6106,7 +6106,6 @@ Morebits.wikitext.Page = Morebits.wikitext.page;
  */
 
 if (typeof arguments === 'undefined') { // typeof is here for a reason...
-	/* global Morebits */
 	window.SimpleWindow = Morebits.simpleWindow;
 	window.QuickForm = Morebits.quickForm;
 	window.Wikipedia = Morebits.wiki;

twinkle.js → modules/twinkle.js

@@ -15,8 +15,6 @@
  */
 // <nowiki>
 
-/* global Morebits */
-
 (function() {
 
 // Check if account is experienced enough to use Twinkle

scripts/deploy.pl

@@ -452,11 +452,11 @@ sub usage {
 ## compiler.  Rather, they are used by the --all option to simplify bulk
 ## updating all files.
 __DATA__
-twinkle.js
-  twinkle.css
-  twinkle-pagestyles.css
-  morebits.js
-  morebits.css
+modules/twinkle.js
+  modules/twinkle.css
+  modules/twinkle-pagestyles.css
+  modules/morebits.js
+  modules/morebits.css
   lib/select2.min.js
   lib/select2.min.css
   modules/twinklearv.js

scripts/dev-server.js

@@ -14,8 +14,8 @@ async function readFiles(filePaths) {
 }
 const server = http.createServer(async (request, response) => {
 	const moduleFiles = (await fs.readdir('./modules')).filter(f => f.endsWith('.js'));
-	const jsFiles = ['morebits.js', 'twinkle.js'].concat(moduleFiles.map(f => 'modules/' + f));
-	const cssFiles = ['morebits.css', 'twinkle.css'];
+	const jsFiles = moduleFiles.map(f => 'modules/' + f);
+	const cssFiles = ['modules/morebits.css', 'modules/twinkle.css'];
 
 	let jsCode = `mw.loader.using(['jquery.ui', 'ext.gadget.select2']).then(function () {\n`;
 

tests/jest.setup.js

@@ -4,8 +4,8 @@ mw.config.set({
 	wgUserGroups: ['interface-admin', 'sysop', '*', 'user', 'autoconfirmed'],
 });
 
-require('../morebits.js');
-require('../twinkle.js');
+require('../modules/morebits.js');
+require('../modules/twinkle.js');
 require('../modules/twinklewarn.js');
 require('../modules/twinklexfd.js');
 global.Morebits = window.Morebits;