Fixes dnn-react-common build (#3462)

* Should fix common bundle build

* One more little fix

* One more try

* Update all package.json first

* Add react-common to glob

* Missing ;

* eslint ignore dist files

* Remove version scripts on common

* Trying Matt latest info

* Removed back eslint from workspace root

* Remove parallel build of clientside

* Replacing parallel for stream

* Fix svg icons

* Revert test change

* Commit package.json and yarn.lock now that it works

* Re-comming package.json versions

* Fixed whitespace and uneeded diffs

Build/Cake/version.cake

@@ -48,6 +48,7 @@ Task("SetVersion")
 Task("UpdateDnnManifests")
   .IsDependentOn("SetVersion")
   .IsDependentOn("GenerateChecksum")
+  .IsDependentOn("SetPackageVersions")
   .DoesForEach(GetFilesByPatterns(".", new string[] {"**/*.dnn"}, unversionedManifests), (file) => 
   { 
     Information("Transforming: " + file);
@@ -56,6 +57,21 @@ Task("UpdateDnnManifests")
     XdtTransformConfig(file, transformFile, file);
 });
 
+Task("SetPackageVersions")
+  .IsDependentOn("SetVersion")
+  .Does(() => {
+    var packages = GetFiles("./Dnn.AdminExperience/ClientSide/*.Web/package.json");
+    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(() => {

Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "admin_logs",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -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.73",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "8.0.6",

Dnn.AdminExperience/ClientSide/Bundle.Web/.eslintignore

@@ -1,4 +1,4 @@
 src/components/contentTypeModal/fieldDefinitions/FileUpload/Dropzone.jsx
 /src/vendor/**
 /src/utils/masker.js
-*dnn-react-common.min.js
+*dnn-react-common.min.js

Dnn.AdminExperience/ClientSide/Bundle.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-bundle",
-  "version": "1.0.2",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p --progress",
@@ -64,6 +64,6 @@
     "webpack-dev-server": "3.1.14"
   },
   "dependencies": {
-    "@dnnsoftware/dnn-react-common": "2.1.2"
+    "@dnnsoftware/dnn-react-common": "9.4.5-unstable.73"
   }
 }

Dnn.AdminExperience/ClientSide/Bundle.Web/webpack.config.js

@@ -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/"
     },

Dnn.AdminExperience/ClientSide/Dnn.React.Common/dist.webpack.config.js

@@ -32,9 +32,9 @@ module.exports = {
     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
+            path.resolve(__dirname, "./src"), // Look in src first
+            path.resolve("./node_modules"), // Try local node_modules
+            path.resolve("../../../node_modules") // Last fallback to workspaces node_modules
         ]
     },
     plugins: [

Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnnsoftware/dnn-react-common",
-  "version": "2.1.2",
+  "version": "9.4.5-unstable.73",
   "private": false,
   "description": "DNN React Component Library",
   "main": "dist/dnn-react-common.min.js",
@@ -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",

Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/SvgIcons/index.jsx

@@ -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,

Dnn.AdminExperience/ClientSide/Extensions.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extensions",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -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.73",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-object-assign": "6.22.0",
     "babel-plugin-transform-object-rest-spread": "6.26.0",

Dnn.AdminExperience/ClientSide/Licensing.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "licensing",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -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.73",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-core": "6.26.3",

Dnn.AdminExperience/ClientSide/Pages.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pages",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "start": "npm run webpack",
@@ -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.73",
     "@types/knockout": "^3.4.66",
     "@types/redux": "3.6.31",
     "babel-core": "^7.0.0-bridge.0",

Dnn.AdminExperience/ClientSide/Prompt.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prompt",
-  "version": "1.0.1",
+  "version": "9.4.5-unstable.73",
   "description": "DNN Prompt",
   "private": true,
   "scripts": {
@@ -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.73",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-core": "^7.0.0-bridge.0",

Dnn.AdminExperience/ClientSide/Roles.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roles",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -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.73",
     "array.prototype.find": "^2.0.0",
     "array.prototype.findindex": "^2.0.0",
     "babel-loader": "^8.0.6",

Dnn.AdminExperience/ClientSide/Security.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "security_settings",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -14,7 +14,7 @@
     "@babel/plugin-transform-react-jsx": "^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.73",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "create-react-class": "^15.6.3",

Dnn.AdminExperience/ClientSide/Seo.Web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "seo",
-  "version": "1.0.0",
+  "version": "9.4.5-unstable.73",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -13,7 +13,7 @@
     "@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",
+    "@dnnsoftware/dnn-react-common": "9.4.5-unstable.73",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-core": "6.26.3",