Skip to content

Commit

Permalink
Fixing build pipeline after moving packages
Browse files Browse the repository at this point in the history
  • Loading branch information
paulomarg committed Apr 10, 2024
1 parent 2d7755c commit aeef4d2
Show file tree
Hide file tree
Showing 69 changed files with 183 additions and 213 deletions.
10 changes: 5 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ module.exports = {
'**/setup-jest.ts',
'**/rollup.config.js',
'**/rollup.config.*.js',
'packages/shopify-app-express/src/__tests__/test-helper.ts',
'packages/admin-api-client/src/rest/tests/client.test.ts',
'packages/shopify-api/adapters/__e2etests__/rollup.test-web-api-app.config.ts',
'packages/storefront-api-client/src/tests/setupTests.ts',
'packages/api-clients/admin-api-client/src/rest/tests/client.test.ts',
'packages/api-clients/storefront-api-client/src/tests/setupTests.ts',
'packages/apps/shopify-app-express/src/__tests__/test-helper.ts',
'packages/apps/shopify-api/adapters/__e2etests__/rollup.test-web-api-app.config.ts',
],
rules: {
'import/no-extraneous-dependencies': 0,
},
},
{
files: ['packages/shopify-app-remix/src/__tests__/index.test.ts'],
files: ['packages/apps/shopify-app-remix/src/__tests__/index.test.ts'],
rules: {
'@babel/no-unused-expressions': 0,
},
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
on: [push, pull_request]

name: CI

env:
DISABLE_V8_COMPILE_CACHE: 1

jobs:
CI:
name: CI_Node_${{ matrix.version }}
Expand All @@ -16,7 +21,9 @@ jobs:
run: yarn install --ignore-engines
- name: Build packages
run: yarn build
- name: Run tests
- name: Run package tests
run: yarn test:ci
- name: Run session storage tests
run: yarn test:ci_sessions
- name: Run linting
run: yarn lint
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"build": "turbo build",
"lint": "turbo lint --parallel",
"test": "turbo run test --concurrency 1",
"test:ci": "turbo run test:ci --concurrency 1",
"test:ci": "turbo run test:ci --filter='!./packages/apps/session-storage/*' --concurrency 1",
"test:ci_sessions": "turbo run test:ci --filter=./packages/apps/session-storage/* --concurrency 2",
"release": "turbo build && changeset publish",
"dev": "turbo dev --no-cache --continue",
"clean": "turbo clean",
Expand Down Expand Up @@ -47,7 +48,7 @@
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"tslib": "^2.6.2",
"turbo": "^1.12.4",
"turbo": "^1.13.2",
"typescript": "5.3.3"
},
"dependencies": {},
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/admin-api-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"allowSyntheticDefaultImports": true,
"strictPropertyInitialization": true
},
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json"
}
2 changes: 1 addition & 1 deletion packages/api-clients/api-codegen-preset/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"allowSyntheticDefaultImports": true,
"strictPropertyInitialization": true
},
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json"
}
2 changes: 1 addition & 1 deletion packages/api-clients/graphql-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"allowSyntheticDefaultImports": true,
"strictPropertyInitialization": true
},
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json"
}
2 changes: 1 addition & 1 deletion packages/api-clients/storefront-api-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"allowSyntheticDefaultImports": true,
"strictPropertyInitialization": true
},
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json"
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
testTimeout: 30000,
testTimeout: 35000,
};

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/drizzle.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/drizzle.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/dynamodb.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/dynamodb.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/kv.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/kv.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/memory.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/memory.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/mongodb.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/mongodb.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
testTimeout: 30000,
testTimeout: 35000,
};

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/mysql.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/mysql.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/postgresql.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/postgresql.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/prisma.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/prisma.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {getConfig} from '../../config/rollup/rollup.config';
import {getConfig} from '../../../../config/rollup/rollup-utils';

const config = getConfig('src/redis.ts');
import * as pkg from './package.json';

const config = getConfig(pkg, 'src/redis.ts');

export default config;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.build.json",
"extends": "../../../../tsconfig.build.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"outDir": "./dist/ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Config} from 'jest';

import baseConfig from '../../config/tests/jest.config';
import baseConfig from '../../../../config/tests/jest.config';

const config: Config = {
...baseConfig,
Expand Down
Loading

0 comments on commit aeef4d2

Please sign in to comment.