happy-css-modules 3.2.0 → 5.0.0
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/LICENSE.txt +23 -0
- package/README.md +307 -2
- package/bin/hcm.js +1 -1
- package/dist/cli.d.ts +0 -4
- package/dist/cli.js +111 -118
- package/dist/cli.js.map +1 -1
- package/dist/emitter/dts.js +7 -8
- package/dist/emitter/dts.js.map +1 -1
- package/dist/emitter/dts.test.js +12 -12
- package/dist/emitter/file-system.js +2 -2
- package/dist/emitter/file-system.js.map +1 -1
- package/dist/emitter/file-system.test.js +1 -1
- package/dist/emitter/file-system.test.js.map +1 -1
- package/dist/emitter/index.js +1 -1
- package/dist/emitter/index.js.map +1 -1
- package/dist/emitter/index.test.js +2 -4
- package/dist/emitter/index.test.js.map +1 -1
- package/dist/emitter/source-map.js +1 -1
- package/dist/emitter/source-map.js.map +1 -1
- package/dist/emitter/source-map.test.js +1 -1
- package/dist/emitter/source-map.test.js.map +1 -1
- package/dist/integration-test/go-to-definition.test.js +403 -105
- package/dist/integration-test/go-to-definition.test.js.map +1 -1
- package/dist/locator/index.js +10 -8
- package/dist/locator/index.js.map +1 -1
- package/dist/locator/index.test.js +304 -171
- package/dist/locator/index.test.js.map +1 -1
- package/dist/locator/postcss.js +2 -3
- package/dist/locator/postcss.js.map +1 -1
- package/dist/locator/postcss.test.js +317 -73
- package/dist/locator/postcss.test.js.map +1 -1
- package/dist/logger.js +7 -6
- package/dist/logger.js.map +1 -1
- package/dist/regression-test/issue-168.test.js +3 -5
- package/dist/regression-test/issue-168.test.js.map +1 -1
- package/dist/resolver/index.d.ts +1 -1
- package/dist/resolver/index.js +3 -3
- package/dist/resolver/index.js.map +1 -1
- package/dist/resolver/node-resolver.js +1 -1
- package/dist/resolver/node-resolver.js.map +1 -1
- package/dist/resolver/relative-resolver.js +1 -1
- package/dist/resolver/relative-resolver.js.map +1 -1
- package/dist/resolver/webpack-resolver.d.ts +1 -1
- package/dist/resolver/webpack-resolver.js +4 -4
- package/dist/resolver/webpack-resolver.js.map +1 -1
- package/dist/runner.js +52 -21
- package/dist/runner.js.map +1 -1
- package/dist/runner.test.js +59 -43
- package/dist/runner.test.js.map +1 -1
- package/dist/test-util/line-column.d.ts +9 -0
- package/dist/test-util/line-column.js +16 -0
- package/dist/test-util/line-column.js.map +1 -0
- package/dist/test-util/line-column.test.d.ts +1 -0
- package/dist/test-util/line-column.test.js +21 -0
- package/dist/test-util/line-column.test.js.map +1 -0
- package/dist/test-util/tsserver.js +11 -12
- package/dist/test-util/tsserver.js.map +1 -1
- package/dist/test-util/util.d.ts +6 -0
- package/dist/test-util/util.js +23 -6
- package/dist/test-util/util.js.map +1 -1
- package/dist/transformer/index.d.ts +0 -1
- package/dist/transformer/index.js +1 -1
- package/dist/transformer/index.js.map +1 -1
- package/dist/transformer/index.test.js +17 -17
- package/dist/transformer/index.test.js.map +1 -1
- package/dist/transformer/less-transformer.js +4 -4
- package/dist/transformer/less-transformer.js.map +1 -1
- package/dist/transformer/less-transformer.test.js +76 -51
- package/dist/transformer/less-transformer.test.js.map +1 -1
- package/dist/transformer/postcss-transformer.test.js +58 -54
- package/dist/transformer/postcss-transformer.test.js.map +1 -1
- package/dist/transformer/scss-transformer.js +11 -30
- package/dist/transformer/scss-transformer.js.map +1 -1
- package/dist/transformer/scss-transformer.test.js +106 -54
- package/dist/transformer/scss-transformer.test.js.map +1 -1
- package/dist/util.js +6 -8
- package/dist/util.js.map +1 -1
- package/dist/util.test.js +2 -2
- package/dist/util.test.js.map +1 -1
- package/package.json +59 -35
- package/src/__snapshots__/runner.test.ts.snap +1 -1
- package/src/cli.ts +119 -117
- package/src/emitter/dts.test.ts +12 -12
- package/src/emitter/dts.ts +27 -28
- package/src/emitter/file-system.test.ts +1 -1
- package/src/emitter/file-system.ts +2 -2
- package/src/emitter/index.test.ts +2 -4
- package/src/emitter/index.ts +1 -1
- package/src/emitter/source-map.test.ts +1 -1
- package/src/emitter/source-map.ts +1 -1
- package/src/integration-test/go-to-definition.test.ts +405 -105
- package/src/locator/index.test.ts +304 -171
- package/src/locator/index.ts +6 -6
- package/src/locator/postcss.test.ts +317 -73
- package/src/locator/postcss.ts +2 -3
- package/src/logger.ts +6 -6
- package/src/regression-test/issue-168.test.ts +3 -5
- package/src/resolver/index.ts +4 -4
- package/src/resolver/node-resolver.ts +1 -1
- package/src/resolver/relative-resolver.ts +1 -1
- package/src/resolver/webpack-resolver.ts +5 -5
- package/src/runner.test.ts +66 -43
- package/src/runner.ts +53 -22
- package/src/test-util/line-column.test.ts +21 -0
- package/src/test-util/line-column.ts +15 -0
- package/src/test-util/tsserver.ts +11 -12
- package/src/test-util/util.ts +24 -6
- package/src/transformer/index.test.ts +17 -17
- package/src/transformer/index.ts +1 -1
- package/src/transformer/less-transformer.test.ts +74 -47
- package/src/transformer/less-transformer.ts +1 -3
- package/src/transformer/postcss-transformer.test.ts +58 -54
- package/src/transformer/scss-transformer.test.ts +108 -54
- package/src/transformer/scss-transformer.ts +13 -30
- package/src/util.test.ts +2 -2
- package/src/util.ts +6 -8
- package/dist/test-util/jest/resolver.cjs +0 -31
- package/dist/test-util/jest/resolver.cjs.map +0 -1
- package/dist/test-util/jest/resolver.d.cts +0 -16
- package/src/test-util/jest/resolver.cjs +0 -31
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import { jest } from '@jest/globals';
|
|
4
3
|
import dedent from 'dedent';
|
|
5
4
|
import { Locator } from '../locator/index.js';
|
|
6
|
-
import { createFixtures, getFixturePath } from '../test-util/util.js';
|
|
5
|
+
import { createFixtures, getFixturePath, replaceFixtureDir } from '../test-util/util.js';
|
|
7
6
|
import { createPostcssTransformer } from './postcss-transformer.js';
|
|
8
7
|
const cwd = getFixturePath('/');
|
|
9
8
|
const require = createRequire(import.meta.url);
|
|
@@ -19,28 +18,34 @@ test('handles postcss features', async () => {
|
|
|
19
18
|
});
|
|
20
19
|
createFixtures({
|
|
21
20
|
[`/${uuid}/postcss.config.js`]: dedent `
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
21
|
+
module.exports = {
|
|
22
|
+
plugins: [
|
|
23
|
+
require('${require.resolve('postcss-simple-vars')}'),
|
|
24
|
+
],
|
|
25
|
+
};
|
|
27
26
|
`,
|
|
28
27
|
'/test/1.css': dedent `
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
$prefix: foo;
|
|
29
|
+
.$(prefix)_bar {}
|
|
31
30
|
`,
|
|
32
31
|
});
|
|
33
32
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
34
|
-
expect(result).toMatchInlineSnapshot(`
|
|
33
|
+
expect(replaceFixtureDir(result)).toMatchInlineSnapshot(`
|
|
35
34
|
{
|
|
36
|
-
dependencies: [],
|
|
37
|
-
tokens: [
|
|
35
|
+
"dependencies": [],
|
|
36
|
+
"tokens": [
|
|
38
37
|
{
|
|
39
|
-
name: "foo_bar",
|
|
40
|
-
originalLocation: {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
"name": "foo_bar",
|
|
39
|
+
"originalLocation": {
|
|
40
|
+
"end": {
|
|
41
|
+
"column": 8,
|
|
42
|
+
"line": 2,
|
|
43
|
+
},
|
|
44
|
+
"filePath": "<fixtures>/test/1.css",
|
|
45
|
+
"start": {
|
|
46
|
+
"column": 1,
|
|
47
|
+
"line": 2,
|
|
48
|
+
},
|
|
44
49
|
},
|
|
45
50
|
},
|
|
46
51
|
],
|
|
@@ -55,18 +60,18 @@ test('tracks dependencies that have been pre-bundled by postcss compiler', async
|
|
|
55
60
|
postcssConfig: `${uuid}/postcss.config.js`,
|
|
56
61
|
}),
|
|
57
62
|
});
|
|
58
|
-
const loadSpy =
|
|
63
|
+
const loadSpy = vi.spyOn(locator, 'load');
|
|
59
64
|
createFixtures({
|
|
60
65
|
[`/${uuid}/postcss.config.js`]: dedent `
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
+
module.exports = {
|
|
67
|
+
plugins: [
|
|
68
|
+
require('${require.resolve('postcss-import')}'),
|
|
69
|
+
],
|
|
70
|
+
};
|
|
66
71
|
`,
|
|
67
72
|
'/test/1.css': dedent `
|
|
68
|
-
|
|
69
|
-
|
|
73
|
+
@import './2.css';
|
|
74
|
+
@import './3.css';
|
|
70
75
|
`,
|
|
71
76
|
'/test/2.css': ``,
|
|
72
77
|
'/test/3.css': `@import './4.css'`,
|
|
@@ -75,7 +80,7 @@ test('tracks dependencies that have been pre-bundled by postcss compiler', async
|
|
|
75
80
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
76
81
|
// The files imported using @import are pre-bundled by the compiler.
|
|
77
82
|
// Therefore, `Locator#load` is not called to process other files.
|
|
78
|
-
expect(loadSpy).
|
|
83
|
+
expect(loadSpy).toHaveBeenCalledTimes(1);
|
|
79
84
|
expect(loadSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
|
|
80
85
|
// The files pre-bundled by the compiler are also included in `result.dependencies`
|
|
81
86
|
expect(result.dependencies).toStrictEqual(['/test/2.css', '/test/3.css', '/test/4.css'].map(getFixturePath));
|
|
@@ -90,16 +95,16 @@ test('resolves specifier using resolver', async () => {
|
|
|
90
95
|
});
|
|
91
96
|
createFixtures({
|
|
92
97
|
[`/${uuid}/postcss.config.js`]: dedent `
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
98
|
+
module.exports = {
|
|
99
|
+
plugins: [
|
|
100
|
+
// When using postcss-import, the resolver of happy-css-modules is ignored.
|
|
101
|
+
// Therefore, we test here without postcss-import.
|
|
102
|
+
// require('${require.resolve('postcss-import')}'),
|
|
103
|
+
],
|
|
104
|
+
};
|
|
100
105
|
`,
|
|
101
106
|
'/test/1.css': dedent `
|
|
102
|
-
|
|
107
|
+
@import 'package';
|
|
103
108
|
`,
|
|
104
109
|
'/node_modules/package/index.css': `.a {}`,
|
|
105
110
|
});
|
|
@@ -116,17 +121,17 @@ test('ignores http(s) protocol file', async () => {
|
|
|
116
121
|
});
|
|
117
122
|
createFixtures({
|
|
118
123
|
[`/${uuid}/postcss.config.js`]: dedent `
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
124
|
+
module.exports = {
|
|
125
|
+
plugins: [
|
|
126
|
+
// When using postcss-import, the resolver of happy-css-modules is ignored.
|
|
127
|
+
// Therefore, we test here without postcss-import.
|
|
128
|
+
// require('${require.resolve('postcss-import')}'),
|
|
129
|
+
],
|
|
130
|
+
};
|
|
126
131
|
`,
|
|
127
132
|
'/test/1.css': dedent `
|
|
128
|
-
|
|
129
|
-
|
|
133
|
+
@import 'http://example.com/path/http.css';
|
|
134
|
+
@import 'https://example.com/path/https.css';
|
|
130
135
|
`,
|
|
131
136
|
});
|
|
132
137
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
@@ -140,15 +145,14 @@ test('returns false if postcssrc is not found', async () => {
|
|
|
140
145
|
});
|
|
141
146
|
createFixtures({
|
|
142
147
|
'/test/1.css': dedent `
|
|
143
|
-
|
|
144
|
-
|
|
148
|
+
@import 'http://example.com/path/http.css';
|
|
149
|
+
@import 'https://example.com/path/https.css';
|
|
145
150
|
`,
|
|
146
151
|
});
|
|
147
152
|
expect(await transformer('', {
|
|
148
153
|
from: getFixturePath('/test/1.css'),
|
|
149
154
|
isIgnoredSpecifier: () => false,
|
|
150
|
-
|
|
151
|
-
resolver: jest.fn(),
|
|
155
|
+
resolver: vi.fn(),
|
|
152
156
|
})).toBe(false);
|
|
153
157
|
});
|
|
154
158
|
test('searches config from cwd if postcssConfig option is missing', async () => {
|
|
@@ -161,15 +165,15 @@ test('searches config from cwd if postcssConfig option is missing', async () =>
|
|
|
161
165
|
});
|
|
162
166
|
createFixtures({
|
|
163
167
|
[`/${uuid}/postcss.config.js`]: dedent `
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
168
|
+
module.exports = {
|
|
169
|
+
plugins: [
|
|
170
|
+
require('${require.resolve('postcss-simple-vars')}'),
|
|
171
|
+
],
|
|
172
|
+
};
|
|
169
173
|
`,
|
|
170
174
|
'/test/1.css': dedent `
|
|
171
|
-
|
|
172
|
-
|
|
175
|
+
$prefix: foo;
|
|
176
|
+
.$(prefix)_bar {}
|
|
173
177
|
`,
|
|
174
178
|
});
|
|
175
179
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postcss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/postcss-transformer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"postcss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/postcss-transformer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,40 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
// However, due to the implementation of custom resolvers, we have switched to the legacy API.
|
|
3
|
-
// Therefore, the workaround is now disabled. See
|
|
4
|
-
// https://github.com/mizdra/happy-css-modules/issues/65#issuecomment-1229471950 for more information.
|
|
1
|
+
import { fileURLToPath, pathToFileURL } from 'node:url';
|
|
5
2
|
import { handleImportError } from './index.js';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
return
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
reject(exception);
|
|
13
|
-
else
|
|
14
|
-
resolve(result);
|
|
15
|
-
});
|
|
16
|
-
});
|
|
17
|
-
};
|
|
18
|
-
}
|
|
3
|
+
const createFileImporter = (resolver) => ({
|
|
4
|
+
async findFileUrl(url, context) {
|
|
5
|
+
const path = await resolver(url, { request: fileURLToPath(context.containingUrl) });
|
|
6
|
+
return pathToFileURL(path);
|
|
7
|
+
},
|
|
8
|
+
});
|
|
19
9
|
export const createScssTransformer = () => {
|
|
20
10
|
let sass;
|
|
21
11
|
return async (source, options) => {
|
|
22
|
-
// eslint-disable-next-line require-atomic-updates
|
|
23
12
|
sass ??= await import('sass').catch(handleImportError('sass'));
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
data: source,
|
|
27
|
-
file: options.from,
|
|
28
|
-
outFile: 'DUMMY', // Required for sourcemap output.
|
|
13
|
+
const result = await sass.compileStringAsync(source, {
|
|
14
|
+
url: pathToFileURL(options.from),
|
|
29
15
|
sourceMap: true,
|
|
30
|
-
|
|
31
|
-
options
|
|
32
|
-
.resolver(url, { request: prev })
|
|
33
|
-
.then((resolved) => done({ file: resolved }))
|
|
34
|
-
.catch((e) => done(e));
|
|
35
|
-
},
|
|
16
|
+
importers: [createFileImporter(options.resolver)],
|
|
36
17
|
});
|
|
37
|
-
return { css: result.css.toString(), map: result.
|
|
18
|
+
return { css: result.css.toString(), map: JSON.stringify(result.sourceMap), dependencies: result.loadedUrls };
|
|
38
19
|
};
|
|
39
20
|
};
|
|
40
21
|
//# sourceMappingURL=scss-transformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scss-transformer.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"scss-transformer.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,kBAAkB,GAA0D,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC/F,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO;QAC5B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,aAAc,CAAC,EAAE,CAAC,CAAC;QACrF,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAsB,GAAG,EAAE;IAC3D,IAAI,IAA2B,CAAC;IAChC,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC/B,IAAI,KAAK,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;YACnD,GAAG,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;YAChC,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAClD,CAAC,CAAC;QACH,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAU,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;IACjH,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
|
-
import { jest } from '@jest/globals';
|
|
2
1
|
import dedent from 'dedent';
|
|
3
2
|
import { Locator } from '../locator/index.js';
|
|
4
|
-
import { createFixtures, getFixturePath } from '../test-util/util.js';
|
|
3
|
+
import { createFixtures, getFixturePath, replaceFixtureDir } from '../test-util/util.js';
|
|
5
4
|
import { createScssTransformer } from './scss-transformer.js';
|
|
5
|
+
vi.mock('sass', async (importOriginal) => {
|
|
6
|
+
const sass = await importOriginal();
|
|
7
|
+
return {
|
|
8
|
+
...sass,
|
|
9
|
+
// Suppress the warning: `Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0.`
|
|
10
|
+
compileStringAsync: async (source, options) => sass.compileStringAsync(source, { silenceDeprecations: ['import'], ...options }),
|
|
11
|
+
};
|
|
12
|
+
});
|
|
6
13
|
const locator = new Locator({ transformer: createScssTransformer() });
|
|
7
|
-
const loadSpy =
|
|
14
|
+
const loadSpy = vi.spyOn(locator, 'load');
|
|
8
15
|
afterEach(() => {
|
|
9
16
|
loadSpy.mockClear();
|
|
10
17
|
});
|
|
@@ -20,81 +27,126 @@ test('handles sass features', async () => {
|
|
|
20
27
|
.a_2_1 { dummy: ''; }
|
|
21
28
|
&_2 { dummy: ''; }
|
|
22
29
|
}
|
|
23
|
-
|
|
30
|
+
`,
|
|
24
31
|
'/test/2.scss': dedent `
|
|
25
32
|
.b_1 { dummy: ''; }
|
|
26
33
|
@mixin b_2 { dummy: ''; }
|
|
27
|
-
|
|
34
|
+
`,
|
|
28
35
|
'/test/3.scss': dedent `
|
|
29
36
|
.c { dummy: ''; }
|
|
30
|
-
|
|
37
|
+
`,
|
|
31
38
|
'/test/4.scss': dedent `
|
|
32
39
|
.d { dummy: ''; }
|
|
33
|
-
|
|
40
|
+
`,
|
|
34
41
|
});
|
|
35
42
|
const result = await locator.load(getFixturePath('/test/1.scss'));
|
|
36
43
|
// NOTE: There should be only one originalLocations for 'a_2', but there are multiple.
|
|
37
44
|
// This is probably due to an incorrect sourcemap output by the sass compiler.
|
|
38
45
|
// FIXME: The sass compiler or Loader implementation needs to be fixed.
|
|
39
46
|
// FIXME: The end position of 'a_2_2' is incorrect.
|
|
40
|
-
expect(result).toMatchInlineSnapshot(`
|
|
47
|
+
expect(replaceFixtureDir(result)).toMatchInlineSnapshot(`
|
|
41
48
|
{
|
|
42
|
-
dependencies: [
|
|
43
|
-
|
|
49
|
+
"dependencies": [
|
|
50
|
+
"<fixtures>/test/2.scss",
|
|
51
|
+
"<fixtures>/test/3.scss",
|
|
52
|
+
],
|
|
53
|
+
"tokens": [
|
|
44
54
|
{
|
|
45
|
-
name: "b_1",
|
|
46
|
-
originalLocation: {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
55
|
+
"name": "b_1",
|
|
56
|
+
"originalLocation": {
|
|
57
|
+
"end": {
|
|
58
|
+
"column": 4,
|
|
59
|
+
"line": 1,
|
|
60
|
+
},
|
|
61
|
+
"filePath": "<fixtures>/test/2.scss",
|
|
62
|
+
"start": {
|
|
63
|
+
"column": 1,
|
|
64
|
+
"line": 1,
|
|
65
|
+
},
|
|
50
66
|
},
|
|
51
67
|
},
|
|
52
68
|
{
|
|
53
|
-
name: "c",
|
|
54
|
-
originalLocation: {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
69
|
+
"name": "c",
|
|
70
|
+
"originalLocation": {
|
|
71
|
+
"end": {
|
|
72
|
+
"column": 2,
|
|
73
|
+
"line": 1,
|
|
74
|
+
},
|
|
75
|
+
"filePath": "<fixtures>/test/3.scss",
|
|
76
|
+
"start": {
|
|
77
|
+
"column": 1,
|
|
78
|
+
"line": 1,
|
|
79
|
+
},
|
|
58
80
|
},
|
|
59
81
|
},
|
|
60
82
|
{
|
|
61
|
-
name: "a_1",
|
|
62
|
-
originalLocation: {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
83
|
+
"name": "a_1",
|
|
84
|
+
"originalLocation": {
|
|
85
|
+
"end": {
|
|
86
|
+
"column": 4,
|
|
87
|
+
"line": 3,
|
|
88
|
+
},
|
|
89
|
+
"filePath": "<fixtures>/test/1.scss",
|
|
90
|
+
"start": {
|
|
91
|
+
"column": 1,
|
|
92
|
+
"line": 3,
|
|
93
|
+
},
|
|
66
94
|
},
|
|
67
95
|
},
|
|
68
96
|
{
|
|
69
|
-
name: "a_2",
|
|
70
|
-
originalLocation: {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
97
|
+
"name": "a_2",
|
|
98
|
+
"originalLocation": {
|
|
99
|
+
"end": {
|
|
100
|
+
"column": 4,
|
|
101
|
+
"line": 4,
|
|
102
|
+
},
|
|
103
|
+
"filePath": "<fixtures>/test/1.scss",
|
|
104
|
+
"start": {
|
|
105
|
+
"column": 1,
|
|
106
|
+
"line": 4,
|
|
107
|
+
},
|
|
74
108
|
},
|
|
75
109
|
},
|
|
76
110
|
{
|
|
77
|
-
name: "a_2",
|
|
78
|
-
originalLocation: {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
111
|
+
"name": "a_2",
|
|
112
|
+
"originalLocation": {
|
|
113
|
+
"end": {
|
|
114
|
+
"column": 6,
|
|
115
|
+
"line": 7,
|
|
116
|
+
},
|
|
117
|
+
"filePath": "<fixtures>/test/1.scss",
|
|
118
|
+
"start": {
|
|
119
|
+
"column": 3,
|
|
120
|
+
"line": 7,
|
|
121
|
+
},
|
|
82
122
|
},
|
|
83
123
|
},
|
|
84
124
|
{
|
|
85
|
-
name: "a_2_1",
|
|
86
|
-
originalLocation: {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
125
|
+
"name": "a_2_1",
|
|
126
|
+
"originalLocation": {
|
|
127
|
+
"end": {
|
|
128
|
+
"column": 8,
|
|
129
|
+
"line": 7,
|
|
130
|
+
},
|
|
131
|
+
"filePath": "<fixtures>/test/1.scss",
|
|
132
|
+
"start": {
|
|
133
|
+
"column": 3,
|
|
134
|
+
"line": 7,
|
|
135
|
+
},
|
|
90
136
|
},
|
|
91
137
|
},
|
|
92
138
|
{
|
|
93
|
-
name: "a_2_2",
|
|
94
|
-
originalLocation: {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
139
|
+
"name": "a_2_2",
|
|
140
|
+
"originalLocation": {
|
|
141
|
+
"end": {
|
|
142
|
+
"column": 8,
|
|
143
|
+
"line": 8,
|
|
144
|
+
},
|
|
145
|
+
"filePath": "<fixtures>/test/1.scss",
|
|
146
|
+
"start": {
|
|
147
|
+
"column": 3,
|
|
148
|
+
"line": 8,
|
|
149
|
+
},
|
|
98
150
|
},
|
|
99
151
|
},
|
|
100
152
|
],
|
|
@@ -104,13 +156,13 @@ test('handles sass features', async () => {
|
|
|
104
156
|
test('tracks dependencies that have been pre-bundled by sass compiler', async () => {
|
|
105
157
|
createFixtures({
|
|
106
158
|
'/test/1.scss': dedent `
|
|
107
|
-
|
|
108
|
-
|
|
159
|
+
@import './2.scss';
|
|
160
|
+
@import './3.scss';
|
|
109
161
|
`,
|
|
110
162
|
'/test/2.scss': dedent `
|
|
111
163
|
`,
|
|
112
164
|
'/test/3.scss': dedent `
|
|
113
|
-
|
|
165
|
+
@import './4.scss';
|
|
114
166
|
`,
|
|
115
167
|
'/test/4.scss': dedent `
|
|
116
168
|
`,
|
|
@@ -118,7 +170,7 @@ test('tracks dependencies that have been pre-bundled by sass compiler', async ()
|
|
|
118
170
|
const result = await locator.load(getFixturePath('/test/1.scss'));
|
|
119
171
|
// The files imported using @import are pre-bundled by the compiler.
|
|
120
172
|
// Therefore, `Locator#load` is not called to process other files.
|
|
121
|
-
expect(loadSpy).
|
|
173
|
+
expect(loadSpy).toHaveBeenCalledTimes(1);
|
|
122
174
|
expect(loadSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.scss'));
|
|
123
175
|
// The files pre-bundled by the compiler are also included in `result.dependencies`
|
|
124
176
|
expect(result.dependencies).toStrictEqual(['/test/2.scss', '/test/3.scss', '/test/4.scss'].map(getFixturePath));
|
|
@@ -126,8 +178,8 @@ test('tracks dependencies that have been pre-bundled by sass compiler', async ()
|
|
|
126
178
|
test('resolves specifier using resolver', async () => {
|
|
127
179
|
createFixtures({
|
|
128
180
|
'/test/1.scss': dedent `
|
|
129
|
-
|
|
130
|
-
|
|
181
|
+
@import 'package-1';
|
|
182
|
+
@import 'package-2';
|
|
131
183
|
`,
|
|
132
184
|
'/node_modules/package-1/index.css': `.a {}`,
|
|
133
185
|
'/node_modules/package-2/index.scss': `.a {}`,
|
|
@@ -138,9 +190,9 @@ test('resolves specifier using resolver', async () => {
|
|
|
138
190
|
test('ignores http(s) protocol file', async () => {
|
|
139
191
|
createFixtures({
|
|
140
192
|
'/test/1.scss': dedent `
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
193
|
+
@import 'http://example.com/path/http.css';
|
|
194
|
+
@import 'https://example.com/path/https.css';
|
|
195
|
+
@import 'https://example.com/path/scss.scss';
|
|
144
196
|
`,
|
|
145
197
|
});
|
|
146
198
|
const result = await locator.load(getFixturePath('/test/1.scss'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"scss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.test.ts"],"names":[],"mappings":"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"}
|
package/dist/util.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { constants, readFileSync } from 'fs';
|
|
2
|
-
import { access } from 'fs/promises';
|
|
3
|
-
import { join, dirname, resolve } from 'path';
|
|
4
|
-
import { fileURLToPath } from 'url';
|
|
1
|
+
import { constants, readFileSync } from 'node:fs';
|
|
2
|
+
import { access } from 'node:fs/promises';
|
|
3
|
+
import { join, dirname, resolve, matchesGlob } from 'node:path';
|
|
4
|
+
import { fileURLToPath } from 'node:url';
|
|
5
5
|
import { resolve as importMetaResolve } from 'import-meta-resolve';
|
|
6
|
-
import { minimatch } from 'minimatch';
|
|
7
6
|
export function isSystemError(value) {
|
|
8
7
|
return (isObject(value) &&
|
|
9
8
|
hasProp(value, 'constructor') &&
|
|
@@ -36,7 +35,6 @@ export function uniqueBy(arr, fn) {
|
|
|
36
35
|
}
|
|
37
36
|
export function sleepSync(ms) {
|
|
38
37
|
const start = Date.now();
|
|
39
|
-
// eslint-disable-next-line no-empty
|
|
40
38
|
while (Date.now() - start < ms) { }
|
|
41
39
|
}
|
|
42
40
|
export async function exists(path) {
|
|
@@ -44,12 +42,12 @@ export async function exists(path) {
|
|
|
44
42
|
await access(path, constants.F_OK);
|
|
45
43
|
return true;
|
|
46
44
|
}
|
|
47
|
-
catch
|
|
45
|
+
catch {
|
|
48
46
|
return false;
|
|
49
47
|
}
|
|
50
48
|
}
|
|
51
49
|
export function isMatchByGlob(filePath, pattern, options) {
|
|
52
|
-
return
|
|
50
|
+
return matchesGlob(filePath, join(options.cwd, pattern));
|
|
53
51
|
}
|
|
54
52
|
export function getPackageJson() {
|
|
55
53
|
return JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf-8'));
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/dist/util.test.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { join } from 'path';
|
|
1
|
+
import { join } from 'node:path';
|
|
2
2
|
import { createFixtures, getFixturePath } from './test-util/util.js';
|
|
3
3
|
import { hasProp, isObject, isSystemError, unique, uniqueBy, isMatchByGlob, exists } from './util.js';
|
|
4
4
|
function fakeSystemError({ code }) {
|
|
5
5
|
const error = new Error();
|
|
6
|
-
//
|
|
6
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
7
7
|
error.code = code;
|
|
8
8
|
return error;
|
|
9
9
|
}
|
package/dist/util.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.test.js","sourceRoot":"","sources":["../src/util.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"util.test.js","sourceRoot":"","sources":["../src/util.test.ts"],"names":[],"mappings":"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"}
|