Compare commits
4 commits
a027ba64a2
...
6b8c085976
Author | SHA1 | Date | |
---|---|---|---|
Manuel Thalmann | 6b8c085976 | ||
Manuel Thalmann | 2b44c6ac22 | ||
Manuel Thalmann | b413318097 | ||
Manuel Thalmann | 683e09f236 |
|
@ -2,7 +2,7 @@ MYSQL_DATABASE=SilverStripe
|
||||||
MYSQL_ROOT_PASSWORD=root
|
MYSQL_ROOT_PASSWORD=root
|
||||||
|
|
||||||
SS_ENVIRONMENT_TYPE=dev
|
SS_ENVIRONMENT_TYPE=dev
|
||||||
SS_BASE_URL=http://localhost:8080
|
SS_BASE_URL=http://localhost
|
||||||
|
|
||||||
SS_DATABASE_CLASS=MySQLPDODatabase
|
SS_DATABASE_CLASS=MySQLPDODatabase
|
||||||
SS_DATABASE_SERVER=db
|
SS_DATABASE_SERVER=db
|
||||||
|
|
|
@ -6,6 +6,8 @@ services:
|
||||||
env_file: devcontainer.env
|
env_file: devcontainer.env
|
||||||
ports:
|
ports:
|
||||||
- 8080:80
|
- 8080:80
|
||||||
|
- 3000:3000
|
||||||
|
- 3001:3001
|
||||||
volumes:
|
volumes:
|
||||||
- ..:/vscode/src/mantra
|
- ..:/vscode/src/mantra
|
||||||
- ../test/website:/var/www/html
|
- ../test/website:/var/www/html
|
||||||
|
|
|
@ -65,6 +65,11 @@ export class Settings
|
||||||
*/
|
*/
|
||||||
private testWebsitePath = "website";
|
private testWebsitePath = "website";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The name of the theme.
|
||||||
|
*/
|
||||||
|
private themeName = "mantra";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes a new instance of the `Settings` class.
|
* Initializes a new instance of the `Settings` class.
|
||||||
*
|
*
|
||||||
|
@ -237,4 +242,18 @@ export class Settings
|
||||||
{
|
{
|
||||||
return this.TestPath(this.testWebsitePath, ...path);
|
return this.TestPath(this.testWebsitePath, ...path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a path relative to the test-theme.
|
||||||
|
*
|
||||||
|
* @param path
|
||||||
|
* The path to join.
|
||||||
|
*
|
||||||
|
* @returns
|
||||||
|
* The joined path.
|
||||||
|
*/
|
||||||
|
public TestThemePath(...path: string[])
|
||||||
|
{
|
||||||
|
return this.TestWebsitePath("themes", this.themeName, ...path);
|
||||||
|
}
|
||||||
}
|
}
|
61
gulpfile.ts
61
gulpfile.ts
|
@ -1,3 +1,4 @@
|
||||||
|
import browserSync = require("browser-sync");
|
||||||
import browserify = require("browserify");
|
import browserify = require("browserify");
|
||||||
import log = require("fancy-log");
|
import log = require("fancy-log");
|
||||||
import FileSystem = require("fs-extra");
|
import FileSystem = require("fs-extra");
|
||||||
|
@ -24,6 +25,11 @@ import "./.gulp/TaskFunction";
|
||||||
*/
|
*/
|
||||||
const watchConnectorPort = 50958;
|
const watchConnectorPort = 50958;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An object for syncing browsers.
|
||||||
|
*/
|
||||||
|
let syncer = browserSync.create();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The message that is printed when starting the compilation in watch mode.
|
* The message that is printed when starting the compilation in watch mode.
|
||||||
*/
|
*/
|
||||||
|
@ -90,19 +96,17 @@ export async function Initialize()
|
||||||
"assets"
|
"assets"
|
||||||
];
|
];
|
||||||
|
|
||||||
let themePath = settings.TestWebsitePath("themes", Path.basename(settings.RootPath()));
|
|
||||||
|
|
||||||
for (let directory of directories)
|
for (let directory of directories)
|
||||||
{
|
{
|
||||||
await FileSystem.emptyDir(settings.RootPath(directory));
|
await FileSystem.emptyDir(settings.RootPath(directory));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (await FileSystem.pathExists(themePath))
|
if (await FileSystem.pathExists(settings.TestThemePath()))
|
||||||
{
|
{
|
||||||
await FileSystem.remove(themePath);
|
await FileSystem.remove(settings.TestThemePath());
|
||||||
}
|
}
|
||||||
|
|
||||||
await require("create-symlink")(settings.RootPath(), themePath, { type: "junction" });
|
await require("create-symlink")(settings.RootPath(), settings.TestThemePath(), { type: "junction" });
|
||||||
}
|
}
|
||||||
|
|
||||||
Initialize.description = "Initializes the project.";
|
Initialize.description = "Initializes the project.";
|
||||||
|
@ -131,6 +135,7 @@ export let Watch: TaskFunction = (done) =>
|
||||||
|
|
||||||
if (options["target"] === settings.Target)
|
if (options["target"] === settings.Target)
|
||||||
{
|
{
|
||||||
|
syncer.exit();
|
||||||
server.close();
|
server.close();
|
||||||
done();
|
done();
|
||||||
process.exit();
|
process.exit();
|
||||||
|
@ -144,6 +149,28 @@ export let Watch: TaskFunction = (done) =>
|
||||||
|
|
||||||
Watch.description = "Builds the project in watched mode.";
|
Watch.description = "Builds the project in watched mode.";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reloads all browsers using `browser-sync`.
|
||||||
|
*/
|
||||||
|
function BrowserSync(filePath?: string): TaskFunction
|
||||||
|
{
|
||||||
|
let BrowserSync: TaskFunction = (done) =>
|
||||||
|
{
|
||||||
|
if (filePath)
|
||||||
|
{
|
||||||
|
syncer.reload(filePath);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
syncer.reload();
|
||||||
|
}
|
||||||
|
|
||||||
|
done();
|
||||||
|
};
|
||||||
|
|
||||||
|
return BrowserSync;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds the project.
|
* Builds the project.
|
||||||
*/
|
*/
|
||||||
|
@ -152,8 +179,17 @@ export async function Build()
|
||||||
if (settings.Watch)
|
if (settings.Watch)
|
||||||
{
|
{
|
||||||
log.info(watchStartMessage);
|
log.info(watchStartMessage);
|
||||||
gulp.watch(settings.ThemeSource("**"), Theme);
|
|
||||||
gulp.watch(settings.TemplateSource("**"), Templates);
|
syncer.init({
|
||||||
|
open: false,
|
||||||
|
proxy: "http://localhost",
|
||||||
|
port: 3000,
|
||||||
|
ghostMode: false,
|
||||||
|
online: false
|
||||||
|
});
|
||||||
|
|
||||||
|
gulp.watch(settings.ThemeSource("**"), gulp.series(Theme, BrowserSync("*.css")));
|
||||||
|
gulp.watch(settings.TemplateSource("**"), gulp.series(Templates, BrowserSync()));
|
||||||
}
|
}
|
||||||
|
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
|
@ -245,6 +281,11 @@ export async function Library()
|
||||||
{
|
{
|
||||||
if (settings.Watch && ((queue.getQueueLength() + queue.getPendingLength()) === 1))
|
if (settings.Watch && ((queue.getQueueLength() + queue.getPendingLength()) === 1))
|
||||||
{
|
{
|
||||||
|
if (errorMessages.length === 0)
|
||||||
|
{
|
||||||
|
syncer.reload("*.js");
|
||||||
|
}
|
||||||
|
|
||||||
log.info(watchFinishMessage(errorMessages.length));
|
log.info(watchFinishMessage(errorMessages.length));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -296,7 +337,11 @@ export async function Theme()
|
||||||
sourcemaps: settings.Debug,
|
sourcemaps: settings.Debug,
|
||||||
base: settings.StylePath()
|
base: settings.StylePath()
|
||||||
}).pipe(
|
}).pipe(
|
||||||
sass({ importer: require("node-sass-tilde-importer") })
|
sass(
|
||||||
|
{
|
||||||
|
importer: require("node-sass-tilde-importer"),
|
||||||
|
outputStyle: settings.Debug ? "expanded" : "compressed"
|
||||||
|
})
|
||||||
).pipe(
|
).pipe(
|
||||||
rename(
|
rename(
|
||||||
(parsedPath) =>
|
(parsedPath) =>
|
||||||
|
|
1292
package-lock.json
generated
1292
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -8,6 +8,7 @@
|
||||||
"@manuth/tsconfig": "^1.2.2",
|
"@manuth/tsconfig": "^1.2.2",
|
||||||
"@manuth/tslint-presets": "^1.0.4",
|
"@manuth/tslint-presets": "^1.0.4",
|
||||||
"@types/bootstrap": "^4.3.1",
|
"@types/bootstrap": "^4.3.1",
|
||||||
|
"@types/browser-sync": "^2.26.1",
|
||||||
"@types/browserify": "^12.0.36",
|
"@types/browserify": "^12.0.36",
|
||||||
"@types/fancy-log": "^1.3.1",
|
"@types/fancy-log": "^1.3.1",
|
||||||
"@types/fs-extra": "^8.0.0",
|
"@types/fs-extra": "^8.0.0",
|
||||||
|
@ -25,6 +26,7 @@
|
||||||
"@types/vinyl-source-stream": "0.0.30",
|
"@types/vinyl-source-stream": "0.0.30",
|
||||||
"@types/watchify": "^3.7.4",
|
"@types/watchify": "^3.7.4",
|
||||||
"bootstrap": "^4.3.1",
|
"bootstrap": "^4.3.1",
|
||||||
|
"browser-sync": "^2.26.7",
|
||||||
"browserify": "^16.5.0",
|
"browserify": "^16.5.0",
|
||||||
"create-symlink": "^1.0.0",
|
"create-symlink": "^1.0.0",
|
||||||
"fancy-log": "^1.3.3",
|
"fancy-log": "^1.3.3",
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<% base_tag %>
|
<% base_tag %>
|
||||||
$MetaTags()
|
$MetaTags()
|
||||||
<% require themedCSS("mantra") %>
|
<% require themedCSS("mantra") %>
|
||||||
<% require themedJavascript("mantra") %>
|
<% require themedJavascript("main") %>
|
||||||
</head>
|
</head>
|
||||||
<body class="d-flex flex-column h-100">
|
<body class="d-flex flex-column h-100">
|
||||||
<% if $Menu(1) %>
|
<% if $Menu(1) %>
|
||||||
|
|
Loading…
Reference in a new issue