Switch to pnpm

.github/workflows/ci.yml

@@ -24,30 +24,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/checkout@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: 16
-      - name: Locate Yarn Cache
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Build
-        run: yarn build
+        run: pnpm build
       - name: Run Tests
         uses: coactions/setup-xvfb@v1
         with:
-          run: yarn test
+          run: pnpm test
 
   # The Windows runner can be super flaky both with Yarn installs and
   # when launching browser tests, so we allow for retries in those steps.
@@ -56,7 +44,7 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Node
         uses: actions/setup-node@v3
         with:
@@ -66,67 +54,52 @@ jobs:
         with:
           max_attempts: 2
           timeout_minutes: 10
-          command: yarn install --frozen-lockfile
+          command: pnpm install 
       - name: Build
-        run: yarn build
+        run: pnpm build
       - name: Test @glint/core
         uses: nick-fields/retry@v2
         with:
           max_attempts: 2
           timeout_minutes: 20
-          command: yarn workspace @glint/core test
+          command: pnpm --filter '@glint/core' test
       - name: Test glint-vscode
         uses: nick-fields/retry@v2
         with:
           max_attempts: 2
           timeout_minutes: 10
-          command: yarn workspace glint-vscode test
+          command: pnpm --filter 'glint-vscode' test
       - name: Test @glint/scripts
-        run: yarn workspace @glint/scripts test
+        run: pnpm --filter '@glint/scripts' test
 
   test-floating-deps:
     name: Test Floating Dependencies
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/checkout@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: 16
-      - name: Install Dependencies
-        run: yarn install --no-lockfile
       - name: Build
-        run: yarn build
+        run: pnpm build
       - name: Run Tests
         uses: coactions/setup-xvfb@v1
         with:
-          run: yarn test
+          run: pnpm test
 
   test-ts-nightly:
     name: Test TypeScript Nightly
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
-      - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/checkout@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
           node-version: 16
-      - name: Locate Yarn Cache
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install Dependencies
-        run: yarn add --dev -W typescript@next
       - name: Build
-        run: yarn build
+        run: pnpm build
       - name: Run Tests
         uses: coactions/setup-xvfb@v1
         with:
-          run: yarn test
+          run: pnpm test

.npmrc

@@ -0,0 +1,25 @@
+# as a library, we want to make sure we explicitly handle peers,
+# and not rely on hidden behavior of package-managers.
+auto-install-peers=false
+
+# we never want to use packages from the registry over what's in the workspace
+prefer-workspaces-packages=true
+
+# use the highest version possible
+resolution-mode=highest
+
+# when migrating from yarn, too much sloppiness was revealed to
+# deal with in one PR.
+# These settings re-create yarn's broken dep management behavior
+#
+# To fix, we need to:
+# - adjust usage of ephemeral directory,
+#   - probably use tmp
+#   - properly manage dependencies under test
+#     - link to our workspace packages
+#     - potentially use scenario-tester to manage package linking
+# - properly manage dependencies
+#   - no package cycles
+#   - whatever is imported must be in local package.json
+shamefully-hoist=true
+node-linker=hoisted

.prettierignore

@@ -24,3 +24,5 @@ dist/
 # the formatting applied by Gitbook. Having both present is a recipe for ongoing
 # CI problems.
 *.md
+*.yml
+*.yaml

CONTRIBUTING.md

@@ -8,12 +8,12 @@ We welcome contributions to Glint! To help us help you be successful, please fol
 
 ## Working on the project
 
-Glint is a family of packages which all live in this repo as a Yarn workspace. To be most successful here, you should:
+Glint is a family of packages which all live in this repo as a pnpm workspace. To be most successful here, you should:
 
-- Install [Volta](https://volta.sh), a JavaScript toolchain manager we use to make sure everyone working on the project is using the same versions of Node and Yarn.
+- Install [Volta](https://volta.sh), a JavaScript toolchain manager we use to make sure everyone working on the project is using the same versions of Node and pnpm.
 - Clone the repo.
-- Run `yarn` in the root of the repo to install all the package dependencies. If you have Volta installed, it will automatically fetch and use the correct versions of Node and Yarn for you.
-- Run `yarn build` in the root of the repository to build all of the projects the first time. This will make sure that once you start working on one of the packages, you are working with an up to date version of the other packages in the project it depends on.
+- Run `pnpm install` in the root of the repo to install all the package dependencies. If you have Volta installed, it will automatically fetch and use the correct versions of Node and Yarn for you.
+- Run `pnpm build` in the root of the repository to build all of the projects the first time. This will make sure that once you start working on one of the packages, you are working with an up to date version of the other packages in the project it depends on.
 - Read the project’s [ARCHITECTURE.md](./ARCHITECTURE.md) to understand the basics of how the code base works.
 
 Once you have made changes and added tests to confirm they work correctly, you can then open a PR and we'll work with you to polish it up and get it landed!

package.json

@@ -2,26 +2,23 @@
   "name": "glint",
   "repository": "https://github.com/typed-ember/glint",
   "private": true,
-  "workspaces": [
-    "packages/*",
-    "test-packages/*"
-  ],
   "scripts": {
-    "lint": "yarn lint:scripts && yarn lint:formatting",
-    "lint:scripts": "yarn eslint --max-warnings 0 --cache .",
-    "lint:formatting": "yarn prettier --check .",
-    "test": "yarn workspaces run test",
+    "lint": "pnpm lint:scripts && pnpm lint:formatting",
+    "lint:scripts": "pnpm eslint --max-warnings 0 --cache .",
+    "lint:formatting": "pnpm prettier --check .",
+    "test": "pnpm --filter '*' run test",
     "build": "tsc --build",
     "release-it": "echo \"Running release-it via yarn breaks publishing! Use npx or a Volta global installation.\""
   },
   "volta": {
     "node": "16.17.1",
-    "yarn": "1.22.4"
+    "pnpm": "8.14.0"
   },
   "devDependencies": {
     "@release-it-plugins/lerna-changelog": "^5.0.0",
     "@release-it-plugins/workspaces": "^3.2.0",
     "@types/babel__traverse": "^7.18.2",
+    "@types/node": "^18.11.5",
     "@types/yargs": "^17.0.10",
     "@typescript-eslint/eslint-plugin": "^5.42.1",
     "@typescript-eslint/parser": "^5.42.1",
@@ -30,7 +27,13 @@
     "release-it": "^15.5.0",
     "typescript": "~4.8.0"
   },
+  "pnpm": {
+    "overrides": {
+      "@glimmer/validator": ">= 0.83.0"
+    }
+  },
   "resolutions:notes": {
+    "@glimmer/validator": "Due to semver, and some dependency in the graph specifying @glimmer/validator 0.44, 0.44 is what gets installed. However, this is incorrect for type definitions",
     "@types/yargs": "Locking temporarily to avoid an issue with the ESM types in 17.0.14; see DT#63373",
     "@types/node": "Locking to avoid conflicts between the declared version in packages/core and floating '*' versions when we run in CI without the lockfile"
   },

packages/environment-ember-loose/package.json

@@ -19,7 +19,7 @@
     "test": "glint --project __tests__/type-tests && vitest run",
     "test:watch": "vitest watch",
     "build": "tsc --build",
-    "prepack": "yarn build"
+    "prepack": "pnpm build"
   },
   "files": [
     "README.md",
@@ -62,6 +62,8 @@
   },
   "devDependencies": {
     "@glimmer/component": "^1.1.2",
+    "@glint/template": "workspace:*",
+    "@glint/core": "workspace:*",
     "@types/ember__array": "^4.0.2",
     "@types/ember__component": "^4.0.10",
     "@types/ember__controller": "^4.0.2",

packages/environment-ember-template-imports/package.json

@@ -19,7 +19,7 @@
     "test": "vitest run",
     "test:watch": "vitest watch",
     "build": "tsc --build",
-    "prepack": "yarn build"
+    "prepack": "pnpm build"
   },
   "files": [
     "README.md",
@@ -52,6 +52,9 @@
     }
   },
   "devDependencies": {
+    "@glint/environment-ember-loose": "workspace:*",
+    "@glint/core": "workspace:*",
+    "@glint/template": "workspace:*",
     "@types/ember": "^4.0.0",
     "@types/ember__component": "^4.0.10",
     "@types/ember__helper": "^4.0.1",

packages/environment-glimmerx/package.json

@@ -18,7 +18,7 @@
   "scripts": {
     "test": "tsc --project __tests__",
     "build": "tsc --build",
-    "prepack": "yarn build"
+    "prepack": "pnpm build"
   },
   "files": [
     "README.md",
@@ -47,6 +47,8 @@
     }
   },
   "devDependencies": {
+    "@glint/template": "workspace:*",
+    "@glint/core": "workspace:*",
     "@glimmerx/component": "^0.6.7",
     "@glimmerx/modifier": "^0.6.7",
     "@glimmerx/helper": "^0.6.7",

packages/scripts/package.json

@@ -21,19 +21,22 @@
   "scripts": {
     "test": "vitest run",
     "build": "tsc --build",
-    "prepack": "yarn build"
+    "prepack": "pnpm build"
   },
   "dependencies": {
-    "golden-fleece": "^1.0.9",
     "glob": "^7.2.0",
+    "golden-fleece": "^1.0.9",
     "js-yaml": "^4.1.0",
     "ora": "^6.1.2",
     "true-myth": "^6.1.0",
     "yargs": "^17.5.1",
     "zod": "^3.22.3"
   },
   "devDependencies": {
+    "@glint/core": "workspace:*",
+    "@types/glob": "^8.1.0",
     "@types/js-yaml": "^4.0.5",
+    "@types/node": "^18.11.5",
     "@types/yargs": "^17.0.10",
     "json5": "^2.2.2",
     "vitest": "^0.22.0"

packages/template/__tests__/emit-content.test.ts

@@ -1,9 +1,8 @@
-import { SafeString } from '@glimmer/runtime';
 import { htmlSafe } from '@ember/template';
 import { emitContent } from '../-private/dsl';
 
 // Glimmer's SafeString interface
-let safeString: SafeString = {
+let safeString: ReturnType<typeof htmlSafe> = {
   toHTML(): string {
     return '<span>Foo</span>';
   },

packages/template/__tests__/tsconfig.json

@@ -2,6 +2,11 @@
   "extends": "../../../tsconfig.compileroptions.json",
   "compilerOptions": {
     "noEmit": true,
-    "lib": ["es2020", "dom"]
+    "lib": ["es2020", "dom"],
+    "paths": {
+      "@glint/template": [".."],
+      "@glint/template/*": ["../*"],
+      "@glint/environment-ember-loose/*": ["../../environment-ember-loose/*"]
+    }
   }
 }

packages/template/package.json

@@ -18,6 +18,7 @@
     "@glimmer/component": "^1.1.2",
     "@glimmerx/component": "^0.6.7",
     "@types/ember__component": "~4.0.8",
+    "@types/ember__template": "^4.0.5",
     "expect-type": "^0.15.0",
     "sums-up": "^2.1.0"
   },

packages/type-test/package.json

@@ -21,7 +21,11 @@
     "expect-type": "^0.15.0"
   },
   "peerDependencies": {
-    "@glint/template": "^1.2.1"
+    "@glint/template": "workspace:*"
+  },
+  "devDependencies": {
+    "@glint/environment-ember-loose": "workspace:^",
+    "@glint/template": "workspace:*"
   },
   "publishConfig": {
     "access": "public"

packages/vscode/package.json

@@ -24,12 +24,12 @@
     "Linters"
   ],
   "scripts": {
-    "pretest": "yarn build",
+    "pretest": "pnpm build",
     "test": "node lib/__tests__/support/launch-from-cli.mjs",
-    "build": "yarn compile && yarn bundle",
+    "build": "pnpm compile && pnpm bundle",
     "compile": "tsc --build",
     "bundle": "esbuild lib/src/extension.js --bundle --outfile=dist/extension.js --platform=node --external:vscode --minify",
-    "vscode:prepublish": "yarn build",
+    "vscode:prepublish": "pnpm build",
     "extension:package": "vsce package --no-dependencies",
     "extension:publish": "vsce publish --no-dependencies"
   },
@@ -104,7 +104,7 @@
     "@vscode/test-electron": "Dropped support for Node < 16 in the 2.2.1 patch release, so locking to 2.2.0 while we still support Node 14."
   },
   "devDependencies": {
-    "@glint/core": "^1.2.1",
+    "@glint/core": "workspace:*",
     "@types/mocha": "^10.0.1",
     "@types/vscode": "^1.68.1",
     "@vscode/test-electron": "^2.3.8",