Skip to content

Commit

Permalink
Merge pull request #99 from diegonvs/lerna3
Browse files Browse the repository at this point in the history
Upgrade lerna version and fix tooling
  • Loading branch information
jbalsas authored Nov 19, 2018
2 parents f3d4fd6 + 6359dd3 commit 803007f
Show file tree
Hide file tree
Showing 28 changed files with 21,327 additions and 10,235 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/packages/incremental-dom-string/__tests__/virtual_elements.js
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "2.10.1",
"lerna": "3.4.3",
"packages": [
"packages/*"
],
Expand Down
7,538 changes: 4,884 additions & 2,654 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
"scripts": {
"checkFormat": "npm run prettier -- --list-different",
"compile": "lerna run compile",
"clear": "rm -rf coverage",
"clearCoverage": "rm -rf coverage",
"clear": "lerna clean",
"format": "npm run prettier -- --write",
"lerna": "lerna bootstrap -- --no-optional && npm install --no-optional",
"lerna:ci": "lerna bootstrap -- --no-optional --ci",
"lint": "eslint 'packages/*/{src,test}/**/*.js'",
"lerna": "lerna bootstrap -- --no-optional --hoist && npm install --no-optional",
"lerna:ci": "lerna bootstrap -- --no-optional --hoist --ci",
"lint": "eslint 'packages/*/{src,test,__tests__}/**/*.js'",
"ls": "lerna ls",
"precommit": "lint-staged",
"prettier": "prettier-eslint 'packages/*/{src,test}/**/*.js'",
"prettier": "prettier-eslint 'packages/*/{src,test,__tests__}/**/*.js'",
"saucelabs": "karma start karma-saucelabs.conf.js",
"test": "karma start",
"test:coverage": "npm run clear && karma start karma-coverage.conf.js",
"test:coverage": "npm run clearCoverage && karma start karma-coverage.conf.js",
"test:coverage:open": "npm run test:coverage && serve coverage/lcov/lcov-report/",
"test:jest": "lerna run test:jest --concurrency 1 --stream",
"test:mobile": "concurrently \"node test-mobile.js\" \"npm run test:watch\"",
Expand All @@ -38,7 +40,7 @@
"karma-sharding": "^4.4.0",
"karma-sinon": "^1.0.5",
"karma-webpack": "^3.0.0",
"lerna": "^2.11.0",
"lerna": "^3.4.3",
"lint-staged": "^7.1.0",
"mocha": "^4.1.0",
"ngrok": "^3.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {currentElement, patch, text} from '../core.js';
import {currentElement, patch, text} from '../src/core.js';

import {
attr,
Expand All @@ -8,7 +8,7 @@ import {
elementOpenStart,
elementVoid,
renderToString,
} from '../virtual_elements.js';
} from '../src/virtual_elements.js';

describe('element creation', () => {
const findAttribute = (node, attr, check = true) => {
Expand Down
Loading

0 comments on commit 803007f

Please sign in to comment.