Skip to content

Commit e42fda6

Browse files
committed
Upgrade popper.js to @popperjs/core
1 parent 103cb52 commit e42fda6

10 files changed

Lines changed: 81 additions & 67 deletions

File tree

@popperjs/CHANGES.htm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<p>
2+
See the
3+
<a
4+
href="https://github.com/floating-ui/floating-ui/releases?q=popper&expanded=true"
5+
>Popper.js changelog</a
6+
>
7+
</p>

@popperjs/LICENSE.htm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<p>
2+
Popper.js is licensed under the
3+
<a
4+
href="https://github.com/popperjs/popper-core/blob/v<~=version~>/LICENSE.md"
5+
>MIT license</a
6+
>.
7+
</p>

@popperjs/dnn-library.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"files": ["node_modules/@popperjs/core/dist/umd/popper.min.js"],
3+
"resources": [
4+
"node_modules/@popperjs/core/dist/umd/*.js",
5+
"node_modules/@popperjs/core/dist/umd/*.map"
6+
]
7+
}
Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
<dotnetnuke type="Package" version="5.0">
2-
<packages>
3-
<package name="popper.js" type="JavaScript_Library" version="<~=version~>">
4-
<friendlyName>Popper.js</friendlyName>
5-
<description>
6-
<![CDATA[A library used to position poppers in web applications.]]>
7-
</description>
8-
<owner>
9-
<name>Engage Software</name>
10-
<organization>Engage Software</organization>
11-
<url>https://engagesoftware.com/</url>
12-
<email>support@engagesoftware.com</email>
13-
</owner>
14-
<license src="LICENSE.htm" />
15-
<releaseNotes src="CHANGES.htm" />
16-
<azureCompatible>true</azureCompatible>
17-
<dependencies></dependencies>
18-
<components>
19-
<component type="JavaScript_Library">
20-
<javaScriptLibrary>
21-
<libraryName>popper.js</libraryName>
22-
<fileName>popper.min.js</fileName>
23-
<preferredScriptLocation>BodyBottom</preferredScriptLocation>
24-
<objectName>Popper</objectName>
25-
<cdnUrl>https://cdn.jsdelivr.net/npm/popper.js@<~=version~>/dist/popper.min.js</cdnUrl>
26-
</javaScriptLibrary>
27-
</component>
28-
<component type="JavaScriptFile">
29-
<jsfiles>
30-
<libraryFolderName>popper.js</libraryFolderName>
31-
<jsfile>
32-
<name>popper.min.js</name>
33-
</jsfile>
34-
</jsfiles>
35-
</component>
36-
<component type="ResourceFile">
37-
<resourceFiles>
38-
<basePath>Resources\Libraries\popper.js\<~=versionFolder~></basePath>
39-
<resourceFile>
40-
<name>Resources.zip</name>
41-
</resourceFile>
42-
</resourceFiles>
43-
</component>
44-
</components>
45-
</package>
46-
</packages>
47-
</dotnetnuke>
1+
<dotnetnuke type="Package" version="5.0">
2+
<packages>
3+
<package name="popper" type="JavaScript_Library" version="<~=version~>">
4+
<friendlyName>Popper</friendlyName>
5+
<description>
6+
<![CDATA[Tooltip & Popover Positioning Engine]]>
7+
</description>
8+
<owner>
9+
<name>Engage Software</name>
10+
<organization>Engage Software</organization>
11+
<url>https://engagesoftware.com/</url>
12+
<email>support@engagesoftware.com</email>
13+
</owner>
14+
<license src="LICENSE.htm" />
15+
<releaseNotes src="CHANGES.htm" />
16+
<azureCompatible>true</azureCompatible>
17+
<dependencies></dependencies>
18+
<components>
19+
<component type="JavaScript_Library">
20+
<javaScriptLibrary>
21+
<libraryName>popper</libraryName>
22+
<fileName>popper.min.js</fileName>
23+
<preferredScriptLocation>BodyBottom</preferredScriptLocation>
24+
<objectName>Popper</objectName>
25+
<cdnUrl>https://cdn.jsdelivr.net/npm/@popperjs/core@<~=version~>/dist/umd/popper.min.js</cdnUrl>
26+
</javaScriptLibrary>
27+
</component>
28+
<component type="JavaScriptFile">
29+
<jsfiles>
30+
<libraryFolderName>popper</libraryFolderName>
31+
<jsfile>
32+
<name>popper.min.js</name>
33+
</jsfile>
34+
</jsfiles>
35+
</component>
36+
<component type="ResourceFile">
37+
<resourceFiles>
38+
<basePath>Resources\Libraries\popper\<~=versionFolder~></basePath>
39+
<resourceFile>
40+
<name>Resources.zip</name>
41+
</resourceFile>
42+
</resourceFiles>
43+
</component>
44+
</components>
45+
</package>
46+
</packages>
47+
</dotnetnuke>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"dependencies": {
1515
"@fancyapps/fancybox": "3.5.7",
1616
"@khanacademy/tota11y": "0.2.0",
17+
"@popperjs/core": "2.11.8",
1718
"@xmldom/xmldom": "^0.9.10",
1819
"alpaca": "1.5.27",
1920
"blob.js": "1.0.1",
@@ -66,7 +67,6 @@
6667
"numeral": "2.0.6",
6768
"pepjs": "0.5.3",
6869
"picturefill": "3.0.3",
69-
"popper.js": "1.16.1",
7070
"pubsub-js": "1.9.5",
7171
"quill": "2.0.3",
7272
"respond.js": "1.4.2",

popper.js/CHANGES.htm

Lines changed: 0 additions & 3 deletions
This file was deleted.

popper.js/LICENSE.htm

Lines changed: 0 additions & 3 deletions
This file was deleted.

popper.js/dnn-library.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

utility/packages.mjs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import path from 'path';
2-
import {globSync} from 'glob';
2+
import { globSync } from 'glob';
33
import semver from 'semver';
44
import log from 'fancy-log';
55
import chalk from 'chalk';
@@ -32,6 +32,12 @@ function resolveLibraryName(libraryPath) {
3232
}
3333
}
3434

35+
for (const libraryName of validLibraryNames) {
36+
if (libraryName.startsWith(`${name}/`)) {
37+
return libraryName;
38+
}
39+
}
40+
3541
log.warn(chalk`Unable to find npm package name for {yellow ${name}}`);
3642

3743
return null;

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,11 @@
464464
"@pnpm/network.ca-file" "^1.0.1"
465465
config-chain "^1.1.11"
466466

467+
"@popperjs/core@2.11.8":
468+
version "2.11.8"
469+
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
470+
integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
471+
467472
"@sec-ant/readable-stream@^0.4.1":
468473
version "0.4.1"
469474
resolved "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz"
@@ -4327,11 +4332,6 @@ plugin-error@^1.0.0:
43274332
arr-union "^3.1.0"
43284333
extend-shallow "^3.0.2"
43294334

4330-
popper.js@1.16.1:
4331-
version "1.16.1"
4332-
resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
4333-
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
4334-
43354335
postcss-selector-parser@^7.0.0:
43364336
version "7.1.0"
43374337
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz#4d6af97eba65d73bc4d84bcb343e865d7dd16262"

0 commit comments

Comments
 (0)