Skip to content

Commit 0bc7964

Browse files
chriseppsteinchriseppstein
committed
fix: Clean up the dependencies on @Glimmer packages.
1 parent 85c3560 commit 0bc7964

File tree

11 files changed

+81
-15
lines changed

11 files changed

+81
-15
lines changed

‎packages/@css-blocks/broccoli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
},
4040
"dependencies": {
4141
"@css-blocks/core": "^1.2.0",
42-
"@glimmer/compiler": "^0.43.0",
43-
"@glimmer/syntax": "^0.43.0",
42+
"@glimmer/compiler": "^0.51.1",
43+
"@glimmer/syntax": "^0.51.1",
4444
"@opticss/template-api": "^0.7.0",
4545
"broccoli-funnel": "^3.0.0",
4646
"broccoli-merge-trees": "^4.0.0",

‎packages/@css-blocks/ember/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"devDependencies": {
3838
"@css-blocks/code-style": "^1.2.0",
3939
"@css-blocks/glimmer": "^1.0.0",
40+
"@glimmer/syntax": "^0.51.1",
4041
"@types/chai-as-promised": "^7.1.2",
4142
"@types/console-ui": "^2.2.3",
4243
"@types/core-object": "^3.0.1",
@@ -57,8 +58,6 @@
5758
"@css-blocks/core": "^1.2.0",
5859
"@css-blocks/ember-utils": "^1.2.1",
5960
"@css-blocks/glimmer": "^1.2.0",
60-
"@glimmer/compiler": "^0.43.0",
61-
"@glimmer/syntax": "^0.43.0",
6261
"@opticss/template-api": "^0.7.0",
6362
"@opticss/util": "^0.7.0",
6463
"broccoli-debug": "^0.6.5",

‎packages/@css-blocks/ember/src/AnalyzingRewriteManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
resolveConfiguration,
1111
} from "@css-blocks/core";
1212
import { EmberAnalysis, HandlebarsTemplate, TEMPLATE_TYPE } from "@css-blocks/ember-utils";
13-
import { Syntax } from "@glimmer/syntax";
13+
import type { Syntax } from "@glimmer/syntax";
1414
import { ObjectDictionary, unionInto } from "@opticss/util";
1515

1616
import { FileLocator } from "./FileLocator";

‎packages/@css-blocks/ember/src/TemplateAnalyzingRewriter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { StringExpression as StringAST, TemplateElement, isStyleOfHelper } from
1414
import { getEmberBuiltInStates, isEmberBuiltIn, isEmberBuiltInNode } from "@css-blocks/glimmer/dist/cjs/src/EmberBuiltins";
1515
import { CONCAT_HELPER_NAME } from "@css-blocks/glimmer/dist/cjs/src/helpers";
1616
import { cssBlockError, isConcatStatement, isMustacheStatement, isPathExpression, isStringLiteral, isSubExpression, isTextNode, pathString } from "@css-blocks/glimmer/dist/cjs/src/utils";
17-
import {
17+
import type {
1818
AST,
1919
ASTPlugin,
2020
NodeVisitor,

‎packages/@css-blocks/ember/src/types/ember-cli-preprocess-registry/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ASTPluginBuilder } from '@glimmer/syntax';
1+
import type { ASTPluginBuilder } from '@glimmer/syntax';
22

33
// from https://github.com/typed-ember/ember-cli-typescript/blob/master/ts/types/ember-cli-preprocess-registry/index.d.ts
44
declare module 'ember-cli-preprocess-registry' {

‎packages/@css-blocks/glimmer/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
"dependencies": {
5959
"@amiller-gh/glimmer-analyzer": "^0.4.0",
6060
"@css-blocks/core": "^1.2.0",
61-
"@glimmer/compiler": "^0.43.0",
61+
"@glimmer/compiler": "^0.51.1",
6262
"@glimmer/resolution-map-builder": "0.5.1",
6363
"@glimmer/resolver": "^0.4.3",
64-
"@glimmer/syntax": "^0.43.0",
64+
"@glimmer/syntax": "^0.51.1",
6565
"@opticss/element-analysis": "^0.6.2",
6666
"@opticss/template-api": "^0.7.0",
6767
"@opticss/util": "^0.7.0",

‎packages/@css-blocks/glimmer/src/Analyzer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
BlockFactory,
99
} from "@css-blocks/core";
1010
import { ResolverConfiguration } from "@glimmer/resolver";
11-
import { AST, preprocess, traverse } from "@glimmer/syntax";
11+
import { AST, preprocess, traverse } from "@glimmer/syntax";
1212
import { TemplateIntegrationOptions } from "@opticss/template-api";
1313
import * as debugGenerator from "debug";
1414
import * as fs from "fs";

‎packages/@css-blocks/glimmer/src/EmberBuiltins.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AST } from "@glimmer/syntax";
1+
import type { AST } from "@glimmer/syntax";
22

33
import { isBlockStatement, isMustacheStatement, isPathExpression, isStringLiteral } from "./utils";
44

‎packages/@css-blocks/glimmer/src/Rewriter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
resolveConfiguration,
77
} from "@css-blocks/core";
88
import { DEFAULT_EXPORT } from "@css-blocks/core/dist/src/BlockSyntax";
9-
import {
9+
import type {
1010
AST,
1111
ASTPlugin,
1212
NodeVisitor,

‎packages/@css-blocks/glimmer/src/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CssBlockError } from "@css-blocks/core";
2-
import { AST } from "@glimmer/syntax";
2+
import type { AST } from "@glimmer/syntax";
33
import { ClassifiedParsedSelectors } from "opticss";
44

55
export type AnalyzableNode = AST.ElementNode | AST.BlockStatement | AST.MustacheStatement | AST.SubExpression;

‎yarn.lock

+69-2
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,17 @@
14931493
"@glimmer/util" "^0.43.0"
14941494
"@glimmer/wire-format" "^0.43.0"
14951495

1496+
"@glimmer/compiler@^0.51.1":
1497+
version "0.51.1"
1498+
resolved "https://registry.npmjs.org/@glimmer/compiler/-/compiler-0.51.1.tgz#2de0ab1a6a7d335e3b3a726b6e209c7f4c578033"
1499+
integrity sha512-Z+Kon7apLazd4y9AQzFs3O/JtbEg9Xo4lYB7njzosUUxc644Ix6tz14hPwu89MJ2hF16rJQpvLAvD+6Jq6ZKSw==
1500+
dependencies:
1501+
"@glimmer/interfaces" "^0.51.1"
1502+
"@glimmer/syntax" "^0.51.1"
1503+
"@glimmer/util" "^0.51.1"
1504+
"@glimmer/wire-format" "^0.51.1"
1505+
"@simple-dom/interface" "^1.4.0"
1506+
14961507
"@glimmer/component@^0.13.0":
14971508
version "0.13.0"
14981509
resolved "https://registry.npmjs.org/@glimmer/component/-/component-0.13.0.tgz#17992f4f2c7330b3f26d2999f4deed4f7c9f80f7"
@@ -1535,7 +1546,7 @@
15351546
resolved "https://registry.npmjs.org/@glimmer/encoder/-/encoder-0.34.8.tgz#e3548dab4fc639800fcc9267c236781c848f3ddd"
15361547
integrity sha512-E6HGSu1XDXk8fWUQPiN6DarYUUV43PqQV+xUICuIlrBKH6WZSx9NeZaxi6q8nqmSnoAyhcPjHIrg3l0sypNs8w==
15371548

1538-
"@glimmer/env@^0.1.7":
1549+
"@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
15391550
version "0.1.7"
15401551
resolved "https://registry.npmjs.org/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
15411552
integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
@@ -1566,6 +1577,13 @@
15661577
resolved "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.43.0.tgz#a7a38c2476f87d68d6dc894840df17bc8b92de33"
15671578
integrity sha512-rWu6WHVo6tuFFOKOSJWAWsFfXZgkdnKDnvhl3tAb20njW/0uBZ2nx7GZ3lImvBeG0HoxyzYA7pD299ps03TemA==
15681579

1580+
"@glimmer/interfaces@^0.51.1":
1581+
version "0.51.1"
1582+
resolved "https://registry.npmjs.org/@glimmer/interfaces/-/interfaces-0.51.1.tgz#c5637669ff83c630d91c700598b9963225d656f2"
1583+
integrity sha512-ImwkFNj92RaeANQPlnSQ5kTtK18JzkY2FPE7N7Ktn3AvdXgM4P3puQzPuXhTn4UCBl6NZtN8YqCAy7kQ6eRC0w==
1584+
dependencies:
1585+
"@simple-dom/interface" "^1.4.0"
1586+
15691587
"@glimmer/low-level@^0.31.0":
15701588
version "0.31.0"
15711589
resolved "https://registry.npmjs.org/@glimmer/low-level/-/low-level-0.31.0.tgz#c5ed9c825fa67498f5285e8fe8003ec54d58d826"
@@ -1745,6 +1763,16 @@
17451763
handlebars "^4.0.13"
17461764
simple-html-tokenizer "^0.5.8"
17471765

1766+
"@glimmer/syntax@^0.51.1":
1767+
version "0.51.1"
1768+
resolved "https://registry.npmjs.org/@glimmer/syntax/-/syntax-0.51.1.tgz#24cb4f01693bd934075d03087bdc76ab6bff0524"
1769+
integrity sha512-z5XSbLgMKGU8tgSm9Ju4mimSAJ6/SZrY2Xw2znEAmUJOIPte+tmkdpggpgj7lAjD5u2YVBVHDbz6RaZDhYASsw==
1770+
dependencies:
1771+
"@glimmer/interfaces" "^0.51.1"
1772+
"@glimmer/util" "^0.51.1"
1773+
handlebars "^4.7.4"
1774+
simple-html-tokenizer "^0.5.9"
1775+
17481776
"@glimmer/test-helpers@^0.31.2":
17491777
version "0.31.2"
17501778
resolved "https://registry.npmjs.org/@glimmer/test-helpers/-/test-helpers-0.31.2.tgz#3614cca5e1714ce08c41175ba2505e3329dca732"
@@ -1765,6 +1793,15 @@
17651793
resolved "https://registry.npmjs.org/@glimmer/util/-/util-0.43.0.tgz#dd28cd1a233c25427032437b9050c6fa6d098e2c"
17661794
integrity sha512-RtjHU8/rhysOugu+Q0j6dQ3G67J4h45tQgKPEwVPxu8P+hqijqnz/lBLxTdVg/1zKmlqUkyngTr8H4Jpg2yF/g==
17671795

1796+
"@glimmer/util@^0.51.1":
1797+
version "0.51.1"
1798+
resolved "https://registry.npmjs.org/@glimmer/util/-/util-0.51.1.tgz#db27afd2ee7191e8e399c272b9f7fbe05cc26691"
1799+
integrity sha512-MCwUvV3z4pqLpeXcv5Mbchdgw0GeEPH8jUEkUTG837b5XlC2M/NO893E5A8AZbGNSP7CDsYibDExz7mjaLqq/A==
1800+
dependencies:
1801+
"@glimmer/env" "0.1.7"
1802+
"@glimmer/interfaces" "^0.51.1"
1803+
"@simple-dom/interface" "^1.4.0"
1804+
17681805
"@glimmer/vm@^0.31.0":
17691806
version "0.31.0"
17701807
resolved "https://registry.npmjs.org/@glimmer/vm/-/vm-0.31.0.tgz#5ea4b84723e184a869a09f6a24a3715eb9056599"
@@ -1805,6 +1842,14 @@
18051842
"@glimmer/interfaces" "^0.43.0"
18061843
"@glimmer/util" "^0.43.0"
18071844

1845+
"@glimmer/wire-format@^0.51.1":
1846+
version "0.51.1"
1847+
resolved "https://registry.npmjs.org/@glimmer/wire-format/-/wire-format-0.51.1.tgz#3b6b9c7f108eeeb84297961cade16bc3b980c2f4"
1848+
integrity sha512-EcgSfF4jAq9Q90okQIoSu+P2Ss/ZZkbjo4ZtFEPqTr8U3qqb01pR4qHJF5lAU8uFebHasiB8OBGdBBB6jwFLDA==
1849+
dependencies:
1850+
"@glimmer/interfaces" "^0.51.1"
1851+
"@glimmer/util" "^0.51.1"
1852+
18081853
"@lerna/[email protected]":
18091854
version "3.20.0"
18101855
resolved "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz#bea7edf36fc93fb72ec34cb9ba854c48d4abf309"
@@ -2655,6 +2700,11 @@
26552700
dependencies:
26562701
typescript-collections "^1.2.5"
26572702

2703+
"@simple-dom/interface@^1.4.0":
2704+
version "1.4.0"
2705+
resolved "https://registry.npmjs.org/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
2706+
integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
2707+
26582708
"@sindresorhus/is@^0.7.0":
26592709
version "0.7.0"
26602710
resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -11030,6 +11080,18 @@ handlebars@*, handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.13, handleb
1103011080
optionalDependencies:
1103111081
uglify-js "^3.1.4"
1103211082

11083+
handlebars@^4.7.4:
11084+
version "4.7.6"
11085+
resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
11086+
integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
11087+
dependencies:
11088+
minimist "^1.2.5"
11089+
neo-async "^2.6.0"
11090+
source-map "^0.6.1"
11091+
wordwrap "^1.0.0"
11092+
optionalDependencies:
11093+
uglify-js "^3.1.4"
11094+
1103311095
har-schema@^2.0.0:
1103411096
version "2.0.0"
1103511097
resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -13903,6 +13965,11 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
1390313965
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
1390413966
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
1390513967

13968+
minimist@^1.2.5:
13969+
version "1.2.5"
13970+
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
13971+
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
13972+
1390613973
minimist@~0.0.1:
1390713974
version "0.0.10"
1390813975
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -17505,7 +17572,7 @@ simple-html-tokenizer@^0.4.1:
1750517572
resolved "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.4.3.tgz#9b00b766e30058b4bb377c0d4f97566a13ab1be1"
1750617573
integrity sha512-OpUzgR+P/Qsu6ztZehr4PxvTbV4sDW91hAqc2tnz4fjuFTqErWIUdUMbnzX+19F4IEpSSfa0vCAz5xJSs0LpPw==
1750717574

17508-
simple-html-tokenizer@^0.5.1, simple-html-tokenizer@^0.5.3, simple-html-tokenizer@^0.5.8:
17575+
simple-html-tokenizer@^0.5.1, simple-html-tokenizer@^0.5.3, simple-html-tokenizer@^0.5.8, simple-html-tokenizer@^0.5.9:
1750917576
version "0.5.9"
1751017577
resolved "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
1751117578
integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==

0 commit comments

Comments
 (0)