diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c0334a..f800717 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: defaults: run: - working-directory: sdk/feature-management + working-directory: src/feature-management steps: - uses: actions/checkout@v3 @@ -31,40 +31,40 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - cache-dependency-path: sdk/feature-management/package-lock.json + cache-dependency-path: src/feature-management/package-lock.json - name: Install dependencies run: npm ci - working-directory: sdk/feature-management + working-directory: src/feature-management - name: Run lint check for feature-management run: npm run lint - working-directory: sdk/feature-management + working-directory: src/feature-management - name: Build feature-management run: npm run build - working-directory: sdk/feature-management + working-directory: src/feature-management - name: Run tests run: npm run test - working-directory: sdk/feature-management + working-directory: src/feature-management - name: Run browser tests run: npm run test-browser - working-directory: sdk/feature-management + working-directory: src/feature-management - name: Build feature-management-applicationinsights-browser run: npm run build - working-directory: sdk/feature-management-applicationinsights-browser + working-directory: src/feature-management-applicationinsights-browser - name: Run lint check for feature-management-applicationinsights-browser run: npm run lint - working-directory: sdk/feature-management-applicationinsights-browser + working-directory: src/feature-management-applicationinsights-browser - name: Build feature-management-applicationinsights-node run: npm run build - working-directory: sdk/feature-management-applicationinsights-node + working-directory: src/feature-management-applicationinsights-node - name: Run lint check for feature-management-applicationinsights-node run: npm run lint - working-directory: sdk/feature-management-applicationinsights-node + working-directory: src/feature-management-applicationinsights-node diff --git a/scripts/build-and-pack.sh b/scripts/build-and-pack.sh index 1256871..7a76419 100755 --- a/scripts/build-and-pack.sh +++ b/scripts/build-and-pack.sh @@ -5,10 +5,16 @@ set -e SCRIPT_DIR=$(dirname $(readlink -f $0)) PROJECT_BASE_DIR=$(dirname $SCRIPT_DIR) -SDK_DIR="$PROJECT_BASE_DIR/sdk" +NPMRC_FILE="$PROJECT_BASE_DIR/.npmrc" +SRC_DIR="$PROJECT_BASE_DIR/src" PACKAGE="feature-management" -PACKAGE_DIR="$SDK_DIR/$PACKAGE" +PACKAGE_DIR="$SRC_DIR/$PACKAGE" + +if [ -f "$NPMRC_FILE" ]; then + echo "Copy .npmrc file to $PACKAGE_DIR" + cp "$NPMRC_FILE" "$PACKAGE_DIR" +fi echo "Building package $PACKAGE in $PACKAGE_DIR" cd "$PACKAGE_DIR" @@ -29,7 +35,12 @@ echo "copy $PACKAGE package to $PROJECT_BASE_DIR" cp "$PACKAGE_DIR"/*.tgz "$PROJECT_BASE_DIR" PACKAGE="feature-management-applicationinsights-browser" -PACKAGE_DIR="$SDK_DIR/$PACKAGE" +PACKAGE_DIR="$SRC_DIR/$PACKAGE" + +if [ -f "$NPMRC_FILE" ]; then + echo "Copy .npmrc file to $PACKAGE_DIR" + cp "$NPMRC_FILE" "$PACKAGE_DIR" +fi echo "Building package $PACKAGE in $PACKAGE_DIR" cd "$PACKAGE_DIR" @@ -44,7 +55,12 @@ echo "copy $PACKAGE package to $PROJECT_BASE_DIR" cp "$PACKAGE_DIR"/*.tgz "$PROJECT_BASE_DIR" PACKAGE="feature-management-applicationinsights-node" -PACKAGE_DIR="$SDK_DIR/$PACKAGE" +PACKAGE_DIR="$SRC_DIR/$PACKAGE" + +if [ -f "$NPMRC_FILE" ]; then + echo "Copy .npmrc file to $PACKAGE_DIR" + cp "$NPMRC_FILE" "$PACKAGE_DIR" +fi echo "Building package $PACKAGE in $PACKAGE_DIR" cd "$PACKAGE_DIR" diff --git a/sdk/feature-management-applicationinsights-browser/.eslintrc b/src/feature-management-applicationinsights-browser/.eslintrc similarity index 100% rename from sdk/feature-management-applicationinsights-browser/.eslintrc rename to src/feature-management-applicationinsights-browser/.eslintrc diff --git a/sdk/feature-management-applicationinsights-browser/LICENSE b/src/feature-management-applicationinsights-browser/LICENSE similarity index 100% rename from sdk/feature-management-applicationinsights-browser/LICENSE rename to src/feature-management-applicationinsights-browser/LICENSE diff --git a/sdk/feature-management-applicationinsights-browser/README.md b/src/feature-management-applicationinsights-browser/README.md similarity index 100% rename from sdk/feature-management-applicationinsights-browser/README.md rename to src/feature-management-applicationinsights-browser/README.md diff --git a/sdk/feature-management-applicationinsights-browser/package.json b/src/feature-management-applicationinsights-browser/package.json similarity index 92% rename from sdk/feature-management-applicationinsights-browser/package.json rename to src/feature-management-applicationinsights-browser/package.json index 2f3d831..625938d 100644 --- a/sdk/feature-management-applicationinsights-browser/package.json +++ b/src/feature-management-applicationinsights-browser/package.json @@ -1,9 +1,10 @@ { "name": "@microsoft/feature-management-applicationinsights-browser", - "version": "3.0.0-preview.1", + "version": "2.0.0", "description": "Feature Management Application Insights Plugin for Browser provides a solution for sending feature flag evaluation events produced by the Feature Management library.", - "main": "./dist/umd/index.js", + "main": "./dist/esm/index.js", "module": "./dist/esm/index.js", + "type": "module", "types": "types/index.d.ts", "files": [ "dist/", @@ -45,7 +46,7 @@ }, "dependencies": { "@microsoft/applicationinsights-web": "^3.3.2", - "@microsoft/feature-management": "3.0.0-preview.1" + "@microsoft/feature-management": "2.0.0" } } \ No newline at end of file diff --git a/sdk/feature-management-applicationinsights-browser/rollup.config.mjs b/src/feature-management-applicationinsights-browser/rollup.config.mjs similarity index 84% rename from sdk/feature-management-applicationinsights-browser/rollup.config.mjs rename to src/feature-management-applicationinsights-browser/rollup.config.mjs index 4dcb837..7d1c851 100644 --- a/sdk/feature-management-applicationinsights-browser/rollup.config.mjs +++ b/src/feature-management-applicationinsights-browser/rollup.config.mjs @@ -4,6 +4,7 @@ import dts from "rollup-plugin-dts"; export default [ { + external: ["@microsoft/feature-management"], input: "src/index.ts", output: [ { @@ -11,12 +12,6 @@ export default [ format: "esm", sourcemap: true, preserveModules: true, - }, - { - file: "dist/umd/index.js", - format: "umd", - name: 'FeatureManagementApplicationInsights', - sourcemap: true } ], plugins: [ @@ -43,5 +38,5 @@ export default [ input: "src/index.ts", output: [{ file: "types/index.d.ts", format: "esm" }], plugins: [dts()], - }, + } ]; diff --git a/sdk/feature-management-applicationinsights-browser/src/index.ts b/src/feature-management-applicationinsights-browser/src/index.ts similarity index 100% rename from sdk/feature-management-applicationinsights-browser/src/index.ts rename to src/feature-management-applicationinsights-browser/src/index.ts diff --git a/sdk/feature-management-applicationinsights-browser/src/telemetry.ts b/src/feature-management-applicationinsights-browser/src/telemetry.ts similarity index 100% rename from sdk/feature-management-applicationinsights-browser/src/telemetry.ts rename to src/feature-management-applicationinsights-browser/src/telemetry.ts diff --git a/sdk/feature-management-applicationinsights-node/src/version.ts b/src/feature-management-applicationinsights-browser/src/version.ts similarity index 64% rename from sdk/feature-management-applicationinsights-node/src/version.ts rename to src/feature-management-applicationinsights-browser/src/version.ts index 83eb430..b4709c9 100644 --- a/sdk/feature-management-applicationinsights-node/src/version.ts +++ b/src/feature-management-applicationinsights-browser/src/version.ts @@ -1,4 +1,4 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -export const VERSION = "3.0.0-preview.1"; +export const VERSION = "2.0.0"; diff --git a/sdk/feature-management-applicationinsights-browser/tsconfig.json b/src/feature-management-applicationinsights-browser/tsconfig.json similarity index 100% rename from sdk/feature-management-applicationinsights-browser/tsconfig.json rename to src/feature-management-applicationinsights-browser/tsconfig.json diff --git a/sdk/feature-management-applicationinsights-node/.eslintrc b/src/feature-management-applicationinsights-node/.eslintrc similarity index 100% rename from sdk/feature-management-applicationinsights-node/.eslintrc rename to src/feature-management-applicationinsights-node/.eslintrc diff --git a/sdk/feature-management-applicationinsights-node/LICENSE b/src/feature-management-applicationinsights-node/LICENSE similarity index 100% rename from sdk/feature-management-applicationinsights-node/LICENSE rename to src/feature-management-applicationinsights-node/LICENSE diff --git a/sdk/feature-management-applicationinsights-node/README.md b/src/feature-management-applicationinsights-node/README.md similarity index 100% rename from sdk/feature-management-applicationinsights-node/README.md rename to src/feature-management-applicationinsights-node/README.md diff --git a/sdk/feature-management-applicationinsights-node/package.json b/src/feature-management-applicationinsights-node/package.json similarity index 94% rename from sdk/feature-management-applicationinsights-node/package.json rename to src/feature-management-applicationinsights-node/package.json index 0a865ec..d0cd0c6 100644 --- a/sdk/feature-management-applicationinsights-node/package.json +++ b/src/feature-management-applicationinsights-node/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/feature-management-applicationinsights-node", - "version": "3.0.0-preview.1", + "version": "2.0.0", "description": "Feature Management Application Insights Plugin for Node.js provides a solution for sending feature flag evaluation events produced by the Feature Management library.", "main": "./dist/commonjs/index.js", "module": "./dist/esm/index.js", @@ -45,7 +45,7 @@ }, "dependencies": { "applicationinsights": "^2.9.6", - "@microsoft/feature-management": "3.0.0-preview.1" + "@microsoft/feature-management": "2.0.0" } } \ No newline at end of file diff --git a/sdk/feature-management-applicationinsights-node/rollup.config.mjs b/src/feature-management-applicationinsights-node/rollup.config.mjs similarity index 94% rename from sdk/feature-management-applicationinsights-node/rollup.config.mjs rename to src/feature-management-applicationinsights-node/rollup.config.mjs index c95df86..019a779 100644 --- a/sdk/feature-management-applicationinsights-node/rollup.config.mjs +++ b/src/feature-management-applicationinsights-node/rollup.config.mjs @@ -4,6 +4,7 @@ import dts from "rollup-plugin-dts"; export default [ { + external: ["@microsoft/feature-management"], input: "src/index.ts", output: [ { @@ -43,5 +44,5 @@ export default [ input: "src/index.ts", output: [{ file: "types/index.d.ts", format: "esm" }], plugins: [dts()], - }, + } ]; diff --git a/sdk/feature-management-applicationinsights-node/src/index.ts b/src/feature-management-applicationinsights-node/src/index.ts similarity index 100% rename from sdk/feature-management-applicationinsights-node/src/index.ts rename to src/feature-management-applicationinsights-node/src/index.ts diff --git a/sdk/feature-management-applicationinsights-node/src/telemetry.ts b/src/feature-management-applicationinsights-node/src/telemetry.ts similarity index 100% rename from sdk/feature-management-applicationinsights-node/src/telemetry.ts rename to src/feature-management-applicationinsights-node/src/telemetry.ts diff --git a/sdk/feature-management-applicationinsights-browser/src/version.ts b/src/feature-management-applicationinsights-node/src/version.ts similarity index 64% rename from sdk/feature-management-applicationinsights-browser/src/version.ts rename to src/feature-management-applicationinsights-node/src/version.ts index 83eb430..b4709c9 100644 --- a/sdk/feature-management-applicationinsights-browser/src/version.ts +++ b/src/feature-management-applicationinsights-node/src/version.ts @@ -1,4 +1,4 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -export const VERSION = "3.0.0-preview.1"; +export const VERSION = "2.0.0"; diff --git a/sdk/feature-management-applicationinsights-node/tsconfig.json b/src/feature-management-applicationinsights-node/tsconfig.json similarity index 100% rename from sdk/feature-management-applicationinsights-node/tsconfig.json rename to src/feature-management-applicationinsights-node/tsconfig.json diff --git a/sdk/feature-management/.eslintrc b/src/feature-management/.eslintrc similarity index 100% rename from sdk/feature-management/.eslintrc rename to src/feature-management/.eslintrc diff --git a/sdk/feature-management/LICENSE b/src/feature-management/LICENSE similarity index 100% rename from sdk/feature-management/LICENSE rename to src/feature-management/LICENSE diff --git a/sdk/feature-management/README.md b/src/feature-management/README.md similarity index 100% rename from sdk/feature-management/README.md rename to src/feature-management/README.md diff --git a/sdk/feature-management/package-lock.json b/src/feature-management/package-lock.json similarity index 96% rename from sdk/feature-management/package-lock.json rename to src/feature-management/package-lock.json index 32e1c19..74c975d 100644 --- a/sdk/feature-management/package-lock.json +++ b/src/feature-management/package-lock.json @@ -1,12 +1,12 @@ { "name": "@microsoft/feature-management", - "version": "3.0.0-preview.1", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@microsoft/feature-management", - "version": "3.0.0-preview.1", + "version": "2.0.0", "license": "MIT", "devDependencies": { "@playwright/test": "^1.46.1", @@ -20,7 +20,7 @@ "eslint": "^8.56.0", "mocha": "^10.2.0", "rimraf": "^5.0.5", - "rollup": "^4.22.4", + "rollup": "^4.9.4", "rollup-plugin-dts": "^6.1.0", "tslib": "^2.6.2", "typescript": "^5.3.3" @@ -1028,9 +1028,9 @@ } }, "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, "engines": { "node": ">=6" @@ -1294,9 +1294,9 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -1308,12 +1308,12 @@ } }, "node_modules/debug": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", - "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { - "ms": "^2.1.3" + "ms": "2.1.2" }, "engines": { "node": ">=6.0" @@ -1355,9 +1355,9 @@ "dev": true }, "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true, "engines": { "node": ">=0.3.1" @@ -2225,12 +2225,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, "dependencies": { - "braces": "^3.0.3", + "braces": "^3.0.2", "picomatch": "^2.3.1" }, "engines": { @@ -2259,31 +2259,32 @@ } }, "node_modules/mocha": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", - "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", - "dev": true, - "dependencies": { - "ansi-colors": "^4.1.3", - "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", - "debug": "^4.3.5", - "diff": "^5.2.0", - "escape-string-regexp": "^4.0.0", - "find-up": "^5.0.0", - "glob": "^8.1.0", - "he": "^1.2.0", - "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", - "minimatch": "^5.1.6", - "ms": "^2.1.3", - "serialize-javascript": "^6.0.2", - "strip-json-comments": "^3.1.1", - "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", - "yargs-unparser": "^2.0.0" + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", + "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", + "dev": true, + "dependencies": { + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" }, "bin": { "_mocha": "bin/_mocha", @@ -2291,41 +2292,48 @@ }, "engines": { "node": ">= 14.0.0" - } - }, - "node_modules/mocha/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" } }, "node_modules/mocha/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">=12" + "node": "*" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/mocha/node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/mocha/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -2334,6 +2342,21 @@ "node": ">=10" } }, + "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -2350,11 +2373,23 @@ } }, "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/nanoid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -2808,9 +2843,9 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, "dependencies": { "randombytes": "^2.1.0" @@ -3061,9 +3096,9 @@ } }, "node_modules/workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", "dev": true }, "node_modules/wrap-ansi": { @@ -3141,9 +3176,9 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", "dev": true, "engines": { "node": ">=10" @@ -3177,4 +3212,4 @@ } } } -} +} \ No newline at end of file diff --git a/sdk/feature-management/package.json b/src/feature-management/package.json similarity index 98% rename from sdk/feature-management/package.json rename to src/feature-management/package.json index 5657601..5217463 100644 --- a/sdk/feature-management/package.json +++ b/src/feature-management/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/feature-management", - "version": "3.0.0-preview.1", + "version": "2.0.0", "description": "Feature Management is a library for enabling/disabling features at runtime. Developers can use feature flags in simple use cases like conditional statement to more advanced scenarios like conditionally adding routes.", "main": "./dist/commonjs/index.js", "module": "./dist/esm/index.js", diff --git a/sdk/feature-management/playwright.config.ts b/src/feature-management/playwright.config.ts similarity index 100% rename from sdk/feature-management/playwright.config.ts rename to src/feature-management/playwright.config.ts diff --git a/sdk/feature-management/rollup.config.mjs b/src/feature-management/rollup.config.mjs similarity index 97% rename from sdk/feature-management/rollup.config.mjs rename to src/feature-management/rollup.config.mjs index 2b19caf..1d61acd 100644 --- a/sdk/feature-management/rollup.config.mjs +++ b/src/feature-management/rollup.config.mjs @@ -22,7 +22,7 @@ export default [ { file: "dist/umd/index.js", format: "umd", - name: 'FeatureManagement', + name: "FeatureManagement", sourcemap: true } ], diff --git a/sdk/feature-management/src/IFeatureManager.ts b/src/feature-management/src/IFeatureManager.ts similarity index 100% rename from sdk/feature-management/src/IFeatureManager.ts rename to src/feature-management/src/IFeatureManager.ts diff --git a/sdk/feature-management/src/common/ITargetingContext.ts b/src/feature-management/src/common/ITargetingContext.ts similarity index 100% rename from sdk/feature-management/src/common/ITargetingContext.ts rename to src/feature-management/src/common/ITargetingContext.ts diff --git a/sdk/feature-management/src/common/targetingEvaluator.ts b/src/feature-management/src/common/targetingEvaluator.ts similarity index 100% rename from sdk/feature-management/src/common/targetingEvaluator.ts rename to src/feature-management/src/common/targetingEvaluator.ts diff --git a/sdk/feature-management/src/featureManager.ts b/src/feature-management/src/featureManager.ts similarity index 100% rename from sdk/feature-management/src/featureManager.ts rename to src/feature-management/src/featureManager.ts diff --git a/sdk/feature-management/src/featureProvider.ts b/src/feature-management/src/featureProvider.ts similarity index 100% rename from sdk/feature-management/src/featureProvider.ts rename to src/feature-management/src/featureProvider.ts diff --git a/sdk/feature-management/src/filter/FeatureFilter.ts b/src/feature-management/src/filter/FeatureFilter.ts similarity index 100% rename from sdk/feature-management/src/filter/FeatureFilter.ts rename to src/feature-management/src/filter/FeatureFilter.ts diff --git a/sdk/feature-management/src/filter/TargetingFilter.ts b/src/feature-management/src/filter/TargetingFilter.ts similarity index 100% rename from sdk/feature-management/src/filter/TargetingFilter.ts rename to src/feature-management/src/filter/TargetingFilter.ts diff --git a/sdk/feature-management/src/filter/TimeWindowFilter.ts b/src/feature-management/src/filter/TimeWindowFilter.ts similarity index 100% rename from sdk/feature-management/src/filter/TimeWindowFilter.ts rename to src/feature-management/src/filter/TimeWindowFilter.ts diff --git a/sdk/feature-management/src/gettable.ts b/src/feature-management/src/gettable.ts similarity index 100% rename from sdk/feature-management/src/gettable.ts rename to src/feature-management/src/gettable.ts diff --git a/sdk/feature-management/src/index.ts b/src/feature-management/src/index.ts similarity index 100% rename from sdk/feature-management/src/index.ts rename to src/feature-management/src/index.ts diff --git a/sdk/feature-management/src/schema/model.ts b/src/feature-management/src/schema/model.ts similarity index 100% rename from sdk/feature-management/src/schema/model.ts rename to src/feature-management/src/schema/model.ts diff --git a/sdk/feature-management/src/schema/validator.ts b/src/feature-management/src/schema/validator.ts similarity index 100% rename from sdk/feature-management/src/schema/validator.ts rename to src/feature-management/src/schema/validator.ts diff --git a/sdk/feature-management/src/telemetry/featureEvaluationEvent.ts b/src/feature-management/src/telemetry/featureEvaluationEvent.ts similarity index 100% rename from sdk/feature-management/src/telemetry/featureEvaluationEvent.ts rename to src/feature-management/src/telemetry/featureEvaluationEvent.ts diff --git a/sdk/feature-management/src/variant/Variant.ts b/src/feature-management/src/variant/Variant.ts similarity index 100% rename from sdk/feature-management/src/variant/Variant.ts rename to src/feature-management/src/variant/Variant.ts diff --git a/sdk/feature-management/src/version.ts b/src/feature-management/src/version.ts similarity index 74% rename from sdk/feature-management/src/version.ts rename to src/feature-management/src/version.ts index 3c6d999..aaae469 100644 --- a/sdk/feature-management/src/version.ts +++ b/src/feature-management/src/version.ts @@ -1,5 +1,5 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -export const VERSION = "3.0.0-preview.1"; +export const VERSION = "2.0.0"; export const EVALUATION_EVENT_VERSION = "1.0.0"; diff --git a/sdk/feature-management/test/browser/browser.test.ts b/src/feature-management/test/browser/browser.test.ts similarity index 100% rename from sdk/feature-management/test/browser/browser.test.ts rename to src/feature-management/test/browser/browser.test.ts diff --git a/sdk/feature-management/test/browser/index.html b/src/feature-management/test/browser/index.html similarity index 100% rename from sdk/feature-management/test/browser/index.html rename to src/feature-management/test/browser/index.html diff --git a/sdk/feature-management/test/browser/testcases.js b/src/feature-management/test/browser/testcases.js similarity index 100% rename from sdk/feature-management/test/browser/testcases.js rename to src/feature-management/test/browser/testcases.js diff --git a/sdk/feature-management/test/featureEvaluation.test.ts b/src/feature-management/test/featureEvaluation.test.ts similarity index 100% rename from sdk/feature-management/test/featureEvaluation.test.ts rename to src/feature-management/test/featureEvaluation.test.ts diff --git a/sdk/feature-management/test/featureManager.test.ts b/src/feature-management/test/featureManager.test.ts similarity index 100% rename from sdk/feature-management/test/featureManager.test.ts rename to src/feature-management/test/featureManager.test.ts diff --git a/sdk/feature-management/test/noFilters.test.ts b/src/feature-management/test/noFilters.test.ts similarity index 100% rename from sdk/feature-management/test/noFilters.test.ts rename to src/feature-management/test/noFilters.test.ts diff --git a/sdk/feature-management/test/sampleFeatureFlags.ts b/src/feature-management/test/sampleFeatureFlags.ts similarity index 100% rename from sdk/feature-management/test/sampleFeatureFlags.ts rename to src/feature-management/test/sampleFeatureFlags.ts diff --git a/sdk/feature-management/test/targetingFilter.test.ts b/src/feature-management/test/targetingFilter.test.ts similarity index 100% rename from sdk/feature-management/test/targetingFilter.test.ts rename to src/feature-management/test/targetingFilter.test.ts diff --git a/sdk/feature-management/test/variant.test.ts b/src/feature-management/test/variant.test.ts similarity index 100% rename from sdk/feature-management/test/variant.test.ts rename to src/feature-management/test/variant.test.ts diff --git a/sdk/feature-management/tsconfig.json b/src/feature-management/tsconfig.json similarity index 100% rename from sdk/feature-management/tsconfig.json rename to src/feature-management/tsconfig.json diff --git a/sdk/feature-management/tsconfig.test.json b/src/feature-management/tsconfig.test.json similarity index 100% rename from sdk/feature-management/tsconfig.test.json rename to src/feature-management/tsconfig.test.json