Skip to content

Commit 6857f85

Browse files
authored
Merge pull request #11 from umbraco/feature/v14
Upgrade to v14
2 parents 5ca4a8e + fabdce3 commit 6857f85

File tree

58 files changed

+6605
-9576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+6605
-9576
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,3 +479,7 @@ $RECYCLE.BIN/
479479
##
480480
## Umbraco Commerce specific
481481
##
482+
/src/Umbraco.Commerce.Checkout/wwwroot/
483+
.vscode
484+
/src/Umbraco.Commerce.Checkout/packages.lock.json
485+
/src/Umbraco.Commerce.Checkout/packages.lock.json

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
4+
<Nullable>enable</Nullable>
45
<Company>Umbraco HQ</Company>
56
<Authors>Umbraco</Authors>
67
<Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
77
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
88
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
9-
<GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
9+
<GlobalPackageReference Include="Umbraco.Code" Version="[2.2.0, 3)" />
1010
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.1.0, 14)" />
14-
<PackageVersion Include="Umbraco.Cms.Web.Website" Version="[13.0.0, 14)" />
13+
<PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[14.0.0--beta2.preview.552.gf22f570, 15)" />
14+
<PackageVersion Include="Umbraco.Cms.Web.Website" Version="[14.0.0, 15)" />
1515
</ItemGroup>
1616
</Project>

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ Umbraco Commerce Checkout is an add-on package for Umbraco Commerce, providing a
1010

1111
With Umbraco Commerce Checkout you can quickly and easily add a ready made, themeable and responsive checkout flow onto your site, saving hours of custom development.
1212

13-
## System Requirements
13+
This package uses the same versioning strategy with Umbraco Commerce.
1414

15-
To get started with the Umbraco Commerce demo store you will need:
16-
17-
* Visual Studio 2019 (15.9.7+)
18-
* .NET 7.0 SDK or newer
15+
## Working locally
16+
To fork and build your own Commerce Checkout package, you will need:
17+
* .NET 8.0 SDK or newer
1918
* Umbraco 11.0.0 or newer
20-
* Umbraco Commerce 12.0.0 or newer
21-
19+
* Umbraco Commerce 14.0.0 or newer
20+
* NodeJS 20+ for frontend development. Open `/src/Umbraco.Commerce.Checkout/Client` folder and run `npm i; npm run build`
2221

2322
## Raising an Issue
2423

azure-pipelines.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222
default: false
2323

2424
variables:
25-
nodeVersion: 18.x
25+
nodeVersion: 20.x
2626
solution: Umbraco.Commerce.Checkout.sln
2727
buildConfiguration: Release
2828
DOTNET_NOLOGO: true
@@ -68,6 +68,18 @@ stages:
6868
npm | "$(Agent.OS)"
6969
npm
7070
path: $(npm_config_cache)
71+
72+
- task: CmdLine@2
73+
displayName: 'Install NPM packages'
74+
inputs:
75+
script: 'npm ci --no-fund --no-audit --prefer-offline'
76+
workingDirectory: '$(Build.SourcesDirectory)/src/Umbraco.Commerce.Checkout/Client'
77+
78+
- task: CmdLine@2
79+
displayName: 'Build frontend'
80+
inputs:
81+
workingDirectory: $(Build.SourcesDirectory)/src/Umbraco.Commerce.Checkout/Client
82+
script: 'npm run build'
7183

7284
# Cache and restore NuGet packages
7385
- task: Cache@2

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.2.23502.2",
3+
"version": "8.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

src/Umbraco.Commerce.Checkout/Client/config.outputPath.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// @ts-check
2+
3+
import eslint from '@eslint/js';
4+
import tseslint from 'typescript-eslint';
5+
import globals from 'globals';
6+
7+
export default tseslint.config(
8+
eslint.configs.recommended,
9+
...tseslint.configs.recommended,
10+
{
11+
languageOptions: {
12+
globals: {
13+
...globals.node,
14+
...globals.browser,
15+
},
16+
},
17+
files: ['**/*.ts', '**/*.js'],
18+
rules: {
19+
'comma-dangle': ['error', 'always-multiline'],
20+
'quotes': ['error', 'single'],
21+
'object-property-newline': 'error',
22+
'semi': ['error'],
23+
'no-console': 'warn',
24+
},
25+
},
26+
);

src/Umbraco.Commerce.Checkout/Client/gulpfile.js

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

0 commit comments

Comments
 (0)