Merge branch 'master' into budi-8960-issue-sorting-dates-when-using-mmddyyyy
This commit is contained in:
commit
481b6721f8
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||
"version": "3.2.43",
|
||||
"version": "3.2.44",
|
||||
"npmClient": "yarn",
|
||||
"concurrency": 20,
|
||||
"command": {
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit a4f63b22675e16dcdcaa4d9e83b298eee6466a07
|
||||
Subproject commit 43a5785ccb4f83ce929b29f05ea0a62199fcdf23
|
|
@ -46,7 +46,10 @@ const svelteCompilePlugin = {
|
|||
let { argv } = require("yargs")
|
||||
|
||||
async function runBuild(entry, outfile) {
|
||||
const isDev = process.env.NODE_ENV !== "production"
|
||||
const isDev = !process.env.CI
|
||||
|
||||
console.log(`Building in mode dev mode: ${isDev}`)
|
||||
|
||||
const tsconfig = argv["p"] || `tsconfig.build.json`
|
||||
|
||||
const { data: tsconfigPathPluginContent } = loadTsConfig(
|
||||
|
@ -58,7 +61,7 @@ async function runBuild(entry, outfile) {
|
|||
entryPoints: [entry],
|
||||
bundle: true,
|
||||
minify: !isDev,
|
||||
sourcemap: isDev,
|
||||
sourcemap: tsconfigPathPluginContent.compilerOptions.sourceMap,
|
||||
tsconfig,
|
||||
plugins: [
|
||||
svelteCompilePlugin,
|
||||
|
@ -125,10 +128,12 @@ async function runBuild(entry, outfile) {
|
|||
|
||||
await Promise.all([hbsFiles, mainBuild, oldClientVersions])
|
||||
|
||||
fs.writeFileSync(
|
||||
`dist/${path.basename(outfile)}.meta.json`,
|
||||
JSON.stringify((await mainBuild).metafile)
|
||||
)
|
||||
if (isDev) {
|
||||
fs.writeFileSync(
|
||||
`dist/${path.basename(outfile)}.meta.json`,
|
||||
JSON.stringify((await mainBuild).metafile)
|
||||
)
|
||||
}
|
||||
|
||||
console.log(
|
||||
"\x1b[32m%s\x1b[0m",
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"declaration": true,
|
||||
"isolatedModules": true,
|
||||
"baseUrl": ".",
|
||||
"sourceMap": true,
|
||||
"paths": {
|
||||
"@budibase/types": ["./packages/types/src"],
|
||||
"@budibase/backend-core": ["./packages/backend-core/src"],
|
||||
|
|
Loading…
Reference in New Issue