@compiled/webpack-loader 0.8.2 → 0.8.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/css-loader/README.md +1 -1
- package/dist/__fixtures__/async-styles.js +5 -1
- package/dist/__fixtures__/async-styles.js.map +1 -1
- package/dist/compiled-loader.js +4 -19
- package/dist/compiled-loader.js.map +1 -1
- package/dist/css-loader.d.ts +1 -1
- package/dist/css-loader.js +1 -1
- package/dist/css-loader.js.map +1 -1
- package/dist/extract-plugin.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/utils.d.ts +0 -8
- package/dist/utils.js +1 -13
- package/dist/utils.js.map +1 -1
- package/package.json +11 -11
- package/src/__tests__/{compiled-loader.test.tsx → compiled-loader.test.ts} +0 -0
- package/src/__tests__/{extract-plugin.test.tsx → extract-plugin.test.ts} +2 -1
- package/src/__tests__/{test-utils.tsx → test-utils.ts} +0 -0
- package/src/{compiled-loader.tsx → compiled-loader.ts} +4 -22
- package/src/{css-loader.tsx → css-loader.ts} +1 -1
- package/src/{extract-plugin.tsx → extract-plugin.ts} +0 -0
- package/src/{index.tsx → index.ts} +0 -0
- package/src/{types.tsx → types.ts} +0 -0
- package/src/{utils.tsx → utils.ts} +0 -13
package/css-loader/README.md
CHANGED
|
@@ -8,4 +8,4 @@ used for two reasons:
|
|
|
8
8
|
1. thread safe collection of styles
|
|
9
9
|
1. caching -- resulting in faster bundles
|
|
10
10
|
|
|
11
|
-
You can find it being used here `packages/webpack-loader/src/compiled-loader.
|
|
11
|
+
You can find it being used here `packages/webpack-loader/src/compiled-loader.ts`.
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/async-styles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"async-styles.js","sourceRoot":"","sources":["../../src/__fixtures__/async-styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAO,mBAAmB,IAAE"}
|
package/dist/compiled-loader.js
CHANGED
|
@@ -22,7 +22,6 @@ const utils_1 = require("@compiled/utils");
|
|
|
22
22
|
const enhanced_resolve_1 = require("enhanced-resolve");
|
|
23
23
|
const loader_utils_1 = require("loader-utils");
|
|
24
24
|
const extract_plugin_1 = require("./extract-plugin");
|
|
25
|
-
const utils_2 = require("./utils");
|
|
26
25
|
let hasErrored = false;
|
|
27
26
|
/**
|
|
28
27
|
* Returns user configuration.
|
|
@@ -90,7 +89,6 @@ async function compiledLoader(code) {
|
|
|
90
89
|
}
|
|
91
90
|
try {
|
|
92
91
|
const includedFiles = [];
|
|
93
|
-
const foundCSSRules = [];
|
|
94
92
|
const _d = getLoaderOptions(this), { resolve } = _d, options = __rest(_d, ["resolve"]);
|
|
95
93
|
// Transform to an AST using the local babel config.
|
|
96
94
|
const ast = await (0, core_1.parseAsync)(code, {
|
|
@@ -115,7 +113,9 @@ async function compiledLoader(code) {
|
|
|
115
113
|
plugins: [
|
|
116
114
|
options.extract && [
|
|
117
115
|
'@compiled/babel-plugin-strip-runtime',
|
|
118
|
-
{
|
|
116
|
+
{
|
|
117
|
+
styleSheetPath: `@compiled/webpack-loader/css-loader!@compiled/webpack-loader/css-loader/${extract_plugin_1.styleSheetName}.css`,
|
|
118
|
+
},
|
|
119
119
|
],
|
|
120
120
|
options.bake && [
|
|
121
121
|
'@compiled/babel-plugin',
|
|
@@ -131,22 +131,7 @@ async function compiledLoader(code) {
|
|
|
131
131
|
includedFiles.forEach((file) => {
|
|
132
132
|
this.addDependency((0, path_1.normalize)(file));
|
|
133
133
|
});
|
|
134
|
-
|
|
135
|
-
if (options.extract && foundCSSRules.length) {
|
|
136
|
-
foundCSSRules.forEach((rule) => {
|
|
137
|
-
// Each found atomic rule will create a new import that uses `@compiled/webpack-loader/css-loader`.
|
|
138
|
-
// The benefit is two fold:
|
|
139
|
-
// (1) thread safe collection of styles
|
|
140
|
-
// (2) caching -- resulting in faster builds (one import per rule!)
|
|
141
|
-
const params = (0, utils_2.toURIComponent)(rule);
|
|
142
|
-
// We use require instead of import so it works with both ESM and CJS source.
|
|
143
|
-
// If we used ESM it would blow up with CJS source, unfortunately.
|
|
144
|
-
output = `
|
|
145
|
-
require("@compiled/webpack-loader/css-loader!@compiled/webpack-loader/css-loader/${extract_plugin_1.styleSheetName}.css?style=${params}");
|
|
146
|
-
${output}`;
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
callback(null, output, (_c = result === null || result === void 0 ? void 0 : result.map) !== null && _c !== void 0 ? _c : undefined);
|
|
134
|
+
callback(null, (result === null || result === void 0 ? void 0 : result.code) || '', (_c = result === null || result === void 0 ? void 0 : result.map) !== null && _c !== void 0 ? _c : undefined);
|
|
150
135
|
}
|
|
151
136
|
catch (e) {
|
|
152
137
|
// @ts-expect-error Not checking for error type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiled-loader.js","sourceRoot":"","sources":["../src/compiled-loader.
|
|
1
|
+
{"version":3,"file":"compiled-loader.js","sourceRoot":"","sources":["../src/compiled-loader.ts"],"names":[],"mappings":"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"}
|
package/dist/css-loader.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { LoaderContext } from 'webpack';
|
|
2
2
|
/**
|
|
3
|
-
* CSSLoader will take the style query params added by `./compiled-loader.
|
|
3
|
+
* CSSLoader will take the style query params added by `./compiled-loader.ts` and turn it into CSS.
|
|
4
4
|
*/
|
|
5
5
|
export default function CSSLoader(this: LoaderContext<void>): string;
|
|
6
6
|
/**
|
package/dist/css-loader.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.pitch = void 0;
|
|
4
4
|
const url_1 = require("url");
|
|
5
5
|
/**
|
|
6
|
-
* CSSLoader will take the style query params added by `./compiled-loader.
|
|
6
|
+
* CSSLoader will take the style query params added by `./compiled-loader.ts` and turn it into CSS.
|
|
7
7
|
*/
|
|
8
8
|
function CSSLoader() {
|
|
9
9
|
const query = new url_1.URLSearchParams(this.resourceQuery);
|
package/dist/css-loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"css-loader.js","sourceRoot":"","sources":["../src/css-loader.
|
|
1
|
+
{"version":3,"file":"css-loader.js","sourceRoot":"","sources":["../src/css-loader.ts"],"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-plugin.js","sourceRoot":"","sources":["../src/extract-plugin.
|
|
1
|
+
{"version":3,"file":"extract-plugin.js","sourceRoot":"","sources":["../src/extract-plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAmD;AAA1C,2HAAA,OAAO,OAAA;AAAE,wGAAA,KAAK,OAAA;AACvB,mDAAyD;AAAhD,uHAAA,qBAAqB,OAAA"}
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
|
package/dist/utils.d.ts
CHANGED
|
@@ -29,11 +29,3 @@ export declare const getOptimizeAssetsHook: (compiler: Compiler, compilation: Co
|
|
|
29
29
|
* @returns
|
|
30
30
|
*/
|
|
31
31
|
export declare const getSources: (compiler: Compiler) => typeof sources;
|
|
32
|
-
/**
|
|
33
|
-
* Escapes a CSS rule to be a valid query param.
|
|
34
|
-
* Also escapes escalamation marks (!) to not confuse webpack.
|
|
35
|
-
*
|
|
36
|
-
* @param rule
|
|
37
|
-
* @returns
|
|
38
|
-
*/
|
|
39
|
-
export declare const toURIComponent: (rule: string) => string;
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getSources = exports.getOptimizeAssetsHook = exports.getAssetSourceContents = exports.setPluginConfiguredOption = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* Sets an option on the plugin config to tell loaders that the plugin has been configured.
|
|
6
6
|
* Bundling will throw if this option is missing (i.e. consumers did not setup correctly).
|
|
@@ -103,16 +103,4 @@ const getSources = (compiler) => {
|
|
|
103
103
|
require('webpack-sources'));
|
|
104
104
|
};
|
|
105
105
|
exports.getSources = getSources;
|
|
106
|
-
/**
|
|
107
|
-
* Escapes a CSS rule to be a valid query param.
|
|
108
|
-
* Also escapes escalamation marks (!) to not confuse webpack.
|
|
109
|
-
*
|
|
110
|
-
* @param rule
|
|
111
|
-
* @returns
|
|
112
|
-
*/
|
|
113
|
-
const toURIComponent = (rule) => {
|
|
114
|
-
const component = encodeURIComponent(rule).replace(/!/g, '%21');
|
|
115
|
-
return component;
|
|
116
|
-
};
|
|
117
|
-
exports.toURIComponent = toURIComponent;
|
|
118
106
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@compiled/webpack-loader",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.5",
|
|
4
4
|
"description": "A familiar and performant compile time CSS-in-JS library for React.",
|
|
5
5
|
"homepage": "https://compiledcssinjs.com/docs/pkg-webpack-loader",
|
|
6
6
|
"bugs": "https://github.com/atlassian-labs/compiled/issues/new?assignees=&labels=bug&template=bug_report.md",
|
|
@@ -21,24 +21,24 @@
|
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@babel/core": "^7.17.5",
|
|
24
|
-
"@compiled/babel-plugin": "^0.
|
|
25
|
-
"@compiled/babel-plugin-strip-runtime": "^0.
|
|
26
|
-
"@compiled/css": "^0.8.
|
|
27
|
-
"@compiled/react": "0.10.
|
|
28
|
-
"@compiled/utils": "^0.6.
|
|
24
|
+
"@compiled/babel-plugin": "^0.14.0",
|
|
25
|
+
"@compiled/babel-plugin-strip-runtime": "^0.14.0",
|
|
26
|
+
"@compiled/css": "^0.8.2",
|
|
27
|
+
"@compiled/react": "0.10.4",
|
|
28
|
+
"@compiled/utils": "^0.6.16",
|
|
29
29
|
"enhanced-resolve": "^5.8.3",
|
|
30
30
|
"loader-utils": "^2.0.2",
|
|
31
|
-
"webpack-sources": "^
|
|
31
|
+
"webpack-sources": "^3.2.3"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"babel-loader": "^8.2.3",
|
|
35
|
-
"css-loader": "^
|
|
35
|
+
"css-loader": "^6.7.0",
|
|
36
36
|
"memfs": "^3.4.1",
|
|
37
37
|
"mini-css-extract-plugin": "^1.6.2",
|
|
38
38
|
"react": "^17.0.2",
|
|
39
|
-
"ts-node": "^10.
|
|
40
|
-
"tsconfig-paths": "^3.
|
|
41
|
-
"webpack": "^5.
|
|
39
|
+
"ts-node": "^10.7.0",
|
|
40
|
+
"tsconfig-paths": "^3.13.0",
|
|
41
|
+
"webpack": "^5.69.1"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"webpack": ">= 4.46.0"
|
|
File without changes
|
|
@@ -126,8 +126,9 @@ describe('CompiledExtractPlugin', () => {
|
|
|
126
126
|
._ajmmnqa1{-webkit-text-decoration-style:solid;text-decoration-style:solid}
|
|
127
127
|
._1hmsglyw{-webkit-text-decoration-line:none;text-decoration-line:none}
|
|
128
128
|
._4bfu1r31{-webkit-text-decoration-color:currentColor;text-decoration-color:currentColor}
|
|
129
|
+
._n7zl17qw{border-bottom:1px solid transparent}
|
|
130
|
+
._n7zl1l01{border-bottom:1px solid rgba(135,119,217,0.2)}
|
|
129
131
|
._syaz14aq{color:var(--_1p69eoh)}
|
|
130
|
-
._n7zl1fc7{border-bottom:1px solid var(--_1gpyhvo)}
|
|
131
132
|
._p12f1us4{max-width:140rem}
|
|
132
133
|
._18u01wug{margin-left:auto}
|
|
133
134
|
._otyridpf{margin-bottom:0}
|
|
File without changes
|
|
@@ -9,7 +9,6 @@ import type { LoaderContext } from 'webpack';
|
|
|
9
9
|
|
|
10
10
|
import { pluginName, styleSheetName } from './extract-plugin';
|
|
11
11
|
import type { CompiledLoaderOptions } from './types';
|
|
12
|
-
import { toURIComponent } from './utils';
|
|
13
12
|
|
|
14
13
|
let hasErrored = false;
|
|
15
14
|
|
|
@@ -94,7 +93,6 @@ export default async function compiledLoader(
|
|
|
94
93
|
|
|
95
94
|
try {
|
|
96
95
|
const includedFiles: string[] = [];
|
|
97
|
-
const foundCSSRules: string[] = [];
|
|
98
96
|
const { resolve, ...options } = getLoaderOptions(this);
|
|
99
97
|
|
|
100
98
|
// Transform to an AST using the local babel config.
|
|
@@ -125,7 +123,9 @@ export default async function compiledLoader(
|
|
|
125
123
|
plugins: [
|
|
126
124
|
options.extract && [
|
|
127
125
|
'@compiled/babel-plugin-strip-runtime',
|
|
128
|
-
{
|
|
126
|
+
{
|
|
127
|
+
styleSheetPath: `@compiled/webpack-loader/css-loader!@compiled/webpack-loader/css-loader/${styleSheetName}.css`,
|
|
128
|
+
},
|
|
129
129
|
],
|
|
130
130
|
options.bake && [
|
|
131
131
|
'@compiled/babel-plugin',
|
|
@@ -147,25 +147,7 @@ export default async function compiledLoader(
|
|
|
147
147
|
this.addDependency(normalize(file));
|
|
148
148
|
});
|
|
149
149
|
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
if (options.extract && foundCSSRules.length) {
|
|
153
|
-
foundCSSRules.forEach((rule) => {
|
|
154
|
-
// Each found atomic rule will create a new import that uses `@compiled/webpack-loader/css-loader`.
|
|
155
|
-
// The benefit is two fold:
|
|
156
|
-
// (1) thread safe collection of styles
|
|
157
|
-
// (2) caching -- resulting in faster builds (one import per rule!)
|
|
158
|
-
const params = toURIComponent(rule);
|
|
159
|
-
|
|
160
|
-
// We use require instead of import so it works with both ESM and CJS source.
|
|
161
|
-
// If we used ESM it would blow up with CJS source, unfortunately.
|
|
162
|
-
output = `
|
|
163
|
-
require("@compiled/webpack-loader/css-loader!@compiled/webpack-loader/css-loader/${styleSheetName}.css?style=${params}");
|
|
164
|
-
${output}`;
|
|
165
|
-
});
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
callback(null, output, result?.map ?? undefined);
|
|
150
|
+
callback(null, result?.code || '', result?.map ?? undefined);
|
|
169
151
|
} catch (e: unknown) {
|
|
170
152
|
// @ts-expect-error Not checking for error type
|
|
171
153
|
const error = createError('compiled-loader', 'Unhandled exception')(e.stack);
|
|
@@ -3,7 +3,7 @@ import { URLSearchParams } from 'url';
|
|
|
3
3
|
import type { LoaderContext } from 'webpack';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
|
-
* CSSLoader will take the style query params added by `./compiled-loader.
|
|
6
|
+
* CSSLoader will take the style query params added by `./compiled-loader.ts` and turn it into CSS.
|
|
7
7
|
*/
|
|
8
8
|
export default function CSSLoader(this: LoaderContext<void>): string {
|
|
9
9
|
const query = new URLSearchParams(this.resourceQuery);
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -113,16 +113,3 @@ export const getSources = (compiler: Compiler): typeof sources => {
|
|
|
113
113
|
require('webpack-sources')
|
|
114
114
|
);
|
|
115
115
|
};
|
|
116
|
-
|
|
117
|
-
/**
|
|
118
|
-
* Escapes a CSS rule to be a valid query param.
|
|
119
|
-
* Also escapes escalamation marks (!) to not confuse webpack.
|
|
120
|
-
*
|
|
121
|
-
* @param rule
|
|
122
|
-
* @returns
|
|
123
|
-
*/
|
|
124
|
-
export const toURIComponent = (rule: string): string => {
|
|
125
|
-
const component = encodeURIComponent(rule).replace(/!/g, '%21');
|
|
126
|
-
|
|
127
|
-
return component;
|
|
128
|
-
};
|