mirror of
https://github.com/logseq/logseq.git
synced 2026-02-01 14:43:56 +00:00
a0a19a91fa
* enhance(ui): login form * enhance(ui): add localization support with translate and locale management * enhance(ui): WIP implement new authentication forms with context management * enhance(ui): add password visibility toggle to input row * enhance(ui): adjust padding for password visibility toggle * enhance(i18n): implement internationalization support for authentication UI * enhance(ui): implement sign in and sign up functionality with loading state * enhance(ui): add session management and error handling in login form * enhance(ui): add confirm code form and enhance authentication flow * enhance(ui): improve sign-in flow and confirm code handling * enhance(ui): add warning variant to alerts and improve error handling * enhance(ui): implement countdown timer for code resend functionality * enhance(ui): implement countdown timer for password reset and enhance login flow * enhance(ui): export authentication and enhance UI components * enhance(ui): integrate new login component and refresh token handling * chore: clear amplify related codes * enhance(i18n): normalize language codes and update locale handling * enhance(auth): add multilingual support for signup and password reset flows * enhance(ui): update login styles to inherit text color * enhance(ui): adjust input color variables for improved accessibility * enhance(auth): add password policy validation and tips in multiple languages * enhance(ui): improve localization handling and update alert styles * enhance(mobile): enhance login modal styling and accessibility * fix(ui): update password validation regex for special characters * enhance(ui): add padding to card header in login dialog --------- Co-authored-by: Tienson Qin <tiensonqin@gmail.com>
312 lines
10 KiB
JavaScript
312 lines
10 KiB
JavaScript
const fs = require('fs')
|
|
const utils = require('util')
|
|
const cp = require('child_process')
|
|
const exec = utils.promisify(cp.exec)
|
|
const path = require('path')
|
|
const gulp = require('gulp')
|
|
const del = require('del')
|
|
const ip = require('ip')
|
|
const replace = require('gulp-replace')
|
|
|
|
const outputPath = path.join(__dirname, 'static')
|
|
const outputJsPath = path.join(outputPath, 'js')
|
|
const resourcesPath = path.join(__dirname, 'resources')
|
|
const publicRootPath = path.join(__dirname, 'public')
|
|
const mobilePath = path.join(outputPath, 'mobile')
|
|
const mobileJsPath = path.join(mobilePath, 'js')
|
|
const sourcePath = path.join(__dirname, 'src/main/frontend')
|
|
const resourceFilePath = path.join(resourcesPath, '**')
|
|
const outputFilePath = path.join(outputPath, '**')
|
|
|
|
const css = {
|
|
watchCSS () {
|
|
return cp.spawn(`yarn css:watch`, {
|
|
shell: true,
|
|
stdio: 'inherit',
|
|
})
|
|
},
|
|
|
|
watchMobileCSS () {
|
|
return cp.spawn(`yarn css:mobile-watch`, {
|
|
shell: true,
|
|
stdio: 'inherit',
|
|
})
|
|
},
|
|
|
|
buildCSS (...params) {
|
|
return gulp.series(
|
|
() => exec(`yarn css:build`, {}),
|
|
css._optimizeCSSForRelease,
|
|
)(...params)
|
|
},
|
|
|
|
buildMobileCSS (...params) {
|
|
return gulp.series(
|
|
() => exec(`yarn css:mobile-build`, {}),
|
|
)(...params)
|
|
},
|
|
|
|
_optimizeCSSForRelease () {
|
|
return gulp.src(path.join(outputPath, 'css', 'style.css')).
|
|
pipe(gulp.dest(path.join(outputPath, 'css')))
|
|
},
|
|
}
|
|
|
|
const common = {
|
|
clean () {
|
|
return del(
|
|
['./static/**/*', '!./static/node_modules'])
|
|
},
|
|
|
|
syncResourceFile () {
|
|
return gulp.src(resourceFilePath).pipe(gulp.dest(outputPath))
|
|
},
|
|
|
|
// NOTE: All assets from node_modules are copied to the output directory
|
|
syncAssetFiles (...params) {
|
|
return gulp.series(
|
|
() => gulp.src([
|
|
'./node_modules/@excalidraw/excalidraw/dist/excalidraw-assets/**',
|
|
'!**/*/i18n-*.js',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'js', 'excalidraw-assets'))),
|
|
() => gulp.src([
|
|
'node_modules/katex/dist/katex.min.js',
|
|
'node_modules/katex/dist/contrib/mhchem.min.js',
|
|
'node_modules/html2canvas/dist/html2canvas.min.js',
|
|
'node_modules/interactjs/dist/interact.min.js',
|
|
'node_modules/photoswipe/dist/umd/*.js',
|
|
'node_modules/shepherd.js/dist/js/shepherd.min.js',
|
|
'node_modules/marked/marked.min.js',
|
|
'node_modules/@highlightjs/cdn-assets/highlight.min.js',
|
|
'node_modules/@isomorphic-git/lightning-fs/dist/lightning-fs.min.js',
|
|
'packages/ui/dist/ui/ui.js',
|
|
'node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm',
|
|
'node_modules/react/umd/react.production.min.js',
|
|
'node_modules/react/umd/react.development.js',
|
|
'node_modules/react-dom/umd/react-dom.production.min.js',
|
|
'node_modules/react-dom/umd/react-dom.development.js',
|
|
'node_modules/prop-types/prop-types.min.js',
|
|
'node_modules/dompurify/dist/purify.js',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'js'))),
|
|
() => gulp.src([
|
|
'node_modules/@tabler/icons-react/dist/umd/tabler-icons-react.min.js',
|
|
]).
|
|
pipe(replace('"@tabler/icons-react"]={},a.react,',
|
|
'"tablerIcons"]={},a.React,')).
|
|
pipe(gulp.dest(path.join(outputPath, 'js'))),
|
|
() => gulp.src([
|
|
'node_modules/@glidejs/glide/dist/glide.min.js',
|
|
'node_modules/@glidejs/glide/dist/css/glide.core.min.css',
|
|
'node_modules/@glidejs/glide/dist/css/glide.theme.min.css',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'js', 'glide'))),
|
|
() => gulp.src([
|
|
'node_modules/pdfjs-dist/legacy/build/pdf.mjs',
|
|
'node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs',
|
|
'node_modules/pdfjs-dist/legacy/web/pdf_viewer.mjs',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'js', 'pdfjs'))),
|
|
() => gulp.src([
|
|
'node_modules/pdfjs-dist/cmaps/*.*',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'js', 'pdfjs', 'cmaps'))),
|
|
() => gulp.src([
|
|
'node_modules/inter-ui/inter.css',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'css'))),
|
|
() => gulp.src('node_modules/inter-ui/Inter (web)/*.*').
|
|
pipe(gulp.dest(path.join(outputPath, 'css', 'Inter (web)'))),
|
|
() => gulp.src([
|
|
'node_modules/@tabler/icons-webfont/fonts/**',
|
|
'node_modules/katex/dist/fonts/*.woff2',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'css', 'fonts'))),
|
|
() => gulp.src([
|
|
'node_modules/katex/dist/katex.min.js',
|
|
'node_modules/katex/dist/contrib/mhchem.min.js',
|
|
'node_modules/marked/marked.min.js',
|
|
'node_modules/@highlightjs/cdn-assets/highlight.min.js',
|
|
'node_modules/@isomorphic-git/lightning-fs/dist/lightning-fs.min.js',
|
|
'node_modules/react/umd/react.production.min.js',
|
|
'node_modules/react/umd/react.development.js',
|
|
'node_modules/react-dom/umd/react-dom.production.min.js',
|
|
'node_modules/react-dom/umd/react-dom.development.js',
|
|
'node_modules/prop-types/prop-types.min.js',
|
|
'node_modules/interactjs/dist/interact.min.js',
|
|
'node_modules/photoswipe/dist/umd/*.js',
|
|
'packages/ui/dist/ui/ui.js',
|
|
'node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'mobile', 'js'))),
|
|
() => gulp.src([
|
|
'packages/ui/dist/silkhq/*.css*',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'mobile', 'css'))),
|
|
() => gulp.src([
|
|
'packages/ui/dist/silkhq/*.js*',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'mobile', 'js'))),
|
|
() => gulp.src([
|
|
'node_modules/inter-ui/inter.css',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'mobile', 'css'))),
|
|
() => gulp.src('node_modules/inter-ui/Inter (web)/*.*').
|
|
pipe(gulp.dest(path.join(outputPath, 'mobile', 'css', 'Inter (web)'))),
|
|
() => gulp.src([
|
|
'node_modules/@tabler/icons-webfont/fonts/**',
|
|
'node_modules/katex/dist/fonts/*.woff2',
|
|
]).pipe(gulp.dest(path.join(outputPath, 'mobile', 'css', 'fonts'))),
|
|
)(...params)
|
|
},
|
|
|
|
keepSyncResourceFile () {
|
|
return gulp.watch(resourceFilePath, { ignoreInitial: true },
|
|
common.syncResourceFile)
|
|
},
|
|
|
|
syncAllStatic () {
|
|
return gulp.src([
|
|
outputFilePath,
|
|
'!' + path.join(outputPath, 'node_modules/**'),
|
|
'!' + path.join(outputPath, 'mobile/**'),
|
|
'!' + path.join(outputPath, 'android/**'),
|
|
'!' + path.join(outputPath, 'ios/**'),
|
|
]).pipe(gulp.dest(publicRootPath))
|
|
},
|
|
|
|
syncJS_CSSinRt () {
|
|
return gulp.src([
|
|
path.join(outputPath, 'js/**'),
|
|
path.join(outputPath, 'css/**'),
|
|
], { base: outputPath }).pipe(gulp.dest(publicRootPath))
|
|
},
|
|
|
|
keepSyncStaticInRt () {
|
|
return gulp.watch([
|
|
path.join(outputPath, 'js/**'),
|
|
path.join(outputPath, 'css/**'),
|
|
], { ignoreInitial: true }, common.syncJS_CSSinRt)
|
|
},
|
|
|
|
syncWorkersToMobile () {
|
|
return gulp.src([
|
|
path.join(outputPath, 'js/db-worker.js'),
|
|
], { base: outputJsPath }).pipe(gulp.dest(mobileJsPath))
|
|
},
|
|
|
|
keepSyncWorkersToMobile () {
|
|
return gulp.watch([
|
|
path.join(outputPath, 'js/db-worker.js'),
|
|
], { ignoreInitial: false }, common.syncWorkersToMobile)
|
|
},
|
|
|
|
async runCapWithLocalDevServerEntry (cb) {
|
|
const mode = process.env.PLATFORM || 'ios'
|
|
|
|
const LOGSEQ_APP_SERVER_URL = `http://localhost:3002`
|
|
|
|
if (typeof global.fetch === 'function') {
|
|
try {
|
|
await fetch(LOGSEQ_APP_SERVER_URL)
|
|
} catch (e) {
|
|
return cb(new Error(
|
|
`/* ❌ Please check if the service is ON. (${LOGSEQ_APP_SERVER_URL}) ❌ */`))
|
|
}
|
|
}
|
|
|
|
console.log(`------ Cap ${mode.toUpperCase()} -----`)
|
|
console.log(`Dev serve at: ${LOGSEQ_APP_SERVER_URL}`)
|
|
console.log(`--------------------------------------`)
|
|
|
|
cp.execSync(`npx cap sync ${mode}`, {
|
|
stdio: 'inherit',
|
|
env: Object.assign(process.env, {
|
|
LOGSEQ_APP_SERVER_URL,
|
|
}),
|
|
})
|
|
|
|
cp.execSync(`rm -rf ios/App/App/public/out`, {
|
|
stdio: 'inherit',
|
|
})
|
|
|
|
cp.execSync(`npx cap run ${mode}`, {
|
|
stdio: 'inherit',
|
|
env: Object.assign(process.env, {
|
|
LOGSEQ_APP_SERVER_URL,
|
|
}),
|
|
})
|
|
|
|
cb()
|
|
},
|
|
|
|
switchReactDevelopmentMode (cb) {
|
|
try {
|
|
const reactFrom = path.join(outputPath, 'js', 'react.development.js')
|
|
const reactTo = path.join(outputPath, 'js', 'react.production.min.js')
|
|
fs.renameSync(reactFrom, reactTo)
|
|
|
|
const reactDomFrom = path.join(outputPath, 'js',
|
|
'react-dom.development.js')
|
|
const reactDomTo = path.join(outputPath, 'js',
|
|
'react-dom.production.min.js')
|
|
fs.renameSync(reactDomFrom, reactDomTo)
|
|
|
|
cb()
|
|
} catch (err) {
|
|
console.error('Error during switchReactDevelopmentMode:', err)
|
|
cb(err)
|
|
}
|
|
},
|
|
}
|
|
|
|
exports.electron = () => {
|
|
if (!fs.existsSync(path.join(outputPath, 'node_modules'))) {
|
|
cp.execSync('yarn', {
|
|
cwd: outputPath,
|
|
stdio: 'inherit',
|
|
})
|
|
}
|
|
|
|
cp.execSync('yarn electron:dev', {
|
|
cwd: outputPath,
|
|
stdio: 'inherit',
|
|
})
|
|
}
|
|
|
|
exports.electronMaker = async () => {
|
|
cp.execSync('yarn cljs:release-electron', {
|
|
stdio: 'inherit',
|
|
})
|
|
|
|
const pkgPath = path.join(outputPath, 'package.json')
|
|
const pkg = require(pkgPath)
|
|
const version = fs.readFileSync(
|
|
path.join(__dirname, 'src/main/frontend/version.cljs')).
|
|
toString().
|
|
match(/[0-9.]{3,}/)[0]
|
|
|
|
if (!version) {
|
|
throw new Error('release version error in src/**/*/version.cljs')
|
|
}
|
|
|
|
pkg.version = version
|
|
fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
|
|
|
|
if (!fs.existsSync(path.join(outputPath, 'node_modules'))) {
|
|
cp.execSync('yarn', {
|
|
cwd: outputPath,
|
|
stdio: 'inherit',
|
|
})
|
|
}
|
|
|
|
cp.execSync('yarn electron:make', {
|
|
cwd: outputPath,
|
|
stdio: 'inherit',
|
|
})
|
|
}
|
|
|
|
exports.cap = common.runCapWithLocalDevServerEntry
|
|
exports.clean = common.clean
|
|
exports.watch = gulp.series(
|
|
common.syncResourceFile,
|
|
common.syncAssetFiles, common.switchReactDevelopmentMode,
|
|
gulp.parallel(common.keepSyncResourceFile, css.watchCSS))
|
|
exports.watchMobile = gulp.series(
|
|
common.syncResourceFile, common.syncAssetFiles,
|
|
gulp.parallel(common.keepSyncResourceFile, common.keepSyncWorkersToMobile, css.watchMobileCSS))
|
|
exports.build = gulp.series(common.clean, common.syncResourceFile,
|
|
common.syncAssetFiles, css.buildCSS)
|
|
exports.buildMobile = gulp.series(common.clean, common.syncResourceFile,
|
|
common.syncAssetFiles, css.buildMobileCSS)
|