Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
@taye
taye committed Apr 5, 2019
2 parents 4bf1e4b + d380d42 commit d3afb1e
Show file tree
Hide file tree
Showing 21 changed files with 8,761 additions and 12,576 deletions.
3 changes: 1 addition & 2 deletions lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"version": "1.4.0-rc.5",
"version": "0.0.0",
"packages": [
".",
"packages/*"
]
}
12,423 changes: 0 additions & 12,423 deletions package-lock.json
View file

This file was deleted.

16 changes: 11 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
{
"name": "@interactjs/_dev",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"private": true,
"workspaces": [
".",
"./packages/*"
],
"bin": {
"@build": "scripts/build.js",
"@docs": "docs/index.js",
"@lint": "scripts/lint.js",
"@run_test": "scripts/test.sh"
"@run_test": "scripts/test.sh",
"@version": "scripts/version.js"
},
"scripts": {
"bootstrap": "npx lerna bootstrap --ci",
"bootstrap": "npx yarn install",
"start": "cd packages/interactjs; NODE_ENV=development ../../scripts/build.js --watch",
"build": "cd packages/interactjs; NODE_ENV=production ../../scripts/build.js --docs",
"lint": "scripts/lint.js",
Expand All @@ -18,7 +23,7 @@
"tsc_lint_test": "tsc -b -f && tsc -b --clean && npm run lint -- --fail-on-error && npm test",
"docs": "node docs --go",
"release": "sh ./scripts/release.sh",
"bump": "npx lerna version --no-git-tag-version --exact && git add -p -- lerna.json package.json packages/*/package.json && git commit"
"version": "scripts/version.js"
},
"dependencies": {
"@babel/core": "latest",
Expand Down Expand Up @@ -70,7 +75,8 @@
"typescript": "latest",
"uglify-js": "latest",
"watchify": "latest",
"yargs": "latest"
"yargs": "latest",
"yarn": "latest"
},
"husky": {
"hooks": {
Expand Down
11 changes: 3 additions & 8 deletions packages/actions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"name": "@interactjs/actions",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 2 additions & 6 deletions packages/auto-scroll/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
{
"name": "@interactjs/auto-scroll",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 3 additions & 9 deletions packages/auto-start/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
{
"name": "@interactjs/auto-start",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/actions": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 3 additions & 7 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
{
"name": "@interactjs/core",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/dev-tools": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/dev-tools": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 2 additions & 8 deletions packages/dev-tools/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
{
"name": "@interactjs/dev-tools",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"dependencies": {
"@interactjs/utils": "1.4.0-rc.5"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/actions": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.2"
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 4 additions & 11 deletions packages/inertia/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
{
"name": "@interactjs/inertia",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/modifiers": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/actions": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/modifiers": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/modifiers": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
35 changes: 11 additions & 24 deletions packages/interact/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,17 @@
{
"name": "@interactjs/interact",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/actions": "1.4.0-rc.2",
"@interactjs/auto-scroll": "1.4.0-rc.2",
"@interactjs/auto-start": "1.4.0-rc.2",
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/dev-tools": "1.4.0-rc.2",
"@interactjs/inertia": "1.4.0-rc.2",
"@interactjs/modifiers": "1.4.0-rc.2",
"@interactjs/pointer-events": "1.4.0-rc.2",
"@interactjs/reflow": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/actions": "1.4.0-rc.5",
"@interactjs/auto-scroll": "1.4.0-rc.5",
"@interactjs/auto-start": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/dev-tools": "1.4.0-rc.5",
"@interactjs/inertia": "1.4.0-rc.5",
"@interactjs/modifiers": "1.4.0-rc.5",
"@interactjs/pointer-events": "1.4.0-rc.5",
"@interactjs/reflow": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/actions": "1.4.0-rc.6",
"@interactjs/auto-scroll": "1.4.0-rc.6",
"@interactjs/auto-start": "1.4.0-rc.6",
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/dev-tools": "1.4.0-rc.6",
"@interactjs/inertia": "1.4.0-rc.6",
"@interactjs/modifiers": "1.4.0-rc.6",
"@interactjs/pointer-events": "1.4.0-rc.6",
"@interactjs/reflow": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 2 additions & 8 deletions packages/interactjs/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "interactjs",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"repository": {
"type": "git",
"url": "https://github.com/taye/interact.js.git"
Expand Down Expand Up @@ -41,13 +41,7 @@
],
"license": "MIT",
"dependencies": {
"@interactjs/types": "1.4.0-rc.5"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/interact": "1.4.0-rc.5",
"@interactjs/modifiers": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/types": "1.4.0-rc.6"
},
"_dev": {
"entries": "./index.ts",
Expand Down
11 changes: 3 additions & 8 deletions packages/modifiers/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"name": "@interactjs/modifiers",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
11 changes: 3 additions & 8 deletions packages/pointer-events/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"name": "@interactjs/pointer-events",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
14 changes: 0 additions & 14 deletions packages/reflow/package-lock.json
View file

This file was deleted.

9 changes: 3 additions & 6 deletions packages/reflow/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"name": "@interactjs/reflow",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"peerDependencies": {
"@interactjs/core": "1.4.0-rc.2",
"@interactjs/utils": "1.4.0-rc.2"
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5",
"promise-polyfill": "latest"
},
"publishConfig": {
Expand Down
1 change: 0 additions & 1 deletion packages/types/node_modules/interactjs
View file

This file was deleted.

27 changes: 12 additions & 15 deletions packages/types/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{
"name": "@interactjs/types",
"version": "1.4.0-rc.5",
"version": "1.4.0-rc.6",
"dependencies": {
"@interactjs/actions": "1.4.0-rc.5",
"@interactjs/auto-scroll": "1.4.0-rc.5",
"@interactjs/auto-start": "1.4.0-rc.5",
"@interactjs/core": "1.4.0-rc.5",
"@interactjs/dev-tools": "1.4.0-rc.5",
"@interactjs/inertia": "1.4.0-rc.5",
"@interactjs/interact": "1.4.0-rc.5",
"@interactjs/modifiers": "1.4.0-rc.5",
"@interactjs/pointer-events": "1.4.0-rc.5",
"@interactjs/reflow": "1.4.0-rc.5",
"@interactjs/utils": "1.4.0-rc.5"
},
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5"
"@interactjs/actions": "1.4.0-rc.6",
"@interactjs/auto-scroll": "1.4.0-rc.6",
"@interactjs/auto-start": "1.4.0-rc.6",
"@interactjs/core": "1.4.0-rc.6",
"@interactjs/dev-tools": "1.4.0-rc.6",
"@interactjs/inertia": "1.4.0-rc.6",
"@interactjs/interact": "1.4.0-rc.6",
"@interactjs/modifiers": "1.4.0-rc.6",
"@interactjs/pointer-events": "1.4.0-rc.6",
"@interactjs/reflow": "1.4.0-rc.6",
"@interactjs/utils": "1.4.0-rc.6"
},
"publishConfig": {
"access": "public"
Expand Down
5 changes: 1 addition & 4 deletions packages/utils/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"name": "@interactjs/utils",
"version": "1.4.0-rc.5",
"devDependencies": {
"@interactjs/_dev": "1.4.0-rc.5"
},
"version": "1.4.0-rc.6",
"publishConfig": {
"access": "public"
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ run_build() {
npx tsc --emitDeclarationOnly false -p $ROOT &&

# copy .npmignore to all packages
npx lerna exec --no-private -- "echo '# copied from ../../.npmignore' > .npmignore
npx lerna exec --no-private -- "echo '# copied from [root]/.npmignore' > .npmignore
cat ../../.npmignore >> .npmignore" &&

# build packages
Expand Down
Loading

0 comments on commit d3afb1e

Please sign in to comment.