Skip to content

Commit 8df5f2e

Browse files
Merge pull request #160 from Azure/merge-main-to-preview
Merge main to preview
2 parents d649dd3 + 07026ac commit 8df5f2e

27 files changed

+1732
-523
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: AppConfiguration-JavaScriptProvider CI
22

33
on:
44
push:
5-
branches: [ "main" ]
5+
branches: [ "main", "preview" ]
66
pull_request:
7-
branches: [ "main" ]
7+
branches: [ "main", "preview" ]
88

99
jobs:
1010
build:

package-lock.json

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/app-configuration-provider",
3-
"version": "1.1.3",
3+
"version": "2.0.0-preview.2",
44
"description": "The JavaScript configuration provider for Azure App Configuration",
55
"main": "dist/index.js",
66
"module": "./dist-esm/index.js",

rollup.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import dts from "rollup-plugin-dts";
44

55
export default [
66
{
7-
external: ["@azure/app-configuration", "@azure/keyvault-secrets", "@azure/core-rest-pipeline"],
7+
external: ["@azure/app-configuration", "@azure/keyvault-secrets", "@azure/core-rest-pipeline", "crypto", "dns/promises", "@microsoft/feature-management"],
88
input: "src/index.ts",
99
output: [
1010
{

0 commit comments

Comments
 (0)