Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: valor-software/ng2-dragula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.1
Choose a base ref
...
head repository: valor-software/ng2-dragula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.0
Choose a head ref
  • 18 commits
  • 129 files changed
  • 6 contributors

Commits on Nov 8, 2018

  1. Copy the full SHA
    838027c View commit details

Commits on Dec 2, 2019

  1. build: update lerna to 3.18.4 to be able to publish dist/ directory (

    …#981)
    
    Currently, the published `ng2-dragula` package contains two
    `package.json` files (one at [./package.json](https://unpkg.com/browse/ng2-dragula@2.1.1/package.json)
    and another one at [./dist/package.json](https://unpkg.com/browse/ng2-dragula@2.1.1/dist/package.json)),
    both pointing to the same library files inside `dist/`.
    
    Under certain circumstances, this can throw off ngcc (the Angular
    Compatibility Compiler), which is used in v9 to enable apps using the
    new default Ivy renderer to consume libraries (which should should be
    built with ViewEngine for compatibility).
    
    To remedy this, we have added a fallback config in ngcc that ignores
    `dist/package.json`, but ideally the issue should be fixed in the
    library itself.
    
    To address this, this commit updates lerna to the latest version, which
    includes lerna/lerna@5e790e5 that in turn allows publishing a
    sub-directory of a package (in this case `dist/`).
    
    (NOTE: Once this is released, we should update ngcc's fallback config to
    only apply to the versions of `ng2-dragula` that don't have the fix.)
    gkalpak authored and valorkin committed Dec 2, 2019
    Copy the full SHA
    2ffec89 View commit details

Commits on Sep 14, 2020

  1. feat: Angular 10 Compatibility (#1008)

    Fix# 1003
    jziggas authored Sep 14, 2020
    Copy the full SHA
    ad945e0 View commit details

Commits on Jan 27, 2022

  1. Copy the full SHA
    5c8a8f4 View commit details

Commits on Feb 15, 2022

  1. fear(bump): upgrade to ng13 (#1044)

    * update to angular 7
    
    * chore(bump): updated versions
    
    * fix(eventTypes): fixed types
    
    * chore(bump): updated versions. Workable state
    
    * ref(karma):extra line
    
    * chore(bump): fix path
    
    * chore(bump): save package-lock.json
    
    * chore(bump): lib in angular 12
    
    * chore(bump): updated git ignore
    
    * chore(bump): demo angular 13
    
    * chore(bump): lib angular 13
    
    * chore(bump): demo angular 13
    
    * master merging
    
    * feat-add-nx-structure
    
    * feat(lint): lint fixies
    
    * chore(bump): fix yml
    
    * chore(bump): fix .yml
    
    * fix(build): fixed build
    
    * fix(lint): fixed lint
    
    * chore(bump): firebase deploy
    
    * fix(tests): fixies for unit tests
    
    * fix(tests): fixed test, updated yml files
    
    * fix .yml
    
    * fix .yml
    
    * fix .yml
    
    * fix .yml
    
    * fix .yml
    
    * switched on strict mode
    
    * fixed lint
    
    * directive tests almost fixed
    
    * fix(tests): fixies for unit tests
    
    * fixies for unit tests
    
    * fixies for nx.json file
    
    * fixies for github actions
    
    * fixies for github actions
    
    * cleaning commit
    
    * update nx structure
    
    * lint fixies
    SvetlanaMuravlova authored Feb 15, 2022
    Copy the full SHA
    aae781b View commit details

Commits on Sep 28, 2022

  1. feat(dragula): updated angular 14 (#1065)

    * feat(chore): updated angular 14
    
    * fix(ci): fixed build and test in yml files
    
    * fix(ci): fixed build and test in yml files
    
    * fix(chore): updated peerdependencies
    
    * fix(chore): deleted unnecessery command
    SvetlanaMuravlova authored Sep 28, 2022
    Copy the full SHA
    2d2388d View commit details

Commits on Dec 7, 2022

  1. Copy the full SHA
    1cc1f0e View commit details
  2. Copy the full SHA
    f6798c9 View commit details
  3. fix ci

    SvetlanaMuravlova committed Dec 7, 2022
    Copy the full SHA
    b89050b View commit details
  4. fix ci

    SvetlanaMuravlova committed Dec 7, 2022
    Copy the full SHA
    809f58e View commit details
  5. fix ci

    SvetlanaMuravlova committed Dec 7, 2022
    Copy the full SHA
    3341c25 View commit details
  6. 3.0.0

    SvetlanaMuravlova committed Dec 7, 2022
    Copy the full SHA
    daae054 View commit details
  7. Copy the full SHA
    d0279ef View commit details
  8. Revert "3.0.0"

    This reverts commit 30e71b1.
    SvetlanaMuravlova committed Dec 7, 2022
    Copy the full SHA
    e2cb7fa View commit details
  9. Copy the full SHA
    1afbdbc View commit details
  10. Copy the full SHA
    22fd062 View commit details
  11. Copy the full SHA
    b963d52 View commit details
  12. 3.0.0

    SvetlanaMuravlova committed Dec 7, 2022
    Copy the full SHA
    4ab006b View commit details
Showing with 41,685 additions and 18,144 deletions.
  1. +6 −4 .editorconfig
  2. +38 −0 .eslintrc.json
  3. +5 −0 .firebaserc
  4. +110 −0 .github/workflows/on-push-or-pull.yml
  5. +119 −0 .github/workflows/on-release.yml
  6. +36 −9 .gitignore
  7. +1 −0 .prettierignore
  8. +3 −0 .prettierrc
  9. +0 −45 .travis.yml
  10. +8 −0 .vscode/extensions.json
  11. +24 −0 CHANGELOG.md
  12. +20 −11 README.md
  13. +9 −0 angular.json
  14. +17 −0 apps/demo/.browserslistrc
  15. +30 −0 apps/demo/.eslintrc.json
  16. +81 −0 apps/demo/project.json
  17. 0 {modules → apps}/demo/src/app/app.component.ts
  18. +2 −3 {modules → apps}/demo/src/app/app.module.ts
  19. 0 {modules → apps}/demo/src/app/examples/01-basic.component.ts
  20. 0 {modules → apps}/demo/src/app/examples/02-events.component.html
  21. +1 −1 {modules → apps}/demo/src/app/examples/02-events.component.ts
  22. 0 {modules → apps}/demo/src/app/examples/03-spill.component.html
  23. +1 −1 {modules → apps}/demo/src/app/examples/03-spill.component.ts
  24. 0 {modules → apps}/demo/src/app/examples/04-revert.component.html
  25. +1 −1 {modules → apps}/demo/src/app/examples/04-revert.component.ts
  26. 0 {modules → apps}/demo/src/app/examples/05-copy.component.html
  27. +4 −4 {modules → apps}/demo/src/app/examples/05-copy.component.ts
  28. 0 {modules → apps}/demo/src/app/examples/06-copy-model.component.html
  29. +4 −4 {modules → apps}/demo/src/app/examples/06-copy-model.component.ts
  30. 0 {modules → apps}/demo/src/app/examples/07-handle.component.html
  31. +3 −3 {modules → apps}/demo/src/app/examples/07-handle.component.ts
  32. 0 {modules → apps}/demo/src/app/examples/08-click.component.html
  33. +13 −4 {modules → apps}/demo/src/app/examples/08-click.component.ts
  34. 0 {modules → apps}/demo/src/app/examples/09-ngfor.component.html
  35. 0 {modules → apps}/demo/src/app/examples/09-ngfor.component.ts
  36. 0 {modules → apps}/demo/src/app/examples/10-nested.component.html
  37. +2 −2 {modules → apps}/demo/src/app/examples/10-nested.component.ts
  38. 0 {modules → apps}/demo/src/assets/css/dragula.min.css
  39. 0 {modules → apps}/demo/src/assets/css/example.css
  40. BIN {modules → apps}/demo/src/assets/img/demo.png
  41. BIN {modules → apps}/demo/src/assets/img/eyes.png
  42. BIN {modules → apps}/demo/src/assets/img/favicon.ico
  43. 0 {modules → apps}/demo/src/assets/img/icon.svg
  44. BIN {modules → apps}/demo/src/assets/img/logo.png
  45. 0 {modules → apps}/demo/src/assets/img/logo.svg
  46. 0 {modules → apps}/demo/src/environments/environment.prod.ts
  47. +1 −1 {modules → apps}/demo/src/environments/environment.ts
  48. BIN {modules → apps}/demo/src/favicon.ico
  49. 0 {modules → apps}/demo/src/index.html
  50. +1 −0 {modules → apps}/demo/src/main.ts
  51. +11 −0 apps/demo/src/polyfills.ts
  52. 0 {modules → apps}/demo/src/styles.css
  53. +31 −0 apps/demo/tsconfig.app.json
  54. +2 −3 {modules/demo/src → apps/demo}/tsconfig.spec.json
  55. 0 {modules/demo → apps}/e2e/protractor.conf.js
  56. 0 {modules/demo → apps}/e2e/src/app.e2e-spec.ts
  57. 0 {modules/demo → apps}/e2e/src/app.po.ts
  58. 0 {modules/demo → apps}/e2e/tsconfig.e2e.json
  59. +69 −0 decorate-angular-cli.js
  60. +16 −0 firebase.json
  61. +3 −0 jest.config.ts
  62. +7 −0 jest.preset.js
  63. +2 −2 lerna.json
  64. +21 −0 libs/ng2-dragula/.eslintrc.json
  65. 0 {modules → libs}/ng2-dragula/CHANGELOG.md
  66. 0 {modules → libs}/ng2-dragula/README.md
  67. +20 −0 libs/ng2-dragula/jest.config.ts
  68. +7 −0 libs/ng2-dragula/ng-package.json
  69. +14,144 −0 libs/ng2-dragula/package-lock.json
  70. +46 −0 libs/ng2-dragula/package.json
  71. +53 −0 libs/ng2-dragula/project.json
  72. 0 {modules → libs}/ng2-dragula/src/DragulaOptions.ts
  73. 0 {modules → libs}/ng2-dragula/src/DrakeFactory.ts
  74. 0 {modules → libs}/ng2-dragula/src/DrakeWithModels.ts
  75. +1 −3 {modules → libs}/ng2-dragula/src/EventTypes.ts
  76. +1 −1 {modules → libs}/ng2-dragula/src/Group.ts
  77. +38 −10 {modules → libs}/ng2-dragula/src/MockDrake.ts
  78. +29 −19 {modules → libs}/ng2-dragula/src/components/dragula.directive.ts
  79. +3 −2 {modules → libs}/ng2-dragula/src/components/dragula.module.ts
  80. +44 −42 {modules → libs}/ng2-dragula/src/components/dragula.service.ts
  81. 0 {modules → libs}/ng2-dragula/src/public_api.ts
  82. +16 −17 {modules → libs}/ng2-dragula/src/spec/StaticService.ts
  83. +120 −131 {modules → libs}/ng2-dragula/src/spec/dragula.directive.spec.ts
  84. +310 −0 libs/ng2-dragula/src/spec/dragula.service.spec.ts
  85. +8 −3 {modules → libs}/ng2-dragula/src/spec/test-host.component.ts
  86. +1 −0 libs/ng2-dragula/src/spec/test-setup.ts
  87. +29 −0 libs/ng2-dragula/tsconfig.json
  88. +20 −0 libs/ng2-dragula/tsconfig.lib.json
  89. +9 −0 libs/ng2-dragula/tsconfig.lib.prod.json
  90. +20 −0 libs/ng2-dragula/tsconfig.spec.json
  91. +0 −13 modules/demo/.editorconfig
  92. +0 −39 modules/demo/.gitignore
  93. +0 −27 modules/demo/README.md
  94. +0 −127 modules/demo/angular.json
  95. +0 −52 modules/demo/package.json
  96. +0 −9 modules/demo/src/browserslist
  97. +0 −31 modules/demo/src/karma.conf.js
  98. +0 −81 modules/demo/src/polyfills.ts
  99. +0 −20 modules/demo/src/test.ts
  100. +0 −12 modules/demo/src/tsconfig.app.json
  101. +0 −17 modules/demo/src/tslint.json
  102. +0 −20 modules/demo/tsconfig.json
  103. +0 −130 modules/demo/tslint.json
  104. +0 −6,526 modules/demo/yarn.lock
  105. +0 −3 modules/ng2-dragula/.gitignore
  106. +0 −40 modules/ng2-dragula/angular.json
  107. +0 −83 modules/ng2-dragula/karma.conf.js
  108. +0 −12 modules/ng2-dragula/ng-package.json
  109. +0 −96 modules/ng2-dragula/package.json
  110. +0 −21 modules/ng2-dragula/scripts/matchers.ts
  111. +0 −18 modules/ng2-dragula/scripts/sauce-browsers.js
  112. +0 −37 modules/ng2-dragula/scripts/test.ts
  113. +0 −11 modules/ng2-dragula/scripts/typings.d.ts
  114. +0 −311 modules/ng2-dragula/src/spec/dragula.service.spec.ts
  115. +0 −7 modules/ng2-dragula/src/spec/jasmine.d.ts
  116. +0 −6 modules/ng2-dragula/src/spec/testdouble-jasmine.d.ts
  117. +0 −26 modules/ng2-dragula/src/test.ts
  118. +0 −19 modules/ng2-dragula/tsconfig.json
  119. +0 −19 modules/ng2-dragula/tsconfig.spec.json
  120. +40 −0 nx.json
  121. +25,890 −0 package-lock.json
  122. +62 −27 package.json
  123. +19 −0 scripts/set-version.ts
  124. 0 tools/schematics/.gitkeep
  125. +12 −0 tools/tsconfig.tools.json
  126. +41 −0 tsconfig.base.json
  127. +0 −24 tsconfig.json
  128. +0 −12 tslint.json
  129. +0 −9,942 yarn.lock
10 changes: 6 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# http://editorconfig.org

# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
38 changes: 38 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"rules": {
},
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {
"semi": "off",
"@typescript-eslint/semi": ["error"],
"@typescript-eslint/ban-ts-comment": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
}
]
}
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "ng2-dragula"
}
}
110 changes: 110 additions & 0 deletions .github/workflows/on-push-or-pull.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: on-pull-request-or-push

on:
pull_request:
branches:
- master

env:
FIREBASE_CHANNEL: ${{ fromJSON('["", "live"]')[!github.base_ref] }}
NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
SAUCE_USERNAME_PR: valorkinpr
SAUCE_ACCESS_KEY_PR: e0a97bd3-4b74-4408-89bf-cce1b44a8bf1

CACHE_NODE_MODULES_PATH: |
~/.npm
node_modules
CACHE_DIST_PATH: dist

jobs:
# one run
one_run:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

# install dependencies
install:
runs-on: ubuntu-latest
needs: one_run
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
id: cache
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- run: npm ci
if: steps.cache.outputs.cache-hit != 'true'

# build ng2-dragula
build:
needs: install
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- run: |
npx nx build demo --configuration production
# run unit tests
unit_tests_with_coverage:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- run: npx nx run-many --target=test --all --code-coverage
continue-on-error: true

# run linting
linting:
runs-on: ubuntu-latest
needs: install
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- run: npm run lint

# firebase deploy preview
firebase_preview:
runs-on: ubuntu-latest
needs: build
outputs:
output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- uses: FirebaseExtended/action-hosting-deploy@v0
continue-on-error: true
id: firebase_hosting_preview
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_NG2_DRAGULA }}'
projectId: ng2-dragula
channelId: ${{ env.FIREBASE_CHANNEL }}
expires: 3d
119 changes: 119 additions & 0 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
name: on-release
on:
push:
tags:
- v*

env:
NX_BRANCH: ${{ github.event.number }}
NX_RUN_GROUP: ${{ github.run_id }}
NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
MOZ_HEADLESS: 1
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
# one run
one_run:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

# install dependencies
install:
runs-on: ubuntu-latest
needs: one_run
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
id: cache
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- run: npm ci
if: steps.cache.outputs.cache-hit != 'true'

# build ng2-dragula
build:
needs: install
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v3
with:
path: dist
key: dist-${{ github.run_id }}
- run: |
npx nx build demo --configuration production
# update release notes in github
update_release_draft:
needs: install
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- run: npx conventional-github-releaser -p angular

# update gh_pages
gh_pages_deploy:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v3
with:
ref: 'gh-pages'
path: 'gh-pages'

- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v3
with:
path: dist
key: dist-${{ github.run_id }}

# - run: npm run scully
- run: |
cd gh-pages
git config user.email gh-actions-${GITHUB_ACTOR}@github.com
git config user.name $GITHUB_ACTOR
git add -A
git commit -am "ci: gh-pages update"
continue-on-error: true
- name: push to gh-pages
uses: ad-m/github-push-action@v0.6.0
continue-on-error: true
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: 'gh-pages'
directory: 'gh-pages'

# publish to npm
npm_publish:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v3
with:
path: dist
key: dist-${{ github.run_id }}
- uses: JS-DevTools/npm-publish@v1
with:
package: "dist/ng2-dragula/package.json"
token: ${{ secrets.NPM_TOKEN }}
45 changes: 36 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,43 @@
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules
npm-debug.log

# WebStorm
.idea
.vscode
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# ignore build and dist for now
/demo/dist
/dist
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.angular
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db

# ignore inline compiling
/logs
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Add files here to ignore them from prettier formatting
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

Loading