Merge pull request #112 from universal-ember/pnpm9

Use pnpm 9

Author: NullVoxPopuli

.npmrc

@@ -0,0 +1,5 @@
+# super strict mode
+auto-install-peers=false
+resolve-peers-from-workspace-root=false
+
+

package.json

@@ -25,7 +25,7 @@
   },
   "volta": {
     "node": "20.11.1",
-    "pnpm": "8.15.3"
+    "pnpm": "9.9.0"
   },
   "pnpm": {
     "overrides": {

pnpm-lock.yaml

@@ -74,7 +74,7 @@
     "@babel/plugin-transform-typescript": "^7.23.6",
     "@babel/runtime": "^7.23.8",
     "@ember/test-waiters": "^3.1.0",
-    "@embroider/addon-dev": "^4.1.3",
+    "@embroider/addon-dev": "^5.0.0",
     "@glint/core": "^1.2.1",
     "@glint/environment-ember-loose": "^1.2.1",
     "@glint/environment-ember-template-imports": "^1.2.1",
@@ -87,7 +87,7 @@
     "babel-plugin-ember-template-compilation": "^2.2.0",
     "concurrently": "^8.2.2",
     "ember-source": "~5.5.0",
-    "ember-template-lint": "^5.11.2",
+    "ember-template-lint": "^6.0.0",
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-ember": "^12.0.0",

reactiveweb/package.json

@@ -28,11 +28,11 @@ export type ArgsFor<S> =
         Positional: GetOrElse<S, 'Positional', []>;
       }
     : S extends { named?: object; positional?: unknown[] }
-    ? {
-        Named: GetOrElse<S, 'named', EmptyObject>;
-        Positional: GetOrElse<S, 'positional', []>;
-      }
-    : { Named: EmptyObject; Positional: [] };
+      ? {
+          Named: GetOrElse<S, 'named', EmptyObject>;
+          Positional: GetOrElse<S, 'positional', []>;
+        }
+      : { Named: EmptyObject; Positional: [] };
 
 export type ElementFor<S> = 'Element' extends keyof S
   ? S['Element'] extends Element
@@ -48,8 +48,8 @@ export type ElementFor<S> = 'Element' extends keyof S
 export type ExpandArgs<T> = T extends any[]
   ? ArgsFor<{ Positional: T }>
   : T extends any
-  ? ArgsFor<T>
-  : never;
+    ? ArgsFor<T>
+    : never;
 
 export type Positional<T> = ExpandArgs<T>['Positional'];
 export type Named<T> = ExpandArgs<T>['Named'];

reactiveweb/src/-private/types.ts

@@ -79,10 +79,11 @@ export function helper<T = unknown, S = InferSignature<T>, Return = Get<S, 'Retu
   };
 }
 
-type InferSignature<T> = T extends HelperLike<infer S>
-  ? S
-  : T extends FunctionBasedHelper<infer S>
-  ? S
-  : T extends ClassBasedHelper<infer S>
-  ? S
-  : 'Signature not found';
+type InferSignature<T> =
+  T extends HelperLike<infer S>
+    ? S
+    : T extends FunctionBasedHelper<infer S>
+      ? S
+      : T extends ClassBasedHelper<infer S>
+        ? S
+        : 'Signature not found';

reactiveweb/src/helper.ts

@@ -5,12 +5,45 @@
     "environment": ["ember-loose", "ember-template-imports"]
   },
   "compilerOptions": {
+    "skipLibCheck": true,
+    "declarationDir": "declarations",
+    "emitDeclarationOnly": true,
+
+    // Required, else declarations don't emit
+    // @tsconfig/ember sets noEmit: true
+    "noEmit": false,
+    // noEmitOnError true is not a good default.
+    // especially as CLI tools can accidentally swallow errors
+    "noEmitOnError": false,
+
+    /**
+      https://www.typescriptlang.org/tsconfig#rootDir
+      "Default: The longest common path of all non-declaration input files."
+
+      Because we want our declarations' structure to match our rollup output,
+      we need this "rootDir" to match the "srcDir" in the rollup.config.mjs.
+
+      This way, we can have simpler `package.json#exports` that matches
+      imports to files on disk
+    */
     "rootDir": "./src",
-    "module": "Node16",
-    "moduleResolution": "Node16",
-    "allowJs": true,
+
+    /**
+      https://www.typescriptlang.org/tsconfig#verbatimModuleSyntax
+
+      We don't want to include types dependencies in our compiled output, so tell TypeScript
+      to enforce using `import type` instead of `import` for Types.
+     */
+    "verbatimModuleSyntax": true,
+
+    /**
+      https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions
+
+      We want our tooling to know how to resolve our custom files so the appropriate plugins
+      can do the proper transformations on those files.
+    */
     "allowImportingTsExtensions": true,
-    "declarationDir": "declarations",
+
     // https://www.typescriptlang.org/tsconfig#stripInternal
     "stripInternal": true
   }

reactiveweb/tsconfig.json

@@ -39,7 +39,7 @@
     "@ember/test-helpers": "^3.2.1",
     "@embroider/compat": "^3.2.3",
     "@embroider/core": "^3.3.0",
-    "@embroider/webpack": "^3.2.0",
+    "@embroider/webpack": "^4.0.4",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/environment-ember-loose": "^1.2.1",
@@ -67,17 +67,18 @@
     "ember-resolver": "^11.0.1",
     "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-imports": "^3.0.0",
-    "ember-template-lint": "^5.11.2",
+    "ember-template-imports": "^4.1.1",
+    "ember-template-lint": "^6.0.0",
     "ember-try": "^3.0.0",
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-ember": "^12.0.0",
     "eslint-plugin-n": "^16.2.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-qunit": "^8.0.1",
+    "graphql": "^16.9.0",
     "loader.js": "^4.7.0",
-    "pnpm-sync-dependencies-meta-injected": "^0.0.10",
+    "pnpm-sync-dependencies-meta-injected": "^0.0.14",
     "prettier": "^3.0.3",
     "qunit": "^2.20.0",
     "qunit-dom": "^3.0.0",
@@ -102,7 +103,7 @@
     "ember-concurrency": "^3.1.1",
     "ember-modify-based-class-resource": "^1.1.0",
     "ember-resources": "^6.5.1",
-    "msw": "^1.3.2"
+    "msw": "^2.4.1"
   },
   "msw": {
     "workerDirectory": "public"