fix(pnp): esm - support import attributes

.github/workflows/integration-workflow.yml

@@ -206,7 +206,7 @@ jobs:
       fail-fast: false
       matrix:
         # We run the ubuntu tests on multiple Node versions with 2 shards since they're the fastest.
-        node: [18, 19, 20, 21]
+        node: [18, 19, 20, 21, 22]
         platform: [[ubuntu, 20.04]]
         shard: ['1/2', '2/2']
         include:
@@ -221,13 +221,13 @@ jobs:
           - {node: 18, platform: [macos, latest], shard: 3/3}
           # We also run them on the maximum Node version we support, to catch potential regressions in Node.js.
           # Windows tests
-          - {node: 21, platform: [windows, latest], shard: 1/3}
-          - {node: 21, platform: [windows, latest], shard: 2/3}
-          - {node: 21, platform: [windows, latest], shard: 3/3}
+          - {node: 22, platform: [windows, latest], shard: 1/3}
+          - {node: 22, platform: [windows, latest], shard: 2/3}
+          - {node: 22, platform: [windows, latest], shard: 3/3}
           # macOS tests
-          - {node: 21, platform: [macos, latest], shard: 1/3}
-          - {node: 21, platform: [macos, latest], shard: 2/3}
-          - {node: 21, platform: [macos, latest], shard: 3/3}
+          - {node: 22, platform: [macos, latest], shard: 1/3}
+          - {node: 22, platform: [macos, latest], shard: 2/3}
+          - {node: 22, platform: [macos, latest], shard: 3/3}
 
     name: '${{matrix.platform[0]}}-latest w/ Node.js ${{matrix.node}}.x (${{matrix.shard}})'
     runs-on: ${{matrix.platform[0]}}-${{matrix.platform[1]}}

.yarn/versions/a5b83769.yml

@@ -0,0 +1,27 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"

packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts

@@ -1,6 +1,6 @@
-import {Filename, npath, ppath, xfs}                               from '@yarnpkg/fslib';
-import {ALLOWS_EXTENSIONLESS_FILES, HAS_LOADERS_AFFECTING_LOADERS} from '@yarnpkg/pnp/sources/esm-loader/loaderFlags';
-import {pathToFileURL}                                             from 'url';
+import {Filename, npath, ppath, xfs}                                                                                            from '@yarnpkg/fslib';
+import {ALLOWS_EXTENSIONLESS_FILES, HAS_LOADERS_AFFECTING_LOADERS, SUPPORTS_IMPORT_ATTRIBUTES, SUPPORTS_IMPORT_ATTRIBUTES_ONLY} from '@yarnpkg/pnp/sources/esm-loader/loaderFlags';
+import {pathToFileURL}                                                                                                          from 'url';
 
 describe(`Plug'n'Play - ESM`, () => {
   test(
@@ -220,7 +220,7 @@ describe(`Plug'n'Play - ESM`, () => {
   );
 
   test(
-    `it should not resolve JSON modules without an import assertion`,
+    `it should not resolve JSON modules without an import assertion/attribute`,
     makeTemporaryEnv(
       {
         type: `module`,
@@ -236,14 +236,14 @@ describe(`Plug'n'Play - ESM`, () => {
 
         await expect(run(`node`, `./index.js`)).rejects.toMatchObject({
           code: 1,
-          stderr: expect.stringContaining(`ERR_IMPORT_ASSERTION_TYPE_MISSING`),
+          stderr: expect.stringContaining(SUPPORTS_IMPORT_ATTRIBUTES_ONLY ? `ERR_IMPORT_ATTRIBUTE_MISSING` : `ERR_IMPORT_ASSERTION_TYPE_MISSING`),
         });
       },
     ),
   );
 
   test(
-    `it should resolve JSON modules with an import assertion`,
+    `it should resolve JSON modules with an import assertion/attribute`,
     makeTemporaryEnv(
       {
         type: `module`,
@@ -254,7 +254,7 @@ describe(`Plug'n'Play - ESM`, () => {
         await xfs.writeFilePromise(
           ppath.join(path, `index.js`),
           `
-          import foo from './foo.json' assert { type: 'json' };
+          import foo from './foo.json' ${SUPPORTS_IMPORT_ATTRIBUTES ? `with` : `assert`} { type: 'json' };
           console.log(foo.name);
           `,
         );