happy-css-modules 2.1.2 → 3.0.1
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/README.md +5 -0
- package/dist/cli.js.map +1 -1
- package/dist/emitter/dts.js +8 -7
- package/dist/emitter/dts.js.map +1 -1
- package/dist/emitter/dts.test.js +1 -1
- package/dist/emitter/dts.test.js.map +1 -1
- package/dist/emitter/file-system.js.map +1 -1
- package/dist/emitter/index.js +1 -1
- package/dist/emitter/index.js.map +1 -1
- package/dist/emitter/source-map.js +2 -2
- package/dist/emitter/source-map.js.map +1 -1
- package/dist/emitter/source-map.test.js +2 -2
- package/dist/emitter/source-map.test.js.map +1 -1
- package/dist/integration-test/go-to-definition.test.js +1 -36
- package/dist/integration-test/go-to-definition.test.js.map +1 -1
- package/dist/locator/index.d.ts +1 -1
- package/dist/locator/index.js +6 -16
- package/dist/locator/index.js.map +1 -1
- package/dist/locator/index.test.js +23 -119
- package/dist/locator/index.test.js.map +1 -1
- package/dist/locator/postcss.d.ts +1 -12
- package/dist/locator/postcss.js +3 -42
- package/dist/locator/postcss.js.map +1 -1
- package/dist/locator/postcss.test.js +7 -53
- package/dist/locator/postcss.test.js.map +1 -1
- package/dist/logger.js.map +1 -1
- package/dist/regression-test/issue-168.test.js.map +1 -1
- package/dist/resolver/index.d.ts +1 -1
- package/dist/resolver/index.js +2 -0
- package/dist/resolver/index.js.map +1 -1
- package/dist/resolver/node-resolver.js +2 -2
- package/dist/resolver/node-resolver.js.map +1 -1
- package/dist/resolver/webpack-resolver.js +7 -8
- package/dist/resolver/webpack-resolver.js.map +1 -1
- package/dist/runner.js +9 -7
- package/dist/runner.js.map +1 -1
- package/dist/runner.test.js +16 -15
- package/dist/runner.test.js.map +1 -1
- package/dist/test-util/jest/resolver.cjs +3 -2
- package/dist/test-util/jest/resolver.cjs.map +1 -1
- package/dist/test-util/tsserver.d.ts +2 -2
- package/dist/test-util/tsserver.js +6 -7
- package/dist/test-util/tsserver.js.map +1 -1
- package/dist/test-util/util.d.ts +1 -2
- package/dist/test-util/util.js +3 -4
- package/dist/test-util/util.js.map +1 -1
- package/dist/transformer/index.d.ts +1 -1
- package/dist/transformer/index.js.map +1 -1
- package/dist/transformer/less-transformer.js +1 -0
- package/dist/transformer/less-transformer.js.map +1 -1
- package/dist/transformer/less-transformer.test.js +1 -9
- package/dist/transformer/less-transformer.test.js.map +1 -1
- package/dist/transformer/scss-transformer.js +3 -3
- package/dist/transformer/scss-transformer.js.map +1 -1
- package/dist/transformer/scss-transformer.test.js +1 -9
- package/dist/transformer/scss-transformer.test.js.map +1 -1
- package/dist/util.d.ts +1 -1
- package/dist/util.js +10 -7
- package/dist/util.js.map +1 -1
- package/package.json +17 -17
- package/src/emitter/dts.test.ts +1 -1
- package/src/emitter/dts.ts +10 -9
- package/src/emitter/index.ts +1 -1
- package/src/emitter/source-map.test.ts +2 -2
- package/src/emitter/source-map.ts +2 -2
- package/src/integration-test/go-to-definition.test.ts +1 -36
- package/src/locator/index.test.ts +23 -124
- package/src/locator/index.ts +7 -23
- package/src/locator/postcss.test.ts +7 -74
- package/src/locator/postcss.ts +3 -44
- package/src/resolver/index.ts +3 -1
- package/src/resolver/node-resolver.ts +2 -2
- package/src/resolver/webpack-resolver.ts +7 -8
- package/src/runner.test.ts +17 -17
- package/src/runner.ts +9 -8
- package/src/test-util/jest/resolver.cjs +3 -2
- package/src/test-util/tsserver.ts +7 -11
- package/src/test-util/util.ts +4 -6
- package/src/transformer/index.ts +1 -1
- package/src/transformer/less-transformer.test.ts +1 -9
- package/src/transformer/less-transformer.ts +1 -0
- package/src/transformer/postcss-transformer.ts +1 -1
- package/src/transformer/scss-transformer.test.ts +1 -9
- package/src/transformer/scss-transformer.ts +2 -2
- package/src/util.ts +10 -7
|
@@ -1,24 +1,11 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { readFile, writeFile } from 'fs/promises';
|
|
2
2
|
import { randomUUID } from 'node:crypto';
|
|
3
3
|
import { jest } from '@jest/globals';
|
|
4
4
|
import dedent from 'dedent';
|
|
5
|
-
import { createDefaultTransformer } from '../index.js';
|
|
6
|
-
import { createFixtures,
|
|
5
|
+
import { Locator, createDefaultTransformer } from '../index.js';
|
|
6
|
+
import { createFixtures, getFixturePath } from '../test-util/util.js';
|
|
7
7
|
import { sleepSync } from '../util.js';
|
|
8
|
-
const readFileSpy = jest.spyOn(fs, 'readFile');
|
|
9
|
-
// In ESM, for some reason, we need to explicitly mock module
|
|
10
|
-
jest.unstable_mockModule('fs/promises', () => ({
|
|
11
|
-
...fs,
|
|
12
|
-
readFile: readFileSpy,
|
|
13
|
-
}));
|
|
14
|
-
// After the mock of fs/promises is complete, . /index.js after the mock of fs/promises is complete.
|
|
15
|
-
// ref: https://www.coolcomputerclub.com/posts/jest-hoist-await/
|
|
16
|
-
const { Locator } = await import('./index.js');
|
|
17
|
-
// NOTE: ../test/util.js depends on . /index.js, so it must also be imported dynamically...
|
|
18
8
|
const locator = new Locator();
|
|
19
|
-
afterEach(() => {
|
|
20
|
-
readFileSpy.mockClear();
|
|
21
|
-
});
|
|
22
9
|
test('basic', async () => {
|
|
23
10
|
createFixtures({
|
|
24
11
|
'/test/1.css': dedent `
|
|
@@ -110,30 +97,22 @@ test('tracks other files when `@import` is present', async () => {
|
|
|
110
97
|
}
|
|
111
98
|
`);
|
|
112
99
|
});
|
|
113
|
-
test('
|
|
100
|
+
test('does not track other files by `composes`', async () => {
|
|
114
101
|
createFixtures({
|
|
115
102
|
'/test/1.css': dedent `
|
|
116
103
|
.a {
|
|
117
104
|
composes: b from './2.css';
|
|
118
|
-
composes: c
|
|
119
|
-
composes: e from '${getFixturePath('/test/4.css')}';
|
|
105
|
+
composes: c from './3.css'; /* non-existent file */
|
|
120
106
|
}
|
|
121
107
|
`,
|
|
122
108
|
'/test/2.css': dedent `
|
|
123
109
|
.b {}
|
|
124
|
-
`,
|
|
125
|
-
'/test/3.css': dedent `
|
|
126
|
-
.c {}
|
|
127
|
-
.d {}
|
|
128
|
-
`,
|
|
129
|
-
'/test/4.css': dedent `
|
|
130
|
-
.e {}
|
|
131
110
|
`,
|
|
132
111
|
});
|
|
133
112
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
134
113
|
expect(result).toMatchInlineSnapshot(`
|
|
135
114
|
{
|
|
136
|
-
dependencies: [
|
|
115
|
+
dependencies: [],
|
|
137
116
|
tokens: [
|
|
138
117
|
{
|
|
139
118
|
name: "a",
|
|
@@ -141,30 +120,6 @@ test('tracks other files when `composes` is present', async () => {
|
|
|
141
120
|
{ filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
142
121
|
],
|
|
143
122
|
},
|
|
144
|
-
{
|
|
145
|
-
name: "b",
|
|
146
|
-
originalLocations: [
|
|
147
|
-
{ filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
148
|
-
],
|
|
149
|
-
},
|
|
150
|
-
{
|
|
151
|
-
name: "c",
|
|
152
|
-
originalLocations: [
|
|
153
|
-
{ filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
154
|
-
],
|
|
155
|
-
},
|
|
156
|
-
{
|
|
157
|
-
name: "d",
|
|
158
|
-
originalLocations: [
|
|
159
|
-
{ filePath: "<fixtures>/test/3.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
|
|
160
|
-
],
|
|
161
|
-
},
|
|
162
|
-
{
|
|
163
|
-
name: "e",
|
|
164
|
-
originalLocations: [
|
|
165
|
-
{ filePath: "<fixtures>/test/4.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
166
|
-
],
|
|
167
|
-
},
|
|
168
123
|
],
|
|
169
124
|
}
|
|
170
125
|
`);
|
|
@@ -175,14 +130,7 @@ test('normalizes tokens', async () => {
|
|
|
175
130
|
/* duplicate import */
|
|
176
131
|
@import './2.css';
|
|
177
132
|
@import '2.css';
|
|
178
|
-
.a {
|
|
179
|
-
/* duplicate composes */
|
|
180
|
-
composes: c from './3.css';
|
|
181
|
-
composes: c from '3.css';
|
|
182
|
-
composes: c c from './3.css';
|
|
183
|
-
/* duplicate import and composes */
|
|
184
|
-
composes: b from './2.css';
|
|
185
|
-
}
|
|
133
|
+
.a {}
|
|
186
134
|
.a {} /* duplicate class selector */
|
|
187
135
|
`,
|
|
188
136
|
'/test/2.css': dedent `
|
|
@@ -196,14 +144,14 @@ test('normalizes tokens', async () => {
|
|
|
196
144
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
197
145
|
expect(result).toMatchInlineSnapshot(`
|
|
198
146
|
{
|
|
199
|
-
dependencies: ["<fixtures>/test/2.css"
|
|
147
|
+
dependencies: ["<fixtures>/test/2.css"],
|
|
200
148
|
tokens: [
|
|
201
149
|
{
|
|
202
150
|
name: "a",
|
|
203
151
|
originalLocations: [
|
|
204
152
|
{ filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
205
153
|
{ filePath: "<fixtures>/test/1.css", start: { line: 4, column: 1 }, end: { line: 4, column: 2 } },
|
|
206
|
-
{ filePath: "<fixtures>/test/1.css", start: { line:
|
|
154
|
+
{ filePath: "<fixtures>/test/1.css", start: { line: 5, column: 1 }, end: { line: 5, column: 2 } },
|
|
207
155
|
],
|
|
208
156
|
},
|
|
209
157
|
{
|
|
@@ -212,26 +160,15 @@ test('normalizes tokens', async () => {
|
|
|
212
160
|
{ filePath: "<fixtures>/test/2.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
|
|
213
161
|
],
|
|
214
162
|
},
|
|
215
|
-
{
|
|
216
|
-
name: "c",
|
|
217
|
-
originalLocations: [
|
|
218
|
-
{ filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
219
|
-
],
|
|
220
|
-
},
|
|
221
163
|
],
|
|
222
164
|
}
|
|
223
165
|
`);
|
|
224
166
|
});
|
|
225
|
-
test
|
|
167
|
+
test('returns the result from the cache when the file has not been modified', async () => {
|
|
226
168
|
createFixtures({
|
|
227
169
|
'/test/1.css': dedent `
|
|
228
170
|
@import './2.css';
|
|
229
|
-
@import './
|
|
230
|
-
.a {
|
|
231
|
-
composes: b from './2.css';
|
|
232
|
-
composes: c from './3.css';
|
|
233
|
-
composes: d from './3.css';
|
|
234
|
-
}
|
|
171
|
+
@import './3.css';
|
|
235
172
|
`,
|
|
236
173
|
'/test/2.css': dedent `
|
|
237
174
|
.b {}
|
|
@@ -241,61 +178,28 @@ test.failing('returns the result from the cache when the file has not been modif
|
|
|
241
178
|
.d {}
|
|
242
179
|
`,
|
|
243
180
|
});
|
|
181
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
182
|
+
const readCSSSpy = jest.spyOn(locator, 'readCSS');
|
|
244
183
|
await locator.load(getFixturePath('/test/1.css'));
|
|
245
|
-
expect(
|
|
246
|
-
expect(
|
|
247
|
-
expect(
|
|
248
|
-
expect(
|
|
249
|
-
|
|
184
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(3);
|
|
185
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
|
|
186
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(2, getFixturePath('/test/2.css'));
|
|
187
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(3, getFixturePath('/test/3.css'));
|
|
188
|
+
readCSSSpy.mockClear();
|
|
250
189
|
// update `/test/2.css`
|
|
251
190
|
sleepSync(1); // wait for the file system to update the mtime
|
|
252
191
|
await writeFile(getFixturePath('/test/2.css'), await readFile(getFixturePath('/test/2.css'), 'utf-8'));
|
|
253
192
|
// `3.css` is not updated, so the cache is used. Therefore, `readFile` is not called.
|
|
254
193
|
await locator.load(getFixturePath('/test/3.css'));
|
|
255
|
-
expect(
|
|
194
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(0);
|
|
256
195
|
// `1.css` is not updated, but dependencies are updated, so the cache is used. Therefore, `readFile` is called.
|
|
257
196
|
await locator.load(getFixturePath('/test/1.css'));
|
|
258
|
-
expect(
|
|
259
|
-
expect(
|
|
260
|
-
expect(
|
|
197
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(2);
|
|
198
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
|
|
199
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(2, getFixturePath('/test/2.css'));
|
|
261
200
|
// ``2.css` is updated, but the cache is already available because it was updated in the previous step. Therefore, `readFile` is not called.
|
|
262
201
|
await locator.load(getFixturePath('/test/2.css'));
|
|
263
|
-
expect(
|
|
264
|
-
});
|
|
265
|
-
test('ignores the composition of non-existent tokens', async () => {
|
|
266
|
-
// In css-loader and postcss-modules, compositions of non-existent tokens are simply ignored.
|
|
267
|
-
// Therefore, happy-css-modules follows suit.
|
|
268
|
-
// It may be preferable to warn rather than ignore, but for now, we will focus on compatibility.
|
|
269
|
-
// ref: https://github.com/css-modules/css-modules/issues/356
|
|
270
|
-
createFixtures({
|
|
271
|
-
'/test/1.css': dedent `
|
|
272
|
-
.a {
|
|
273
|
-
composes: b c from './2.css';
|
|
274
|
-
}
|
|
275
|
-
`,
|
|
276
|
-
'/test/2.css': dedent `
|
|
277
|
-
.b {}
|
|
278
|
-
`,
|
|
279
|
-
});
|
|
280
|
-
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
281
|
-
expect(result.tokens.map((t) => t.name)).toStrictEqual(['a', 'b']);
|
|
282
|
-
});
|
|
283
|
-
test('throws error the composition of non-existent file', async () => {
|
|
284
|
-
// In postcss-modules, compositions of non-existent file are causes an error.
|
|
285
|
-
// Therefore, happy-css-modules follows suit.
|
|
286
|
-
createFixtures({
|
|
287
|
-
'/test/1.css': dedent `
|
|
288
|
-
.a {
|
|
289
|
-
composes: a from './2.css';
|
|
290
|
-
}
|
|
291
|
-
`,
|
|
292
|
-
});
|
|
293
|
-
await expect(async () => {
|
|
294
|
-
await locator.load(getFixturePath('/test/1.css')).catch((e) => {
|
|
295
|
-
e.message = e.message.replace(FIXTURE_DIR_PATH, '<fixtures>');
|
|
296
|
-
throw e;
|
|
297
|
-
});
|
|
298
|
-
}).rejects.toThrowError(`Could not resolve './2.css' in '<fixtures>/test/1.css'`);
|
|
202
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(2);
|
|
299
203
|
});
|
|
300
204
|
describe('supports sourcemap', () => {
|
|
301
205
|
test('restores original locations from sourcemap', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/locator/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/locator/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Rule, type AtRule, type Root
|
|
1
|
+
import { type Rule, type AtRule, type Root } from 'postcss';
|
|
2
2
|
import { type ClassName } from 'postcss-selector-parser';
|
|
3
3
|
/** The pair of line number and column number. */
|
|
4
4
|
export type Position = {
|
|
@@ -38,7 +38,6 @@ type CollectNodesResult = {
|
|
|
38
38
|
rule: Rule;
|
|
39
39
|
classSelector: ClassName;
|
|
40
40
|
}[];
|
|
41
|
-
composesDeclarations: Declaration[];
|
|
42
41
|
};
|
|
43
42
|
/**
|
|
44
43
|
* Collect nodes from the AST.
|
|
@@ -51,14 +50,4 @@ export declare function collectNodes(ast: Root): CollectNodesResult;
|
|
|
51
50
|
* @returns The imported sheet path.
|
|
52
51
|
*/
|
|
53
52
|
export declare function parseAtImport(atImport: AtRule): string | undefined;
|
|
54
|
-
/**
|
|
55
|
-
* Parse `composes` declaration with `from <url>`.
|
|
56
|
-
* If the declaration is not found or do not have `from <url>`, return `undefined`.
|
|
57
|
-
* @param composesDeclaration The `composes` declaration to parse.
|
|
58
|
-
* @returns The information of the declaration.
|
|
59
|
-
*/
|
|
60
|
-
export declare function parseComposesDeclarationWithFromUrl(composesDeclaration: Declaration): {
|
|
61
|
-
from: string;
|
|
62
|
-
tokenNames: string[];
|
|
63
|
-
} | undefined;
|
|
64
53
|
export {};
|
package/dist/locator/postcss.js
CHANGED
|
@@ -29,9 +29,9 @@ export async function generateLocalTokenNames(ast) {
|
|
|
29
29
|
postcss
|
|
30
30
|
.default()
|
|
31
31
|
// postcss-modules collects tokens (i.e., includes external tokens) by following
|
|
32
|
-
// the dependencies specified in the @import
|
|
32
|
+
// the dependencies specified in the @import.
|
|
33
33
|
// However, we do not want `generateLocalTokenNames` to return external tokens.
|
|
34
|
-
// So we remove the @import
|
|
34
|
+
// So we remove the @import beforehand.
|
|
35
35
|
.use(removeDependenciesPlugin())
|
|
36
36
|
.use(modules({
|
|
37
37
|
getJSON: (_cssFileName, json) => {
|
|
@@ -122,7 +122,6 @@ function isComposesDeclaration(node) {
|
|
|
122
122
|
export function collectNodes(ast) {
|
|
123
123
|
const atImports = [];
|
|
124
124
|
const classSelectors = [];
|
|
125
|
-
const composesDeclarations = [];
|
|
126
125
|
ast.walk((node) => {
|
|
127
126
|
if (isAtImportNode(node)) {
|
|
128
127
|
atImports.push(node);
|
|
@@ -143,11 +142,8 @@ export function collectNodes(ast) {
|
|
|
143
142
|
});
|
|
144
143
|
}).processSync(node);
|
|
145
144
|
}
|
|
146
|
-
else if (isComposesDeclaration(node)) {
|
|
147
|
-
composesDeclarations.push(node);
|
|
148
|
-
}
|
|
149
145
|
});
|
|
150
|
-
return { atImports, classSelectors
|
|
146
|
+
return { atImports, classSelectors };
|
|
151
147
|
}
|
|
152
148
|
/**
|
|
153
149
|
* Parse the `@import` rule.
|
|
@@ -170,39 +166,4 @@ export function parseAtImport(atImport) {
|
|
|
170
166
|
}
|
|
171
167
|
return undefined;
|
|
172
168
|
}
|
|
173
|
-
/**
|
|
174
|
-
* Parse `composes` declaration with `from <url>`.
|
|
175
|
-
* If the declaration is not found or do not have `from <url>`, return `undefined`.
|
|
176
|
-
* @param composesDeclaration The `composes` declaration to parse.
|
|
177
|
-
* @returns The information of the declaration.
|
|
178
|
-
*/
|
|
179
|
-
export function parseComposesDeclarationWithFromUrl(composesDeclaration) {
|
|
180
|
-
// NOTE: `composes` property syntax is...
|
|
181
|
-
// - syntax: `composes: <class-name> [...<class-name>] [from <url>];`
|
|
182
|
-
// - variables:
|
|
183
|
-
// - `<class-name>`: `<sting>`
|
|
184
|
-
// - `<url>`: `<string>`
|
|
185
|
-
// - ref:
|
|
186
|
-
// - https://github.com/css-modules/css-modules#composition
|
|
187
|
-
// - https://github.com/css-modules/css-modules#composing-from-other-files
|
|
188
|
-
// - https://github.com/css-modules/postcss-modules-extract-imports#specification
|
|
189
|
-
const nodes = valueParser(composesDeclaration.value).nodes;
|
|
190
|
-
if (nodes.length < 5)
|
|
191
|
-
return undefined;
|
|
192
|
-
const classNamesOrSpaces = nodes.slice(0, -3);
|
|
193
|
-
const [from, , url] = nodes.slice(-3);
|
|
194
|
-
const classNames = classNamesOrSpaces.filter((node) => node.type === 'word');
|
|
195
|
-
// validate nodes
|
|
196
|
-
if (from === undefined)
|
|
197
|
-
return undefined;
|
|
198
|
-
if (from.type !== 'word' || from.value !== 'from')
|
|
199
|
-
return undefined;
|
|
200
|
-
if (url === undefined)
|
|
201
|
-
return undefined;
|
|
202
|
-
if (url.type !== 'string')
|
|
203
|
-
return undefined;
|
|
204
|
-
if (classNames.length === 0)
|
|
205
|
-
return undefined;
|
|
206
|
-
return { from: url.value, tokenNames: classNames.map((node) => node.value) };
|
|
207
|
-
}
|
|
208
169
|
//# sourceMappingURL=postcss.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postcss.js","sourceRoot":"","sources":["../../src/locator/postcss.ts"],"names":[],"mappings":"AAAA,OAAO,OAAwF,MAAM,SAAS,CAAC;AAC/G,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,cAAkC,MAAM,yBAAyB,CAAC;AACzE,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAyB/C,SAAS,wBAAwB;IAC/B,OAAO;QACL,aAAa,EAAE,qBAAqB;QACpC,gEAAgE;QAChE,MAAM,CAAC,MAAM;YACX,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"postcss.js","sourceRoot":"","sources":["../../src/locator/postcss.ts"],"names":[],"mappings":"AAAA,OAAO,OAAwF,MAAM,SAAS,CAAC;AAC/G,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,cAAkC,MAAM,yBAAyB,CAAC;AACzE,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAyB/C,SAAS,wBAAwB;IAC/B,OAAO;QACL,aAAa,EAAE,qBAAqB;QACpC,gEAAgE;QAChE,MAAM,CAAC,MAAM;YACX,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpD,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;QACH,CAAC;QACD,gEAAgE;QAChE,WAAW,CAAC,WAAW;YACrB,IAAI,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvC,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAS;IACrD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO;aACJ,OAAO,EAAE;YACV,gFAAgF;YAChF,6CAA6C;YAC7C,+EAA+E;YAC/E,uCAAuC;aACtC,GAAG,CAAC,wBAAwB,EAAE,CAAC;aAC/B,GAAG,CACF,OAAO,CAAC;YACN,OAAO,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE;gBAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7B,CAAC;SACF,CAAC,CACH;YACD,6CAA6C;aAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;aACpB,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAU,EAAE,aAAwB;IACtE,2GAA2G;IAC3G,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACjH,oHAAoH;IACpH,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS;QAC7E,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACtH,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAE1F,MAAM,0BAA0B,GAAG;QACjC,uBAAuB;QACvB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACpE,yBAAyB;QACzB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;KAC3E,CAAC;IACF,MAAM,wBAAwB,GAAG;QAC/B,IAAI,EAAE,0BAA0B,CAAC,IAAI;QACrC,2BAA2B;QAC3B,MAAM,EAAE,0BAA0B,CAAC,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM;KACvE,CAAC;IACF,MAAM,qBAAqB,GAAG;QAC5B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI;QAChC,KAAK,EAAE,0BAA0B;QACjC,GAAG,EAAE,wBAAwB;KAC9B,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO,qBAAqB,CAAC;IAEzD,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAClD,qBAAqB,CAAC,KAAK,CAAC,IAAI;IAChC,uGAAuG;IACvG,mCAAmC;IACnC,qBAAqB,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CACvC,CAAC;IACF,IAAI,mBAAmB,KAAK,KAAK,IAAI,mBAAmB,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5E,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;IACnE,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,mBAAmB,CAAC,IAAI;QAClC,KAAK,EAAE;YACL,IAAI,EAAE,mBAAmB,CAAC,IAAI;YAC9B,MAAM,EAAE,mBAAmB,CAAC,MAAM,GAAG,CAAC;SACvC;QACD,GAAG,EAAE;YACH,IAAI,EAAE,mBAAmB,CAAC,IAAI;YAC9B,MAAM,EAAE,mBAAmB,CAAC,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;SACpE;KACF,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;AACtD,CAAC;AAED,SAAS,aAAa,CAAC,IAAU;IAC/B,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC;AACrD,CAAC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,OAAO,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;AAC9B,CAAC;AAED,SAAS,aAAa,CAAC,IAAU;IAC/B,OAAO,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;AAC9B,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAU;IACvC,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC;AACzD,CAAC;AAOD;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAAS;IACpC,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,cAAc,GAA+C,EAAE,CAAC;IACtE,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAChB,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,iDAAiD;YACjD,YAAY;YACZ,kBAAkB;YAClB,kBAAkB;YAClB,cAAc,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC3B,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;oBAC1B,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC9B,kDAAkD;wBAClD,WAAW;wBACX,WAAW;wBACX,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC/D,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC5C,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACxD,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC9C,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC,KAAK,CAAC;IACxD,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,IAAI,SAAS,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QAC/D,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACvD,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC1E,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1E,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import dedent from 'dedent';
|
|
2
|
-
import { createRoot, createClassSelectors, createAtImports,
|
|
3
|
-
import { generateLocalTokenNames, getOriginalLocation, parseAtImport,
|
|
2
|
+
import { createRoot, createClassSelectors, createAtImports, createFixtures } from '../test-util/util.js';
|
|
3
|
+
import { generateLocalTokenNames, getOriginalLocation, parseAtImport, collectNodes } from './postcss.js';
|
|
4
4
|
describe('generateLocalTokenNames', () => {
|
|
5
5
|
test('basic', async () => {
|
|
6
6
|
expect(await generateLocalTokenNames(createRoot(`
|
|
@@ -24,10 +24,6 @@ describe('generateLocalTokenNames', () => {
|
|
|
24
24
|
.local_class_name_3 {}
|
|
25
25
|
}
|
|
26
26
|
:local(.local_class_name_4) {}
|
|
27
|
-
.composes_target {}
|
|
28
|
-
.composes {
|
|
29
|
-
composes: composes_target;
|
|
30
|
-
}
|
|
31
27
|
`))).toStrictEqual([
|
|
32
28
|
'basic',
|
|
33
29
|
'cascading',
|
|
@@ -45,8 +41,6 @@ describe('generateLocalTokenNames', () => {
|
|
|
45
41
|
'local_class_name_2',
|
|
46
42
|
'local_class_name_3',
|
|
47
43
|
'local_class_name_4',
|
|
48
|
-
'composes_target',
|
|
49
|
-
'composes',
|
|
50
44
|
]);
|
|
51
45
|
});
|
|
52
46
|
test('does not track styles imported by @import in other file because it is not a local token', async () => {
|
|
@@ -155,17 +149,6 @@ describe('getOriginalLocation', () => {
|
|
|
155
149
|
expect(getOriginalLocation(local_class_name_3.rule, local_class_name_3.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 4, column: 3 }, end: { line: 4, column: 21 } }`);
|
|
156
150
|
expect(getOriginalLocation(local_class_name_4.rule, local_class_name_4.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 6, column: 8 }, end: { line: 6, column: 26 } }`);
|
|
157
151
|
});
|
|
158
|
-
test('composes', () => {
|
|
159
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
160
|
-
const [composes_target, composes] = createClassSelectors(createRoot(dedent `
|
|
161
|
-
.composes_target {}
|
|
162
|
-
.composes {
|
|
163
|
-
composes: composes_target;
|
|
164
|
-
}
|
|
165
|
-
`));
|
|
166
|
-
expect(getOriginalLocation(composes_target.rule, composes_target.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 16 } }`);
|
|
167
|
-
expect(getOriginalLocation(composes.rule, composes.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 2, column: 1 }, end: { line: 2, column: 9 } }`);
|
|
168
|
-
});
|
|
169
152
|
test('with_newline', () => {
|
|
170
153
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
171
154
|
const [with_newline_1, with_newline_2, with_newline_3] = createClassSelectors(createRoot(dedent `
|
|
@@ -183,21 +166,18 @@ test('collectNodes', () => {
|
|
|
183
166
|
@import;
|
|
184
167
|
@import "test.css";
|
|
185
168
|
@ignored;
|
|
186
|
-
.a { ignored: "ignored";
|
|
187
|
-
.b { ignored: "ignored";
|
|
169
|
+
.a { ignored: "ignored"; }
|
|
170
|
+
.b { ignored: "ignored"; }
|
|
188
171
|
`);
|
|
189
|
-
const { atImports, classSelectors
|
|
172
|
+
const { atImports, classSelectors } = collectNodes(ast);
|
|
190
173
|
expect(atImports).toHaveLength(2);
|
|
191
174
|
expect(atImports[0].toString()).toEqual('@import');
|
|
192
175
|
expect(atImports[1].toString()).toEqual('@import "test.css"');
|
|
193
176
|
expect(classSelectors).toHaveLength(2);
|
|
194
|
-
expect(classSelectors[0].rule.toString()).toEqual('.a { ignored: "ignored";
|
|
177
|
+
expect(classSelectors[0].rule.toString()).toEqual('.a { ignored: "ignored"; }');
|
|
195
178
|
expect(classSelectors[0].classSelector.toString()).toEqual('.a');
|
|
196
|
-
expect(classSelectors[1].rule.toString()).toEqual('.b { ignored: "ignored";
|
|
179
|
+
expect(classSelectors[1].rule.toString()).toEqual('.b { ignored: "ignored"; }');
|
|
197
180
|
expect(classSelectors[1].classSelector.toString()).toEqual('.b');
|
|
198
|
-
expect(composesDeclarations).toHaveLength(2);
|
|
199
|
-
expect(composesDeclarations[0].toString()).toEqual('composes: a');
|
|
200
|
-
expect(composesDeclarations[1].toString()).toEqual('composes: b');
|
|
201
181
|
});
|
|
202
182
|
test('parseAtImport', () => {
|
|
203
183
|
const atImports = createAtImports(createRoot(dedent `
|
|
@@ -213,30 +193,4 @@ test('parseAtImport', () => {
|
|
|
213
193
|
expect(parseAtImport(atImports[3])).toBe('test.css');
|
|
214
194
|
expect(parseAtImport(atImports[4])).toBe('test.css');
|
|
215
195
|
});
|
|
216
|
-
test('parseComposesDeclarationWithFromUrl', () => {
|
|
217
|
-
const composesDeclarations = createComposesDeclarations(createRoot(dedent `
|
|
218
|
-
.a {
|
|
219
|
-
composes: a;
|
|
220
|
-
composes: a b c;
|
|
221
|
-
composes: a from "test.css";
|
|
222
|
-
composes: a b c from "test.css";
|
|
223
|
-
composes: from from from from "test.css";
|
|
224
|
-
/* NOTE: CSS Modules do not support '... from url("test.css")'. */
|
|
225
|
-
}
|
|
226
|
-
`));
|
|
227
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[0])).toStrictEqual(undefined);
|
|
228
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[1])).toStrictEqual(undefined);
|
|
229
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[2])).toStrictEqual({
|
|
230
|
-
from: 'test.css',
|
|
231
|
-
tokenNames: ['a'],
|
|
232
|
-
});
|
|
233
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[3])).toStrictEqual({
|
|
234
|
-
from: 'test.css',
|
|
235
|
-
tokenNames: ['a', 'b', 'c'],
|
|
236
|
-
});
|
|
237
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[4])).toStrictEqual({
|
|
238
|
-
from: 'test.css',
|
|
239
|
-
tokenNames: ['from', 'from', 'from'], // do not deduplicate.
|
|
240
|
-
});
|
|
241
|
-
});
|
|
242
196
|
//# sourceMappingURL=postcss.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postcss.test.js","sourceRoot":"","sources":["../../src/locator/postcss.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"postcss.test.js","sourceRoot":"","sources":["../../src/locator/postcss.test.ts"],"names":[],"mappings":"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"}
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,SAAS,GAAoC;IACjD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,OAAO,MAAM;IAEjB,YAAY,aAA4B;QACtC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IACD,KAAK,CAAC,OAAgB;QACpB,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,SAAS,GAAoC;IACjD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,OAAO,MAAM;IAEjB,YAAY,aAA4B;QACtC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IACD,KAAK,CAAC,OAAgB;QACpB,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAgB;QACnB,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,KAAK,CAAC,OAAgB;QACpB,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-168.test.js","sourceRoot":"","sources":["../../src/regression-test/issue-168.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExF,MAAM,cAAc,GAAkB;IACpC,OAAO,EAAE,eAAe;IACxB,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC;IACxB,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,gEAAgE;AAChE,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAElF,0CAA0C;AAC1C,IAAI,OAA4B,CAAC;AACjC,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,IAAI,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"issue-168.test.js","sourceRoot":"","sources":["../../src/regression-test/issue-168.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExF,MAAM,cAAc,GAAkB;IACpC,OAAO,EAAE,eAAe;IACxB,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC;IACxB,KAAK,EAAE,KAAK;IACZ,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,gEAAgE;AAChE,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAElF,0CAA0C;AAC1C,IAAI,OAA4B,CAAC;AACjC,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;IACzB,cAAc,CAAC;QACb,oBAAoB,EAAE,OAAO;QAC7B,wBAAwB,EAAE,WAAW;KACtC,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC7F,OAAO,GAAG,MAAM,GAAG,CAAC,EAAE,GAAG,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,+CAA+C;IAC5E,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,qCAAqC;AACjF,CAAC,CAAC,CAAC"}
|
package/dist/resolver/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export type ResolverOptions = {
|
|
|
5
5
|
/**
|
|
6
6
|
* The function to resolve the path of the imported file.
|
|
7
7
|
* @returns The resolved path of the imported file. `false` means to skip resolving.
|
|
8
|
-
|
|
8
|
+
*/
|
|
9
9
|
export type Resolver = (specifier: string, options: ResolverOptions) => string | false | Promise<string | false>;
|
|
10
10
|
export type DefaultResolverOptions = WebpackResolverOptions;
|
|
11
11
|
/**
|
package/dist/resolver/index.js
CHANGED
|
@@ -25,8 +25,10 @@ export const createDefaultResolver = (defaultResolverOptions) => {
|
|
|
25
25
|
return async (specifier, options) => {
|
|
26
26
|
for (const resolver of resolvers) {
|
|
27
27
|
try {
|
|
28
|
+
// eslint-disable-next-line no-await-in-loop
|
|
28
29
|
const resolved = await resolver(specifier, options);
|
|
29
30
|
if (resolved !== false) {
|
|
31
|
+
// eslint-disable-next-line no-await-in-loop
|
|
30
32
|
const isExists = await exists(resolved);
|
|
31
33
|
if (isExists)
|
|
32
34
|
return resolved;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolver/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAc9D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAA8E,CAC9G,sBAAsB,EACtB,EAAE;IACF,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAC1C,MAAM,eAAe,GAAG,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;IAEtE,0EAA0E;IAC1E,kCAAkC;IAClC,2HAA2H;IAC3H,qHAAqH;IACrH,MAAM,SAAS,GAAG,CAAC,gBAAgB,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAClC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolver/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAc9D;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAA8E,CAC9G,sBAAsB,EACtB,EAAE;IACF,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAC1C,MAAM,eAAe,GAAG,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;IAEtE,0EAA0E;IAC1E,kCAAkC;IAClC,2HAA2H;IAC3H,qHAAqH;IACrH,MAAM,SAAS,GAAG,CAAC,gBAAgB,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QAClC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,4CAA4C;gBAC5C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACpD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;oBACvB,4CAA4C;oBAC5C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACxC,IAAI,QAAQ;wBAAE,OAAO,QAAQ,CAAC;gBAChC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO;YACT,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { fileURLToPath, pathToFileURL } from 'url';
|
|
2
2
|
import { resolve } from 'import-meta-resolve';
|
|
3
|
-
export const createNodeResolver = () =>
|
|
4
|
-
return fileURLToPath(
|
|
3
|
+
export const createNodeResolver = () => (specifier, options) => {
|
|
4
|
+
return fileURLToPath(resolve(specifier, pathToFileURL(options.request).href));
|
|
5
5
|
};
|
|
6
6
|
//# sourceMappingURL=node-resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-resolver.js","sourceRoot":"","sources":["../../src/resolver/node-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,MAAM,CAAC,MAAM,kBAAkB,GAAmB,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"node-resolver.js","sourceRoot":"","sources":["../../src/resolver/node-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,MAAM,CAAC,MAAM,kBAAkB,GAAmB,GAAG,EAAE,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;IAC7E,OAAO,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC"}
|