Skip to content
Commits on Source (1)
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
View file @ 1a9c3896
......@@ -3,6 +3,10 @@
<component name="ChangeListManager">
<list default="true" id="26632678-d8a8-4639-9a45-ad2e64f0e3df" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/Server.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/Server.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/package.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/package.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.ts" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -16,11 +20,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<file leaf-file-name="package.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1081">
<caret line="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" />
<state relative-caret-position="46">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
</state>
</provider>
</entry>
......@@ -58,8 +62,8 @@
<file leaf-file-name="index.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/index.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2847">
<caret line="180" column="38" selection-start-line="180" selection-start-column="38" selection-end-line="180" selection-end-column="38" />
<state relative-caret-position="366">
<caret line="31" column="8" lean-forward="true" selection-start-line="31" selection-start-column="8" selection-end-line="31" selection-end-column="8" />
<folding>
<element signature="e#1537#2137#0" />
<element signature="n#!!block;n#createModule#0;n#ExtLB#0" />
......@@ -74,17 +78,17 @@
<file leaf-file-name="Server.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/Server.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
<state relative-caret-position="253">
<caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Client.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/Client.ts">
<file leaf-file-name="package.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/app/package.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="9" column="2" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
<state relative-caret-position="713">
<caret line="31" column="48" selection-start-line="31" selection-start-column="48" selection-end-line="31" selection-end-column="48" />
</state>
</provider>
</entry>
......@@ -116,18 +120,17 @@
</provider>
</entry>
</file>
<file leaf-file-name="app.ts" pinned="false" current-in-tab="true">
<file leaf-file-name="app.ts" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmds/app.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
<state relative-caret-position="1240">
<caret line="116" column="23" selection-start-line="116" selection-start-column="23" selection-end-line="116" selection-end-column="23" />
<folding>
<element signature="e#0#32#0" expanded="true" />
<element signature="n#!!block;n#getName#0;n#App#0" />
<element signature="n#!!block;n#getDescription#0;n#App#0" />
<element signature="n#!!block;n#getVersion#0;n#App#0" />
<element signature="n#!!block;n#getPlatforms#0;n#App#0" />
<element signature="n#!!block;n#getFeatures#0;n#App#0" />
</folding>
</state>
</provider>
......@@ -234,8 +237,6 @@
<option value="$PROJECT_DIR$/src/app/index.ts" />
<option value="$PROJECT_DIR$/bin/elb.ts" />
<option value="$PROJECT_DIR$/tsconfig.json" />
<option value="$PROJECT_DIR$/src/app/package.ts" />
<option value="$PROJECT_DIR$/src/app/Client.ts" />
<option value="$PROJECT_DIR$/src/perspective/package.ts" />
<option value="$PROJECT_DIR$/src/perspective/Client.ts" />
<option value="$PROJECT_DIR$/spec/indexSpec.js" />
......@@ -253,9 +254,11 @@
<option value="$PROJECT_DIR$/src/model/code.ejs" />
<option value="$PROJECT_DIR$/cmds/view.ts" />
<option value="$PROJECT_DIR$/cmds/model.ts" />
<option value="$PROJECT_DIR$/src/app/Client.ts" />
<option value="$PROJECT_DIR$/src/app/package.ts" />
<option value="$PROJECT_DIR$/src/index.ts" />
<option value="$PROJECT_DIR$/src/app/Server.ts" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/index.ts" />
</list>
</option>
</component>
......@@ -288,10 +291,10 @@
</packageJsonPaths>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="560" />
<option name="y" value="292" />
<option name="width" value="2227" />
<option name="height" value="1740" />
<option name="x" value="23" />
<option name="y" value="418" />
<option name="width" value="2170" />
<option name="height" value="1734" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
......@@ -456,14 +459,7 @@
<workItem from="1575580212871" duration="558000" />
<workItem from="1575654701127" duration="578000" />
<workItem from="1575928149621" duration="1186000" />
<workItem from="1583857383968" duration="4364000" />
</task>
<task id="LOCAL-00012" summary="Working on initial features">
<created>1535010672674</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1535010672674</updated>
<workItem from="1583857383968" duration="10676000" />
</task>
<task id="LOCAL-00013" summary="Working on initial features">
<created>1535012171254</created>
......@@ -801,11 +797,18 @@
<option name="project" value="LOCAL" />
<updated>1583862011625</updated>
</task>
<option name="localTasksCounter" value="61" />
<task id="LOCAL-00061" summary="Added authentication module support">
<created>1583863638558</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1583863638558</updated>
</task>
<option name="localTasksCounter" value="62" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="198809000" />
<option name="totallyTimeSpent" value="205121000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -817,7 +820,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="560" y="292" width="2227" height="1740" extended-state="0" />
<frame x="23" y="418" width="2170" height="1734" extended-state="0" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" weight="0.32999372" />
......@@ -828,13 +831,13 @@
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32999372" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" weight="0.30274656" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.19611529" />
<window_info anchor="right" id="Mongo Explorer" order="3" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32958803" />
<window_info anchor="bottom" id="TypeScript" order="7" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.71910113" visible="true" weight="0.21883656" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.7724084" visible="true" weight="0.22475107" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="Grunt " order="2" sideWeight="0.28089887" side_tool="true" visible="true" weight="0.21883656" />
<window_info id="Grunt " order="2" sideWeight="0.22759159" side_tool="true" visible="true" weight="0.22475107" />
<window_info anchor="right" id="LuaJ" order="3" />
<window_info anchor="bottom" id="Tail" order="7" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
......@@ -952,6 +955,9 @@
<option value="N:/NewScreeps/v2/role/Builder.js" />
<option value="N:/NewScreeps/v2/role/Supplier.d.ts" />
<option value="N:/NewScreeps/v2/role/Builder.js.map" />
<option value="$PROJECT_DIR$/../auth/server/boot/authentication.js.map" />
<option value="$PROJECT_DIR$/../auth/server/boot/authentication.js" />
<option value="$PROJECT_DIR$/../auth/server/boot/authentication.d.ts" />
</list>
</option>
</component>
......@@ -1049,7 +1055,6 @@
<element signature="n#!!block;n#getDescription#0;n#App#0" />
<element signature="n#!!block;n#getVersion#0;n#App#0" />
<element signature="n#!!block;n#getPlatforms#0;n#App#0" />
<element signature="n#!!block;n#getFeatures#0;n#App#0" />
</folding>
</state>
</provider>
......@@ -1246,13 +1251,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/model/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="25" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmds/model.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2484">
......@@ -1294,48 +1292,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/package.ts">
<entry file="file://$PROJECT_DIR$/tsconfig.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="667">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
<state relative-caret-position="322">
<caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/index.ts">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tsconfig.json">
<entry file="file://$PROJECT_DIR$/src/model/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<state relative-caret-position="69">
<caret line="3" column="25" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/index.ts">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/app/Client.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="9" column="2" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
<state relative-caret-position="69">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/app/Server.ts">
<entry file="file://$PROJECT_DIR$/src/app/package.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
<state relative-caret-position="713">
<caret line="31" column="48" selection-start-line="31" selection-start-column="48" selection-end-line="31" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<entry file="file://$PROJECT_DIR$/src/app/Server.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1081">
<caret line="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" />
<state relative-caret-position="253">
<caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/index.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2847">
<caret line="180" column="38" selection-start-line="180" selection-start-column="38" selection-end-line="180" selection-end-column="38" />
<state relative-caret-position="366">
<caret line="31" column="8" lean-forward="true" selection-start-line="31" selection-start-column="8" selection-end-line="31" selection-end-column="8" />
<folding>
<element signature="e#1537#2137#0" />
<element signature="n#!!block;n#createModule#0;n#ExtLB#0" />
......@@ -1348,18 +1346,24 @@
</entry>
<entry file="file://$PROJECT_DIR$/cmds/app.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
<state relative-caret-position="1240">
<caret line="116" column="23" selection-start-line="116" selection-start-column="23" selection-end-line="116" selection-end-column="23" />
<folding>
<element signature="e#0#32#0" expanded="true" />
<element signature="n#!!block;n#getName#0;n#App#0" />
<element signature="n#!!block;n#getDescription#0;n#App#0" />
<element signature="n#!!block;n#getVersion#0;n#App#0" />
<element signature="n#!!block;n#getPlatforms#0;n#App#0" />
<element signature="n#!!block;n#getFeatures#0;n#App#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
package.json
View file @ 1a9c3896
{
"name": "@extlb/cli",
"version": "1.0.33",
"version": "1.0.34",
"description": "ExtLB Cli",
"main": "index.js",
"engines": {
......
src/app/Server.ts
View file @ 1a9c3896
......@@ -10,6 +10,21 @@ changes[`config${path.sep}server${path.sep}config.json`] = (options: any, conten
if (!_.includes(options.features, 'queues')) {
delete content.queues;
}
if (!_.includes(options.features, 'auth')) {
content.auth.enabled = false;
}
if (!_.includes(options.features, 'passportjs')) {
content.passport = false;
}
return content;
};
changes[`config${path.sep}server${path.sep}model-config.json`] = (options: any, content: any) => {
if (!_.includes(options.features, 'passportjs')) {
delete content._meta.sources[4];
delete content.ApplicationCredential;
delete content.UserCredential;
delete content.UserIdentity;
}
return content;
};
changes[`server${path.sep}boot${path.sep}queues.ts`] = (options: any, content: any) => {
......
src/app/package.ts
View file @ 1a9c3896
......@@ -29,6 +29,10 @@ export default {
delete content.dependencies['@types/bull'];
delete content.dependencies['bull'];
}
if (!_.includes(options.features, 'passportjs')) {
delete content.dependencies['loopback-component-passport'];
delete content.dependencies['passport-local'];
}
return content;
}
};
src/index.ts
View file @ 1a9c3896
......@@ -178,6 +178,18 @@ export class ExtLB {
});
};
}
installs.grunt = (cb: (err?: {}, result?: {}) => void) => {
process.stdout.write(chalk.keyword('limegreen')('Building application '));
shelljs.exec('grunt "Build Testing Desktop"', {silent:true}, (err) => {
if (err) {
console.error(err);
cb(err);
} else {
process.stdout.write(chalk.keyword('limegreen')(' done!\n'));
cb();
}
});
};
async.series(installs, (err) => {
if (err) {
console.log(err);
......