Skip to content

Throw a waring when outFolder isn't defines in scully.config.js #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SanderElias merged 11 commits into from
Dec 20, 2019
Merged

Throw a waring when outFolder isn't defines in scully.config.js #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
622608d
Fix organge color for chalk
SanderElias Dec 16, 2019
62d1feb
published update
SanderElias Dec 16, 2019
b99609e
fix for orange color
SanderElias Dec 16, 2019
2661e64
Added scully mode detaction. (in scully/from generated)
SanderElias Dec 18, 2019
3ef4ce5
Merge branch 'master' of github.com:scullyio/scully into sander/addSc…
SanderElias Dec 18, 2019
4b6a202
wip setting up contxt
SanderElias Dec 18, 2019
2236e55
replaces require with custom one, and added node's global to context
SanderElias Dec 18, 2019
41fbf5a
Merge branch 'master' of github.com:scullyio/scully into sander/workO…
SanderElias Dec 18, 2019
499655a
remove stray blog sample
SanderElias Dec 18, 2019
115e79e
Merge branch 'master' of github.com:scullyio/scully into sander/outFo…
SanderElias Dec 20, 2019
8ded78c
throw waring when outfolder isn't in scully.config
SanderElias Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions scully.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/** load the plugin */
const {extraRoutesPlugin} = require('./extraPlugin/extra-plugin.js')
const {extraRoutesPlugin} = require('./extraPlugin/extra-plugin.js');
Copy link
Copy Markdown
Contributor

@jorgeucano jorgeucano Dec 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SanderElias Do you test this require in other project (plain angular)?

/** register the plugin */
registerPlugin('router', 'extra', extraRoutesPlugin);


exports.config = {
/** projectRoot is mandatory! */
projectRoot: './projects/sampleBlog/src/app',
/** outFolder is where the static distribution files end up */
outFolder: './dist/static',

routes: {
'/demo/:id': {
Expand Down
1 change: 0 additions & 1 deletion scully/scully.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ let _options = {};
spawn('node', [join(scullyConfig.homeFolder, './node_modules/.bin/scully'), 'serve'], {
detached: true,
}).on('close', err => {
console.log(err);
if (+err > 0) {
spawn(
'node',
Expand Down
13 changes: 10 additions & 3 deletions scully/utils/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {jsonc} from 'jsonc';
import {join} from 'path';
import {findAngularJsonPath} from './findAngularJsonPath';
import {ScullyConfig} from './interfacesandenums';
import {logError} from './log';
import {logError, logWarn, yellow} from './log';
import {validateConfig} from './validateConfig';
import {compileConfig} from './compileConfig';

Expand Down Expand Up @@ -45,17 +45,24 @@ const loadIt = async () => {
distFolder,
appPort: /** 1864 */ 'herodevs'.split('').reduce((sum, token) => (sum += token.charCodeAt(0)), 1000),
staticport: /** 1771 */ 'scully'.split('').reduce((sum, token) => (sum += token.charCodeAt(0)), 1000),
},
await updateScullyConfig(compiledConfig)
}
// compiledConfig
) as ScullyConfig;
await updateScullyConfig(compiledConfig);
return scullyConfig;
};
export const loadConfig = loadIt();

export const updateScullyConfig = async (config: Partial<ScullyConfig>) => {
/** note, an invalid config will abort the entire program. */
const newConfig = Object.assign({}, scullyConfig, config);
if (config.outFolder === undefined) {
logWarn(
`The option outFolder isn't configures, we are using "${yellow(scullyConfig.outFolder)} by default now"`
);
} else {
config.outFolder = join(angularRoot, config.outFolder);
}
const validatedConfig = await validateConfig(newConfig as ScullyConfig);
if (validatedConfig) {
const mergedRoutes = {...scullyConfig.routes, ...validatedConfig.routes};
Expand Down