diff --git a/package.json b/package.json index 1bad64cd..a6bc5491 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", + "lint:glint": "glint", "prepare": "husky install", "start": "ember serve", "test": "npm-run-all lint test:*", @@ -56,9 +57,9 @@ "@ember/string": "^3.1.1", "@ember/test-helpers": "^3.2.0", "@embroider/test-setup": "^3.0.1", - "@glint/core": "^0.9.4", - "@glint/template": "^0.9.4", - "@glint/environment-ember-loose": "^0.9.7", + "@glint/core": "^1.2.0", + "@glint/template": "^1.2.0", + "@glint/environment-ember-loose": "^1.2.0", "@release-it-plugins/lerna-changelog": "^5.0.0", "@tsconfig/ember": "^1.0.1", "@types/ember": "^4.0.1", diff --git a/tests/dummy/app/components/album-cover/index.hbs b/tests/dummy/app/components/album-cover/index.hbs index 403f67c4..11f702b4 100644 --- a/tests/dummy/app/components/album-cover/index.hbs +++ b/tests/dummy/app/components/album-cover/index.hbs @@ -1,3 +1,4 @@ +{{! @glint-nocheck: not typeschecking dummy app templates yet }}
{{@artist}} - {{@title}}
diff --git a/tests/dummy/app/components/markdown-content/index.hbs b/tests/dummy/app/components/markdown-content/index.hbs index 3a1dc683..0021a377 100644 --- a/tests/dummy/app/components/markdown-content/index.hbs +++ b/tests/dummy/app/components/markdown-content/index.hbs @@ -1,5 +1,5 @@ {{!-- BEGIN-SNIPPET markdown-example --}} -
+
{{yield}}
{{!-- template-lint-disable no-triple-curlies --}}
{{{this.renderedMarkdown}}}
diff --git a/tests/dummy/app/components/markdown-content/index.ts b/tests/dummy/app/components/markdown-content/index.ts index 7f1677cf..094760f4 100644 --- a/tests/dummy/app/components/markdown-content/index.ts +++ b/tests/dummy/app/components/markdown-content/index.ts @@ -7,7 +7,14 @@ import { action } from '@ember/object'; import { Remarkable } from 'remarkable'; import stripIndent from 'strip-indent'; -export default class MarkdownContent extends Component { +interface Signature { + Element: HTMLDivElement; + Blocks: { + default: []; + }; +} + +export default class MarkdownContent extends Component { @tracked rawMarkdown: string | undefined; @action diff --git a/tests/dummy/app/components/x-foo/index.hbs b/tests/dummy/app/components/x-foo/index.hbs index cf9d63eb..65b4a6bc 100644 --- a/tests/dummy/app/components/x-foo/index.hbs +++ b/tests/dummy/app/components/x-foo/index.hbs @@ -1,3 +1,4 @@ +{{! @glint-nocheck: not typeschecking test templates yet }} {{!-- BEGIN-FREESTYLE-USAGE foo-normal --}}
Foo
diff --git a/tests/dummy/app/templates/documentation.hbs b/tests/dummy/app/templates/documentation.hbs index 21d2d229..bb3e7b8f 100644 --- a/tests/dummy/app/templates/documentation.hbs +++ b/tests/dummy/app/templates/documentation.hbs @@ -1,3 +1,4 @@ +{{! @glint-nocheck: not typeschecking dummy app templates yet }}
diff --git a/yarn.lock b/yarn.lock index 38dfcc92..88193cff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1494,50 +1494,30 @@ dependencies: babel-plugin-debug-macros "^0.3.4" -"@glint/config@^0.9.7": - version "0.9.7" - resolved "https://registry.yarnpkg.com/@glint/config/-/config-0.9.7.tgz#43077e9cd2743d3bb66f6c4670681c49644ac139" - integrity sha512-XkWIZ3fuOlcofUJUaJmRS57mVVNi+Af2HtrZkBXEOCh4+BNz2wclxv2WKvkhmtvLhEUOhHb5eU3gwI58SuwgXQ== +"@glint/core@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@glint/core/-/core-1.2.0.tgz#4551ba871a852ee605eef44b43b0907b8f4637cb" + integrity sha512-dugZ4wSWOubC9O4+pxhX1EgTf7rVi1ZNYsZ66XKEKPY2JGxAtI5dqyjl4BsX8SkbGKKDKeMKIZjcaDsz17VMqw== dependencies: + "@glimmer/syntax" "^0.84.2" escape-string-regexp "^4.0.0" - minimatch "^3.0.4" - resolve "^1.17.0" + semver "^7.5.2" silent-error "^1.1.1" - -"@glint/core@^0.9.4": - version "0.9.7" - resolved "https://registry.yarnpkg.com/@glint/core/-/core-0.9.7.tgz#887dbdfa10d89702549de36197cc2eb0783a5c86" - integrity sha512-1YLHNRnuYI1dDUKWq/ue4JqiBt6TVR8e7VQJWy37CKB0tiBhWw/FPvr7/S7XbUxCt6KHO0Kl0x/eqLunu3WiQw== - dependencies: - "@glint/config" "^0.9.7" - "@glint/transform" "^0.9.7" - resolve "^1.17.0" uuid "^8.3.2" vscode-languageserver "^8.0.1" vscode-languageserver-textdocument "^1.0.5" vscode-uri "^3.0.2" yargs "^17.5.1" -"@glint/environment-ember-loose@^0.9.7": - version "0.9.7" - resolved "https://registry.yarnpkg.com/@glint/environment-ember-loose/-/environment-ember-loose-0.9.7.tgz#8d27e93d6bd3afd59c46acad27a2c3130045dee0" - integrity sha512-MlCGZtB1Clp4vQWIm2APSnCm7nL8wVhFMOhVy2qzpV0nfLyg3pcN9CQHNpfdJvCydBB72cA4/ahPj7VEFL6xsg== - dependencies: - "@glint/config" "^0.9.7" - "@glint/template" "^0.9.7" - -"@glint/template@^0.9.4", "@glint/template@^0.9.7": - version "0.9.7" - resolved "https://registry.yarnpkg.com/@glint/template/-/template-0.9.7.tgz#8736f357482841962bc66e75831f189f33677165" - integrity sha512-MCp8GxQDIbH8ZzfNxHhVqCSKlydBgQfBEwJLDpN81lgFRCldSDPueIbk8sz3EhpGiZJVdNQbpGeYIDsUXe1ocg== +"@glint/environment-ember-loose@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@glint/environment-ember-loose/-/environment-ember-loose-1.2.0.tgz#8d5414b0da50bb405586fa70dac8301cd8188ccb" + integrity sha512-zj26Gh0cPY8FdT8X+UBUfgXB2Gt7T1RUn9jhlG1O7sZJTCmL8B/UNSZEB4KMAcs/dDv53u/pBl78+JF2B7F+7w== -"@glint/transform@^0.9.7": - version "0.9.7" - resolved "https://registry.yarnpkg.com/@glint/transform/-/transform-0.9.7.tgz#01c60249c1fe6663955d2acd2cf7625a551fb3f3" - integrity sha512-vd0th+Zo4cirYepASpC0fE0ZCqAcI9Y6qHYE0xi4+MY05bFRxBr7Q9ggDoWk+slynTyUrVgzCCeazAYOlZsYcg== - dependencies: - "@glimmer/syntax" "^0.84.2" - "@glint/config" "^0.9.7" +"@glint/template@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@glint/template/-/template-1.2.0.tgz#30723286fefc118f01e88d9b38199e3ab5ab8e64" + integrity sha512-8KsJSLyFQ7lB+ZgJeykoyCs4uw+p2+tMeoOZ1gP7JaoiBhlJOXtGwQv5qt4LGKNX1NjkMkyAYDGVzF1Psgnzhg== "@handlebars/parser@~2.0.0": version "2.0.0" @@ -11988,7 +11968,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: +semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==