Skip to content

Commit

Permalink
Merge pull request #895 from Turbo87/dependencies
Browse files Browse the repository at this point in the history
Fix internal dependency declarations
  • Loading branch information
rwjblue authored Dec 24, 2018
2 parents 5992d9a + ad9a416 commit 543000a
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 28 deletions.
6 changes: 5 additions & 1 deletion packages/@glimmer/encoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"name": "@glimmer/encoder",
"version": "0.37.0",
"repository": "https://github.com/glimmerjs/glimmer-vm/tree/master/packages/@glimmer/encoder",
"dependencies": {
"@glimmer/interfaces": "^0.37.0",
"@glimmer/vm": "^0.37.0"
},
"devDependencies": {
"typescript": "^2.8.3"
}
}
}
3 changes: 2 additions & 1 deletion packages/@glimmer/object/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.37.0",
"repository": "https://github.com/glimmerjs/glimmer-vm/tree/master/packages/@glimmer/object",
"dependencies": {
"@glimmer/interfaces": "^0.37.0",
"@glimmer/object-reference": "^0.37.0",
"@glimmer/reference": "^0.37.0",
"@glimmer/util": "^0.37.0"
Expand All @@ -11,4 +12,4 @@
"typescript": "^2.8.3",
"@types/qunit": "^2.0.31"
}
}
}
7 changes: 6 additions & 1 deletion packages/@glimmer/runtime/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ export {
ElementOperations,
clientBuilder,
} from './lib/vm/element-builder';
export { rehydrationBuilder, RehydrateBuilder } from './lib/vm/rehydrate-builder';
export {
rehydrationBuilder,
RehydrateBuilder,
SERIALIZATION_FIRST_NODE_STRING,
isSerializationFirstNode,
} from './lib/vm/rehydrate-builder';
export { default as Bounds, ConcreteBounds, Cursor } from './lib/bounds';
export { capabilityFlagsFrom, hasCapability, Capability } from './lib/capabilities';
14 changes: 7 additions & 7 deletions packages/@glimmer/runtime/lib/vm/rehydrate-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { NewElementBuilder, ElementBuilder, RemoteBlockTracker } from './element
import { Environment } from '../environment';
import Bounds, { Cursor, ConcreteBounds } from '../bounds';
import { Simple, Option } from '@glimmer/interfaces';
import {
expect,
assert,
Stack,
isSerializationFirstNode,
SERIALIZATION_FIRST_NODE_STRING,
} from '@glimmer/util';
import { expect, assert, Stack } from '@glimmer/util';
import { SVG_NAMESPACE } from '../dom/helper';

export const SERIALIZATION_FIRST_NODE_STRING = '%+b:0%';

export function isSerializationFirstNode(node: Simple.Node): boolean {
return node.nodeValue === SERIALIZATION_FIRST_NODE_STRING;
}

export class RehydratingCursor extends Cursor {
candidate: Option<Simple.Node> = null;
openBlockDepth: number;
Expand Down
5 changes: 0 additions & 5 deletions packages/@glimmer/util/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ export { default as assert } from './lib/assert';
export { assign, fillNulls } from './lib/object-utils';
export { ensureGuid, initializeGuid, HasGuid } from './lib/guid';

export {
isSerializationFirstNode,
SERIALIZATION_FIRST_NODE_STRING,
} from './lib/is-serialization-first-node';

export { Stack, Dict, Set, DictSet, dict } from './lib/collections';
export {
EMPTY_SLICE,
Expand Down
7 changes: 0 additions & 7 deletions packages/@glimmer/util/lib/is-serialization-first-node.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/@glimmer/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"@types/qunit": "^2.0.31",
"typescript": "^2.8.3"
}
}
}
7 changes: 2 additions & 5 deletions packages/@glimmer/vm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
"repository": "https://github.com/glimmerjs/glimmer-vm/tree/master/packages/@glimmer/vm",
"dependencies": {
"@glimmer/util": "^0.37.0",
"@glimmer/interfaces": "^0.37.0",
"@glimmer/program": "^0.37.0"
"@glimmer/interfaces": "^0.37.0"
},
"devDependencies": {
"@glimmer/debug": "^0.37.0",
"@types/qunit": "^2.0.31",
"typescript": "^2.8.3"
}
}
}

0 comments on commit 543000a

Please sign in to comment.