Merge pull request #88 from microsoft/main

Merge main to release/v2

Author: zhiyuanliang-ms

.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

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"

…nt-applicationinsights-browser/.eslintrc …nt-applicationinsights-browser/.eslintrcsdk/feature-management-applicationinsights-browser/.eslintrc renamed to src/feature-management-applicationinsights-browser/.eslintrc sdk/feature-management-applicationinsights-browser/.eslintrc renamed to src/feature-management-applicationinsights-browser/.eslintrc

@@ -2,8 +2,9 @@
   "name": "@microsoft/feature-management-applicationinsights-browser",
   "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/",

…ment-applicationinsights-browser/LICENSE …ment-applicationinsights-browser/LICENSEsdk/feature-management-applicationinsights-browser/LICENSE renamed to src/feature-management-applicationinsights-browser/LICENSE sdk/feature-management-applicationinsights-browser/LICENSE renamed to src/feature-management-applicationinsights-browser/LICENSE

@@ -4,19 +4,14 @@ import dts from "rollup-plugin-dts";
 
 export default [
   {
+    external: ["@microsoft/feature-management"],
     input: "src/index.ts",
     output: [
       {
         dir: "dist/esm/",
         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()],
-  },
+  }
 ];