Skip to content

Commit

Permalink
update license. AG-9148
Browse files Browse the repository at this point in the history
Merge in EXTENSIONS/extended-css from fix/AG-9148 to master

Squashed commit of the following:

commit 9a6ea7268d34d0643c326ac6c7f949e7ef150795
Author: Slava Leleka <[email protected]>
Date:   Thu Jul 29 16:10:46 2021 +0300

    revert pkg.homepage

commit 51ece74772f1e814f59a83216efbd83b050432c7
Author: Slava Leleka <[email protected]>
Date:   Thu Jul 29 16:09:04 2021 +0300

    simplify pkg.license

commit 2bfe8e481b670875d8de6f936e2130c3e3e6cd31
Author: Slava Leleka <[email protected]>
Date:   Thu Jul 29 16:06:28 2021 +0300

    update license
  • Loading branch information
slavaleleka committed Jul 30, 2021
1 parent 8bfd062 commit 66c6c9a
Show file tree
Hide file tree
Showing 7 changed files with 695 additions and 191 deletions.
829 changes: 669 additions & 160 deletions LICENSE

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/extended-css.cjs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! extended-css - v1.3.12 - Mon May 31 2021
/*! extended-css - v1.3.13 - Thu Jul 29 2021
* https://github.com/AdguardTeam/ExtendedCss
* Copyright (c) 2021 AdGuard. Licensed LGPL-3.0
* Copyright (c) 2021 AdGuard. Licensed GPL-3.0
*/
'use strict';

Expand Down
4 changes: 2 additions & 2 deletions dist/extended-css.esm.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! extended-css - v1.3.12 - Mon May 31 2021
/*! extended-css - v1.3.13 - Thu Jul 29 2021
* https://github.com/AdguardTeam/ExtendedCss
* Copyright (c) 2021 AdGuard. Licensed LGPL-3.0
* Copyright (c) 2021 AdGuard. Licensed GPL-3.0
*/
function _typeof(obj) {
"@babel/helpers - typeof";
Expand Down
4 changes: 2 additions & 2 deletions dist/extended-css.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! extended-css - v1.3.12 - Mon May 31 2021
/*! extended-css - v1.3.13 - Thu Jul 29 2021
* https://github.com/AdguardTeam/ExtendedCss
* Copyright (c) 2021 AdGuard. Licensed LGPL-3.0
* Copyright (c) 2021 AdGuard. Licensed GPL-3.0
*/
var ExtendedCss = (function () {
'use strict';
Expand Down
4 changes: 2 additions & 2 deletions dist/extended-css.min.js

Large diffs are not rendered by default.

39 changes: 17 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "extended-css",
"version": "1.3.12",
"version": "1.3.13",
"description": "Module for applying CSS styles with extended selection properties.",
"main": "dist/extended-css.cjs.js",
"module": "dist/extended-css.esm.js",
Expand All @@ -17,7 +17,21 @@
"browserstack": "node tasks/tests.js && node tasks/browserstack.js",
"lint": "eslint ."
},
"dependencies": {},
"husky": {
"hooks": {
"pre-commit": "yarn lint; yarn test"
}
},
"author": "AdGuard",
"license": "GPL-3.0",
"repository": {
"type": "git",
"url": "https://github.com/AdguardTeam/ExtendedCss.git"
},
"bugs": {
"url": "https://github.com/AdguardTeam/ExtendedCss/issues"
},
"homepage": "https://github.com/AdguardTeam/ExtendedCss",
"devDependencies": {
"@babel/core": "^7.7.5",
"@babel/plugin-transform-runtime": "^7.9.6",
Expand All @@ -38,24 +52,5 @@
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-terser": "^7.0.0"
},
"husky": {
"hooks": {
"pre-commit": "yarn lint; yarn test"
}
},
"repository": {
"type": "git",
"url": "https://github.com/AdguardTeam/ExtendedCss.git"
},
"author": "AdGuard",
"licenses": [
{
"type": "LGPL-3.0",
"url": "https://github.com/AdguardTeam/ExtendedCss/blob/master/LICENSE"
}
],
"bugs": {
"url": "https://github.com/AdguardTeam/ExtendedCss/issues"
},
"homepage": "https://github.com/AdguardTeam/ExtendedCss"
"dependencies": {}
}
2 changes: 1 addition & 1 deletion tasks/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (!fs.existsSync(config.outputDir)) {

const banner = `/*! ${pkg.name} - v${pkg.version} - ${new Date().toDateString()}
${pkg.homepage ? `* ${pkg.homepage}` : ''}
* Copyright (c) ${new Date().getFullYear()} ${pkg.author}. Licensed ${pkg.licenses.map((l) => l.type).join(', ')}
* Copyright (c) ${new Date().getFullYear()} ${pkg.author}. Licensed ${pkg.license}
*/`;

const rollupConfig = {
Expand Down

1 comment on commit 66c6c9a

@julissanavarro
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

god

Please sign in to comment.