-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into categorization-to…
…-functional
- Loading branch information
Showing
160 changed files
with
10,973 additions
and
5,360 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| name: "Publish" | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| next_version: | ||
| type: "string" | ||
| description: "version (e.g. 3.4.0-alpha.0)" | ||
| required: true | ||
| skip_publish: | ||
| type: "boolean" | ||
| description: "mark in case only the version update shall be executed, skipping the release to npm" | ||
| required: true | ||
| skip_push: | ||
| type: "boolean" | ||
| description: "mark in case the version update shall not be pushed back to the repository" | ||
| required: true | ||
| stable_release: | ||
| type: "boolean" | ||
| description: "mark in case this is a full stable release (flag is ignored in case publish is skipped)" | ||
| required: true | ||
|
|
||
| jobs: | ||
| publish: | ||
| permissions: | ||
| contents: "write" | ||
| id-token: "write" | ||
| runs-on: "ubuntu-latest" | ||
| steps: | ||
| - uses: "actions/checkout@v4" | ||
| with: | ||
| token: "${{ secrets.JSONFORMS_PUBLISH_PAT }}" | ||
|
|
||
| - name: "Configure Git Credentials" | ||
| run: | | ||
| git config user.name "jsonforms-publish[bot]" | ||
| git config user.email "jsonforms-publish@eclipsesource.com" | ||
| - name: "Setup node" | ||
| uses: "actions/setup-node@v3" | ||
| with: | ||
| node-version: "18" | ||
| registry-url: "https://registry.npmjs.org" | ||
|
|
||
| - uses: "pnpm/action-setup@v2.2.4" | ||
| name: "Install pnpm" | ||
| id: "pnpm-install" | ||
| with: | ||
| version: "8" | ||
| run_install: false | ||
|
|
||
| - name: "Install Packages" | ||
| run: "pnpm i --frozen-lockfile" | ||
|
|
||
| - name: "Build" | ||
| run: "pnpm run build" | ||
|
|
||
| - name: "Test" | ||
| run: "pnpm run test" | ||
|
|
||
| - name: "Versioning" | ||
| run: "pnpm exec lerna version ${{ github.event.inputs.next_version }} --no-push --force-publish --yes" | ||
|
|
||
| - name: "Adjust PeerDependencies" | ||
| run: | | ||
| cd packages/angular && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" | ||
| cd ../angular-material && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/angular="${{ github.event.inputs.next_version }}" | ||
| cd ../examples && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" | ||
| cd ../material-renderers && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/react="${{ github.event.inputs.next_version }}" | ||
| cd ../react && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" | ||
| cd ../vanilla-renderers && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/react="${{ github.event.inputs.next_version }}" | ||
| cd ../vue && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" | ||
| cd ../vue-vanilla && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/vue="${{ github.event.inputs.next_version }}" | ||
| - name: "Tag and Commit" | ||
| run: | | ||
| git add -A && git commit --amend --no-edit | ||
| git tag v${{ github.event.inputs.next_version }} -f | ||
| - name: "Publish to npm" | ||
| if: "github.event.inputs.skip_publish == 'false'" | ||
| run: "pnpm publish --recursive ${{ github.event.inputs.stable_release == 'true' && ' ' || '--tag next' }}" | ||
| env: | ||
| NODE_AUTH_TOKEN: "${{ secrets.NPM_TOKEN }}" | ||
| NPM_CONFIG_PROVENANCE: "true" | ||
|
|
||
| - name: "push" | ||
| if: "github.event.inputs.skip_push == 'false'" | ||
| run: | | ||
| git push | ||
| git push origin v${{ github.event.inputs.next_version }} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v16.20.1 | ||
| v18.19.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "version": "3.2.0-alpha.1", | ||
| "version": "3.2.0-beta.0", | ||
| "npmClient": "pnpm", | ||
| "useWorkspaces": true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| const path = require('path'); | ||
| const ngCore = require('@angular-devkit/core'); | ||
| const buildWebpackBrowser = require('@angular-devkit/build-angular/src/builders/browser').buildWebpackBrowser; | ||
|
|
||
| const main = async () => new Promise((resolve, reject) => { | ||
| const project = 'angular-material'; | ||
| const target = 'build'; | ||
| const configuration = ''; | ||
| const workspaceRoot = path.join(process.cwd(), '../..'); | ||
| const root = `packages/${project}`; | ||
| const options = { | ||
| outputPath: root + '/example/dist', | ||
| tsConfig: root + '/tsconfig.example.json', | ||
| main: root + '/example/main.ts', | ||
| index: root + '/example/index.html', | ||
| styles: [ | ||
| root + '/node_modules/@angular/material/prebuilt-themes/indigo-pink.css' | ||
| ], | ||
| allowedCommonJsDependencies: [ | ||
| 'lodash', | ||
| 'hammerjs' | ||
| ], | ||
| watch: false, | ||
| buildOptimizer: false, | ||
| optimization: false, | ||
| outputHashing: 'none', | ||
| }; | ||
| const sourceRoot = root; | ||
| const teardownLogics = []; | ||
| const context = { | ||
| workspaceRoot, | ||
| logger: new ngCore.logging.Logger(`${project}:${target}:`), | ||
| target: { | ||
| project, | ||
| configuration, | ||
| target | ||
| }, | ||
| getProjectMetadata: (projectName) => Promise.resolve({ | ||
| root, | ||
| sourceRoot | ||
| }), | ||
| getBuilderNameForTarget: () => '@angular-devkit/build-angular:karma', | ||
| getTargetOptions: (target) => ({...options}), | ||
| validateOptions: (options) => options, | ||
| addTeardown: (teardown) => { | ||
| teardownLogics.push(teardown); | ||
| } | ||
| }; | ||
| let exitCode = 1; | ||
| buildWebpackBrowser(options, context, {}).subscribe({ | ||
| next: out => { | ||
| if (out.success) { | ||
| exitCode = 0; | ||
| } | ||
| }, | ||
| error: (err) => { | ||
| reject(err); | ||
| }, | ||
| complete: () => { | ||
| if (!exitCode) return resolve(); | ||
| reject(); | ||
| } | ||
| }); | ||
| return exitCode; | ||
| }); | ||
|
|
||
| main() | ||
| .then(() => { | ||
| process.exit(0); | ||
| }) | ||
| .catch(err => { | ||
| process.exit(1); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| const ngPackage = require('ng-packagr'); | ||
|
|
||
| ngPackage | ||
| .ngPackagr() | ||
| .forProject('ng-package.json') | ||
| .withTsConfig('tsconfig.json') | ||
| .build() | ||
| .catch(error => { | ||
| console.error(error); | ||
| process.exit(1); | ||
| }); |
Oops, something went wrong.