mirror of
https://github.com/floccusaddon/floccus
synced 2025-04-29 15:47:21 +08:00
fix: Clean up dependencies (#1851)
* fix: Clean up dependencies Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: Clean up release tarballs Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: typescript errors Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: add icons to build Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: add lib/ to build Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: add _locales/ to build Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: fix gulpfile Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: fix gulpfile Signed-off-by: Marcel Klehr <mklehr@gmx.net> * fix: fix capacitor.config.json Signed-off-by: Marcel Klehr <mklehr@gmx.net> --------- Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
parent
6683981d31
commit
dbb0684d42
1
.github/workflows/tests.yml
vendored
1
.github/workflows/tests.yml
vendored
@ -230,6 +230,7 @@ jobs:
|
||||
mkdir __fixtures__
|
||||
cd __fixtures__
|
||||
git init --bare test.git -b main
|
||||
npm i git-http-server
|
||||
npx git-http-server &
|
||||
npx htpasswd -cb test.git/.htpasswd admin admin
|
||||
if: matrix.floccus-adapter == 'git-xbel' || matrix.floccus-adapter == 'git-html'
|
||||
|
24
gulpfile.js
24
gulpfile.js
@ -33,18 +33,14 @@ try {
|
||||
const VERSION = require('./package.json').version
|
||||
const paths = {
|
||||
zip: [
|
||||
'./**',
|
||||
(process.env['CI'] ? './' : '!') + 'dist/js/test.js',
|
||||
'!builds/**',
|
||||
'!src/**',
|
||||
'!node_modules/**',
|
||||
'!img/**',
|
||||
'!ISSUE_TEMPLATE.md',
|
||||
'!gulpfile.js',
|
||||
'!key.pem',
|
||||
'!android/**',
|
||||
'!ios/**',
|
||||
'!manifest*.json'
|
||||
'./dist/**',
|
||||
'./icons/**',
|
||||
'./lib/**',
|
||||
'./_locales/**',
|
||||
'LICENSE.txt',
|
||||
'PRIVACY_POLICY.md',
|
||||
'README.md',
|
||||
],
|
||||
views: './html/*.html',
|
||||
nativeHTML: './html/index.html',
|
||||
@ -193,7 +189,7 @@ const main = gulp.series(build, native)
|
||||
|
||||
const chromeZip = function() {
|
||||
return gulp
|
||||
.src(paths.chromeZip, { buffer: false })
|
||||
.src(paths.chromeZip, { buffer: false, base: './' })
|
||||
.pipe(rename((path) => {
|
||||
if (path.basename.startsWith('manifest') && path.extname === '.json') {
|
||||
path.basename = 'manifest'
|
||||
@ -205,7 +201,7 @@ const chromeZip = function() {
|
||||
|
||||
const firefoxZip = function() {
|
||||
return gulp
|
||||
.src(paths.firefoxZip, { buffer: false })
|
||||
.src(paths.firefoxZip, { buffer: false, base: './' })
|
||||
.pipe(rename((path) => {
|
||||
if (path.basename.startsWith('manifest') && path.extname === '.json') {
|
||||
path.basename = 'manifest'
|
||||
@ -217,7 +213,7 @@ const firefoxZip = function() {
|
||||
|
||||
const xpi = function() {
|
||||
return gulp
|
||||
.src(paths.firefoxZip, { buffer: false })
|
||||
.src(paths.firefoxZip, { buffer: false, base: './' })
|
||||
.pipe(rename((path) => {
|
||||
if (path.basename.startsWith('manifest') && path.extname === '.json') {
|
||||
path.basename = 'manifest'
|
||||
|
@ -29,6 +29,6 @@
|
||||
"PreferencesPlugin",
|
||||
"SharePlugin",
|
||||
"SplashScreenPlugin",
|
||||
"SendIntent"
|
||||
"SendIntentPlugin"
|
||||
]
|
||||
}
|
||||
|
8005
package-lock.json
generated
8005
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -52,8 +52,6 @@
|
||||
"eslint-plugin-vue": "9.x.x",
|
||||
"execa": "^6.1.0",
|
||||
"file-loader": "^6.2.0",
|
||||
"gist-client": "^1.1.1",
|
||||
"git-http-server": "^0.0.0",
|
||||
"gulp": "^4",
|
||||
"gulp-rename": "^2.0.0",
|
||||
"gulp-tap": "^1.0.1",
|
||||
|
@ -45,7 +45,7 @@ export default new HtmlSerializer()
|
||||
// Copyright (c) 2019 hold-baby
|
||||
// MIT License
|
||||
|
||||
export const getRootFolder = (body: cheerio.Cheerio<cheerio.Element>) => {
|
||||
export const getRootFolder = (body: cheerio.Cheerio<any>) => {
|
||||
const h3 = body.find('h3').first()
|
||||
|
||||
const isChrome = typeof h3.attr('personal_toolbar_folder') === 'string'
|
||||
@ -76,15 +76,13 @@ export const getRootFolder = (body: cheerio.Cheerio<cheerio.Element>) => {
|
||||
}
|
||||
|
||||
export const parseByString = (content: string) => {
|
||||
const $ = cheerio.load(content, {
|
||||
decodeEntities: true
|
||||
})
|
||||
const $ = cheerio.load(content)
|
||||
|
||||
const body = $('body')
|
||||
const root: TItem<typeof ItemLocation.SERVER>[] = []
|
||||
const rdt = getRootFolder(body).children('dt')
|
||||
|
||||
const parseNode = (node: cheerio.Cheerio<cheerio.Element>, parentId?: string|number) => {
|
||||
const parseNode = (node: cheerio.Cheerio<any>, parentId?: string|number) => {
|
||||
const eq0 = node.children().eq(0)
|
||||
const title = typeof eq0.text() !== 'undefined' ? eq0.text() : ''
|
||||
let url = ''
|
||||
|
@ -4,7 +4,6 @@ const { Builder, By, until } = require('selenium-webdriver')
|
||||
const { Preferences, Level, Type, installConsoleHandler } = require('selenium-webdriver/lib/logging')
|
||||
const { Options: ChromeOptions } = require('selenium-webdriver/chrome')
|
||||
const { Options: FirefoxOptions } = require('selenium-webdriver/firefox')
|
||||
const saveStats = require('./save-stats')
|
||||
const fetch = require('node-fetch')
|
||||
const VERSION = require('../package.json').version
|
||||
// Enable SELENIUM logging to console
|
||||
@ -131,25 +130,6 @@ installConsoleHandler()
|
||||
await driver.quit()
|
||||
process.exit(1)
|
||||
} else {
|
||||
const match = fin.match(/duration: (\d+):(\d+)/i)
|
||||
if (match) {
|
||||
const data = {
|
||||
testSuiteTime: parseInt(match[1]) + parseInt(match[2]) / 60,
|
||||
}
|
||||
const label =
|
||||
process.env['FLOCCUS_TEST'] +
|
||||
' ' +
|
||||
process.env['SELENIUM_BROWSER'] +
|
||||
' nc@' +
|
||||
process.env['SERVER_BRANCH'] +
|
||||
' bm@' +
|
||||
process.env['NC_APP_VERSION']
|
||||
try {
|
||||
await saveStats(process.env['GITHUB_SHA'], label, data)
|
||||
} catch (e) {
|
||||
console.log('FAILED TO SAVE BENCHMARK STATS', e)
|
||||
}
|
||||
}
|
||||
await driver.quit()
|
||||
}
|
||||
} catch (e) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user