Skip to content

build(deps-dev): bump ng-packagr from 3.0.3 to 4.0.0 #31

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

Merged
merged 12 commits into from
Aug 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,19 @@ testem.log
.DS_Store
Thumbs.db
documentation
node_modules
.sonar
.cache
dist
.idea
.ng_pkg_build
coverage
*.log
*.tgz
npm-debug.*
tools/**/*.js
packages/*/scripts
packages/**/ng-package.json
packages/**/package-lock.json
lerna-debug.log
package.json.lerna_backup
13 changes: 13 additions & 0 deletions .istanbul.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
instrumentation:
reporting:
dir: ./coverage
report-config:
html:
subdir: html
lcovonly:
file: lcov/lcovonly.info
watermarks:
statements: [50, 80]
lines: [50, 80]
functions: [50, 80]
branches: [50, 80]
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ cache:
- ~/.yarn
script:
- yarn
- yarn lerna run clean
- yarn lerna bootstrap
- (cd packages/angular-skyhook && yarn run build)
- (cd packages/angular-skyhook-card-list && yarn run build)
- (cd packages/angular-skyhook-multi-backend && yarn run build)
- (cd packages/examples && yarn test:headless)
- yarn clean
- yarn build
- yarn test
# builds examples app quickly if $TRAVIS_PULL_REQUEST / not-master
# else assembles entire docs output in prod mode
- ./build-docs.sh
Expand Down
22 changes: 22 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "lint",
"problemMatcher": {
"base": "$tslint5",
"fileLocation": "relative"
}
},
{
"type": "npm",
"script": "build",
"problemMatcher": [
"$tsc"
]
}
]
}
50 changes: 50 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
module.exports = {
bail: true,
globals: {
"ts-jest": {
tsConfigFile: "./tsconfig.test.json",
useExperimentalLanguageServer: true
},
__TRANSFORM_HTML__: true
},
// https://github.com/facebook/jest/issues/6766
testURL: 'http://localhost',
setupTestFrameworkScriptFile: "./test/test-setup.ts",
transform: {
"^.+\\.(ts|js|html)$": "<rootDir>/node_modules/jest-preset-angular/preprocessor.js"
},
moduleNameMapper: {
"angular-skyhook": "<rootDir>/packages/angular-skyhook",
"angular-skyhook-multi-backend": "<rootDir>/packages/angular-skyhook-multi-backend",
"angular-skyhook-card-list": "<rootDir>/packages/angular-skyhook-card-list"
},
testRegex: ".*spec.ts$",
moduleFileExtensions: [
"ts",
"js",
"json"
],
transformIgnorePatterns: [
"/node_modules/",
"/dist/"
],
modulePathIgnorePatterns: [
"/node_modules/",
"/dist/"
],
projects: [
"<rootDir>",
// "<rootDir>/packages/*"
],
collectCoverageFrom: [
"packages/angular-skyhook*/*/src/**/*.ts",
"packages/angular-skyhook*/src/**/*.ts"
],
coveragePathIgnorePatterns: [
".*(spec|const|config|mock|module|public-api|index|mock|model|d).ts"
],
coverageReporters: [
"lcovonly",
"html"
]
};
48 changes: 40 additions & 8 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,42 @@
{
"lerna": "2.11.0",
"version": "1.0.9",
"npmClient": "yarn",
"useWorkspaces": true,
"skipNpm": true,
"packages": [
"packages/*"
]
"lerna": "2.11.0",
"version": "1.0.9",
"npmClient": "yarn",
"useWorkspaces": true,
"skipNpm": true,
"packages": [
"packages/*"
],
"commands": {
"publish": {
"yes": true,
"message": "chore(release): publish",
"allowBranch": [
"master",
"release/*"
],
"conventionalCommits": true,
"ignore": [
"*.snap",
"*.spec.ts",
"*.md"
]
},
"bootstrap": {
"scope": [
"angular-skyhook*"
]
},
"exec": {
"scope": [
"angular-skyhook*"
]
},
"clean": {
"yes": true
}
},
"npmClientArgs": [
"--no-package-lock"
]
}
25 changes: 25 additions & 0 deletions ng-package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
deleteDestPath: !process.env.WATCH_MODE,
lib: {
entryFile: "public-api.ts",
cssUrl: "inline",
umdModuleIds: {
// vendors
"tslib": "tslib",
"dnd-core": "dndCore",
"react-dnd-html5-backend": "dndHtml5Backend",
"react-dnd-touch-backend": "dndTouchBackend",
"dnd-multi-backend": "dndMultiBackend",

// local
"angular-skyhook": "angularSkyhook",
}
},
whitelistedNonPeerDependencies: [
".",
"dnd-core",
"dnd-multi-backend",
"react-dnd-html5-backend",
"react-dnd-touch-backend",
]
}
59 changes: 39 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,59 @@
{
"name": "@angular-skyhook/monorepo",
"private": true,
"version": "0.0.0",
"devDependencies": {
"@angular/core": "^6.0.9",
"@angular/common": "^6.0.9",
"rxjs": "^6.2.0",
"zone.js": "^0.8.26",
"@angular/cli": "6.0.8",
"@angular/common": "^6.0.9",
"@angular/compiler": "^6.0.9",
"@angular/compiler-cli": "^6.0.9",
"@angular/core": "^6.0.9",
"@angular/language-service": "^6.0.9",
"dnd-core": "^4.0.0",
"chokidar-cli": "^1.2.0",
"lerna": "^2.11.0",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@angular/platform-browser": "^6.0.9",
"@angular/platform-browser-dynamic": "^6.0.9",
"@compodoc/compodoc": "^1.1.3",
"@types/fs-extra": "^5.0.0",
"@types/jest": "^23.3.0",
"@types/lodash": "^4.14.87",
"@types/node": "~10.5.0",
"chokidar-cli": "^1.2.0",
"codelyzer": "~4.4.2",
"cross-env": "^5.2.0",
"dnd-core": "^4.0.0",
"fs-extra": "^7.0.0",
"jasmine-core": "~3.1.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~2.0.4",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.0",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^1.1.0",
"ng-packagr": "^3.0.3",
"jest": "^23.4.1",
"jest-localstorage-mock": "^2.2.0",
"jest-preset-angular": "^5.2.3",
"lerna": "^2.11.0",
"lodash": "^4.17.4",
"ng-packagr": "^4.0.0",
"protractor": "~5.4.0",
"rimraf": "^2.6.2",
"rxjs": "^6.2.0",
"scss-bundle": "^2.1.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"tsickle": "^0.32.0",
"typescript": "~2.7.2",
"tslib": "^1.9.0",
"@compodoc/compodoc": "^1.1.3",
"rimraf": "*"
"tslint": "~5.11.0",
"typescript": "~2.9.2",
"zone.js": "^0.8.26"
},
"scripts": {
"watch": "yarn lerna run watch --parallel --stream"
"lerna": "lerna",
"build": "lerna exec node ../../tools/tasks/build",
"watch": "cross-env WATCH_MODE=true lerna exec --parallel node ../../tools/tasks/build",
"build-tools": "tsc -p ./tools/tsconfig.json",
"clean-all": "lerna clean && rimraf packages/*/dist",
"clean": "rimraf packages/*/dist",
"test": "jest",
"test-tdd": "jest --watchAll --no-cache",
"test-debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --no-cache --runInBand",
"release": "node ./tools/tasks/release",
"postinstall": "yarn build-tools",
"lint": "tslint packages/**/*.ts -t verbose",
"aio": "compodoc -p ./tsconfig.json --output ./aio --hideGenerator --silent"
},
"workspaces": [
"packages/*"
Expand Down
6 changes: 6 additions & 0 deletions packages/angular-skyhook-card-list/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// This file is not used to build this module. It is only used during editing
// by the TypeScript language service and during build for verification. `ngc`
// replaces this file with production index.ts when it rewrites private symbol
// names.

export * from "./public-api";
1 change: 1 addition & 0 deletions packages/angular-skyhook-card-list/ng-package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("../../ng-package");
27 changes: 1 addition & 26 deletions packages/angular-skyhook-card-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,6 @@
"name": "angular-skyhook-card-list",
"private": true,
"version": "1.0.9",
"typings": "./dist/angular-skyhook-card-list.d.ts",
"main": "./dist/bundles/angular-skyhook-card-list.umd.js",
"module": "./dist/fesm5/angular-skyhook-card-list.js",
"es2015": "./dist/fesm2015/angular-skyhook-card-list.js",
"esm5": "./dist/esm5/angular-skyhook-card-list.js",
"esm2015": "./dist/esm2015/angular-skyhook-card-list.js",
"fesm5": "./dist/fesm5/angular-skyhook-card-list.js",
"fesm2015": "./dist/fesm2015/angular-skyhook-card-list.js",
"metadata": "./dist/angular-skyhook-card-list.metadata.json",
"sideEffects": false,
"ngPackage": {
"deleteDestPath": false,
"lib": {
"entryFile": "src/index.ts",
"umdModuleIds": {
"rxjs": "rxjs",
"angular-skyhook": "angularSkyhook"
}
}
},
"dependencies": {
"tslib": "^1.9.0"
},
Expand All @@ -32,12 +12,7 @@
"rxjs": ">= 6.0.0"
},
"scripts": {
"clean": "rimraf dist",
"build": "ng-packagr -p package.json",
"prepare": "yarn run clean && yarn run build",
"lint": "tslint --config tslint.json src/**/*.ts",
"docs": "typedoc ./src",
"watch": "chokidar 'src/**/*.ts' 'src/**/*.html' 'src/**/*.scss' -c 'yarn build'"
"clean": "rimraf dist"
},
"license": "MIT",
"devDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions packages/angular-skyhook-card-list/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export { DraggedItem } from "./src/dragged-item";
export { DropEvent } from "./src/drop-event";
export { HoverEvent, BeginEvent } from "./src/hover-event";
export { CardTemplateContext, CardTemplateDirective } from "./src/card-template.directive";
export { CardRendererDirective } from "./src/card-renderer.directive";
export { Size } from "./src/size";

export { SkyhookCardListModule } from "./src/module";

export { SortableSpec } from "./src/SortableSpec";
export { SimpleSortable } from "./src/SimpleSortable";
export { ParentChildSortable } from "./src/ParentChildSortable";
Loading