Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dist/
!/packages/environment*/-private/intrinsics/**/*.d.ts

packages/core/__tests__/support/character-position-viewer.html
test-packages/*/__tests__/support/*.html

/packages/vscode/src/generated-meta.ts

Expand Down
8 changes: 0 additions & 8 deletions packages/core/__tests__/tsconfig.json

This file was deleted.

12 changes: 5 additions & 7 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"license": "MIT",
"author": "Dan Freeman (https://github.com/dfreeman)",
"type": "module",
"main": "lib/index.js",
"exports": {
".": {
"types": "./lib/index.d.ts",
Expand All @@ -16,7 +15,11 @@
"types": "./lib/config/types.d.cts",
"default": "./lib/config/types.cjs"
},
"./bin/*": "./bin/*.js"
"./bin/*": "./bin/*.js",
"./*": {
"types": "./lib/*.d.ts",
"default": "./lib/*.js"
}
},
"files": [
"README.md",
Expand All @@ -29,10 +32,6 @@
"glint-language-server": "bin/glint-language-server.js"
},
"scripts": {
"test": "vitest run",
"test:typecheck": "echo 'no standalone typecheck within this project'",
"test:tsc": "echo 'no standalone typecheck within this project'",
"test:watch": "vitest watch",
"build": "tsc --build",
"dev": "tsc --watch",
"prepack": "pnpm build"
Expand Down Expand Up @@ -73,7 +72,6 @@
"execa": "^4.0.1",
"glint-monorepo-test-utils": "workspace:*",
"strip-ansi": "^6.0.0",
"vitest": "~3.0.9",
"typescript": ">=5.6.0"
},
"publishConfig": {
Expand Down
105 changes: 86 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as fs from 'node:fs';
import * as os from 'node:os';
import { describe, beforeEach, afterEach, test, expect } from 'vitest';
import { GlintExtensionPreprocess, GlintExtensionTransform } from '@glint/core/config-types';
import { GlintEnvironment } from '../../src/config/environment.js';
import { GlintEnvironment } from '@glint/core/config/index';

describe('Config: Environments', () => {
describe('template tags config', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as fs from 'node:fs';
import * as os from 'node:os';
import { describe, beforeEach, afterEach, test, expect, vi } from 'vitest';
import { loadConfig } from '../../src/config/index.js';
import { normalizePath } from '../../src/config/config.js';
import { findTypeScript, loadConfigInput, require } from '../../src/config/loader.js';
import { loadConfig } from '@glint/core/config/index';
import { normalizePath } from '@glint/core/config/config';
import { findTypeScript, loadConfigInput, require } from '@glint/core/config/loader';

describe('Config: loadConfig', () => {
const testDir = `${os.tmpdir()}/glint-config-test-load-config-${process.pid}`;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as fs from 'node:fs';
import * as os from 'node:os';
import { describe, beforeEach, afterEach, test, expect } from 'vitest';
import { ConfigLoader } from '../../src/config/index.js';
import { normalizePath } from '../../src/config/config.js';
import { ConfigLoader } from '@glint/core/config/index';
import { normalizePath } from '@glint/core/config/config';

describe('Config: loadConfig', () => {
const testDir = `${os.tmpdir()}/glint-config-test-loader-${process.pid}`;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { rewriteModule, TransformedModule } from '../../src/transform/index.js';
import { rewriteModule, TransformedModule } from '@glint/core/transform/index';
import { stripIndent } from 'common-tags';
import { describe, test, expect } from 'vitest';
import { Range, SourceFile } from '../../src/transform/template/transformed-module.js';
import { Range, SourceFile } from '@glint/core/transform/template/transformed-module';
import * as ts from 'typescript';
import { assert } from '../../src/transform/util.js';
import { GlintEnvironment } from '../../src/config/index.js';
import { assert } from '@glint/core/transform/util';
import { GlintEnvironment } from '@glint/core/config/index';

const emberLooseEnvironment = GlintEnvironment.load('ember-loose');
const emberTemplateImportsEnvironment = GlintEnvironment.load('ember-template-imports');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import ts from 'typescript';
import { describe, test, expect } from 'vitest';
import { rewriteModule } from '../../src/transform/index.js';
import { rewriteModule } from '@glint/core/transform/index';
import { stripIndent } from 'common-tags';
import { GlintEnvironment } from '../../src/config/index.js';
import { GlintEnvironment } from '@glint/core/config/index';

describe('Transform: rewriteModule', () => {
describe('inline tagged template', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { describe, test, expect } from 'vitest';
import {
templateToTypescript,
TemplateToTypescriptOptions,
} from '../../src/transform/template/template-to-typescript.js';
} from '@glint/core/transform/template/template-to-typescript';

describe('Transform: rewriteTemplate', () => {
// Slices out the template boilerplate to return only the code representing
Expand Down
37 changes: 37 additions & 0 deletions test-packages/package-test-core/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"name": "package-test-core",
"version": "0.0.0",
"private": true,
"license": "MIT",
"type": "module",
"scripts": {
"test": "vitest run",
"test:typecheck": "echo 'no standalone typecheck within this project'",
"test:tsc": "echo 'no standalone typecheck within this project'",
"test:watch": "vitest watch"
},
"devDependencies": {
"@glimmer/component": "^2.0.0",
"@glint/core": "workspace:*",
"@glint/environment-ember-template-imports": "workspace:*",
"@glint/environment-ember-loose": "workspace:*",
"@volar/language-server": "2.4.12",
"@types/common-tags": "^1.8.0",
"@types/node": "^18.11.5",
"@types/semver": "^7.3.13",
"@types/uuid": "^8.3.4",
"@types/yargs": "^17.0.10",
"@typescript/server-harness": "latest",
"@vitest/ui": "~1.0.0",
"common-tags": "^1.8.0",
"execa": "^4.0.1",
"glint-monorepo-test-utils": "workspace:*",
"strip-ansi": "^6.0.0",
"typescript": ">=5.6.0",
"vitest": "~3.0.9",
"vscode-uri": "^3.0.8"
},
"publishConfig": {
"access": "public"
}
}
8 changes: 8 additions & 0 deletions test-packages/package-test-core/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "../../tsconfig.compileroptions.json",
"include": ["../src", "**/*.ts"],
"compilerOptions": {
"types": ["@types/node"]
},
"references": [{ "path": "../test-utils" }]
}
Loading