diff --git a/gulp/build_variants.js b/gulp/build_variants.js index 6a80c2d9..aecb3ba7 100644 --- a/gulp/build_variants.js +++ b/gulp/build_variants.js @@ -1,26 +1,10 @@ /** * @type {Record} */ export const BUILD_VARIANTS = { - "web-localhost": { - standalone: false, - environment: "dev", - }, - "web-shapezio-beta": { - standalone: false, - environment: "staging", - }, - "web-shapezio": { - standalone: false, - environment: "prod", - }, - "standalone": { + standalone: { standalone: true, - executableName: "shapez", }, }; diff --git a/gulp/js.js b/gulp/js.js index 197bda39..06a4ae3d 100644 --- a/gulp/js.js +++ b/gulp/js.js @@ -7,7 +7,6 @@ import webpackConfig from "./webpack.config.js"; import webpackProductionConfig from "./webpack.production.config.js"; import webpackStream from "webpack-stream"; -import gulpRename from "gulp-rename"; /** * PROVIDES (per ) @@ -18,59 +17,27 @@ import gulpRename from "gulp-rename"; * */ -//// DEV - +// TODO: Move webpack config to build_variants.js and use a separate +// build variant for development export default Object.fromEntries( Object.entries(BUILD_VARIANTS).map(([variant, data]) => { - function build() { - return gulp - .src("../src/js/main.js") - .pipe(webpackStream(webpackConfig, webpack)) - .pipe(gulp.dest(buildFolder)); - } - const dev = { - build, + build() { + return gulp + .src("../src/js/main.js") + .pipe(webpackStream(webpackConfig, webpack)) + .pipe(gulp.dest(buildFolder)); + }, }; - let prod; - if (!data.standalone) { - // WEB - - function transpiled() { - return gulp - .src("../src/js/main.js") - .pipe(webpackStream(webpackProductionConfig, webpack)) - .pipe(gulpRename("bundle-transpiled.js")) - .pipe(gulp.dest(buildFolder)); - } - - function es6() { + const prod = { + build() { return gulp .src("../src/js/main.js") .pipe(webpackStream(webpackProductionConfig, webpack)) .pipe(gulp.dest(buildFolder)); - } - - prod = { - transpiled, - es6, - build: - // transpiled currently not used - // gulp.parallel("js." + variant + ".prod.transpiled", "js." + variant + ".prod.es6") - es6, - }; - } else { - // STANDALONE - function build() { - return gulp - .src("../src/js/main.js") - .pipe(webpackStream(webpackProductionConfig, webpack)) - .pipe(gulp.dest(buildFolder)); - } - - prod = { build }; - } + }, + }; return [variant, { dev, prod }]; }) diff --git a/gulp/tasks.js b/gulp/tasks.js index 8a742574..f613a6b4 100644 --- a/gulp/tasks.js +++ b/gulp/tasks.js @@ -268,12 +268,6 @@ for (const variant in BUILD_VARIANTS) { serve[variant] = gulp.series(build.prepare.dev(variant), () => serveHTML({ version: variant })); } -// Deploying! -export const deploy = { - staging: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio-beta"].full), - prod: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio"].full), -}; - export const main = { prepareDocs: docs.prepareDocs, webserver,