@compiled/webpack-loader 0.11.8 → 0.12.1

package/dist/__fixtures__/custom-resolver.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const App: () => JSX.Element;

package/dist/__fixtures__/custom-resolver.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = void 0;
+/** @jsx jsx */
+// @ts-ignore This is a bug where the meta is not updated for the new file import
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const react_1 = require("@compiled/react");
+// @ts-expect-error
+const test_1 = require("test");
+const App = () => (0, react_1.jsx)("div", { css: (0, react_1.css)({ color: test_1.primary }) });
+exports.App = App;
+//# sourceMappingURL=custom-resolver.js.map

package/dist/__fixtures__/custom-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-resolver.js","sourceRoot":"","sources":["../../src/__fixtures__/custom-resolver.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,iFAAiF;AACjF,6DAA6D;AAC7D,2CAA2C;AAC3C,mBAAmB;AACnB,+BAA+B;AAExB,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,0BAAK,GAAG,EAAE,IAAA,WAAG,EAAC,EAAE,KAAK,EAAE,cAAO,EAAE,CAAC,GAAI,CAAC;AAA/D,QAAA,GAAG,OAA4D"}

package/dist/compiled-loader.js

@@ -10,17 +10,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pitch = void 0;
-const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const core_1 = require("@babel/core");
 const utils_1 = require("@compiled/utils");
-const enhanced_resolve_1 = require("enhanced-resolve");
 const loader_utils_1 = require("loader-utils");
+const create_default_resolver_1 = require("./create-default-resolver");
 const extract_plugin_1 = require("./extract-plugin");
 let hasErrored = false;
 /**
@@ -30,7 +26,7 @@ let hasErrored = false;
  * @returns
  */
 function getLoaderOptions(context) {
-    const { bake = true, extract = false, importReact = undefined, nonce = undefined, resolve = {}, extensions = undefined, parserBabelPlugins = [], transformerBabelPlugins = [], [extract_plugin_1.pluginName]: isPluginEnabled = false, ssr = false, optimizeCss = true, addComponentName = false, classNameCompressionMap = undefined, extractStylesToDirectory = undefined, } = typeof context.getOptions === 'undefined'
+    const { bake = true, extract = false, importReact = undefined, nonce = undefined, resolve = {}, extensions = undefined, parserBabelPlugins = [], transformerBabelPlugins = [], [extract_plugin_1.pluginName]: isPluginEnabled = false, ssr = false, optimizeCss = true, addComponentName = false, classNameCompressionMap = undefined, extractStylesToDirectory = undefined, resolver = undefined, } = typeof context.getOptions === 'undefined'
         ? // Webpack v4 flow
             (0, loader_utils_1.getOptions)(context)
         : // Webpack v5 flow
@@ -79,6 +75,9 @@ function getLoaderOptions(context) {
                     extractStylesToDirectory: {
                         type: 'object',
                     },
+                    resolver: {
+                        type: 'string',
+                    },
                 },
             });
     return {
@@ -96,6 +95,7 @@ function getLoaderOptions(context) {
         addComponentName,
         classNameCompressionMap,
         extractStylesToDirectory,
+        resolver,
     };
 }
 /**
@@ -105,7 +105,7 @@ function getLoaderOptions(context) {
  * @param code
  */
 async function compiledLoader(code) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const callback = this.async();
     // Bail early if Compiled isn't in the module or we're looking at compiled runtime code
     if (code.indexOf('@compiled/react') === -1 ||
@@ -114,7 +114,7 @@ async function compiledLoader(code) {
     }
     try {
         const includedFiles = [];
-        const _h = getLoaderOptions(this), { resolve } = _h, options = __rest(_h, ["resolve"]);
+        const _g = getLoaderOptions(this), { resolve } = _g, options = __rest(_g, ["resolve"]);
         // Transform to an AST using the local babel config.
         const ast = await (0, core_1.parseAsync)(code, {
             filename: this.resourcePath,
@@ -125,14 +125,6 @@ async function compiledLoader(code) {
             },
             plugins: (_b = options.transformerBabelPlugins) !== null && _b !== void 0 ? _b : undefined,
         });
-        // Setup the default resolver, where webpack will merge any passed in options with the default
-        // resolve configuration. Ideally, we use this.getResolve({ ...resolve, useSyncFileSystemCalls: true, })
-        // However, it does not work correctly when in development mode :/
-        const resolver = enhanced_resolve_1.ResolverFactory.createResolver(Object.assign(Object.assign(Object.assign({ 
-            // @ts-expect-error
-            fileSystem: new enhanced_resolve_1.CachedInputFileSystem(fs_1.default, 4000) }, ((_d = (_c = this._compilation) === null || _c === void 0 ? void 0 : _c.options.resolve) !== null && _d !== void 0 ? _d : {})), resolve), { 
-            // This makes the resolver invoke the callback synchronously
-            useSyncFileSystemCalls: true }));
         // Transform using the Compiled Babel Plugin - we deliberately turn off using the local config.
         const result = await (0, core_1.transformFromAstAsync)(ast, code, {
             babelrc: false,
@@ -140,10 +132,10 @@ async function compiledLoader(code) {
             sourceMaps: true,
             filename: this.resourcePath,
             parserOpts: {
-                plugins: (_e = options.parserBabelPlugins) !== null && _e !== void 0 ? _e : undefined,
+                plugins: (_c = options.parserBabelPlugins) !== null && _c !== void 0 ? _c : undefined,
             },
             plugins: [
-                ...((_f = options.transformerBabelPlugins) !== null && _f !== void 0 ? _f : []),
+                ...((_d = options.transformerBabelPlugins) !== null && _d !== void 0 ? _d : []),
                 options.extract && [
                     '@compiled/babel-plugin-strip-runtime',
                     {
@@ -156,19 +148,19 @@ async function compiledLoader(code) {
                     '@compiled/babel-plugin',
                     Object.assign(Object.assign({}, options), { 
                         // Turn off compressing class names if stylesheet extraction is off
-                        classNameCompressionMap: options.extract && options.classNameCompressionMap, onIncludedFiles: (files) => includedFiles.push(...files), resolver: {
-                            // The resolver needs to be synchronous, as babel plugins must be synchronous
-                            resolveSync: (context, request) => {
-                                return resolver.resolveSync({}, (0, path_1.dirname)(context), request);
-                            },
-                        } }),
+                        classNameCompressionMap: options.extract && options.classNameCompressionMap, onIncludedFiles: (files) => includedFiles.push(...files), resolver: options.resolver
+                            ? options.resolver
+                            : (0, create_default_resolver_1.createDefaultResolver)({
+                                resolveOptions: resolve,
+                                webpackResolveOptions: (_e = this._compilation) === null || _e === void 0 ? void 0 : _e.options.resolve,
+                            }) }),
                 ],
             ].filter(utils_1.toBoolean),
         });
         includedFiles.forEach((file) => {
             this.addDependency((0, path_1.normalize)(file));
         });
-        callback(null, (result === null || result === void 0 ? void 0 : result.code) || '', (_g = result === null || result === void 0 ? void 0 : result.map) !== null && _g !== void 0 ? _g : undefined);
+        callback(null, (result === null || result === void 0 ? void 0 : result.code) || '', (_f = result === null || result === void 0 ? void 0 : result.map) !== null && _f !== void 0 ? _f : undefined);
     }
     catch (e) {
         // @ts-expect-error Not checking for error type

package/dist/compiled-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"compiled-loader.js","sourceRoot":"","sources":["../src/compiled-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compiled-loader.js","sourceRoot":"","sources":["../src/compiled-loader.ts"],"names":[],"mappings":"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"}

package/dist/create-default-resolver.d.ts

@@ -0,0 +1,8 @@
+import type { Resolver } from '@compiled/babel-plugin';
+import type { ResolveOptions } from 'webpack';
+type Config = {
+    resolveOptions: ResolveOptions;
+    webpackResolveOptions: ResolveOptions | undefined;
+};
+export declare function createDefaultResolver({ resolveOptions, webpackResolveOptions }: Config): Resolver;
+export {};

package/dist/create-default-resolver.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDefaultResolver = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
+const enhanced_resolve_1 = require("enhanced-resolve");
+function createDefaultResolver({ resolveOptions, webpackResolveOptions }) {
+    // Setup the default resolver, where webpack will merge any passed in options with the default
+    // resolve configuration. Ideally, we use this.getResolve({ ...resolve, useSyncFileSystemCalls: true, })
+    // However, it does not work correctly when in development mode :/
+    const resolver = enhanced_resolve_1.ResolverFactory.createResolver(Object.assign(Object.assign(Object.assign({ 
+        // @ts-expect-error
+        fileSystem: new enhanced_resolve_1.CachedInputFileSystem(fs_1.default, 4000) }, (webpackResolveOptions !== null && webpackResolveOptions !== void 0 ? webpackResolveOptions : {})), resolveOptions), { 
+        // This makes the resolver invoke the callback synchronously
+        useSyncFileSystemCalls: true }));
+    return {
+        // The resolver needs to be synchronous, as babel plugins must be synchronous
+        resolveSync: (context, request) => {
+            return resolver.resolveSync({}, (0, path_1.dirname)(context), request);
+        },
+    };
+}
+exports.createDefaultResolver = createDefaultResolver;
+//# sourceMappingURL=create-default-resolver.js.map

package/dist/create-default-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-default-resolver.js","sourceRoot":"","sources":["../src/create-default-resolver.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,+BAA+B;AAG/B,uDAA0E;AAQ1E,SAAgB,qBAAqB,CAAC,EAAE,cAAc,EAAE,qBAAqB,EAAU;IACrF,8FAA8F;IAC9F,wGAAwG;IACxG,kEAAkE;IAClE,MAAM,QAAQ,GAAG,kCAAe,CAAC,cAAc;QAC7C,mBAAmB;QACnB,UAAU,EAAE,IAAI,wCAAqB,CAAC,YAAE,EAAE,IAAI,CAAC,IAC5C,CAAC,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,EAAE,CAAC,GAC7B,cAAc;QACjB,4DAA4D;QAC5D,sBAAsB,EAAE,IAAI,IAC5B,CAAC;IAEH,OAAO;QACL,6EAA6E;QAC7E,WAAW,EAAE,CAAC,OAAe,EAAE,OAAe,EAAE,EAAE;YAChD,OAAO,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,IAAA,cAAO,EAAC,OAAO,CAAC,EAAE,OAAO,CAAW,CAAC;QACvE,CAAC;KACF,CAAC;AACJ,CAAC;AAnBD,sDAmBC"}

package/dist/types.d.ts

@@ -78,6 +78,10 @@ export interface CompiledLoaderOptions {
         source: string;
         dest: string;
     };
+    /**
+     * Custom resolver for babel plugin, when set overrides default resolver
+     */
+    resolver?: string;
 }
 export interface CompiledExtractPluginOptions {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compiled/webpack-loader",
-  "version": "0.11.8",
+  "version": "0.12.1",
   "description": "A familiar and performant compile time CSS-in-JS library for React.",
   "homepage": "https://compiledcssinjs.com/docs/pkg-webpack-loader",
   "bugs": "https://github.com/atlassian-labs/compiled/issues/new?assignees=&labels=bug&template=bug_report.md",
@@ -23,15 +23,15 @@
     "@babel/core": "^7.21.8",
     "@babel/parser": "^7.21.8",
     "@compiled/babel-plugin": "^0.26.0",
-    "@compiled/babel-plugin-strip-runtime": "^0.25.0",
+    "@compiled/babel-plugin-strip-runtime": "^0.26.2",
     "@compiled/css": "^0.12.1",
-    "@compiled/utils": "^0.9.0",
+    "@compiled/utils": "^0.9.1",
     "enhanced-resolve": "^5.15.0",
     "loader-utils": "^2.0.4",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {
-    "@compiled/react": "^0.16.0",
+    "@compiled/react": "^0.16.5",
     "babel-loader": "^9.1.2",
     "css-loader": "^6.7.3",
     "memfs": "^3.5.3",

package/src/__fixtures__/custom-resolver.tsx

@@ -0,0 +1,8 @@
+/** @jsx jsx */
+// @ts-ignore This is a bug where the meta is not updated for the new file import
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { jsx, css } from '@compiled/react';
+// @ts-expect-error
+import { primary } from 'test';
+
+export const App = (): JSX.Element => <div css={css({ color: primary })} />;

package/src/__tests__/compiled-loader.test.ts

@@ -75,11 +75,19 @@ describe.each<'development' | 'production'>(['development', 'production'])(
       expect(assets['main.js']).toInclude('._syaz1if8{color:indigo}');
     });
 
+    it('transforms styles imported through an overridden resolver', async () => {
+      const assets = await bundle(join(fixturesPath, 'custom-resolver.tsx'), {
+        resolver: '@compiled-private/resolver-webpack',
+      });
+
+      expect(assets['main.js']).toInclude('._syaz8p1k{color:very-very red color');
+    });
+
     it('fails when using unrecognised compiled syntax', async () => {
       await expect(bundle(join(fixturesPath, 'compiled-error.tsx'))).rejects.toEqual([
         expect.objectContaining({
           message: expect.stringContaining(
-            "BooleanLiteral isn't a supported CSS type - try using an object or string"
+            'This BooleanLiteral was unable to have its styles extracted — try to define them statically using Compiled APIs instead'
           ),
         }),
       ]);

package/src/__tests__/test-utils.ts

@@ -16,6 +16,7 @@ export interface BundleOptions {
   disableCacheGroup?: boolean;
   mode: 'development' | 'production';
   resolve?: ResolveOptions;
+  resolver?: string;
 }
 
 export function bundle(
@@ -27,6 +28,7 @@ export function bundle(
     disableCacheGroup = false,
     mode,
     resolve = {},
+    resolver,
   }: BundleOptions
 ): Promise<Record<string, string>> {
   const outputPath = join(__dirname, 'dist');
@@ -56,6 +58,7 @@ export function bundle(
                 importReact: false,
                 optimizeCss: false,
                 resolve,
+                resolver,
               },
             },
           ],

package/src/compiled-loader.ts

@@ -1,12 +1,11 @@
-import fs from 'fs';
-import { dirname, normalize } from 'path';
+import { normalize } from 'path';
 
 import { parseAsync, transformFromAstAsync } from '@babel/core';
 import { createError, toBoolean } from '@compiled/utils';
-import { CachedInputFileSystem, ResolverFactory } from 'enhanced-resolve';
 import { getOptions } from 'loader-utils';
 import type { LoaderContext } from 'webpack';
 
+import { createDefaultResolver } from './create-default-resolver';
 import { pluginName, styleSheetName } from './extract-plugin';
 import type { CompiledLoaderOptions } from './types';
 
@@ -34,6 +33,7 @@ function getLoaderOptions(context: LoaderContext<CompiledLoaderOptions>) {
     addComponentName = false,
     classNameCompressionMap = undefined,
     extractStylesToDirectory = undefined,
+    resolver = undefined,
   }: CompiledLoaderOptions = typeof context.getOptions === 'undefined'
     ? // Webpack v4 flow
       getOptions(context)
@@ -83,6 +83,9 @@ function getLoaderOptions(context: LoaderContext<CompiledLoaderOptions>) {
           extractStylesToDirectory: {
             type: 'object',
           },
+          resolver: {
+            type: 'string',
+          },
         },
       });
 
@@ -101,6 +104,7 @@ function getLoaderOptions(context: LoaderContext<CompiledLoaderOptions>) {
     addComponentName,
     classNameCompressionMap,
     extractStylesToDirectory,
+    resolver,
   };
 }
 
@@ -139,18 +143,6 @@ export default async function compiledLoader(
       plugins: options.transformerBabelPlugins ?? undefined,
     });
 
-    // Setup the default resolver, where webpack will merge any passed in options with the default
-    // resolve configuration. Ideally, we use this.getResolve({ ...resolve, useSyncFileSystemCalls: true, })
-    // However, it does not work correctly when in development mode :/
-    const resolver = ResolverFactory.createResolver({
-      // @ts-expect-error
-      fileSystem: new CachedInputFileSystem(fs, 4000),
-      ...(this._compilation?.options.resolve ?? {}),
-      ...resolve,
-      // This makes the resolver invoke the callback synchronously
-      useSyncFileSystemCalls: true,
-    });
-
     // Transform using the Compiled Babel Plugin - we deliberately turn off using the local config.
     const result = await transformFromAstAsync(ast!, code, {
       babelrc: false,
@@ -177,12 +169,12 @@ export default async function compiledLoader(
             // Turn off compressing class names if stylesheet extraction is off
             classNameCompressionMap: options.extract && options.classNameCompressionMap,
             onIncludedFiles: (files: string[]) => includedFiles.push(...files),
-            resolver: {
-              // The resolver needs to be synchronous, as babel plugins must be synchronous
-              resolveSync: (context: string, request: string) => {
-                return resolver.resolveSync({}, dirname(context), request);
-              },
-            },
+            resolver: options.resolver
+              ? options.resolver
+              : createDefaultResolver({
+                  resolveOptions: resolve,
+                  webpackResolveOptions: this._compilation?.options.resolve,
+                }),
           },
         ],
       ].filter(toBoolean),

package/src/create-default-resolver.ts

@@ -0,0 +1,32 @@
+import fs from 'fs';
+import { dirname } from 'path';
+
+import type { Resolver } from '@compiled/babel-plugin';
+import { CachedInputFileSystem, ResolverFactory } from 'enhanced-resolve';
+import type { ResolveOptions } from 'webpack';
+
+type Config = {
+  resolveOptions: ResolveOptions;
+  webpackResolveOptions: ResolveOptions | undefined;
+};
+
+export function createDefaultResolver({ resolveOptions, webpackResolveOptions }: Config): Resolver {
+  // Setup the default resolver, where webpack will merge any passed in options with the default
+  // resolve configuration. Ideally, we use this.getResolve({ ...resolve, useSyncFileSystemCalls: true, })
+  // However, it does not work correctly when in development mode :/
+  const resolver = ResolverFactory.createResolver({
+    // @ts-expect-error
+    fileSystem: new CachedInputFileSystem(fs, 4000),
+    ...(webpackResolveOptions ?? {}),
+    ...resolveOptions,
+    // This makes the resolver invoke the callback synchronously
+    useSyncFileSystemCalls: true,
+  });
+
+  return {
+    // The resolver needs to be synchronous, as babel plugins must be synchronous
+    resolveSync: (context: string, request: string) => {
+      return resolver.resolveSync({}, dirname(context), request) as string;
+    },
+  };
+}

package/src/types.ts

@@ -91,6 +91,11 @@ export interface CompiledLoaderOptions {
    * When set, extract styles to an external CSS file
    */
   extractStylesToDirectory?: { source: string; dest: string };
+
+  /**
+   * Custom resolver for babel plugin, when set overrides default resolver
+   */
+  resolver?: string;
 }
 
 export interface CompiledExtractPluginOptions {