@compiled/webpack-loader 0.6.17 → 0.7.3

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @compiled/webpack-loader
 
+## 0.7.3
+
+### Patch Changes
+
+- 427cead: Compiled now supports turning on the `css` prop using jsx pragmas (both with `@jsx` and `@jsxImportSource`).
+- 79cfb08: Internal refactor changing how the TypeScript compiler picks up source files.
+- 79cfb08: Compiled's CSS loader now uses referential equality instead of pathname to determine if it needs to re-order itself from the last to first.
+- Updated dependencies [79cfb08]
+- Updated dependencies [14368bb]
+- Updated dependencies [68ebac3]
+- Updated dependencies [427cead]
+- Updated dependencies [79cfb08]
+  - @compiled/babel-plugin@0.11.1
+  - @compiled/babel-plugin-strip-runtime@0.11.1
+  - @compiled/css@0.7.1
+  - @compiled/utils@0.6.12
+
+## 0.7.2
+
+### Patch Changes
+
+- Updated dependencies [e015a3a]
+- Updated dependencies [fa6af90]
+  - @compiled/babel-plugin@0.11.0
+
+## 0.7.1
+
+### Patch Changes
+
+- Updated dependencies [b68411c]
+- Updated dependencies [53a3d71]
+  - @compiled/babel-plugin@0.10.0
+
+## 0.7.0
+
+### Minor Changes
+
+- 0b60ae1: Use webpack resolution and add custom `resolve` override
+
+### Patch Changes
+
+- Updated dependencies [0b60ae1]
+- Updated dependencies [2092839]
+  - @compiled/babel-plugin@0.9.0
+
 ## 0.6.17
 
 ### Patch Changes

package/dist/{__tests__/fixtures/async.js → __fixtures__/async-styles.js}

@@ -18,5 +18,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-Promise.resolve().then(() => __importStar(require('./imports/css-prop')));
-//# sourceMappingURL=async.js.map
+Promise.resolve().then(() => __importStar(require('./common/css-prop')));
+//# sourceMappingURL=async-styles.js.map

package/dist/__fixtures__/async-styles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"async-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/async-styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kDAAO,mBAAmB,IAAE"}

package/dist/__fixtures__/babel.d.ts

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

package/dist/__fixtures__/babel.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = void 0;
+const react_1 = __importDefault(require("react"));
+const babel_cjs_1 = __importDefault(require("./lib/babel-cjs"));
+const babel_esm_1 = __importDefault(require("./lib/babel-esm"));
+const App = () => (react_1.default.createElement(react_1.default.Fragment, null,
+    react_1.default.createElement(babel_cjs_1.default, null),
+    react_1.default.createElement(babel_esm_1.default, null)));
+exports.App = App;
+//# sourceMappingURL=babel.js.map

package/dist/__fixtures__/babel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"babel.js","sourceRoot":"","sources":["../../src/__fixtures__/babel.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,gEAAuC;AACvC,gEAAuC;AAEhC,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,CACpC;IACE,8BAAC,mBAAQ,OAAG;IACZ,8BAAC,mBAAQ,OAAG,CACX,CACJ,CAAC;AALW,QAAA,GAAG,OAKd"}

package/dist/{__tests__/fixtures → __fixtures__}/binding-not-found.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const HeaderSpacing: React.ComponentType<React.ClassAttributes<HTMLDivElement> & React.HTMLAttributes<HTMLDivElement> & import("@compiled/react/dist/esm/styled").StyledProps>;
+export declare const HeaderSpacing: React.ComponentType<React.ClassAttributes<HTMLDivElement> & React.HTMLAttributes<HTMLDivElement> & import("../../../react/src/styled").StyledProps>;
 interface HeaderProps {
     variant?: 'default' | 'invert';
     children: React.ReactNode;

package/dist/{__tests__/fixtures → __fixtures__}/binding-not-found.js

@@ -10,15 +10,12 @@ 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.Header = exports.HeaderSpacing = void 0;
-const react_1 = __importDefault(require("react"));
-const react_2 = require("@compiled/react");
+/** @jsx jsx */
+const react_1 = require("@compiled/react");
 const height = '9rem';
-const StyledHeader = react_2.styled.header `
+const StyledHeader = react_1.styled.header `
   height: ${height};
   display: flex;
   align-items: center;
@@ -34,14 +31,14 @@ const StyledHeader = react_2.styled.header `
     ${(props) => (props.variant === 'default' ? 'rgba(135, 119, 217, 0.2)' : 'transparent')};
   color: ${(props) => props.color};
 `;
-exports.HeaderSpacing = react_2.styled.div `
+exports.HeaderSpacing = react_1.styled.div `
   height: ${height};
 `;
 const Header = (_a) => {
     var { children, variant = 'default' } = _a, props = __rest(_a, ["children", "variant"]);
     const color = variant === 'default' ? 'rgba(37, 56, 88, 0.9)' : 'rgba(255, 255, 255, 0.75)';
-    return (react_1.default.createElement(StyledHeader, Object.assign({ variant: variant, color: color }, props),
-        react_1.default.createElement("a", { href: "/", css: { textDecoration: 'none', color: 'currentColor' } }, "Compiled"),
+    return (react_1.jsx(StyledHeader, Object.assign({ variant: variant, color: color }, props),
+        react_1.jsx("a", { href: "/", css: { textDecoration: 'none', color: 'currentColor' } }, "Compiled"),
         children));
 };
 exports.Header = Header;

package/dist/__fixtures__/binding-not-found.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"binding-not-found.js","sourceRoot":"","sources":["../../src/__fixtures__/binding-not-found.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,eAAe;AACf,2CAA8C;AAG9C,MAAM,MAAM,GAAG,MAAM,CAAC;AAEtB,MAAM,YAAY,GAAG,cAAM,CAAC,MAAM,CAGhC;YACU,MAAM;;;;;;;;;;;;MAYZ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,aAAa,CAAC;WAChF,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK;CAChC,CAAC;AAEW,QAAA,aAAa,GAAG,cAAM,CAAC,GAAG,CAAA;YAC3B,MAAM;CACjB,CAAC;AAOK,MAAM,MAAM,GAAG,CAAC,EAAwD,EAAe,EAAE;QAAzE,EAAE,QAAQ,EAAE,OAAO,GAAG,SAAS,OAAyB,EAApB,KAAK,cAAzC,uBAA2C,CAAF;IAC9D,MAAM,KAAK,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,2BAA2B,CAAC;IAE5F,OAAO,CACL,YAAC,YAAY,kBAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,IAAM,KAAK;QACrD,mBAAG,IAAI,EAAC,GAAG,EAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,eAE9D;QACH,QAAQ,CACI,CAChB,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,MAAM,UAWjB"}

package/dist/__fixtures__/common/colors.d.ts

@@ -0,0 +1,7 @@
+export declare const blue = "blue";
+export declare const blueviolet = "blueviolet";
+export declare const coral = "coral";
+export declare const purple = "purple";
+export declare const orange = "orange";
+export declare const red = "red";
+export declare const yellow = "yellow";

package/dist/{__tests__/fixtures/imports → __fixtures__/common}/colors.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yellow = exports.orange = exports.red = exports.blue = exports.blueviolet = exports.purple = void 0;
-exports.purple = 'purple';
-exports.blueviolet = 'blueviolet';
+exports.yellow = exports.red = exports.orange = exports.purple = exports.coral = exports.blueviolet = exports.blue = void 0;
 exports.blue = 'blue';
-exports.red = 'red';
+exports.blueviolet = 'blueviolet';
+exports.coral = 'coral';
+exports.purple = 'purple';
 exports.orange = 'orange';
+exports.red = 'red';
 exports.yellow = 'yellow';
 //# sourceMappingURL=colors.js.map

package/dist/__fixtures__/common/colors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"colors.js","sourceRoot":"","sources":["../../../src/__fixtures__/common/colors.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG,MAAM,CAAC;AACd,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,KAAK,GAAG,OAAO,CAAC;AAChB,QAAA,MAAM,GAAG,QAAQ,CAAC;AAClB,QAAA,MAAM,GAAG,QAAQ,CAAC;AAClB,QAAA,GAAG,GAAG,KAAK,CAAC;AACZ,QAAA,MAAM,GAAG,QAAQ,CAAC"}

package/dist/__fixtures__/common/css-prop.d.ts

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

package/dist/__fixtures__/common/css-prop.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Coral = void 0;
+/** @jsx jsx */
+const react_1 = require("@compiled/react");
+const colors_1 = require("./colors");
+const Coral = () => (react_1.jsx("div", { css: { color: colors_1.coral, border: `2px solid ${colors_1.coral}` } }));
+exports.Coral = Coral;
+//# sourceMappingURL=css-prop.js.map

package/dist/__fixtures__/common/css-prop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"css-prop.js","sourceRoot":"","sources":["../../../src/__fixtures__/common/css-prop.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,2CAAsC;AAEtC,qCAAiC;AAE1B,MAAM,KAAK,GAAG,GAAgB,EAAE,CAAC,CACtC,qBAAK,GAAG,EAAE,EAAE,KAAK,EAAE,cAAK,EAAE,MAAM,EAAE,aAAa,cAAK,EAAE,EAAE,GAAI,CAC7D,CAAC;AAFW,QAAA,KAAK,SAEhB"}

package/dist/__fixtures__/compiled-error.d.ts

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

package/dist/__fixtures__/compiled-error.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = void 0;
+/** @jsx jsx */
+const react_1 = require("@compiled/react");
+// @ts-expect-error
+const styles = react_1.css(false);
+const App = () => react_1.jsx("div", { css: styles });
+exports.App = App;
+//# sourceMappingURL=compiled-error.js.map

package/dist/__fixtures__/compiled-error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compiled-error.js","sourceRoot":"","sources":["../../src/__fixtures__/compiled-error.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,2CAA2C;AAE3C,mBAAmB;AACnB,MAAM,MAAM,GAAG,WAAG,CAAC,KAAK,CAAC,CAAC;AAEnB,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,qBAAK,GAAG,EAAE,MAAM,GAAI,CAAC;AAA9C,QAAA,GAAG,OAA2C"}

package/dist/__fixtures__/important-styles.d.ts

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

package/dist/__fixtures__/important-styles.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/** @jsx jsx */
+const react_1 = require("@compiled/react");
+const Component = () => react_1.jsx("div", { css: { fontSize: '12!important', color: 'blue' } });
+exports.default = Component;
+//# sourceMappingURL=important-styles.js.map

package/dist/__fixtures__/important-styles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"important-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/important-styles.tsx"],"names":[],"mappings":";;AAAA,eAAe;AACf,2CAAsC;AAEtC,MAAM,SAAS,GAAG,GAAgB,EAAE,CAAC,qBAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAI,CAAC;AAE/F,kBAAe,SAAS,CAAC"}

package/dist/__fixtures__/lib/loader-alias.d.ts

@@ -0,0 +1 @@
+export declare const styles: import("@compiled/react").CSSProps;

package/dist/__fixtures__/lib/loader-alias.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.styles = void 0;
+const react_1 = require("@compiled/react");
+exports.styles = react_1.css({
+    color: 'indigo',
+});
+//# sourceMappingURL=loader-alias.js.map

package/dist/__fixtures__/lib/loader-alias.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader-alias.js","sourceRoot":"","sources":["../../../src/__fixtures__/lib/loader-alias.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEzB,QAAA,MAAM,GAAG,WAAG,CAAC;IACxB,KAAK,EAAE,QAAQ;CAChB,CAAC,CAAC"}

package/dist/__fixtures__/lib/webpack-alias.d.ts

@@ -0,0 +1 @@
+export declare const styles: import("@compiled/react").CSSProps;

package/dist/__fixtures__/lib/webpack-alias.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.styles = void 0;
+const react_1 = require("@compiled/react");
+exports.styles = react_1.css({
+    color: 'blue',
+});
+//# sourceMappingURL=webpack-alias.js.map

package/dist/__fixtures__/lib/webpack-alias.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webpack-alias.js","sourceRoot":"","sources":["../../../src/__fixtures__/lib/webpack-alias.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AAEzB,QAAA,MAAM,GAAG,WAAG,CAAC;IACxB,KAAK,EAAE,MAAM;CACd,CAAC,CAAC"}

package/dist/__fixtures__/loader-alias.d.ts

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

package/dist/__fixtures__/loader-alias.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 loader_alias_1 = require("loader-alias");
+const App = () => react_1.jsx("div", { css: loader_alias_1.styles });
+exports.App = App;
+//# sourceMappingURL=loader-alias.js.map

package/dist/__fixtures__/loader-alias.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader-alias.js","sourceRoot":"","sources":["../../src/__fixtures__/loader-alias.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,iFAAiF;AACjF,6DAA6D;AAC7D,2CAA2C;AAC3C,mBAAmB;AACnB,+CAAsC;AAE/B,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,qBAAK,GAAG,EAAE,qBAAM,GAAI,CAAC;AAA9C,QAAA,GAAG,OAA2C"}

package/dist/__fixtures__/local-styles.d.ts

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

package/dist/__fixtures__/local-styles.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = void 0;
+/** @jsx jsx */
+const react_1 = require("@compiled/react");
+const react_2 = require("react");
+const Styled = react_1.styled.div({
+    color: 'blue',
+});
+const App = () => (react_1.jsx(react_2.Fragment, null,
+    react_1.jsx("div", { css: { fontSize: 14 } }),
+    react_1.jsx(Styled, null)));
+exports.App = App;
+//# sourceMappingURL=local-styles.js.map

package/dist/__fixtures__/local-styles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/local-styles.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,2CAA8C;AAC9C,iCAAiC;AAEjC,MAAM,MAAM,GAAG,cAAM,CAAC,GAAG,CAAC;IACxB,KAAK,EAAE,MAAM;CACd,CAAC,CAAC;AAEI,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,CACpC,YAAC,gBAAQ;IACP,qBAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAI;IAC9B,YAAC,MAAM,OAAG,CACD,CACZ,CAAC;AALW,QAAA,GAAG,OAKd"}

package/dist/__fixtures__/no-compiled-styles.js

@@ -0,0 +1,3 @@
+"use strict";
+console.log('Hello world!');
+//# sourceMappingURL=no-compiled-styles.js.map

package/dist/__fixtures__/no-compiled-styles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"no-compiled-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/no-compiled-styles.ts"],"names":[],"mappings":";AAAA,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC"}

package/dist/__fixtures__/relative-styles.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+export declare const Styled: import("react").ComponentType<import("react").ClassAttributes<HTMLSpanElement> & import("react").HTMLAttributes<HTMLSpanElement> & import("../../../react/src/styled").StyledProps>;
+export declare const App: () => JSX.Element;

package/dist/__fixtures__/relative-styles.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = exports.Styled = void 0;
+/** @jsx jsx */
+const react_1 = require("@compiled/react");
+const react_2 = require("react");
+const colors_1 = require("./common/colors");
+exports.Styled = react_1.styled.span `
+  color: ${colors_1.blueviolet};
+
+  :focus {
+    color: ${colors_1.purple};
+  }
+
+  :hover {
+    color: ${colors_1.blue};
+  }
+`;
+const styles = react_1.css `
+  color: ${colors_1.red};
+
+  :focus {
+    color: ${colors_1.orange};
+  }
+
+  :hover {
+    color: ${colors_1.yellow};
+  }
+`;
+const App = () => (react_1.jsx(react_2.Fragment, null,
+    react_1.jsx("div", { css: styles }),
+    react_1.jsx(exports.Styled, null)));
+exports.App = App;
+//# sourceMappingURL=relative-styles.js.map

package/dist/__fixtures__/relative-styles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"relative-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/relative-styles.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,2CAAmD;AACnD,iCAAiC;AAEjC,4CAAgF;AAKnE,QAAA,MAAM,GAAG,cAAM,CAAC,IAAI,CAAA;WACtB,mBAAU;;;aAGR,eAAM;;;;aAIN,aAAI;;CAEhB,CAAC;AAEF,MAAM,MAAM,GAAG,WAAG,CAAA;WACP,YAAG;;;aAGD,eAAM;;;;aAIN,eAAM;;CAElB,CAAC;AAEK,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,CACpC,YAAC,gBAAQ;IACP,qBAAK,GAAG,EAAE,MAAM,GAAI;IACpB,YAAC,cAAM,OAAG,CACD,CACZ,CAAC;AALW,QAAA,GAAG,OAKd"}

package/dist/__fixtures__/webpack-alias.d.ts

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

package/dist/__fixtures__/webpack-alias.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.App = void 0;
+/** @jsx jsx */
+// @ts-expect-error 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 webpack_alias_1 = require("webpack-alias");
+const App = () => react_1.jsx("div", { css: webpack_alias_1.styles });
+exports.App = App;
+//# sourceMappingURL=webpack-alias.js.map

package/dist/__fixtures__/webpack-alias.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webpack-alias.js","sourceRoot":"","sources":["../../src/__fixtures__/webpack-alias.tsx"],"names":[],"mappings":";;;AAAA,eAAe;AACf,uFAAuF;AACvF,6DAA6D;AAC7D,2CAA2C;AAC3C,mBAAmB;AACnB,iDAAuC;AAEhC,MAAM,GAAG,GAAG,GAAgB,EAAE,CAAC,qBAAK,GAAG,EAAE,sBAAM,GAAI,CAAC;AAA9C,QAAA,GAAG,OAA2C"}

package/dist/compiled-loader.d.ts

@@ -1,9 +1,10 @@
-import type { CompiledLoaderOptions, LoaderThis } from './types';
+import type { LoaderContext } from 'webpack';
+import type { CompiledLoaderOptions } from './types';
 /**
  * Compiled webpack loader.
  *
  * @param this
  * @param code
  */
-export default function compiledLoader(this: LoaderThis<CompiledLoaderOptions>, code: string): Promise<void>;
-export declare function pitch(this: LoaderThis<CompiledLoaderOptions>): void;
+export default function compiledLoader(this: LoaderContext<CompiledLoaderOptions>, code: string): Promise<void>;
+export declare function pitch(this: LoaderContext<CompiledLoaderOptions>): void;

package/dist/compiled-loader.js

@@ -1,45 +1,67 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    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 path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
 const core_1 = require("@babel/core");
-const loader_utils_1 = require("loader-utils");
 const utils_1 = require("@compiled/utils");
+const enhanced_resolve_1 = require("enhanced-resolve");
+const loader_utils_1 = require("loader-utils");
 const extract_plugin_1 = require("./extract-plugin");
-const webpack_1 = require("./utils/webpack");
+const utils_2 = require("./utils");
 let hasErrored = false;
 /**
  * Returns user configuration.
  *
- * @param loader
+ * @param context
  * @returns
  */
 function getLoaderOptions(context) {
-    const { bake = true, extract = false, importReact = undefined, nonce = undefined, } = typeof context.getOptions === 'undefined'
+    const { bake = true, extract = false, importReact = undefined, nonce = undefined, resolve = {}, } = typeof context.getOptions === 'undefined'
         ? // Webpack v4 flow
             loader_utils_1.getOptions(context)
         : // Webpack v5 flow
             context.getOptions({
                 type: 'object',
                 properties: {
-                    importReact: {
+                    bake: {
                         type: 'boolean',
                     },
-                    nonce: {
-                        type: 'string',
-                    },
                     extract: {
                         type: 'boolean',
                     },
-                    bake: {
+                    importReact: {
                         type: 'boolean',
                     },
+                    nonce: {
+                        type: 'string',
+                    },
+                    resolve: {
+                        type: 'object',
+                    },
                 },
             });
-    return { bake, extract, importReact, nonce };
+    return {
+        bake,
+        extract,
+        importReact,
+        nonce,
+        resolve,
+    };
 }
 /**
  * Compiled webpack loader.
@@ -48,7 +70,7 @@ function getLoaderOptions(context) {
  * @param code
  */
 async function compiledLoader(code) {
-    var _a;
+    var _a, _b, _c;
     const callback = this.async();
     // Bail early if Compiled isn't in the module.
     if (code.indexOf('@compiled/react') === -1) {
@@ -57,13 +79,21 @@ async function compiledLoader(code) {
     try {
         const includedFiles = [];
         const foundCSSRules = [];
-        const options = getLoaderOptions(this);
+        const _d = getLoaderOptions(this), { resolve } = _d, options = __rest(_d, ["resolve"]);
         // Transform to an AST using the local babel config.
         const ast = await core_1.parseAsync(code, {
             filename: this.resourcePath,
             caller: { name: 'compiled' },
             rootMode: 'upward-optional',
         });
+        // 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) }, ((_b = (_a = this._compilation) === null || _a === void 0 ? void 0 : _a.options.resolve) !== null && _b !== void 0 ? _b : {})), 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 core_1.transformFromAstAsync(ast, code, {
             babelrc: false,
@@ -77,12 +107,17 @@ async function compiledLoader(code) {
                 ],
                 options.bake && [
                     '@compiled/babel-plugin',
-                    Object.assign(Object.assign({}, options), { onIncludedFiles: (files) => includedFiles.push(...files) }),
+                    Object.assign(Object.assign({}, options), { onIncludedFiles: (files) => includedFiles.push(...files), resolver: {
+                            // The resolver needs to be synchronous, as babel plugins must be synchronous
+                            resolveSync: (context, request) => {
+                                return resolver.resolveSync({}, path_1.dirname(context), request);
+                            },
+                        } }),
                 ],
             ].filter(utils_1.toBoolean),
         });
         includedFiles.forEach((file) => {
-            this.addDependency(path_1.default.normalize(file));
+            this.addDependency(path_1.normalize(file));
         });
         let output = (result === null || result === void 0 ? void 0 : result.code) || '';
         if (options.extract && foundCSSRules.length) {
@@ -91,7 +126,7 @@ async function compiledLoader(code) {
                 // The benefit is two fold:
                 // (1) thread safe collection of styles
                 // (2) caching -- resulting in faster builds (one import per rule!)
-                const params = webpack_1.toURIComponent(rule);
+                const params = utils_2.toURIComponent(rule);
                 // We use require instead of import so it works with both ESM and CJS source.
                 // If we used ESM it would blow up with CJS source, unfortunately.
                 output = `
@@ -99,7 +134,7 @@ async function compiledLoader(code) {
   ${output}`;
             });
         }
-        callback(null, output, (_a = result === null || result === void 0 ? void 0 : result.map) !== null && _a !== void 0 ? _a : undefined);
+        callback(null, output, (_c = result === null || result === void 0 ? void 0 : result.map) !== null && _c !== void 0 ? _c : undefined);
     }
     catch (e) {
         const error = utils_1.createError('compiled-loader', 'Unhandled exception')(e.stack);
@@ -109,6 +144,7 @@ async function compiledLoader(code) {
 exports.default = compiledLoader;
 function pitch() {
     const options = getLoaderOptions(this);
+    // @ts-expect-error No definitions for this[pluginName]
     if (!hasErrored && options.extract && !this[extract_plugin_1.pluginName]) {
         this.emitError(utils_1.createError('webpack-loader')(`You forgot to add the 'CompiledExtractPlugin' plugin (i.e \`{ plugins: [new CompiledExtractPlugin()] }\`), please read https://compiledcssinjs.com/docs/css-extraction-webpack`));
         // We only want to error once, if we didn't do this you'd get an error for every file found.

package/dist/compiled-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"compiled-loader.js","sourceRoot":"","sources":["../src/compiled-loader.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"compiled-loader.js","sourceRoot":"","sources":["../src/compiled-loader.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,+BAA0C;AAE1C,sCAAgE;AAChE,2CAAyD;AACzD,uDAA0E;AAC1E,+CAA0C;AAG1C,qDAA8C;AAE9C,mCAAyC;AAEzC,IAAI,UAAU,GAAG,KAAK,CAAC;AAEvB;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,OAA6C;IACrE,MAAM,EACJ,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,KAAK,EACf,WAAW,GAAG,SAAS,EACvB,KAAK,GAAG,SAAS,EACjB,OAAO,GAAG,EAAE,GACb,GAA0B,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW;QAClE,CAAC,CAAC,kBAAkB;YAClB,yBAAU,CAAC,OAAO,CAAC;QACrB,CAAC,CAAC,kBAAkB;YAClB,OAAO,CAAC,UAAU,CAAC;gBACjB,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,IAAI,EAAE,SAAS;qBAChB;oBACD,OAAO,EAAE;wBACP,IAAI,EAAE,SAAS;qBAChB;oBACD,WAAW,EAAE;wBACX,IAAI,EAAE,SAAS;qBAChB;oBACD,KAAK,EAAE;wBACL,IAAI,EAAE,QAAQ;qBACf;oBACD,OAAO,EAAE;wBACP,IAAI,EAAE,QAAQ;qBACf;iBACF;aACF,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,OAAO;QACP,WAAW;QACX,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACY,KAAK,UAAU,cAAc,CAE1C,IAAY;;IAEZ,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAE9B,8CAA8C;IAC9C,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KAC7B;IAED,IAAI;QACF,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,KAA0B,gBAAgB,CAAC,IAAI,CAAC,EAAhD,EAAE,OAAO,OAAuC,EAAlC,OAAO,cAArB,WAAuB,CAAyB,CAAC;QAEvD,oDAAoD;QACpD,MAAM,GAAG,GAAG,MAAM,iBAAU,CAAC,IAAI,EAAE;YACjC,QAAQ,EAAE,IAAI,CAAC,YAAY;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;YAC5B,QAAQ,EAAE,iBAAiB;SAC5B,CAAC,CAAC;QAEH,8FAA8F;QAC9F,wGAAwG;QACxG,kEAAkE;QAClE,MAAM,QAAQ,GAAG,kCAAe,CAAC,cAAc;YAC7C,mBAAmB;YACnB,UAAU,EAAE,IAAI,wCAAqB,CAAC,YAAE,EAAE,IAAI,CAAC,IAC5C,CAAC,MAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,GAC1C,OAAO;YACV,4DAA4D;YAC5D,sBAAsB,EAAE,IAAI,IAC5B,CAAC;QAEH,+FAA+F;QAC/F,MAAM,MAAM,GAAG,MAAM,4BAAqB,CAAC,GAAI,EAAE,IAAI,EAAE;YACrD,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,IAAI,CAAC,YAAY;YAC3B,OAAO,EAAE;gBACP,OAAO,CAAC,OAAO,IAAI;oBACjB,sCAAsC;oBACtC,EAAE,iBAAiB,EAAE,CAAC,KAAe,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,EAAE;iBACzE;gBACD,OAAO,CAAC,IAAI,IAAI;oBACd,wBAAwB;oDAEnB,OAAO,KACV,eAAe,EAAE,CAAC,KAAe,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,EAClE,QAAQ,EAAE;4BACR,6EAA6E;4BAC7E,WAAW,EAAE,CAAC,OAAe,EAAE,OAAe,EAAE,EAAE;gCAChD,OAAO,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,cAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;4BAC7D,CAAC;yBACF;iBAEJ;aACF,CAAC,MAAM,CAAC,iBAAS,CAAC;SACpB,CAAC,CAAC;QAEH,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC7B,IAAI,CAAC,aAAa,CAAC,gBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAW,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,EAAE,CAAC;QAExC,IAAI,OAAO,CAAC,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE;YAC3C,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC7B,mGAAmG;gBACnG,2BAA2B;gBAC3B,uCAAuC;gBACvC,mEAAmE;gBACnE,MAAM,MAAM,GAAG,sBAAc,CAAC,IAAI,CAAC,CAAC;gBAEpC,6EAA6E;gBAC7E,kEAAkE;gBAClE,MAAM,GAAG;uGACsF,MAAM;IACzG,MAAM,EAAE,CAAC;YACP,CAAC,CAAC,CAAC;SACJ;QAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,mCAAI,SAAS,CAAC,CAAC;KAClD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,KAAK,GAAG,mBAAW,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7E,QAAQ,CAAC,KAAK,CAAC,CAAC;KACjB;AACH,CAAC;AAzFD,iCAyFC;AAED,SAAgB,KAAK;IACnB,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAEvC,uDAAuD;IACvD,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,2BAAU,CAAC,EAAE;QACvD,IAAI,CAAC,SAAS,CACZ,mBAAW,CAAC,gBAAgB,CAAC,CAC3B,gLAAgL,CACjL,CACF,CAAC;QAEF,4FAA4F;QAC5F,UAAU,GAAG,IAAI,CAAC;KACnB;AACH,CAAC;AAdD,sBAcC"}

package/dist/css-loader.d.ts

@@ -1,9 +1,9 @@
-import type { LoaderThis } from './types';
+import type { LoaderContext } from 'webpack';
 /**
  * CSSLoader will take the style query params added by `./compiled-loader.tsx` and turn it into CSS.
  */
-export default function CSSLoader(this: LoaderThis): string;
+export default function CSSLoader(this: LoaderContext<void>): string;
 /**
  * Moves CSSloader to the end of the loader queue so it runs first.
  */
-export declare function pitch(this: LoaderThis): void;
+export declare function pitch(this: LoaderContext<void>): void;

package/dist/css-loader.js

@@ -15,9 +15,12 @@ exports.default = CSSLoader;
  * Moves CSSloader to the end of the loader queue so it runs first.
  */
 function pitch() {
-    if (this.loaders[0].path !== __filename) {
+    if (this.loaders[0].pitch !== pitch) {
+        // If the first loader isn't this one - skip.
         return;
     }
+    // The first loader is Compiled's css-loader - we need to shift
+    // it to be at the end of the loader chain so it runs first (instead of last).
     const firstLoader = this.loaders.shift();
     this.loaders.push(firstLoader);
 }

package/dist/css-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"css-loader.js","sourceRoot":"","sources":["../src/css-loader.tsx"],"names":[],"mappings":";;;AAAA,6BAAsC;AAGtC;;GAEG;AACH,SAAwB,SAAS;IAC/B,MAAM,KAAK,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,SAAS,IAAI,EAAE,CAAC;AACzB,CAAC;AAJD,4BAIC;AAED;;GAEG;AACH,SAAgB,KAAK;IACnB,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE;QACvC,OAAO;KACR;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACjC,CAAC;AAPD,sBAOC"}
+{"version":3,"file":"css-loader.js","sourceRoot":"","sources":["../src/css-loader.tsx"],"names":[],"mappings":";;;AAAA,6BAAsC;AAItC;;GAEG;AACH,SAAwB,SAAS;IAC/B,MAAM,KAAK,GAAG,IAAI,qBAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,SAAS,IAAI,EAAE,CAAC;AACzB,CAAC;AAJD,4BAIC;AAED;;GAEG;AACH,SAAgB,KAAK;IACnB,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,EAAE;QACnC,6CAA6C;QAC7C,OAAO;KACR;IAED,+DAA+D;IAC/D,8EAA8E;IAC9E,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAY,CAAC,CAAC;AAClC,CAAC;AAVD,sBAUC"}