gdu 4.0.0-next.13 → 4.0.0-next.17

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # gdu
 
+## 4.0.0-next.17
+
+### Patch Changes
+
+-   GDU: Improves build maniset plugin
+
+## 4.0.0-next.16
+
+### Patch Changes
+
+-   GDU: Fixes build manifest plugin
+
+## 4.0.0-next.15
+
+### Patch Changes
+
+-   GDU Assumed prod env fro build commands
+
+## 4.0.0-next.14
+
+### Patch Changes
+
+-   GDU: Exposes naked nextjs configs
+
 ## 4.0.0-next.13
 
 ### Patch Changes

package/dist/commands/build/buildSSR.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSSR = void 0;
 const path_1 = require("path");
 const utilities_1 = require("@autoguru/utilities");
-const roots_1 = require("../../lib/roots");
 const execa_1 = __importDefault(require("execa"));
 const kleur_1 = require("kleur");
+const roots_1 = require("../../lib/roots");
 const logger = utilities_1.createLogger('build');
 const buildSSR = async (guruConfig) => {
     const start = Date.now();

package/dist/config/next.config.d.ts

@@ -1 +1,14 @@
-export declare const createNextJSConfig: () => {};
+export declare const withTM: (nextConfig?: {}) => {};
+export declare const createNextJSConfig: () => {
+    reactStrictMode: boolean;
+    experimental: {
+        esmExternals: boolean;
+        externalDir: boolean;
+    };
+    images: {
+        domains: string[];
+        formats: string[];
+    };
+    webpack: (defaultConfig: any) => any;
+};
+export declare const createNextJSTranspiledConfig: () => any;

package/dist/config/next.config.js

@@ -22,17 +22,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNextJSConfig = void 0;
-const roots_1 = require("../lib/roots");
+exports.createNextJSTranspiledConfig = exports.createNextJSConfig = exports.withTM = void 0;
 const path_1 = __importStar(require("path"));
-const webpack_1 = require("webpack");
-const misc_1 = require("../lib/misc");
+const next_plugin_1 = require("@vanilla-extract/next-plugin");
 const dotenv_webpack_1 = __importDefault(require("dotenv-webpack"));
 const next_transpile_modules_1 = __importDefault(require("next-transpile-modules"));
+const webpack_1 = require("webpack");
+const misc_1 = require("../lib/misc");
+const roots_1 = require("../lib/roots");
 const configs_1 = require("../utils/configs");
-const webpack_plugin_1 = require("@vanilla-extract/webpack-plugin");
-const loaders_1 = require("next/dist/build/webpack/config/blocks/css/loaders");
-const withTM = next_transpile_modules_1.default([
+const withVanillaExtract = next_plugin_1.createVanillaExtractPlugin();
+exports.withTM = next_transpile_modules_1.default([
     '@autoguru/themes',
     '@autoguru/overdrive',
     '@autoguru/icons',
@@ -46,7 +46,7 @@ const withTM = next_transpile_modules_1.default([
 ]);
 const createNextJSConfig = () => {
     const isDev = !misc_1.isEnvProduction();
-    return withTM({
+    return {
         reactStrictMode: true,
         experimental: {
             esmExternals: false,
@@ -54,25 +54,9 @@ const createNextJSConfig = () => {
         },
         images: {
             domains: ['cdn.autoguru.com.au'],
+            formats: ['image/webp'],
         },
-        webpack: (defaultConfig, options) => {
-            const { dev, isServer } = options;
-            const cssRules = defaultConfig.module.rules.find((rule) => Array.isArray(rule.oneOf) &&
-                rule.oneOf.some(({ test }) => typeof test === 'object' &&
-                    typeof test.test === 'function' &&
-                    test.test('filename.css'))).oneOf;
-            cssRules.unshift({
-                test: /\.vanilla\.css$/i,
-                sideEffects: true,
-                use: loaders_1.getGlobalCssLoader({
-                    assetPrefix: defaultConfig.assetPrefix,
-                    isClient: !isServer,
-                    isServer,
-                    isDevelopment: dev,
-                    future: defaultConfig.future || {},
-                    experimental: defaultConfig.experimental || {},
-                }, [], []),
-            });
+        webpack: (defaultConfig) => {
             defaultConfig.plugins.push(new webpack_1.DefinePlugin({
                 __DEV__: isDev,
             }));
@@ -82,7 +66,9 @@ const createNextJSConfig = () => {
                     path: path_1.default.resolve(configsDir, '.env.defaults'),
                 }),
                 new dotenv_webpack_1.default({
-                    path: path_1.default.resolve(configsDir, `.env.${process.env.APP_ENV || 'dev'}`),
+                    path: path_1.default.resolve(configsDir, `.env.${process.env.APP_ENV || misc_1.isEnvProduction()
+                        ? 'prod'
+                        : 'dev'}`),
                 }),
             ])
                 .forEach((plugin) => defaultConfig.plugins.push(plugin));
@@ -90,9 +76,10 @@ const createNextJSConfig = () => {
             defaultConfig.resolve.alias['react-dom'] = path_1.resolve(roots_1.PROJECT_ROOT, '../../', 'node_modules/react-dom/');
             defaultConfig.resolve.alias['@autoguru/icons'] = path_1.resolve(roots_1.PROJECT_ROOT, '../../', 'node_modules/@autoguru/icons/');
             defaultConfig.resolve.alias['next'] = path_1.resolve(roots_1.PROJECT_ROOT, '../../', 'node_modules/next/');
-            defaultConfig.plugins.push(new webpack_plugin_1.VanillaExtractPlugin());
             return defaultConfig;
         },
-    });
+    };
 };
 exports.createNextJSConfig = createNextJSConfig;
+const createNextJSTranspiledConfig = () => withVanillaExtract(exports.withTM(exports.createNextJSConfig()));
+exports.createNextJSTranspiledConfig = createNextJSTranspiledConfig;

package/dist/config/ssr/server.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const utilities_1 = require("@autoguru/utilities");
-const roots_1 = require("../../lib/roots");
 const execa_1 = __importDefault(require("execa"));
 const kleur_1 = require("kleur");
 const misc_1 = require("../../lib/misc");
+const roots_1 = require("../../lib/roots");
 const logger = utilities_1.createLogger('server');
 const run = async (port) => {
     const start = Date.now();

package/dist/config/webpack/plugins/GuruBuildManifest.d.ts

@@ -1,4 +1,21 @@
 import { Compiler } from 'webpack';
+declare const defaultOptions: {
+    excludeFile: RegExp;
+    chunkGroupName: (filename: any) => string;
+    outputDir: string;
+    filename: string;
+    objectToString: (result: any) => string;
+    includeChunks: boolean;
+    publicPath: string;
+};
 export declare class GuruBuildManifest {
+    private options;
+    private result;
+    constructor(options: Partial<typeof defaultOptions>);
     apply(compiler: Compiler): void;
+    saveJson(): void;
+    _excludeChunk(excludeCriterium: any, filename: any, chunk: any): any;
+    _shouldFolderBeCreated(outputDir: any): any;
+    _normalizeOutputDir(outputDir: any): any;
 }
+export {};

package/dist/config/webpack/plugins/GuruBuildManifest.js

@@ -1,55 +1,103 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuruBuildManifest = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
+const emptyResults = {
+    hash: '',
+    assets: {
+        js: [],
+        css: [],
+    },
+    chunks: {
+        js: [],
+        css: [],
+    },
+};
+const pluginName = 'GuruBuildManifestPlugin';
+const defaultOptions = {
+    excludeFile: /\.hot-update\.js$/,
+    chunkGroupName: (filename) => /\.([\da-z]+(\.map)?)(\?.*)?$/.exec(filename)[1],
+    outputDir: process.cwd(),
+    filename: 'build-manifest.json',
+    objectToString: (result) => JSON.stringify(result),
+    includeChunks: true,
+    publicPath: '',
+};
 class GuruBuildManifest {
-    apply(compiler) {
-        const fileMap = {
-            hash: '',
-            env: {},
+    constructor(options) {
+        this.options = {};
+        this.result = emptyResults;
+        this.options = Object.assign({}, defaultOptions, options);
+        this.result = {
+            ...emptyResults,
         };
-        const configChunks = new Map();
-        compiler.hooks.make.tap('BuildManifestPlugin', (compilation) => {
+    }
+    apply(compiler) {
+        compiler.hooks.emit.tap(pluginName, (compilation) => {
+            this.result = { ...emptyResults };
+            this.result.hash = compilation.hash;
+            compilation.chunks.forEach((chunk) => {
+                chunk.files.forEach((filename) => {
+                    if (this._excludeChunk(this.options.excludeFile, filename, chunk) === true) {
+                        return;
+                    }
+                    const ext = this.options.chunkGroupName(filename, chunk);
+                    if (chunk.name)
+                        this.result.assets[ext].push(`${this.options.publicPath}${filename}`);
+                    else if (this.options.includeChunks)
+                        this.result.chunks[ext].push(`${this.options.publicPath}${filename}`);
+                });
+            });
+            if (!this.options.includeChunks)
+                this.result.chunks = void 0;
+            this.saveJson();
         });
-        compiler.hooks.emit.tapAsync('BuildManifestPlugin', (compilation, cb) => {
-            fileMap.hash = compilation.hash;
-            const js = [];
-            const css = [];
-            for (const [, entrypoint,] of compilation.entrypoints.entries()) {
-                for (const file of entrypoint.getFiles()) {
-                    if (file.endsWith('.js'))
-                        js.push(file);
-                    if (file.endsWith('.css'))
-                        css.push(file);
+    }
+    saveJson() {
+        if (this._shouldFolderBeCreated(this.options.outputDir) === true) {
+            let pathStep = process.cwd();
+            const normalizedOutputPath = this._normalizeOutputDir(this.options.outputDir);
+            normalizedOutputPath.split('/').forEach((folder) => {
+                pathStep = path_1.join(pathStep, folder);
+                try {
+                    fs_1.default.mkdirSync(pathStep);
                 }
-            }
-            for (const [name, { chunk, config },] of configChunks.entries()) {
-                const prefixCreator = (path) => {
-                    var _a, _b, _c;
-                    return `${(_b = (_a = config.config) === null || _a === void 0 ? void 0 : _a.publicPathBase) !== null && _b !== void 0 ? _b : ''}${(_c = compiler.options.output.publicPath) !== null && _c !== void 0 ? _c : ''}${path}`;
-                };
-                fileMap.env[name] = {
-                    js: [
-                        ...chunk.files.filter((i) => i.endsWith('.js')),
-                        ...js,
-                    ].map((i) => prefixCreator(i)),
-                    css: [...css].map((i) => prefixCreator(i)),
-                };
-            }
-            compilation.assets['build-manifest.json'] = makeSource(JSON.stringify(fileMap, null, 4));
-            cb();
-        });
+                catch {
+                }
+            });
+        }
+        const file = path_1.resolve(this.options.outputDir, this.options.filename);
+        const blob = this.options.objectToString(this.result);
+        try {
+            fs_1.default.writeFileSync(file, blob, { flag: 'w' });
+            console.log(`File successfully created - ${file}`);
+        }
+        catch (error) {
+            console.error(error);
+        }
+    }
+    _excludeChunk(excludeCriterium, filename, chunk) {
+        if (typeof excludeCriterium === 'function') {
+            return excludeCriterium(filename, chunk);
+        }
+        if (excludeCriterium instanceof RegExp) {
+            return excludeCriterium.test(filename);
+        }
+        return true;
+    }
+    _shouldFolderBeCreated(outputDir) {
+        const isAbsolutePathWithProjectRoot = outputDir.includes(process.cwd());
+        const isPathWithinProjectRoot = !outputDir.startsWith('/');
+        return (isAbsolutePathWithProjectRoot || isPathWithinProjectRoot || false);
+    }
+    _normalizeOutputDir(outputDir) {
+        const removedRelativePrefix = outputDir.replace(/^\.\//, '');
+        const removeAbsolutePrefix = removedRelativePrefix.replace(process.cwd(), '');
+        return removeAbsolutePrefix;
     }
 }
 exports.GuruBuildManifest = GuruBuildManifest;
-const makeSource = (contents) => ({
-    source() {
-        return Buffer.from(contents);
-    },
-    size() {
-        return Buffer.byteLength(contents);
-    },
-    updateHash: null,
-    map: null,
-    sourceAndMap: null,
-    buffer: null,
-});

package/dist/config/webpack/webpack.config.js

@@ -23,23 +23,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importStar(require("path"));
+const webpack_plugin_1 = require("@vanilla-extract/webpack-plugin");
 const browserslist_config_autoguru_1 = __importDefault(require("browserslist-config-autoguru"));
 const clean_webpack_plugin_1 = require("clean-webpack-plugin");
 const dotenv_webpack_1 = __importDefault(require("dotenv-webpack"));
+const env_ci_1 = __importDefault(require("env-ci"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const terser_webpack_plugin_1 = __importDefault(require("terser-webpack-plugin"));
-const webpack_plugin_1 = require("treat/webpack-plugin");
-const webpack_plugin_2 = require("@vanilla-extract/webpack-plugin");
+const webpack_plugin_2 = require("treat/webpack-plugin");
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const webpack_1 = require("webpack");
 const config_1 = require("../../lib/config");
 const misc_1 = require("../../lib/misc");
 const roots_1 = require("../../lib/roots");
+const configs_1 = require("../../utils/configs");
 const hooks_1 = require("../../utils/hooks");
 const common_1 = require("./blocks/common");
 const GuruBuildManifest_1 = require("./plugins/GuruBuildManifest");
-const configs_1 = require("../../utils/configs");
-const env_ci_1 = __importDefault(require("env-ci"));
 const { branch = 'null', commit = 'null' } = env_ci_1.default();
 const terserOptions = {
     ie8: false,
@@ -72,7 +72,7 @@ const ourCodePaths = [
     /@autoguru[/\\]/,
 ].filter(Boolean);
 const fileMask = isDev ? '[name]' : '[name]-[contenthash:8]';
-const baseOptions = {
+const baseOptions = (buildEnv) => ({
     context: roots_1.PROJECT_ROOT,
     mode: isDev ? 'development' : 'production',
     entry: {
@@ -82,6 +82,9 @@ const baseOptions = {
             path_1.join(gduEntryPath, '/spa/client.js'),
         ].filter(Boolean),
     },
+    experiments: {
+        layers: true,
+    },
     cache: {
         type: 'filesystem',
         cacheLocation: path_1.resolve(roots_1.PROJECT_ROOT, '.build_cache'),
@@ -91,7 +94,6 @@ const baseOptions = {
         },
     },
     devtool: isDev ? 'eval-cheap-module-source-map' : 'source-map',
-    bail: !isDev || !process.env.APP_ENV,
     resolve: {
         extensions: ['.tsx', '.ts', '.mjs', '.jsx', '.js', '.json'],
         plugins: [
@@ -259,7 +261,7 @@ const baseOptions = {
                 branch,
             }),
         }),
-        new webpack_plugin_1.TreatPlugin({
+        new webpack_plugin_2.TreatPlugin({
             outputLoaders: [
                 {
                     loader: misc_1.isEnvProduction()
@@ -270,23 +272,29 @@ const baseOptions = {
             minify: !isDev,
             browsers: browserslist_config_autoguru_1.default,
         }),
-        new webpack_plugin_2.VanillaExtractPlugin(),
+        new webpack_plugin_1.VanillaExtractPlugin(),
         new mini_css_extract_plugin_1.default({
             filename: `${fileMask}.css`,
             chunkFilename: `chunks/${fileMask}.css`,
             ignoreOrder: true,
         }),
-        !isDev && new GuruBuildManifest_1.GuruBuildManifest(),
         ...configs_1.getConfigsDirs().flatMap((configsDir) => [
             new dotenv_webpack_1.default({
                 path: path_1.default.resolve(configsDir, '.env.defaults'),
             }),
             new dotenv_webpack_1.default({
-                path: path_1.default.resolve(configsDir, `.env.${process.env.APP_ENV || 'dev'}`),
+                path: path_1.default.resolve(configsDir, `.env.${process.env.APP_ENV || (isDev ? 'dev' : buildEnv)}`),
             }),
         ]),
+        !isDev &&
+            new GuruBuildManifest_1.GuruBuildManifest({
+                outputDir: buildEnv === 'prod'
+                    ? path_1.resolve(roots_1.PROJECT_ROOT, 'dist')
+                    : path_1.resolve(roots_1.PROJECT_ROOT, 'dist', buildEnv),
+                includeChunks: false,
+            }),
     ].filter(Boolean),
-};
+});
 const buildEnvs = process.env.APP_ENV
     ? [process.env.APP_ENV]
     : ['dev', 'uat', 'test', 'preprod', 'prod'];
@@ -296,7 +304,7 @@ const makeWebpackConfig = (buildEnv) => {
     return ({
         name: buildEnv,
         output: {
-            path: `${outputPath}/${buildEnv}`,
+            path: `${outputPath}/${buildEnv === 'prod' ? '' : buildEnv}`,
             publicPath: isDev ? '/' : (_b = (_a = config_1.getGuruConfig()) === null || _a === void 0 ? void 0 : _a.publicPath) !== null && _b !== void 0 ? _b : '/',
             filename: `${fileMask}.js`,
             chunkFilename: `chunks/${fileMask}.js`,
@@ -308,7 +316,7 @@ const makeWebpackConfig = (buildEnv) => {
     });
 };
 const buildConfigs = () => buildEnvs.map((buildEnv) => ({
-    ...baseOptions,
+    ...baseOptions(buildEnv),
     ...makeWebpackConfig(buildEnv),
 }));
 exports.default = buildConfigs;

package/dist/lib/runWebpack.js

@@ -20,7 +20,13 @@ const done = (resolve, reject) => (err, stats) => {
     }
     resolve();
 };
-const run = async (compiler) => new Promise((resolve, reject) => compiler.run(done(resolve, reject)));
+const run = async (compiler) => new Promise((resolve, reject) => compiler.run((err, stats) => {
+    compiler.close((err2) => {
+        console.log(stats);
+        resolve(err || err2);
+    });
+    done(resolve, reject);
+}));
 exports.run = run;
 const watch = async (compiler) => new Promise((resolve, reject) => compiler.watch({}, done(resolve, reject)));
 exports.watch = watch;

package/dist/utils/configs.d.ts

@@ -1 +1,2 @@
 export declare const getConfigsDirs: () => string[];
+export declare const getBuildFolder: () => string[];

package/dist/utils/configs.js

@@ -3,10 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfigsDirs = void 0;
+exports.getBuildFolder = exports.getConfigsDirs = void 0;
 const find_up_1 = __importDefault(require("find-up"));
 const getConfigsDirs = () => [
     find_up_1.default.sync('.gdu_config', { type: 'directory' }),
     find_up_1.default.sync('.gdu_app_config', { type: 'directory' }),
 ].filter(Boolean);
 exports.getConfigsDirs = getConfigsDirs;
+const getBuildFolder = () => [
+    find_up_1.default.sync('.gdu_config', { type: 'directory' }),
+    find_up_1.default.sync('.gdu_app_config', { type: 'directory' }),
+].filter(Boolean);
+exports.getBuildFolder = getBuildFolder;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "gdu",
-	"version": "4.0.0-next.13",
+	"version": "4.0.0-next.17",
 	"private": false,
 	"description": "AutoGuru's development toolkit",
 	"homepage": "https://github.com/autoguru-au/octane/tree/master/packages/gdu#readme",
@@ -82,8 +82,8 @@
 		"ts-dedent": "^2.0.0",
 		"tsconfig-paths-webpack-plugin": "^3.5.1",
 		"url-loader": "^4.1.1",
-		"webpack": "^5.50.0",
-		"webpack-dev-server": "^4.0.0-rc.0",
+		"webpack": "^5.64.2",
+		"webpack-dev-server": "^4.5.0",
 		"whatwg-fetch": "^3.6.2"
 	},
 	"devDependencies": {