Bladeren bron

chore: Fix build/e2e issues

Michael Bromley 2 jaren geleden
bovenliggende
commit
c6d0a3e0a4
5 gewijzigde bestanden met toevoegingen van 355 en 347 verwijderingen
  1. 1 0
      e2e-common/tsconfig.e2e.json
  2. 8 1
      e2e-common/vitest.config.ts
  3. 9 4
      packages/core/e2e/fast-importer.e2e-spec.ts
  4. 1 0
      packages/core/src/config/index.ts
  5. 336 342
      yarn.lock

+ 1 - 0
e2e-common/tsconfig.e2e.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "types": ["node"],
     "lib": ["es2015"],
+    "useDefineForClassFields": false,
     "skipLibCheck": true,
     "inlineSourceMap": false,
     "sourceMap": true,

+ 8 - 1
e2e-common/vitest.config.ts

@@ -21,6 +21,13 @@ export default defineConfig({
         // SWC required to support decorators used in test plugins
         // See https://github.com/vitest-dev/vitest/issues/708#issuecomment-1118628479
         // Vite plugin
-        swc.vite(),
+        swc.vite({
+            jsc: {
+                transform: {
+                    // See https://github.com/vendure-ecommerce/vendure/issues/2099
+                    useDefineForClassFields: false,
+                },
+            },
+        }),
     ],
 });

+ 9 - 4
packages/core/e2e/fast-importer.e2e-spec.ts

@@ -1,12 +1,16 @@
 import { CreateProductInput, ProductTranslationInput } from '@vendure/common/lib/generated-types';
+import { ensureConfigLoaded, FastImporterService, LanguageCode } from '@vendure/core';
 import { createTestEnvironment } from '@vendure/testing';
 import path from 'path';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
 import { testConfig, TEST_SETUP_TIMEOUT_MS } from '../../../e2e-common/test-config';
 import { initialData } from '../mock-data/data-sources/initial-data';
-import { FastImporterService, LanguageCode } from '../src';
 
-import { GetProductWithVariants } from './graphql/generated-e2e-admin-types';
+import {
+    GetProductWithVariantsQuery,
+    GetProductWithVariantsQueryVariables,
+} from './graphql/generated-e2e-admin-types';
 import { GET_PRODUCT_WITH_VARIANTS } from './graphql/shared-definitions';
 
 describe('FastImporterService resolver', () => {
@@ -15,6 +19,7 @@ describe('FastImporterService resolver', () => {
     let fastImporterService: FastImporterService;
 
     beforeAll(async () => {
+        await ensureConfigLoaded();
         await server.init({
             initialData,
             productsCsvPath: path.join(__dirname, 'fixtures/e2e-products-full.csv'),
@@ -41,8 +46,8 @@ describe('FastImporterService resolver', () => {
         const productId = await fastImporterService.createProduct(createProductInput);
 
         const { product } = await adminClient.query<
-            GetProductWithVariants.Query,
-            GetProductWithVariants.Variables
+            GetProductWithVariantsQuery,
+            GetProductWithVariantsQueryVariables
         >(GET_PRODUCT_WITH_VARIANTS, {
             id: productId as string,
         });

+ 1 - 0
packages/core/src/config/index.ts

@@ -20,6 +20,7 @@ export * from './catalog/stock-display-strategy';
 export * from './catalog/stock-location-strategy';
 export * from './config.module';
 export * from './config.service';
+export * from './config-helpers';
 export * from './custom-field/custom-field-types';
 export * from './default-config';
 export * from './entity/auto-increment-id-strategy';

File diff suppressed because it is too large
+ 336 - 342
yarn.lock


Some files were not shown because too many files changed in this diff