gdu 4.0.0-next.7 → 4.0.1

package/CHANGELOG.md

@@ -1,5 +1,125 @@
 # gdu
 
+## 4.0.1
+
+### Patch Changes
+
+-   GDU: Supports artifact directory for relay generated files
+
+## 4.0.0
+
+### Major Changes
+
+-   Upgrades browserlist
+-   a08a3f9: GDU: Upgrades babel
+-   2486c59: GDU: Applies caching to babel
+-   2486c59: GDU fixed build commads
+
+### Patch Changes
+
+-   cdd95c9: Fixes ssr builds
+-   7c65b2c: GDU: Uses dotenv for env variables
+-   7b7fecc: Upgrades webpack dependencies
+-   c0130be: GDU: Puts prod artifacts in folder when building for multiple envs
+-   2adfc80: Adds AG cdn to next image domains
+-   0185749: GDU: Improves build maniset plugin
+-   7f3b1ac: Add multi env build support for nextJS apps
+-   3acac86: GDU: Fixes build manifest plugin
+-   f7d42ea: Adds fleet
+-   4288672: GDU: Exposes naked nextjs configs
+-   3acac86: GDU Assumed prod env fro build commands
+-   1f93d6c: GDU: Support vanilla extract
+-   33c60da: GDU: Moves build cache to project root level
+-   2750501: GDU: Allows app level configs
+-   33c60da: GDU uses APP_ENV instead of NODE_ENV for environment configs
+-   94bb85b: Fixes for ssr apps
+-   6c1f212: GDU: Fixed config file paths
+-   9a144dc: GDU: Uses next cli dev command to start dev server
+-   2486c59: GDU Updated GuruBuildManifest plugin
+-   7c65b2c: Dev server: Removed invalid options
+-   61f1da4: GDU upgrades webpack dependency to v5
+-   Updated dependencies [undefined]
+    -   browserslist-config-autoguru@2.0.1
+
+## 4.0.0-next.20
+
+### Patch Changes
+
+-   Add multi env build support for nextJS apps
+
+## 4.0.0-next.19
+
+### Patch Changes
+
+-   Fixes ssr builds
+
+## 4.0.0-next.18
+
+### Patch Changes
+
+-   GDU: Puts prod artifacts in folder when building for multiple envs
+
+## 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
+
+-   Adds fleet
+
+## 4.0.0-next.12
+
+### Patch Changes
+
+-   2adfc80: Adds AG cdn to next image domains
+
+## 4.0.0-next.11
+
+### Patch Changes
+
+-   Fixes for ssr apps
+
+## 4.0.0-next.10
+
+### Patch Changes
+
+-   GDU: Uses next cli dev command to start dev server
+
+## 4.0.0-next.9
+
+### Patch Changes
+
+-   GDU: Support vanilla extract
+
+## 4.0.0-next.8
+
+### Major Changes
+
+-   GDU: Applies caching to babel
+-   GDU fixed build commads
+
 ## 4.0.0-next.7
 
 ### Patch Changes

package/dist/commands/build/buildSPA.js

@@ -5,16 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSPA = void 0;
 const webpack_1 = __importDefault(require("webpack"));
-const webpack_config_1 = require("../../config/webpack/webpack.config");
+const webpack_config_1 = __importDefault(require("../../config/webpack/webpack.config"));
 const runWebpack_1 = require("../../lib/runWebpack");
 const hooks_1 = require("../../utils/hooks");
 const buildSPA = async (guruConfig) => {
     const hooks = hooks_1.getHooks();
-    const webpackConfig = hooks.webpackConfig.call(webpack_config_1.makeWebpackConfig({
-        isDevServer: false,
-    }));
-    const compiler = webpack_1.default(webpackConfig);
-    await runWebpack_1.run(compiler);
+    const webpackConfigs = hooks.webpackConfig.call(webpack_config_1.default());
+    const compiler = webpack_1.default(webpackConfigs);
+    runWebpack_1.run(compiler);
     return {
         artifactPath: guruConfig.outputPath,
     };

package/dist/commands/build/buildSSR.js

@@ -1,16 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSSR = void 0;
 const path_1 = require("path");
-const next_config_1 = require("../../config/next.config");
-const resolve_1 = require("../../lib/resolve");
+const utilities_1 = require("@autoguru/utilities");
+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 { default: nextBuild } = resolve_1.requireFromCaller('next/dist/build');
-    await nextBuild(roots_1.PROJECT_ROOT, {
-        dev: false,
-        quiet: true,
-        ...next_config_1.createNextJSConfig(),
+    const start = Date.now();
+    execa_1.default
+        .command(`next build --profile`, {
+        stdio: 'inherit',
+        cwd: roots_1.PROJECT_ROOT,
+        localDir: roots_1.GDU_ROOT,
+    })
+        .then((result) => {
+        console.log(`${kleur_1.dim('SUCCESS!')}`, `${kleur_1.dim('Listening')}: ${kleur_1.blue(result === null || result === void 0 ? void 0 : result.all)}`);
+    }, (error) => {
+        logger.error('response', {
+            processingTime: Date.now() - start,
+            responseHeaders: Object.fromEntries(Object.entries(error.getHeaders())),
+            url: 'incomingPath',
+            statusCode: error.statusCode,
+        });
+        throw error;
     });
     return {
         artifactPath: path_1.join(guruConfig.outputPath, 'BUILD_ID'),

package/dist/commands/start/index.d.ts

@@ -1,4 +1,4 @@
-declare const _default: ({ port: incomingPort, }: {
+declare const _default: ({ port: incomingPort }: {
     port: any;
 }) => Promise<void>;
 export default _default;

package/dist/commands/start/index.js

@@ -25,7 +25,7 @@ const config_1 = require("../../lib/config");
 const misc_1 = require("../../lib/misc");
 const roots_1 = require("../../lib/roots");
 const { debug } = diary_1.diary('gdu:commands:start');
-exports.default = async ({ port: incomingPort, }) => {
+exports.default = async ({ port: incomingPort }) => {
     debug('running action with %O', { port: incomingPort });
     const { port = incomingPort, ...otherConfig } = config_1.getGuruConfig(roots_1.PROJECT_ROOT) || {};
     const resolvedConfig = { port, ...otherConfig };

package/dist/commands/start/runSPA.js

@@ -11,7 +11,7 @@ const kleur_1 = require("kleur");
 const ts_dedent_1 = __importDefault(require("ts-dedent"));
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
-const webpack_config_1 = require("../../config/webpack/webpack.config");
+const webpack_config_1 = __importDefault(require("../../config/webpack/webpack.config"));
 const config_1 = require("../../lib/config");
 const roots_1 = require("../../lib/roots");
 const hooks_1 = require("../../utils/hooks");
@@ -31,9 +31,9 @@ const hosts = ['localhost', localhost];
 const runSPA = async (guruConfig) => {
     const hooks = hooks_1.getHooks();
     console.log(`${kleur_1.cyan('Starting dev server...')}`);
-    const webpackConfig = hooks.webpackConfig.call(webpack_config_1.makeWebpackConfig({
-        isDevServer: true,
-    }));
+    const webpackConfig = hooks.webpackConfig
+        .call(webpack_config_1.default())
+        .find(({ name }) => name === process.env.APP_ENV);
     const consumerHtmlTemplate = getConsumerHtmlTemplate(guruConfig);
     webpackConfig.plugins.push(new html_webpack_plugin_1.default({
         template: consumerHtmlTemplate !== null && consumerHtmlTemplate !== void 0 ? consumerHtmlTemplate : 'auto',
@@ -55,7 +55,7 @@ const runSPA = async (guruConfig) => {
                                     src: `${compilation.options.output
                                         .publicPath || ''}${file}`,
                                 },
-                                meta: { 'plugin': 'html-webpack-plugin' }
+                                meta: { plugin: 'html-webpack-plugin' },
                             });
                         }
                     }

package/dist/commands/start/runSSR.js

@@ -1,36 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runNextJS = void 0;
-const utilities_1 = require("@autoguru/utilities");
 const diary_1 = require("diary");
 const kleur_1 = require("kleur");
 const server_1 = require("../../config/ssr/server");
 const misc_1 = require("../../lib/misc");
-const hooks_1 = require("../../utils/hooks");
 const { debug } = diary_1.diary('gdu:commands:start:ssr');
-const log = utilities_1.createLogger('server');
 const runNextJS = async (guruConfig) => {
     var _a;
     const port = (_a = guruConfig.port) !== null && _a !== void 0 ? _a : 8080;
     debug('next start %o', { port });
-    const hooks = hooks_1.getHooks();
     if (!misc_1.isEnvProduction())
-        hooks.beforeServer.tap('runner', () => {
-            console.log(`${kleur_1.cyan('Starting dev server...')}`);
-        });
-    hooks.afterServer.tap('runner', (server) => {
-        var _a;
-        server.listen((_a = guruConfig.port) !== null && _a !== void 0 ? _a : 8080, (err) => {
-            if (err)
-                throw err;
-            if (misc_1.isEnvProduction()) {
-                log.info('Started accepting requests...');
-            }
-            else {
-                console.log(`${kleur_1.dim('Listening')}: ${kleur_1.blue(`http://localhost:${port}/`)}`);
-            }
-        });
-    });
-    await server_1.run();
+        console.log(`${kleur_1.cyan('Starting dev server...')}`);
+    await server_1.run(port);
 };
 exports.runNextJS = runNextJS;

package/dist/config/babel.config.d.ts

@@ -11,6 +11,7 @@ declare function _exports(guruConfig: any): {
         haste: boolean;
         isDevVariable: string;
         eagerESModules: boolean;
+        artifactDirectory: string;
     })[])[];
 };
 export = _exports;

package/dist/config/babel.config.js

@@ -1,6 +1,7 @@
 "use strict";
 const { join } = require('path');
 const browsers = require('browserslist-config-autoguru');
+const { PROJECT_ROOT } = require('../lib/roots');
 module.exports = (guruConfig) => {
     let hasRelay = false;
     try {
@@ -40,6 +41,7 @@ module.exports = (guruConfig) => {
                     haste: false,
                     isDevVariable: '__DEV__',
                     eagerESModules: true,
+                    artifactDirectory: `./../../packages/relay/__generated__`,
                 },
             ],
             require.resolve('babel-plugin-treat'),

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

@@ -1 +1,16 @@
-export declare const createNextJSConfig: () => any;
+export declare const withTM: (nextConfig?: {}) => {};
+export declare const createNextJSConfig: (buildEnv: any) => {
+    distDir: string;
+    reactStrictMode: boolean;
+    swcMinify: boolean;
+    experimental: {
+        concurrentFeatures: boolean;
+    };
+    images: {
+        domains: string[];
+        formats: string[];
+        imageSizes: number[];
+    };
+    webpack: (defaultConfig: any) => any;
+};
+export declare const createNextJSTranspiledConfig: () => any;

package/dist/config/next.config.js

@@ -1,92 +1,92 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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 path_1 = require("path");
-const browserslist_config_autoguru_1 = __importDefault(require("browserslist-config-autoguru"));
-const client_1 = require("next/dist/build/webpack/config/blocks/css/loaders/client");
-const webpack_plugin_1 = require("treat/webpack-plugin");
-const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
+exports.createNextJSTranspiledConfig = exports.createNextJSConfig = exports.withTM = void 0;
+const path_1 = __importStar(require("path"));
+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 config_1 = require("../lib/config");
 const misc_1 = require("../lib/misc");
 const roots_1 = require("../lib/roots");
-const hooks_1 = require("../utils/hooks");
-const createNextJSConfig = () => {
-    var _a;
-    const hooks = hooks_1.getHooks();
+const configs_1 = require("../utils/configs");
+const withVanillaExtract = next_plugin_1.createVanillaExtractPlugin();
+exports.withTM = next_transpile_modules_1.default([
+    '@autoguru/themes',
+    '@autoguru/overdrive',
+    '@autoguru/icons',
+    '@autoguru/components',
+    '@autoguru/fleet',
+    '@autoguru/relay',
+    '@autoguru/auth',
+    '@autoguru/components',
+    '@autoguru/layout',
+    '@popperjs/core',
+]);
+const createNextJSConfig = (buildEnv) => {
     const isDev = !misc_1.isEnvProduction();
-    const nextJsConfig = {
-        poweredByHeader: false,
-        generateEtags: false,
-        pageExtensions: ['tsx', 'ts'],
-        assetPrefix: (_a = config_1.getGuruConfig()) === null || _a === void 0 ? void 0 : _a.publicPath,
-        publicRuntimeConfig: {},
-        webpack(originalConfig, nextConfig) {
-            const guruConfig = config_1.getGuruConfig();
-            const ourCodePaths = [
-                ...guruConfig === null || guruConfig === void 0 ? void 0 : guruConfig.srcPaths.map((item) => path_1.join(roots_1.PROJECT_ROOT, item)),
-                roots_1.CALLING_WORKSPACE_ROOT &&
-                    path_1.join(roots_1.CALLING_WORKSPACE_ROOT, 'packages'),
-                /@autoguru[/\\]/,
-            ].filter(Boolean);
-            originalConfig.resolve.alias['@babel/runtime-corejs2'] =
-                '@babel/runtime-corejs3';
-            originalConfig.resolve.plugins.push(new tsconfig_paths_webpack_plugin_1.default());
-            originalConfig.plugins.push(new (class {
-                apply(compiler) {
-                    compiler.options.plugins.push(new webpack_1.DefinePlugin({
-                        __DEV__: JSON.stringify(isDev),
-                    }), new webpack_plugin_1.TreatPlugin({
-                        outputCSS: !nextConfig.isServer,
-                        outputLoaders: [
-                            !nextConfig.isServer
-                                ? client_1.getClientStyleLoader({
-                                    isDevelopment: isDev,
-                                    assetPrefix: nextConfig.config
-                                        .assetPrefix,
-                                })
-                                : '',
-                        ],
-                        minify: !isDev,
-                        browsers: browserslist_config_autoguru_1.default,
-                    }));
-                    const oldLoader = compiler.options.module.rules[0];
-                    const babelConfig = hooks.babelConfig.call(require('./babel.config')(guruConfig));
-                    let use = oldLoader.use;
-                    if (Array.isArray(use)) {
-                        use = use[1];
-                    }
-                    use.options = {
-                        ...use.options,
-                        hasReactRefresh: false,
-                        overrides: [babelConfig],
-                    };
-                    compiler.options.module.rules[0] = {
-                        ...oldLoader,
-                        include: [...oldLoader.include, ...ourCodePaths],
-                        exclude(path) {
-                            const orig = oldLoader === null || oldLoader === void 0
-                                ? void 0
-                                : oldLoader.exclude(path);
-                            return orig
-                                ? !ourCodePaths.some((r) => {
-                                    if (r instanceof RegExp) {
-                                        return r.test(path);
-                                    }
-                                    return path.includes(r);
-                                })
-                                : false;
-                        },
-                        use,
-                    };
-                }
-            })());
-            return hooks.webpackConfig.call(originalConfig);
+    const env = process.env.APP_ENV || (isDev ? 'dev' : buildEnv);
+    return {
+        distDir: `dist/${env}`,
+        reactStrictMode: true,
+        swcMinify: true,
+        experimental: {
+            concurrentFeatures: false,
+        },
+        images: {
+            domains: [
+                'cdn.autoguru.com.au',
+                'cdn-dev.autoguru.com.au',
+                'cdn-test.autoguru.com.au',
+                'cdn-uat.autoguru.com.au',
+                'cdn-preprod.autoguru.com.au',
+            ],
+            formats: ['image/avif', 'image/webp'],
+            imageSizes: [16, 32, 48, 64, 96, 128, 256, 384, 512],
+        },
+        webpack: (defaultConfig) => {
+            defaultConfig.plugins.push(new webpack_1.DefinePlugin({
+                __DEV__: isDev,
+            }));
+            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.${env}`),
+                }),
+            ])
+                .forEach((plugin) => defaultConfig.plugins.push(plugin));
+            defaultConfig.resolve.alias['react'] = path_1.resolve(roots_1.PROJECT_ROOT, '../../', 'node_modules/react/');
+            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/');
+            return defaultConfig;
         },
     };
-    return hooks.nextJSConfig.call(nextJsConfig);
 };
 exports.createNextJSConfig = createNextJSConfig;
+const createNextJSTranspiledConfig = () => withVanillaExtract(exports.withTM(exports.createNextJSConfig('uat')));
+exports.createNextJSTranspiledConfig = createNextJSTranspiledConfig;

package/dist/config/ssr/server.d.ts

@@ -1 +1 @@
-export declare const run: () => Promise<void>;
+export declare const run: (port: number) => Promise<void>;

package/dist/config/ssr/server.js

@@ -5,50 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const utilities_1 = require("@autoguru/utilities");
-const polka_1 = __importDefault(require("polka"));
+const execa_1 = __importDefault(require("execa"));
+const kleur_1 = require("kleur");
 const misc_1 = require("../../lib/misc");
-const resolve_1 = require("../../lib/resolve");
 const roots_1 = require("../../lib/roots");
-const hooks_1 = require("../../utils/hooks");
-const next_config_1 = require("../next.config");
 const logger = utilities_1.createLogger('server');
-const hooks = hooks_1.getHooks();
-const run = async () => {
-    var _a;
-    const server = polka_1.default();
-    await hooks.beforeServer.promise(server);
-    const { default: next } = resolve_1.requireFromCaller('next');
-    const nextJsConfig = next_config_1.createNextJSConfig();
-    const app = next({
-        dev: !misc_1.isEnvProduction(),
-        quiet: false,
-        dir: roots_1.PROJECT_ROOT,
-        conf: nextJsConfig,
-    });
-    const handle = app.getRequestHandler();
-    await hooks.nextJSPrepare.promise(app.prepare());
-    const { pageChecker, dynamicRoutes } = app.router;
-    server.use(async (req, res, next) => {
-        const start = Date.now();
-        const incomingPath = req.originalUrl;
-        const isPageWeCareAbout = dynamicRoutes.some(({ match }) => match(incomingPath)) ||
-            (await pageChecker(incomingPath));
-        await next();
-        isPageWeCareAbout &&
-            logger.info('response', {
-                processingTime: Date.now() - start,
-                responseHeaders: Object.fromEntries(Object.entries(res.getHeaders())),
-                url: incomingPath,
-                statusCode: res.statusCode,
-            });
-    });
-    if (((_a = nextJsConfig.assetPrefix) !== null && _a !== void 0 ? _a : '/') !== '/') {
-        server.get(`${nextJsConfig.assetPrefix}*`, async (req, res) => {
-            req.url = req.originalUrl.replace(`${nextJsConfig.assetPrefix}`, '/');
-            return handle(req, res);
+const run = async (port) => {
+    const start = Date.now();
+    execa_1.default
+        .command(`next ${misc_1.isEnvProduction() ? 'start' : 'dev'} -p ${port}`, {
+        stdio: 'inherit',
+        cwd: roots_1.PROJECT_ROOT,
+        localDir: roots_1.GDU_ROOT,
+    })
+        .then(() => {
+        console.log(`${kleur_1.dim('Listening')}: ${kleur_1.blue(`http://localhost:${port}/`)}`);
+    }, (error) => {
+        logger.error('response', {
+            processingTime: Date.now() - start,
+            responseHeaders: Object.fromEntries(Object.entries(error.getHeaders())),
+            url: 'incomingPath',
+            statusCode: error.statusCode,
         });
-    }
-    server.all('*', (req, res) => handle(req, res));
-    await hooks.afterServer.promise(server);
+        throw error;
+    });
 };
 exports.run = run;

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 {};