mirror of
https://github.com/sasjs/server.git
synced 2026-01-15 01:40:05 +00:00
Revert "fix: moved macros from codebase to drive"
This reverts commit 9ac3191891.
This commit is contained in:
@@ -7,7 +7,6 @@ import cors from 'cors'
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
connectDB,
|
connectDB,
|
||||||
copySASjsCore,
|
|
||||||
getWebBuildFolderPath,
|
getWebBuildFolderPath,
|
||||||
loadAppStreamConfig,
|
loadAppStreamConfig,
|
||||||
sasJSCoreMacros,
|
sasJSCoreMacros,
|
||||||
@@ -43,8 +42,6 @@ const onError: ErrorRequestHandler = (err, req, res, next) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default setProcessVariables().then(async () => {
|
export default setProcessVariables().then(async () => {
|
||||||
await copySASjsCore()
|
|
||||||
|
|
||||||
// loading these modules after setting up variables due to
|
// loading these modules after setting up variables due to
|
||||||
// multer's usage of process var process.driveLoc
|
// multer's usage of process var process.driveLoc
|
||||||
const { setupRoutes } = await import('./routes/setupRoutes')
|
const { setupRoutes } = await import('./routes/setupRoutes')
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ import {
|
|||||||
extractHeaders,
|
extractHeaders,
|
||||||
generateFileUploadSasCode,
|
generateFileUploadSasCode,
|
||||||
getTmpFilesFolderPath,
|
getTmpFilesFolderPath,
|
||||||
getTmpMacrosPath,
|
|
||||||
HTTPHeaders,
|
HTTPHeaders,
|
||||||
isDebugOn
|
isDebugOn,
|
||||||
|
sasJSCoreMacros
|
||||||
} from '../../utils'
|
} from '../../utils'
|
||||||
|
|
||||||
export interface ExecutionVars {
|
export interface ExecutionVars {
|
||||||
@@ -106,7 +106,7 @@ export class ExecutionController {
|
|||||||
`
|
`
|
||||||
|
|
||||||
program = `
|
program = `
|
||||||
options insert=(SASAUTOS="${getTmpMacrosPath()}");
|
options insert=(SASAUTOS="${sasJSCoreMacros}");
|
||||||
|
|
||||||
/* runtime vars */
|
/* runtime vars */
|
||||||
${varStatments}
|
${varStatments}
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
import { copy, createFolder } from '@sasjs/utils'
|
|
||||||
|
|
||||||
import { getTmpMacrosPath, sasJSCoreMacros } from '.'
|
|
||||||
|
|
||||||
export const copySASjsCore = async () => {
|
|
||||||
await createFolder(sasJSCoreMacros)
|
|
||||||
|
|
||||||
const macrosDrivePath = getTmpMacrosPath()
|
|
||||||
await copy(sasJSCoreMacros, macrosDrivePath)
|
|
||||||
}
|
|
||||||
@@ -18,8 +18,6 @@ export const getTmpFolderPath = () => process.driveLoc
|
|||||||
export const getTmpAppStreamConfigPath = () =>
|
export const getTmpAppStreamConfigPath = () =>
|
||||||
path.join(getTmpFolderPath(), 'appStreamConfig.json')
|
path.join(getTmpFolderPath(), 'appStreamConfig.json')
|
||||||
|
|
||||||
export const getTmpMacrosPath = () => path.join(getTmpFolderPath(), 'sasjscore')
|
|
||||||
|
|
||||||
export const getTmpUploadsPath = () => path.join(getTmpFolderPath(), 'uploads')
|
export const getTmpUploadsPath = () => path.join(getTmpFolderPath(), 'uploads')
|
||||||
|
|
||||||
export const getTmpFilesFolderPath = () =>
|
export const getTmpFilesFolderPath = () =>
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
export * from './appStreamConfig'
|
export * from './appStreamConfig'
|
||||||
export * from './connectDB'
|
export * from './connectDB'
|
||||||
export * from './copySASjsCore'
|
|
||||||
export * from './extractHeaders'
|
export * from './extractHeaders'
|
||||||
export * from './file'
|
export * from './file'
|
||||||
export * from './generateAccessToken'
|
export * from './generateAccessToken'
|
||||||
export * from './generateAuthCode'
|
export * from './generateAuthCode'
|
||||||
export * from './generateRefreshToken'
|
export * from './generateRefreshToken'
|
||||||
|
export * from './isDebugOn'
|
||||||
export * from './getCertificates'
|
export * from './getCertificates'
|
||||||
export * from './getDesktopFields'
|
export * from './getDesktopFields'
|
||||||
export * from './isDebugOn'
|
|
||||||
export * from './parseLogToArray'
|
export * from './parseLogToArray'
|
||||||
export * from './removeTokensInDB'
|
export * from './removeTokensInDB'
|
||||||
export * from './saveTokensInDB'
|
export * from './saveTokensInDB'
|
||||||
|
|||||||
Reference in New Issue
Block a user