alex/yomichan
1
Fork 0
Code Releases Activity

Move mixed/lib/ to lib/ (#1382)

Browse Source
This commit is contained in:
toasted-nutbread 2021-02-13 21:28:47 -05:00 committed by GitHub
parent e9358997c0
commit deed5027cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.json
View File

@ -12,7 +12,7 @@
}, },
"plugins": ["no-unsanitized"], "plugins": ["no-unsanitized"],
"ignorePatterns": [ "ignorePatterns": [
"/ext/mixed/lib/", "/ext/lib/",
"/ext/bg/js/templates.js" "/ext/bg/js/templates.js"
], ],
"rules": { "rules": {

2
.stylelintrc.json
View File

@ -1,7 +1,7 @@
{ {
"extends": "stylelint-config-recommended", "extends": "stylelint-config-recommended",
"ignoreFiles": [ "ignoreFiles": [
"ext/mixed/lib/**/*.css" "ext/lib/**/*.css"
], ],
"rules": { "rules": {
"font-family-name-quotes": "always-where-recommended", "font-family-name-quotes": "always-where-recommended",

8
dev/data/manifest-variants.json
View File

@ -123,7 +123,7 @@
"excludeFiles": [ "excludeFiles": [
"sw.js", "sw.js",
"bg/js/simple-dom-parser.js", "bg/js/simple-dom-parser.js",
"mixed/lib/parse5.js" "lib/parse5.js"
] ]
}, },
{ {
@ -148,7 +148,7 @@
"excludeFiles": [ "excludeFiles": [
"sw.js", "sw.js",
"bg/js/simple-dom-parser.js", "bg/js/simple-dom-parser.js",
"mixed/lib/parse5.js" "lib/parse5.js"
] ]
}, },
{ {
@ -220,7 +220,7 @@
"excludeFiles": [ "excludeFiles": [
"sw.js", "sw.js",
"bg/js/simple-dom-parser.js", "bg/js/simple-dom-parser.js",
"mixed/lib/parse5.js" "lib/parse5.js"
] ]
}, },
{ {
@ -256,7 +256,7 @@
"excludeFiles": [ "excludeFiles": [
"sw.js", "sw.js",
"bg/js/simple-dom-parser.js", "bg/js/simple-dom-parser.js",
"mixed/lib/parse5.js" "lib/parse5.js"
] ]
} }
] ]

2
dev/util.js
View File

@ -25,7 +25,7 @@ let JSZip = null;
function getJSZip() { function getJSZip() {
if (JSZip === null) { if (JSZip === null) {
process.noDeprecation = true; // Suppress a warning about JSZip process.noDeprecation = true; // Suppress a warning about JSZip
JSZip = require(path.join(__dirname, '../ext/mixed/lib/jszip.min.js')); JSZip = require(path.join(__dirname, '../ext/lib/jszip.min.js'));
process.noDeprecation = false; process.noDeprecation = false;
} }
return JSZip; return JSZip;

2
ext/background.html
View File

@ -15,7 +15,7 @@
<body> <body>
<textarea id="clipboard-paste-target"></textarea> <textarea id="clipboard-paste-target"></textarea>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/mixed/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/yomichan.js"></script>

0
ext/mixed/lib/bootstrap/css/bootstrap-theme.css → ext/lib/bootstrap/css/bootstrap-theme.css vendored
View File

0
ext/mixed/lib/bootstrap/css/bootstrap-theme.css.map → ext/lib/bootstrap/css/bootstrap-theme.css.map
View File

0
ext/mixed/lib/bootstrap/css/bootstrap-theme.min.css → ext/lib/bootstrap/css/bootstrap-theme.min.css vendored
View File

0
ext/mixed/lib/bootstrap/css/bootstrap-theme.min.css.map → ext/lib/bootstrap/css/bootstrap-theme.min.css.map
View File

0
ext/mixed/lib/bootstrap/css/bootstrap.css → ext/lib/bootstrap/css/bootstrap.css vendored
View File

0
ext/mixed/lib/bootstrap/css/bootstrap.css.map → ext/lib/bootstrap/css/bootstrap.css.map
View File

0
ext/mixed/lib/bootstrap/css/bootstrap.min.css → ext/lib/bootstrap/css/bootstrap.min.css vendored
View File

0
ext/mixed/lib/bootstrap/css/bootstrap.min.css.map → ext/lib/bootstrap/css/bootstrap.min.css.map
View File

0
ext/mixed/lib/bootstrap/fonts/glyphicons-halflings-regular.eot → ext/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
View File

0
ext/mixed/lib/bootstrap/fonts/glyphicons-halflings-regular.svg → ext/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

0
ext/mixed/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf → ext/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
View File

0
ext/mixed/lib/bootstrap/fonts/glyphicons-halflings-regular.woff → ext/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
View File

0
ext/mixed/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2 → ext/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
View File

0
ext/mixed/lib/bootstrap/js/bootstrap.js → ext/lib/bootstrap/js/bootstrap.js vendored
View File

0
ext/mixed/lib/bootstrap/js/bootstrap.min.js → ext/lib/bootstrap/js/bootstrap.min.js vendored
View File

0
ext/mixed/lib/bootstrap/js/npm.js → ext/lib/bootstrap/js/npm.js
View File

0
ext/mixed/lib/handlebars.min.js → ext/lib/handlebars.min.js vendored
View File

0
ext/mixed/lib/jquery.min.js → ext/lib/jquery.min.js vendored
View File

0
ext/mixed/lib/jszip.min.js → ext/lib/jszip.min.js vendored
View File

0
ext/mixed/lib/parse5.js → ext/lib/parse5.js
View File

0
ext/mixed/lib/wanakana.min.js → ext/lib/wanakana.min.js vendored
View File

0
ext/mixed/lib/wanakana.min.js.map → ext/lib/wanakana.min.js.map
View File

2
ext/popup-preview.html
View File

@ -34,7 +34,7 @@
</div></div> </div></div>
</div></div> </div></div>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/mixed/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/yomichan.js"></script>

2
ext/search.html
View File

@ -73,7 +73,7 @@
<div id="popup-menus"></div> <div id="popup-menus"></div>
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/mixed/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/yomichan.js"></script>

12
ext/settings-old.html
View File

@ -11,8 +11,8 @@
<link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48"> <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
<link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64"> <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
<link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128"> <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
<link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="/lib/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css"> <link rel="stylesheet" type="text/css" href="/lib/bootstrap/css/bootstrap-theme.min.css">
<link rel="stylesheet" type="text/css" href="/css/settings.css"> <link rel="stylesheet" type="text/css" href="/css/settings.css">
</head> </head>
<body> <body>
@ -1273,10 +1273,10 @@
</div> </div>
</div> </div>
<script src="/mixed/lib/jquery.min.js"></script> <script src="/lib/jquery.min.js"></script>
<script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script> <script src="/lib/bootstrap/js/bootstrap.min.js"></script>
<script src="/mixed/lib/jszip.min.js"></script> <script src="/lib/jszip.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/mixed/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/yomichan.js"></script>

4
ext/settings.html
View File

@ -3186,8 +3186,8 @@
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/lib/jszip.min.js"></script> <script src="/lib/jszip.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/lib/wanakana.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/mixed/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/yomichan.js"></script>

4
ext/sw.js
View File

@ -16,8 +16,8 @@
*/ */
self.importScripts( self.importScripts(
'/mixed/lib/parse5.js', '/lib/parse5.js',
'/mixed/lib/wanakana.min.js', '/lib/wanakana.min.js',
'/mixed/js/core.js', '/mixed/js/core.js',
'/mixed/js/yomichan.js', '/mixed/js/yomichan.js',
'/mixed/js/environment.js', '/mixed/js/environment.js',

2
ext/template-renderer.html
View File

@ -13,7 +13,7 @@
<link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128"> <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
</head> </head>
<body> <body>
<script src="/mixed/lib/handlebars.min.js"></script> <script src="/lib/handlebars.min.js"></script>
<script src="/mixed/js/dictionary-data-util.js"></script> <script src="/mixed/js/dictionary-data-util.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/japanese.js"></script>
<script src="/bg/js/anki-note-data.js"></script> <script src="/bg/js/anki-note-data.js"></script>

2
ext/welcome.html
View File

@ -312,7 +312,7 @@
<!-- Scripts --> <!-- Scripts -->
<script src="/mixed/lib/jszip.min.js"></script> <script src="/lib/jszip.min.js"></script>
<script src="/mixed/js/core.js"></script> <script src="/mixed/js/core.js"></script>
<script src="/mixed/js/yomichan.js"></script> <script src="/mixed/js/yomichan.js"></script>

2
test/test-japanese.js
View File

@ -21,7 +21,7 @@ const {VM} = require('../dev/vm');
const vm = new VM(); const vm = new VM();
vm.execute([ vm.execute([
'mixed/lib/wanakana.min.js', 'lib/wanakana.min.js',
'mixed/js/japanese.js', 'mixed/js/japanese.js',
'bg/js/text-source-map.js' 'bg/js/text-source-map.js'
]); ]);

4
test/test-sw.js
View File

@ -37,7 +37,7 @@ function getAllHtmlScriptPaths(fileName) {
function convertBackgroundScriptsToServiceWorkerScripts(scripts) { function convertBackgroundScriptsToServiceWorkerScripts(scripts) {
// Use parse5-based SimpleDOMParser // Use parse5-based SimpleDOMParser
scripts.splice(0, 0, '/mixed/lib/parse5.js'); scripts.splice(0, 0, '/lib/parse5.js');
const index = scripts.indexOf('/bg/js/native-simple-dom-parser.js'); const index = scripts.indexOf('/bg/js/native-simple-dom-parser.js');
assert.ok(index >= 0); assert.ok(index >= 0);
scripts[index] = '/bg/js/simple-dom-parser.js'; scripts[index] = '/bg/js/simple-dom-parser.js';
@ -65,7 +65,7 @@ function main() {
vm.assert.deepStrictEqual(scripts, importedScripts); vm.assert.deepStrictEqual(scripts, importedScripts);
// Verify that eslint config lists files correctly // Verify that eslint config lists files correctly
const expectedSwRulesFiles = scripts.filter((src) => !src.startsWith('/mixed/lib/')).map((src) => `${extDirName}${src}`); const expectedSwRulesFiles = scripts.filter((src) => !src.startsWith('/lib/')).map((src) => `${extDirName}${src}`);
const eslintConfig = JSON.parse(fs.readFileSync(path.join(rootDir, '.eslintrc.json'), {encoding: 'utf8'})); const eslintConfig = JSON.parse(fs.readFileSync(path.join(rootDir, '.eslintrc.json'), {encoding: 'utf8'}));
const swRules = eslintConfig.overrides.find((item) => ( const swRules = eslintConfig.overrides.find((item) => (
typeof item.env === 'object' && typeof item.env === 'object' &&