Skip to content

First commit #4

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

First commit #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .cds/solutionMap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"mappings":[{"organizationId":"cf7d2607-493c-45ee-b427-b906dc01527d","solutionId":"9b63f280-a943-ea11-a812-000d3a55df44","path":"c:\\Dev\\Public\\cds-webdev-sample\\solutions\\CSDemoSolution"}]}
{"mappings":[{"organizationId":"cf7d2607-493c-45ee-b427-b906dc01527d","solutionId":"9b63f280-a943-ea11-a812-000d3a55df44","path":"c:\\Dev\\Public\\cds-webdev-sample\\solutions\\CSDemoSolution"},{"organizationId":"948e8f97-2482-44d7-8d25-1d3c426f7880","solutionId":"a170b9bf-184d-ea11-a81e-000d3a7d21f0","path":"c:\\Projects\\cds-webdev-sample\\Solutions\\CodeExample"}]}
0 ...s/CSDemoSolution/Other/Customizations.xml → ...ions/CodeExample/Other/Customizations.xml
View file
Open in desktop
File renamed without changes.
0 ...ns/CSDemoSolution/Other/Relationships.xml → ...tions/CodeExample/Other/Relationships.xml
View file
Open in desktop
File renamed without changes.
52 changes: 27 additions & 25 deletions solutions/CSDemoSolution/Other/Solution.xml → Solutions/CodeExample/Other/Solution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml version="9.1.0.12629" SolutionPackageVersion="9.1" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ImportExportXml version="9.0.7.8" SolutionPackageVersion="9.0" languagecode="1033" generatedBy="OnPremise" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SolutionManifest>
<UniqueName>CSDemoSolution</UniqueName>
<UniqueName>CodeExample</UniqueName>
<LocalizedNames>
<LocalizedName description="CSDemoSolution" languagecode="1033" />
<LocalizedName description="CodeExample" languagecode="1033" />
</LocalizedNames>
<Descriptions />
<Version>1.0.0.0</Version>
<Managed>0</Managed>
<Publisher>
<UniqueName>CloudSmith</UniqueName>
<UniqueName>DefaultPublishertest</UniqueName>
<LocalizedNames>
<LocalizedName description="CloudSmith Consulting LLC" languagecode="1033" />
<LocalizedName description="Default Publisher for test" languagecode="1033" />
</LocalizedNames>
<Descriptions />
<EMailAddress>sales@cloudsmithconsulting.com</EMailAddress>
<SupportingWebsiteUrl>https://www.cloudsmithconsulting.com</SupportingWebsiteUrl>
<CustomizationPrefix>cs</CustomizationPrefix>
<CustomizationOptionValuePrefix>71764</CustomizationOptionValuePrefix>
<Descriptions>
<Description description="Default publisher for this organization" languagecode="1033" />
</Descriptions>
<EMailAddress xsi:nil="true"></EMailAddress>
<SupportingWebsiteUrl xsi:nil="true"></SupportingWebsiteUrl>
<CustomizationPrefix>new</CustomizationPrefix>
<CustomizationOptionValuePrefix>10000</CustomizationOptionValuePrefix>
<Addresses>
<Address>
<AddressNumber>1</AddressNumber>
<AddressTypeCode>1</AddressTypeCode>
<City>Valrico</City>
<AddressTypeCode xsi:nil="true"></AddressTypeCode>
<City xsi:nil="true"></City>
<County xsi:nil="true"></County>
<Country>USA</Country>
<Country xsi:nil="true"></Country>
<Fax xsi:nil="true"></Fax>
<FreightTermsCode xsi:nil="true"></FreightTermsCode>
<ImportSequenceNumber xsi:nil="true"></ImportSequenceNumber>
<Latitude xsi:nil="true"></Latitude>
<Line1>3433 Lithia Pinecrest Road</Line1>
<Line2>Suite 283</Line2>
<Line1 xsi:nil="true"></Line1>
<Line2 xsi:nil="true"></Line2>
<Line3 xsi:nil="true"></Line3>
<Longitude xsi:nil="true"></Longitude>
<Name xsi:nil="true"></Name>
<PostalCode>33596</PostalCode>
<PostalCode xsi:nil="true"></PostalCode>
<PostOfficeBox xsi:nil="true"></PostOfficeBox>
<PrimaryContactName xsi:nil="true"></PrimaryContactName>
<ShippingMethodCode>1</ShippingMethodCode>
<StateOrProvince>FL</StateOrProvince>
<Telephone1>813-375-0682</Telephone1>
<ShippingMethodCode xsi:nil="true"></ShippingMethodCode>
<StateOrProvince xsi:nil="true"></StateOrProvince>
<Telephone1 xsi:nil="true"></Telephone1>
<Telephone2 xsi:nil="true"></Telephone2>
<Telephone3 xsi:nil="true"></Telephone3>
<TimeZoneRuleVersionNumber xsi:nil="true"></TimeZoneRuleVersionNumber>
Expand All @@ -49,7 +51,7 @@
</Address>
<Address>
<AddressNumber>2</AddressNumber>
<AddressTypeCode>1</AddressTypeCode>
<AddressTypeCode xsi:nil="true"></AddressTypeCode>
<City xsi:nil="true"></City>
<County xsi:nil="true"></County>
<Country xsi:nil="true"></Country>
Expand All @@ -65,7 +67,7 @@
<PostalCode xsi:nil="true"></PostalCode>
<PostOfficeBox xsi:nil="true"></PostOfficeBox>
<PrimaryContactName xsi:nil="true"></PrimaryContactName>
<ShippingMethodCode>1</ShippingMethodCode>
<ShippingMethodCode xsi:nil="true"></ShippingMethodCode>
<StateOrProvince xsi:nil="true"></StateOrProvince>
<Telephone1 xsi:nil="true"></Telephone1>
<Telephone2 xsi:nil="true"></Telephone2>
Expand All @@ -78,10 +80,10 @@
</Addresses>
</Publisher>
<RootComponents>
<RootComponent type="61" schemaName="cs_pages/react-test.html" behavior="0" />
<RootComponent type="61" schemaName="cs_scripts/app.bundle.js" behavior="0" />
<RootComponent type="61" schemaName="cs_scripts/react.bundle.js" behavior="0" />
<RootComponent type="61" schemaName="cs_styles/app.a4c254b1dd46f0e718e3.css" behavior="0" />
<RootComponent type="61" schemaName="new_css/app.e0a8d0d77e1c22b7be75.css" behavior="0" />
<RootComponent type="61" schemaName="new_pages/example.html" behavior="0" />
<RootComponent type="61" schemaName="new_scripts/app.bundle.js" behavior="0" />
<RootComponent type="61" schemaName="new_scripts/react.bundle.js" behavior="0" />
</RootComponents>
<MissingDependencies />
</SolutionManifest>
Expand Down
18 changes: 11 additions & 7 deletions ...olution/Resources/template_resources.resx → ...Example/Resources/template_resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<value>1033</value>
</metadata>
<metadata name="Source file" xml:space="preserve">
<value>CSDemoSolution_temp.zip</value>
<value>CodeExample_temp.zip</value>
</metadata>
<metadata name="Source package type" xml:space="preserve">
<value>Unmanaged</value>
Expand All @@ -132,12 +132,16 @@
bGQJX1JldmlzaW9uAAAAAAgICAgJAAAAAAAAAAAAAAAAAAAACw==
</value>
</metadata>
<data name="15062:LocalizedName,CloudSmithcs71764" xml:space="preserve">
<value>CloudSmith Consulting LLC</value>
<comment> 'CloudSmith' : LocalizedName for Solution Publisher</comment>
<data name="15062:Description,DefaultPublishertestnew10000" xml:space="preserve">
<value>Default publisher for this organization</value>
<comment> 'DefaultPublishertest' : Description for Solution Publisher</comment>
</data>
<data name="15062:LocalizedName,CSDemoSolution" xml:space="preserve">
<value>CSDemoSolution</value>
<comment> 'CSDemoSolution' : LocalizedName for Solution</comment>
<data name="15062:LocalizedName,CodeExample" xml:space="preserve">
<value>CodeExample</value>
<comment> 'CodeExample' : LocalizedName for Solution</comment>
</data>
<data name="15062:LocalizedName,DefaultPublishertestnew10000" xml:space="preserve">
<value>Default Publisher for test</value>
<comment> 'DefaultPublishertest' : LocalizedName for Solution Publisher</comment>
</data>
</root>
0 ...es/cs_styles/app.a4c254b1dd46f0e718e3.css → ...rces/new_css/app.e0a8d0d77e1c22b7be75.css
View file
Open in desktop
File renamed without changes.
10 changes: 6 additions & 4 deletions ...les/app.a4c254b1dd46f0e718e3.css.data.xml → ...css/app.e0a8d0d77e1c22b7be75.css.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<WebResource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<WebResourceId>{ef6d3f53-ef4f-40b4-be23-70a9c76a4fb5}</WebResourceId>
<Name>cs_styles/app.a4c254b1dd46f0e718e3.css</Name>
<WebResourceId>{85b0eaba-a206-4ee6-810d-944c6390f478}</WebResourceId>
<Name>new_css/app.e0a8d0d77e1c22b7be75.css</Name>
<DisplayName>Example CDS CSS</DisplayName>
<Description>Desc</Description>
<WebResourceType>2</WebResourceType>
<IntroducedVersion>1.0</IntroducedVersion>
<IsEnabledForMobileClient>1</IsEnabledForMobileClient>
<IsEnabledForMobileClient>0</IsEnabledForMobileClient>
<IsAvailableForMobileOffline>0</IsAvailableForMobileOffline>
<IsCustomizable>1</IsCustomizable>
<CanBeDeleted>1</CanBeDeleted>
<IsHidden>0</IsHidden>
<FileName>/WebResources/cs_stylesappa4c254b1dd46f0e718e3cssEF6D3F53-EF4F-40B4-BE23-70A9C76A4FB5</FileName>
<FileName>/WebResources/new_cssappe0a8d0d77e1c22b7be75css85B0EABA-A206-4EE6-810D-944C6390F478</FileName>
</WebResource>
6 changes: 3 additions & 3 deletions ...ion/WebResources/cs_pages/react-test.html → ...ample/WebResources/new_pages/example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>ReactTS</title>
<link href="../cs_styles/app.a4c254b1dd46f0e718e3.css" rel="stylesheet">
<link href="../new_css/app.e0a8d0d77e1c22b7be75.css" rel="stylesheet">
</head>

<body>
<div id="appRoot"></div>
<script type="text/javascript" src="../cs_scripts/app.bundle.js"></script>
<script type="text/javascript" src="../cs_scripts/react.bundle.js"></script>
<script type="text/javascript" src="../new_scripts/app.bundle.js"></script>
<script type="text/javascript" src="../new_scripts/bundle.js"></script>
</body>

</html>
15 changes: 15 additions & 0 deletions Solutions/CodeExample/WebResources/new_pages/example.html.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<WebResource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<WebResourceId>{0d210144-0919-4f76-8c6a-c431bc4d4f74}</WebResourceId>
<Name>new_pages/example.html</Name>
<DisplayName>Example CDS Webres</DisplayName>
<Description>Desc</Description>
<WebResourceType>1</WebResourceType>
<IntroducedVersion>1.0</IntroducedVersion>
<IsEnabledForMobileClient>0</IsEnabledForMobileClient>
<IsAvailableForMobileOffline>0</IsAvailableForMobileOffline>
<IsCustomizable>1</IsCustomizable>
<CanBeDeleted>1</CanBeDeleted>
<IsHidden>0</IsHidden>
<FileName>/WebResources/new_pagesexamplehtml0D210144-0919-4F76-8C6A-C431BC4D4F74</FileName>
</WebResource>
0 ...ion/WebResources/cs_scripts/app.bundle.js → ...le/WebResources/new_scripts/app.bundle.js
View file
Open in desktop
File renamed without changes.
11 changes: 6 additions & 5 deletions ...sources/cs_scripts/app.bundle.js.data.xml → ...ources/new_scripts/app.bundle.js.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<WebResource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<WebResourceId>{ccfeee6b-3fb0-43e4-9dc7-6e2fb33b617a}</WebResourceId>
<Name>cs_scripts/app.bundle.js</Name>
<DisplayName>React App Bundle</DisplayName>
<WebResourceId>{3e6a68f0-8492-4d7a-85e3-a9507f42ab4f}</WebResourceId>
<Name>new_scripts/app.bundle.js</Name>
<DisplayName>Example App Bundle CDS </DisplayName>
<Description>Desc</Description>
<WebResourceType>3</WebResourceType>
<IntroducedVersion>1.0</IntroducedVersion>
<IsEnabledForMobileClient>1</IsEnabledForMobileClient>
<IsEnabledForMobileClient>0</IsEnabledForMobileClient>
<IsAvailableForMobileOffline>0</IsAvailableForMobileOffline>
<IsCustomizable>1</IsCustomizable>
<CanBeDeleted>1</CanBeDeleted>
<IsHidden>0</IsHidden>
<FileName>/WebResources/cs_scriptsappbundlejsCCFEEE6B-3FB0-43E4-9DC7-6E2FB33B617A</FileName>
<FileName>/WebResources/new_scriptsappbundlejs3E6A68F0-8492-4D7A-85E3-A9507F42AB4F</FileName>
</WebResource>
0 ...n/WebResources/cs_scripts/react.bundle.js → .../WebResources/new_scripts/react.bundle.js
View file
Open in desktop
File renamed without changes.
11 changes: 6 additions & 5 deletions ...urces/cs_scripts/react.bundle.js.data.xml → ...rces/new_scripts/react.bundle.js.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<WebResource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<WebResourceId>{253d5bd4-9726-4be9-be63-b856a469b90a}</WebResourceId>
<Name>cs_scripts/react.bundle.js</Name>
<DisplayName>React core script</DisplayName>
<WebResourceId>{b15bdff0-6ed8-4a90-afe6-3578166fec72}</WebResourceId>
<Name>new_scripts/react.bundle.js</Name>
<DisplayName>Example React CDS</DisplayName>
<Description>Desc</Description>
<WebResourceType>3</WebResourceType>
<IntroducedVersion>1.0</IntroducedVersion>
<IsEnabledForMobileClient>1</IsEnabledForMobileClient>
<IsEnabledForMobileClient>0</IsEnabledForMobileClient>
<IsAvailableForMobileOffline>0</IsAvailableForMobileOffline>
<IsCustomizable>1</IsCustomizable>
<CanBeDeleted>1</CanBeDeleted>
<IsHidden>0</IsHidden>
<FileName>/WebResources/cs_scriptsreactbundlejs253D5BD4-9726-4BE9-BE63-B856A469B90A</FileName>
<FileName>/WebResources/new_scriptsreactbundlejsB15BDFF0-6ED8-4A90-AFE6-3578166FEC72</FileName>
</WebResource>
15 changes: 0 additions & 15 deletions solutions/CSDemoSolution/WebResources/cs_pages/react-test.html.data.xml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions webresources/webpack.prod.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ module.exports = {
chunkFilename: '[id].[hash].css'
}),
new CopyPlugin([
{ from: '../dist/release/js', to: '../../solutions/CSDemoSolution/WebResources/cs_scripts' },
{ from: '../dist/*.css', to: '../../solutions/CSDemoSolution/WebResources/cs_styles' },
{ from: '../dist/release/js', to: '../../solutions/CodeExample/WebResources/new_scripts' },
{ from: '../dist/release/**/*.css', to: '../../solutions/CodeExample/WebResources/new_css', flatten: true },
])
],

Expand Down