Skip to content
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.

Sign up for GitHub

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

Fixes dnn-react-common build #3462

Merged
merged 18 commits into from
Jan 12, 2020
Merged

Fixes dnn-react-common build #3462

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2e2ffa5
Should fix common bundle build
valadas Jan 9, 2020
1aacfe1
One more little fix
valadas Jan 9, 2020
2de35d1
One more try
valadas Jan 9, 2020
6280106
Update all package.json first
valadas Jan 9, 2020
c90f29c
Add react-common to glob
valadas Jan 9, 2020
8ed366b
Missing ;
valadas Jan 9, 2020
a4a4369
eslint ignore dist files
valadas Jan 9, 2020
4784168
Remove version scripts on common
valadas Jan 9, 2020
dcb84d8
Trying Matt latest info
valadas Jan 10, 2020
697820d
Removed back eslint from workspace root
valadas Jan 10, 2020
7a7ddf7
Remove parallel build of clientside
valadas Jan 10, 2020
3589ac3
Replacing parallel for stream
valadas Jan 10, 2020
b247978
Fix svg icons
valadas Jan 10, 2020
3cd01b3
Revert test change
valadas Jan 10, 2020
32861e2
Commit package.json and yarn.lock now that it works
valadas Jan 10, 2020
724d249
Merged changes after #3456 got merged
valadas Jan 11, 2020
61335d3
Re-comming package.json versions
valadas Jan 11, 2020
6f23589
Fixed whitespace and uneeded diffs
valadas Jan 11, 2020
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
2 changes: 1 addition & 1 deletion Build/BuildScripts/AEModule.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
<Message Importance="high" Text="Running Yarn for $(WorkingDirectory)" />

<Yarn Command="install" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="lerna run build --parallel" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="lerna run build --stream" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should just call 'build' and the build script in the root package json should be updated. That way if another package replaces lerna or yarn workspaces becomes a bit more robust we just change the scripts in package.json and we keep everything javascript together. Then this AEModule.build file would not need to be changed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The reason we brought Leena was for reducing build time using parallelism. either because of bad documentation or bad reading, the --stream option should have been used instead of --parallel it still uses yarn workspaces under to find the packages and build its dependency tree. Also listing the packages is not needed in the Leena file if they are defined in the workspace. This did not change anything and created duplication

Copy link
Contributor

Choose a reason for hiding this comment

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

@valadas I don't think @mtrutledge is arguing against switching to --stream, he's just saying the command should be in the package.json instead of this MSBuild file. See https://github.com/dnnsoftware/Dnn.Platform/pull/3456/files#diff-b9cfc7f2cdf78a7f4b91a753d10865a2R30-R36, where the scripts section is added to package.json, so that the MSBuild file can just call yarn build

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes @bdukes and @valadas that is what I was saying.

Copy link
Contributor

Choose a reason for hiding this comment

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

Without the packages in the lerna.json file, it will start to cause problems. This was one of the issues that was fixed in my PR that was causing the majority of the weirdnesses. I was able to get a few things working without updating it but eventually had to put in all the packages that were defined in workspaces to solve all the weirdnesses. Without it defined Lerna commands won't know exactly what to be looking for when looking at leaf dependencies. I think it is better to define them and keep them in sync then not have them in there at all.

According to the lerna documentation:

The packages config in lerna.json is a list of globs that match directories containing a package.json, which is how lerna recognizes "leaf" packages (vs the "root" package.json, which is intended to manage the dev dependencies and scripts for the entire repo).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh yeah sure. Wont be able to submit until late or tomorrow

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The packages config in lerna.json is a list of globs that match directories containing a package.json, which is how lerna recognizes "leaf" packages (vs the "root" package.json, which is intended to manage the dev dependencies and scripts for the entire repo).

They should add "unless you use yarn workspaces" to that documentation... It uses what is defined in the yarn workspace if that option is enabled. So adding it in here would just duplicate that definition. Also the issue of build order was the --parallel option and the fact that we need to refer to specific versions for using the local packages, which the automation of versioning fixes too. You can run yarn workspace info to see what local packages are used. The only way that all dependents used the local code was setting them to the exact same version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also, the order they are defined does not mean much, they could stay in alphabetical order, lerna or yarn workspaces will build a dependency tree and build things in a order that makes sense, the problem was --parallel option was specifically saying to not care about the dependency tree and to build everything in parallel. With --steam it builds the dependees first and then the rest in parallel.

</Target>
</Project>
16 changes: 16 additions & 0 deletions Build/Cake/version.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Task("SetVersion")
Task("UpdateDnnManifests")
.IsDependentOn("SetVersion")
.IsDependentOn("GenerateChecksum")
.IsDependentOn("SetPackageVersions")
.DoesForEach(GetFilesByPatterns(".", new string[] {"**/*.dnn"}, unversionedManifests), (file) =>
{
Information("Transforming: " + file);
Expand All @@ -56,6 +57,21 @@ Task("UpdateDnnManifests")
XdtTransformConfig(file, transformFile, file);
});

Task("SetPackageVersions")
.IsDependentOn("SetVersion")
.Does(() => {
var packages = GetFiles("./Dnn.AdminExperience/ClientSide/*.Web/package.json");
valadas marked this conversation as resolved.
Show resolved Hide resolved
packages.Add(GetFiles("./Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json"));
packages.Add(GetFiles("./Dnn.AdminExperience/ClientSide/*.Web/**/_exportables/package.json"));

// Set all package.json in Admin Experience to the current version and to consume the current (local) version of dnn-react-common.
foreach(var file in packages){
Information($"Updating {file.ToString()} to version {version.FullSemVer}");
ReplaceRegexInFiles(file.ToString(), @"""version"": "".*""", $@"""version"": ""{version.FullSemVer}""");
ReplaceRegexInFiles(file.ToString(), @"""@dnnsoftware\/dnn-react-common"": "".*""", $@"""@dnnsoftware/dnn-react-common"": ""{version.FullSemVer}""");
}
});

Task("GenerateChecksum")
.IsDependentOn("SetVersion")
.Does(() => {
Expand Down
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "admin_logs",
"version": "1.0.0",
"version": "9.4.5-unstable.64",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack -p",
Expand All @@ -14,7 +14,7 @@
"@babel/plugin-transform-object-assign": "^7.0.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-loader": "8.0.6",
Expand Down
3 changes: 2 additions & 1 deletion Dnn.AdminExperience/ClientSide/Bundle.Web/.eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
src/components/contentTypeModal/fieldDefinitions/FileUpload/Dropzone.jsx
/src/vendor/**
/src/utils/masker.js
/src/utils/masker.js
dnn-react-common.min.js
6 changes: 4 additions & 2 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "export-bundle",
"version": "1.0.2",
"version": "9.4.5-unstable.64",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack -p --progress",
Expand All @@ -12,7 +12,6 @@
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-loader": "^8.0.6",
Expand Down Expand Up @@ -63,5 +62,8 @@
"webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "3.1.14"
},
"dependencies": {
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64"
}
}
6 changes: 3 additions & 3 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ module.exports = {
},
output: {
path: isProduction || settings.WebsitePath == ""
? path.resolve("../../Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/exports/")
: settings.WebsitePath + "\\DesktopModules\\Admin\\Dnn.PersonaBar\\scripts\\exports\\",
? path.resolve("../../Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/exports/")
: settings.WebsitePath + "\\DesktopModules\\Admin\\Dnn.PersonaBar\\scripts\\exports\\",
filename: "export-bundle.js",
publicPath: isProduction ? "" : "http://localhost:8070/dist/"
},
Expand All @@ -34,7 +34,7 @@ module.exports = {
resolve: {
extensions: [".js", ".json", ".jsx"],
modules: [
"node_modules",
path.resolve("./node_modules"),
path.resolve("../../../node_modules"),
path.resolve(__dirname, "src")
]
Expand Down
6 changes: 2 additions & 4 deletions Dnn.AdminExperience/ClientSide/Dnn.React.Common/dist.webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ module.exports = {
{ test: /\.(ttf|eot)(\?v=[0-9].[0-9].[0-9])?$/, loader: "file-loader?name=[name].[ext]" }
]
},
target: "node", // in order to ignore built-in modules like path, fs, etc.
externals: ["react", "prop-types", nodeExternals()], // in order to ignore all modules in node_modules folder
resolve: {
extensions: [".js", ".json", ".jsx"],
modules: [
path.resolve('./src'), // Look in src first
path.resolve('./node_modules'), // Try local node_modules
path.resolve('../../../node_modules') // Last fallback to workspaces node_modules
"node_modules",
path.resolve(__dirname, "src")
]
},
plugins: [
Expand Down
5 changes: 1 addition & 4 deletions Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dnnsoftware/dnn-react-common",
"version": "2.0.9",
"version": "9.4.5-unstable.64",
"private": false,
"description": "DNN React Component Library",
"main": "dist/dnn-react-common.min.js",
Expand All @@ -17,9 +17,6 @@
"Persona Bar"
],
"scripts": {
"preversion": "yarn run test",
"version": "yarn run build && git add -A dist",
"postversion": "git push && git push --tags",
"eslint": "eslint ./src/**/*.jsx --fix",
"test": "echo \"No tests script specified to run.\"",
"build": "set NODE_ENV=production && webpack -p --config dist.webpack.config.js",
Expand Down
164 changes: 82 additions & 82 deletions Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/SvgIcons/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
/* eslint-disable quotes */
const ActivityIcon = require("./svg/activity.svg");
const AddIcon = require("./svg/add.svg");
const AddCircleIcon = require("./svg/add_circle.svg");
const EditIcon = require("./svg/edit.svg");
const CardViewIcon = require("./svg/card_view.svg");
const ListViewIcon = require("./svg/list_view.svg");
const PreviewIcon = require("./svg/preview.svg");
const SettingsIcon = require("./svg/gear.svg");
const PageIcon = require("./svg/page.svg");
const TrafficIcon = require("./svg/traffic.svg");
const TemplateIcon = require("./svg/site_template.svg");
const TrashIcon = require("./svg/trash.svg");
const UserIcon = require("./svg/user.svg");
const UsersIcon = require("./svg/users.svg");
const ArrowDownIcon = require("./svg/arrow_down.svg");
const ArrowRightIcon = require("./svg/arrow_right.svg");
const ArrowUpIcon = require("./svg/arrow_up.svg");
const ArrowLeftIcon = require("./svg/arrow_left.svg");
const DoubleArrowRightIcon = require("./svg/double_arrow_right.svg");
const DoubleArrowLeftIcon = require("./svg/double_arrow_left.svg");
const ArrowEndLeftIcon = require("./svg/arrow-end_left.svg");
const ArrowEndRightIcon = require("./svg/arrow-end_right.svg");
const CheckboxCheckedIcon = require("./svg/small_checkbox_checked.svg");
const CheckboxPartialCheckedIcon = require("./svg/small_checkbox_partial_checked.svg");
const CheckboxUncheckedIcon = require("./svg/small_checkbox_unchecked.svg");
const CalendarIcon = require("./svg/calendar.svg");
const CalendarEndIcon = require("./svg/calendar_end.svg");
const CalendarStartIcon = require("./svg/calendar_start.svg");
const CheckboxIcon = require("./svg/checkbox.svg");
const CheckMarkIcon = require("./svg/checkmark.svg");
const ClockStopIcon = require("./svg/clock_stop.svg");
const CrossOutIcon = require("./svg/cross_out.svg");
const CycleIcon = require("./svg/cycle.svg");
const DragRowIcon = require("./svg/drag_row.svg");
const ErrorStateIcon = require("./svg/error_state.svg");
const EyeIcon = require("./svg/eye.svg");
const FolderIcon = require("./svg/folder.svg");
const GlobalIcon = require("./svg/global.svg");
const HistoryIcon = require("./svg/history.svg");
const LanguagesIcon = require("./svg/languages.svg");
const LanguagesPageIcon = require("./svg/languages_page.svg");
const LinkIcon = require("./svg/link.svg");
const LockClosedIcon = require("./svg/lock_closed.svg");
const MoreMenuIcon = require("./svg/more.svg");
const SiteGroupNoData = require("./svg/site_group_nodata.svg");
const PagesIcon = require("./svg/pages.svg");
const SearchFileSystemIcon = require("./svg/search_filesystem.svg");
const SearchIcon = require("./svg/search.svg");
const ShieldIcon = require("./svg/shield.svg");
const Signature = require("./svg/signature-solid.svg");
const SiteGroupIcon = require("./svg/site_group.svg");
const Steps1Icon = require("./svg/steps1.svg");
const Steps2Icon = require("./svg/steps2.svg");
const Steps3Icon = require("./svg/steps3.svg");
const ToolTipIcon = require("./svg/tool_tip.svg");
const UploadIcon = require("./svg/upload.svg");
const UploadCircleIcon = require("./svg/upload_circle.svg");
const UserSlash = require("./svg/user-slash-solid.svg");
const XIcon = require("./svg/x.svg");
const XThinIcon = require("./svg/x_thin.svg");
const ModuleIcon = require("./svg/module.svg");
const ArrowMoveUpIcon = require("./svg/arrow_moveup.svg");
const ArrowMoveDownIcon = require("./svg/arrow_movedown.svg");
const TableEmptyState = require("./svg/table_empty.svg");
const ArrowBack = require("./svg/arrow_back.svg");
const ArrowForward = require("./svg/arrow_forward.svg");
const DownloadIcon = require("./svg/download.svg");
const ImageIcon = require("./svg/image.svg");
const HourglassIcon = require("./svg/hourglass.svg");
const CollapseTree = require("./svg/collapse_tree.svg");
const ExpandTree = require("./svg/expand_tree.svg");
const TreeLinkIcon = require("./svg/tree_link.svg");
const TreeDraftIcon = require("./svg/draft.svg");
const TreeMoreIcon = require("./svg/tree_more.svg");
const TreePaperClip = require("./svg/paperclip.svg");
const TreeAddPage = require("./svg/tree_add_page.svg");
const TreeEye = require("./svg/tree_eye.svg");
const TreeEdit = require("./svg/tree_edit.svg");
const TreeCopy = require("./svg/tree_copy.svg");
const TreeAnalytics = require("./svg/tree_analytics.svg");
const PagesSearchIcon = require("./svg/pages_search.svg");
const PagesVerticalMore = require("./svg/pages_more_vertical.svg");
const ActivityIcon = require("./svg/activity.svg").default;
const AddIcon = require("./svg/add.svg").default;
const AddCircleIcon = require("./svg/add_circle.svg").default;
const EditIcon = require("./svg/edit.svg").default;
const CardViewIcon = require("./svg/card_view.svg").default;
const ListViewIcon = require("./svg/list_view.svg").default;
const PreviewIcon = require("./svg/preview.svg").default;
const SettingsIcon = require("./svg/gear.svg").default;
const PageIcon = require("./svg/page.svg").default;
const TrafficIcon = require("./svg/traffic.svg").default;
const TemplateIcon = require("./svg/site_template.svg").default;
const TrashIcon = require("./svg/trash.svg").default;
const UserIcon = require("./svg/user.svg").default;
const UsersIcon = require("./svg/users.svg").default;
const ArrowDownIcon = require("./svg/arrow_down.svg").default;
const ArrowRightIcon = require("./svg/arrow_right.svg").default;
const ArrowUpIcon = require("./svg/arrow_up.svg").default;
const ArrowLeftIcon = require("./svg/arrow_left.svg").default;
const DoubleArrowRightIcon = require("./svg/double_arrow_right.svg").default;
const DoubleArrowLeftIcon = require("./svg/double_arrow_left.svg").default;
const ArrowEndLeftIcon = require("./svg/arrow-end_left.svg").default;
const ArrowEndRightIcon = require("./svg/arrow-end_right.svg").default;
const CheckboxCheckedIcon = require("./svg/small_checkbox_checked.svg").default;
const CheckboxPartialCheckedIcon = require("./svg/small_checkbox_partial_checked.svg").default;
const CheckboxUncheckedIcon = require("./svg/small_checkbox_unchecked.svg").default;
const CalendarIcon = require("./svg/calendar.svg").default;
const CalendarEndIcon = require("./svg/calendar_end.svg").default;
const CalendarStartIcon = require("./svg/calendar_start.svg").default;
const CheckboxIcon = require("./svg/checkbox.svg").default;
const CheckMarkIcon = require("./svg/checkmark.svg").default;
const ClockStopIcon = require("./svg/clock_stop.svg").default;
const CrossOutIcon = require("./svg/cross_out.svg").default;
const CycleIcon = require("./svg/cycle.svg").default;
const DragRowIcon = require("./svg/drag_row.svg").default;
const ErrorStateIcon = require("./svg/error_state.svg").default;
const EyeIcon = require("./svg/eye.svg").default;
const FolderIcon = require("./svg/folder.svg").default;
const GlobalIcon = require("./svg/global.svg").default;
const HistoryIcon = require("./svg/history.svg").default;
const LanguagesIcon = require("./svg/languages.svg").default;
const LanguagesPageIcon = require("./svg/languages_page.svg").default;
const LinkIcon = require("./svg/link.svg").default;
const LockClosedIcon = require("./svg/lock_closed.svg").default;
const MoreMenuIcon = require("./svg/more.svg").default;
const SiteGroupNoData = require("./svg/site_group_nodata.svg").default;
const PagesIcon = require("./svg/pages.svg").default;
const SearchFileSystemIcon = require("./svg/search_filesystem.svg").default;
const SearchIcon = require("./svg/search.svg").default;
const ShieldIcon = require("./svg/shield.svg").default;
const Signature = require("./svg/signature-solid.svg").default;
const SiteGroupIcon = require("./svg/site_group.svg").default;
const Steps1Icon = require("./svg/steps1.svg").default;
const Steps2Icon = require("./svg/steps2.svg").default;
const Steps3Icon = require("./svg/steps3.svg").default;
const ToolTipIcon = require("./svg/tool_tip.svg").default;
const UploadIcon = require("./svg/upload.svg").default;
const UploadCircleIcon = require("./svg/upload_circle.svg").default;
const UserSlash = require("./svg/user-slash-solid.svg").default;
const XIcon = require("./svg/x.svg").default;
const XThinIcon = require("./svg/x_thin.svg").default;
const ModuleIcon = require("./svg/module.svg").default;
const ArrowMoveUpIcon = require("./svg/arrow_moveup.svg").default;
const ArrowMoveDownIcon = require("./svg/arrow_movedown.svg").default;
const TableEmptyState = require("./svg/table_empty.svg").default;
const ArrowBack = require("./svg/arrow_back.svg").default;
const ArrowForward = require("./svg/arrow_forward.svg").default;
const DownloadIcon = require("./svg/download.svg").default;
const ImageIcon = require("./svg/image.svg").default;
const HourglassIcon = require("./svg/hourglass.svg").default;
const CollapseTree = require("./svg/collapse_tree.svg").default;
const ExpandTree = require("./svg/expand_tree.svg").default;
const TreeLinkIcon = require("./svg/tree_link.svg").default;
const TreeDraftIcon = require("./svg/draft.svg").default;
const TreeMoreIcon = require("./svg/tree_more.svg").default;
const TreePaperClip = require("./svg/paperclip.svg").default;
const TreeAddPage = require("./svg/tree_add_page.svg").default;
const TreeEye = require("./svg/tree_eye.svg").default;
const TreeEdit = require("./svg/tree_edit.svg").default;
const TreeCopy = require("./svg/tree_copy.svg").default;
const TreeAnalytics = require("./svg/tree_analytics.svg").default;
const PagesSearchIcon = require("./svg/pages_search.svg").default;
const PagesVerticalMore = require("./svg/pages_more_vertical.svg").default;
export {
ActivityIcon,
AddIcon,
Expand Down
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/Extensions.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "extensions",
"version": "1.0.0",
"version": "9.4.5-unstable.64",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack -p",
Expand All @@ -12,7 +12,7 @@
"@babel/core": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64",
"babel-loader": "8.0.6",
"babel-plugin-transform-object-assign": "6.22.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
Expand Down
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/Licensing.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "licensing",
"version": "1.0.0",
"version": "9.4.5-unstable.64",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack -p",
Expand All @@ -12,7 +12,7 @@
"@babel/core": "^7.1.6",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-core": "6.26.3",
Expand Down
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/Pages.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pages",
"version": "1.0.0",
"version": "9.4.5-unstable.64",
"private": true,
"scripts": {
"start": "npm run webpack",
Expand All @@ -22,7 +22,7 @@
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64",
"@types/knockout": "^3.4.66",
"@types/redux": "3.6.31",
"babel-core": "^7.0.0-bridge.0",
Expand Down
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/Prompt.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prompt",
"version": "1.0.1",
"version": "9.4.5-unstable.64",
"description": "DNN Prompt",
"private": true,
"scripts": {
Expand All @@ -14,7 +14,7 @@
"@babel/core": "^7.1.6",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-core": "^7.0.0-bridge.0",
Expand Down
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/Roles.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "roles",
"version": "1.0.0",
"version": "9.4.5-unstable.64",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack -p",
Expand All @@ -12,7 +12,7 @@
"@babel/core": "^7.1.6",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "^2.1.2",
"@dnnsoftware/dnn-react-common": "9.4.5-unstable.64",
"array.prototype.find": "^2.0.0",
"array.prototype.findindex": "^2.0.0",
"babel-loader": "^8.0.6",
Expand Down
Loading