Skip to content

Commit a8502e3

Browse files
jasonwilliamsjasonwilliams
authored
Merge pull request #2 from styled-components/fixTestAndUpdate
update and fork
2 parents 4f6ad2a + e02cf14 commit a8502e3

File tree

8 files changed

+5286
-684
lines changed

8 files changed

+5286
-684
lines changed

‎README.md

+100-108
Large diffs are not rendered by default.

‎e2e/disabled-emmet-project-fixture/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"target": "es2015",
44
"module": "commonjs",
55
"plugins": [
6-
{ "name": "typescript-styled-plugin", "tags": ["css"], "emmet": { "showExpandedAbbreviation": "never"} }
6+
{ "name": "@styled/typescript-styled-plugin", "tags": ["css"], "emmet": { "showExpandedAbbreviation": "never"} }
77
]
88
}
99
}

‎e2e/package-lock.json

+2,392-161
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎e2e/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"author": "",
1515
"license": "ISC",
1616
"dependencies": {
17-
"typescript": "^4.2.4",
18-
"typescript-styled-plugin": "file:./.."
17+
"typescript": "^4.9.3",
18+
"@styled/typescript-styled-plugin": "file:./.."
1919
}
2020
}

‎e2e/project-fixture/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"target": "es2019",
3+
"target": "ES2021",
44
"module": "commonjs",
5-
"plugins": [{ "name": "typescript-styled-plugin", "tags": ["css", "keyframes"] }]
5+
"plugins": [{ "name": "@styled/typescript-styled-plugin", "tags": ["css", "keyframes"] }]
66
}
77
}

‎e2e/tests/completions.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Completions', () => {
1919
return server.close().then(() => {
2020
const completionsResponse = getFirstResponseOfType('completions', server);
2121
assert.isTrue(completionsResponse.success);
22-
assert.strictEqual(completionsResponse.body.length, 157);
22+
assert.strictEqual(completionsResponse.body.length, 160);
2323
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
2424
assert.isTrue(completionsResponse.body.some((item) => item.name === 'rgba'));
2525
});
@@ -43,7 +43,7 @@ describe('Completions', () => {
4343
return server.close().then(() => {
4444
const completionsResponse = getFirstResponseOfType('completions', server);
4545
assert.isTrue(completionsResponse.success);
46-
assert.strictEqual(completionsResponse.body.length, 157);
46+
assert.strictEqual(completionsResponse.body.length, 160);
4747
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
4848
});
4949
});
@@ -55,7 +55,7 @@ describe('Completions', () => {
5555
return server.close().then(() => {
5656
const completionsResponse = getFirstResponseOfType('completions', server);
5757
assert.isTrue(completionsResponse.success);
58-
assert.strictEqual(completionsResponse.body.length, 157);
58+
assert.strictEqual(completionsResponse.body.length, 160);
5959
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
6060
});
6161
});
@@ -78,7 +78,7 @@ describe('Completions', () => {
7878
return server.close().then(() => {
7979
const completionsResponse = getFirstResponseOfType('completions', server);
8080
assert.isTrue(completionsResponse.success);
81-
assert.strictEqual(completionsResponse.body.length, 157);
81+
assert.strictEqual(completionsResponse.body.length, 160);
8282
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
8383
});
8484
});
@@ -90,7 +90,7 @@ describe('Completions', () => {
9090
return server.close().then(() => {
9191
const completionsResponse = getFirstResponseOfType('completions', server);
9292
assert.isTrue(completionsResponse.success);
93-
assert.strictEqual(completionsResponse.body.length, 157);
93+
assert.strictEqual(completionsResponse.body.length, 160);
9494
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
9595
});
9696
});
@@ -102,7 +102,7 @@ describe('Completions', () => {
102102
return server.close().then(() => {
103103
const completionsResponse = getFirstResponseOfType('completions', server);
104104
assert.isTrue(completionsResponse.success);
105-
assert.strictEqual(completionsResponse.body.length, 157);
105+
assert.strictEqual(completionsResponse.body.length, 160);
106106
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
107107
});
108108
});
@@ -114,7 +114,7 @@ describe('Completions', () => {
114114
return server.close().then(() => {
115115
const completionsResponse = getFirstResponseOfType('completions', server);
116116
assert.isTrue(completionsResponse.success);
117-
assert.strictEqual(completionsResponse.body.length, 157);
117+
assert.strictEqual(completionsResponse.body.length, 160);
118118
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
119119
});
120120
});
@@ -181,7 +181,7 @@ describe('Completions', () => {
181181
return server.close().then(() => {
182182
const completionsResponse = getFirstResponseOfType('completions', server);
183183
assert.isTrue(completionsResponse.success);
184-
assert.strictEqual(completionsResponse.body.length, 157);
184+
assert.strictEqual(completionsResponse.body.length, 160);
185185
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
186186
});
187187
});
@@ -195,7 +195,7 @@ describe('Completions', () => {
195195
return server.close().then(() => {
196196
const completionsResponse = getFirstResponseOfType('completions', server);
197197
assert.isTrue(completionsResponse.success);
198-
assert.strictEqual(completionsResponse.body.length, 157);
198+
assert.strictEqual(completionsResponse.body.length, 160);
199199
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
200200
});
201201
});
@@ -207,7 +207,7 @@ describe('Completions', () => {
207207
return server.close().then(() => {
208208
const completionsResponse = getFirstResponseOfType('completions', server);
209209
assert.isTrue(completionsResponse.success);
210-
assert.strictEqual(completionsResponse.body.length, 157);
210+
assert.strictEqual(completionsResponse.body.length, 160);
211211
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
212212
assert.isTrue(completionsResponse.body.some((item) => item.name === 'rgba'));
213213
});
@@ -220,7 +220,7 @@ describe('Completions', () => {
220220
await server.close();
221221
const completionsResponse = getFirstResponseOfType('completions', server);
222222
assert.isTrue(completionsResponse.success);
223-
assert.strictEqual(completionsResponse.body.length, 157);
223+
assert.strictEqual(completionsResponse.body.length, 160);
224224
assert.isTrue(completionsResponse.body.some((item) => item.name === 'aliceblue'));
225225
assert.isTrue(completionsResponse.body.some((item) => item.name === 'rgba'));
226226
});

0 commit comments

Comments
 (0)