Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decommission the monorepo #5292

Merged
merged 35 commits into from
Sep 12, 2019
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e937a06
Copyright year update
hwillson Sep 7, 2019
23b9286
Remove bundle analyzer scripts and functionality
hwillson Sep 7, 2019
008cf2d
Remove outdated design docs
hwillson Sep 7, 2019
de2a956
We no longer support flow, so remove all traces of it
hwillson Sep 7, 2019
61fe3a1
Remove no longer needed AUTHORS file
hwillson Sep 7, 2019
2e4ea3d
Remove legacy changelogs
hwillson Sep 7, 2019
6382fa6
Move child package support files to a temporary location
hwillson Sep 7, 2019
d4c15dc
Merge cache and utilities packages into the AC package
hwillson Sep 7, 2019
3d6dc49
Move apollo-client source into the project root
hwillson Sep 7, 2019
bfe8229
Update import paths and wire up the initial package.json
hwillson Sep 8, 2019
e215b62
Remove the no longer needed tslint config file
hwillson Sep 8, 2019
fac9ab0
Merge branch 'release-3.0' into goodbye-lerna
hwillson Sep 8, 2019
ca9f039
Merge branch 'release-3.0' into goodbye-lerna
hwillson Sep 8, 2019
ea188b1
Prep for alpha publish
hwillson Sep 8, 2019
47d066d
Set npm publish status to public
hwillson Sep 8, 2019
d4e1e90
Add package.json keywords
hwillson Sep 8, 2019
3568e0f
Remove postinstall script
hwillson Sep 9, 2019
1e23664
Re-export cache and utilities functionality
hwillson Sep 9, 2019
6d49d99
We're no longer using prettier
hwillson Sep 9, 2019
281117a
We're no longer using Danger
hwillson Sep 9, 2019
399ce23
Adjust rollup bundle names to include apollo-client
hwillson Sep 9, 2019
21ded05
Remove temporary refactoring directory and contents
hwillson Sep 9, 2019
bcab82c
We're no longer tracking revisions on github settings
hwillson Sep 9, 2019
251d53e
Remove left over lerna artificats
hwillson Sep 9, 2019
5887d9f
CI cleanup
hwillson Sep 9, 2019
b397115
Full dependency update pass
hwillson Sep 9, 2019
44a8217
Update bundlesize filename
hwillson Sep 9, 2019
744e33e
Bundlesize adjustments
hwillson Sep 9, 2019
d77b992
Merge branch 'release-3.0' into goodbye-lerna
hwillson Sep 10, 2019
ff845b0
Fix polyfill path listed as part of sideEffects
hwillson Sep 10, 2019
e66221e
Adjust docs type generation to use new source structure
hwillson Sep 10, 2019
9713fa2
Adjust generated docs.json path to match docs location
hwillson Sep 10, 2019
c967002
Fix moderate npm audit warning by replacing @condenast/bundlesize.
benjamn Sep 11, 2019
184d769
Avoid re-exporting all of src/utilities by default.
benjamn Sep 11, 2019
5ff5ce2
Adjust bundlesize limit down by 1.1KB (-6.2%).
benjamn Sep 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
version: 2

jobs:
Danger:
docker:
- image: circleci/node:10
steps:
- checkout
- restore_cache:
keys:
# When lock file changes, use increasingly general patterns to
# restore cache
- npm-v2-{{ .Branch }}-{{ checksum "package-lock.json" }}
- npm-v2-{{ .Branch }}-
- npm-v2-
- run: npm --version
- run: npm ci
- save_cache:
key: npm-v2-{{ .Branch }}-{{ checksum "package-lock.json" }}
paths:
# This should cache the npm cache instead of node_modules, which is
# needed because npm ci actually removes node_modules before
# installing to guarantee a clean slate.
- ~/.npm
- run: npm run danger

Filesize:
docker:
- image: circleci/node:10
Expand All @@ -45,9 +22,9 @@ jobs:
# needed because npm ci actually removes node_modules before
# installing to guarantee a clean slate.
- ~/.npm
- run: npm run filesize
- run: npm run bundlesize

Apollo Client Monorepo:
Tests:
docker:
- image: circleci/node:10
steps:
Expand All @@ -70,7 +47,7 @@ jobs:
- ~/.npm
- run:
name: Jest suite with coverage
command: npm run test-ci && npm run coverage:upload
command: npm run test:ci && npm run coverage:upload
environment:
JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
- store_test_results:
Expand All @@ -82,6 +59,5 @@ workflows:
version: 2
Build and Test:
jobs:
- Danger
- Filesize
- Apollo Client Monorepo
- Tests
75 changes: 0 additions & 75 deletions .github/settings.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,5 @@
"editor.rulers": [80],
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/.rpt2_cache": true,
"node_modules": true,
"test-lib": true,
"lib": true,
"dist": true,
"coverage": true,
"npm": true
},
"typescript.tsdk": "../node_modules/typescript/lib"
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Meteor Development Group, Inc.
Copyright (c) 2019 Meteor Development Group, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
120 changes: 0 additions & 120 deletions config/dangerfile.ts

This file was deleted.

8 changes: 3 additions & 5 deletions config/jest.config.settings.js → config/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
module.exports = {
rootDir: '..',
transform: {
'.(ts|tsx)': 'ts-jest',
},

globals: {
'ts-jest': {
diagnostics: false,
},
},

moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
testURL: 'http://localhost',

testMatch: ['<rootDir>/src/**/__tests__/**/*.ts'],
testPathIgnorePatterns: [
'/node_modules/',
'/lib/',
'<rootDir>/lib/',
'/lib/'
],
setupFiles: ['<rootDir>/src/config/jest/setup.ts'],
};
2 changes: 0 additions & 2 deletions config/prettierignore

This file was deleted.

24 changes: 13 additions & 11 deletions config/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,23 @@ function onwarn(message) {
}

const defaultGlobals = {
'apollo-client': 'apollo.core',
'apollo-cache': 'apolloCache.core',
'apollo-link': 'apolloLink.core',
'apollo-link-dedup': 'apolloLink.dedup',
'apollo-utilities': 'apollo.utilities',
'tslib': 'tslib',
'ts-invariant': 'invariant',
'symbol-observable': '$$observable',
'graphql/language/printer': 'print',
optimism: 'optimism',
'graphql/language/visitor': 'visitor',
'fast-json-stable-stringify': 'stringify',
'@wry/equality': 'wryEquality',
};

export function rollup({
name,
function rollup({
input = './src/index.ts',
outputPrefix = 'bundle',
outputPrefix = 'apollo-client',
extraGlobals = {},
}) {
const projectDir = path.join(__filename, '..');
} = {}) {
const projectDir = path.join(__dirname, '..');
console.info(`Building project esm ${projectDir}`);
const tsconfig = `${projectDir}/tsconfig.json`;

Expand All @@ -47,7 +48,7 @@ export function rollup({
}

function outputFile(format) {
return './lib/' + outputPrefix + '.' + format + '.js';
return `./lib/${outputPrefix}.${format}.js`;
}

function fromSource(format) {
Expand All @@ -62,7 +63,6 @@ export function rollup({
plugins: [
nodeResolve({
extensions: ['.ts', '.tsx'],
module: true,
}),
typescriptPlugin({ typescript, tsconfig }),
invariantPlugin({
Expand Down Expand Up @@ -147,3 +147,5 @@ export function rollup({
},
];
}

export default rollup();
17 changes: 0 additions & 17 deletions config/tsconfig.base.json

This file was deleted.

Loading