Merge pull request #19 from microsoft/zhiyuanliang/merge-main-to-preview

Merge main to preview

Author: zhiyuanliang-ms

.eslintrc

@@ -45,6 +45,18 @@
             "error",
             "always"
         ],
-        "no-trailing-spaces": "warn"
+        "no-trailing-spaces": "error",
+        "space-before-blocks": [
+            "error",
+            "always"
+        ],
+        "no-multi-spaces": "error",
+        "no-multiple-empty-lines": [
+            "error",
+            {
+                "max": 1 
+            }
+        ],
+        "semi": ["error", "always"]
     }
 }

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: FeatureManagement-JavaScriptProvider CI
+
+on:
+  push:
+    branches:
+      - main
+      - preview
+      - release/*
+  pull_request:
+    branches:
+      - main
+      - preview
+      - release/*
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x, 20.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run lint
+    - run: npm run build
+    - run: npm run test
+    - run: npm run test-browser

.gitignore

@@ -399,7 +399,6 @@ FodyWeavers.xsd
 
 # bundled folder
 dist/
-dist-esm/
 out/
 types/
 
@@ -411,3 +410,6 @@ types/
 
 # examples
 examples/package-lock.json
+
+# playwright test result
+test-results

README.md

@@ -1,5 +1,7 @@
 # Microsoft Feature Management for JavaScript
 
+[![feature-management](https://img.shields.io/npm/v/@microsoft/feature-management?label=@microsoft/feature-management)](https://www.npmjs.com/package/@microsoft/feature-management)
+
 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.
 

package-lock.json

@@ -2,30 +2,24 @@
   "name": "@microsoft/feature-management",
   "version": "1.0.0-preview",
   "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/index.js",
-  "module": "./dist-esm/index.js",
+  "main": "./dist/commonjs/index.js",
+  "module": "./dist/esm/index.js",
   "types": "types/index.d.ts",
   "files": [
-    "dist/**/*.js",
-    "dist/**/*.map",
-    "dist/**/*.d.ts",
-    "dist-esm/**/*.js",
-    "dist-esm/**/*.map",
-    "dist-esm/**/*.d.ts",
-    "types/**/*.d.ts",
+    "dist/",
+    "types/",
     "LICENSE",
     "README.md"
   ],
   "scripts": {
-    "build": "npm run clean && npm run build-cjs && npm run build-esm && npm run build-test",
-    "build-cjs": "rollup --config",
-    "build-esm": "tsc -p ./tsconfig.json",
+    "build": "npm run clean && rollup --config && npm run build-test",
     "build-test": "tsc -p ./tsconfig.test.json",
-    "clean": "rimraf dist dist-esm out types",
+    "clean": "rimraf dist out types",
     "dev": "rollup --config --watch",
-    "lint": "eslint src/ test/",
-    "fix-lint": "eslint src/ test/ --fix",
-    "test": "mocha out/test/*.test.{js,cjs,mjs} --parallel"
+    "lint": "eslint src/ test/ --ignore-pattern test/browser/testcases.js",
+    "fix-lint": "eslint src/ test/ --fix --ignore-pattern test/browser/testcases.js",
+    "test": "mocha out/*.test.{js,cjs,mjs} --parallel",
+    "test-browser": "npx playwright install chromium && npx playwright test"
   },
   "repository": {
     "type": "git",
@@ -42,7 +36,9 @@
     "@types/node": "^20.10.7",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
+    "@playwright/test": "^1.46.1",
     "chai": "^4.4.0",
+    "chai-as-promised": "^7.1.1",
     "eslint": "^8.56.0",
     "mocha": "^10.2.0",
     "rimraf": "^5.0.5",
@@ -52,6 +48,5 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "chai-as-promised": "^7.1.1"
   }
 }

package.json

@@ -0,0 +1,15 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  testDir: './test/browser',
+  fullyParallel: true,
+
+  retries: 0,
+  reporter: 'list',
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    }
+  ],
+});

playwright.config.ts

@@ -4,13 +4,27 @@ import dts from "rollup-plugin-dts";
 
 export default [
   {
+    external: ["crypto"],
     input: "src/index.ts",
     output: [
       {
-        file: "dist/index.js",
+        dir: "dist/commonjs/",
         format: "cjs",
-        sourcemap: true
+        sourcemap: true,
+        preserveModules: true,
+      },
+      {
+        dir: "dist/esm/",
+        format: "esm",
+        sourcemap: true,
+        preserveModules: true,
       },
+      {
+        file: "dist/umd/index.js",
+        format: "umd",
+        name: 'FeatureManagement',
+        sourcemap: true
+      }
     ],
     plugins: [
       typescript({
@@ -28,13 +42,16 @@ export default [
           "strictFunctionTypes": true,
           "sourceMap": true,
           "inlineSources": true
-        }
+        },
+        "exclude": [
+            "test/**/*"
+        ]
       })
     ],
   },
   {
     input: "src/index.ts",
-    output: [{ file: "types/index.d.ts", format: "es" }],
+    output: [{ file: "types/index.d.ts", format: "esm" }],
     plugins: [dts()],
   },
 ];