[Master] Add npm-pack and npm-publish tasks

- Fix publishing content of npm packages - Fix issues related to dependencies for tests
microsoft · Apr 3, 2023 · 1722a4e · 1722a4e
1 parent 5d7e042
commit 1722a4e
Show file tree

Hide file tree

Showing 38 changed files with 676 additions and 401 deletions.
diff --git a/AISKU/Tests/PerfTests.html b/AISKU/Tests/PerfTests.html
@@ -27,18 +27,17 @@
         modules.add("qunit");
 
         loadFetchModule(modules, "whatwg-fetch");
-        loadCommonModules(modules);
+        loadCommonModules(modules, function() {
 
-        modules.add("@microsoft/ai-test-framework", "./node_modules/@microsoft/ai-test-framework/dist/ai-test-framework");
-
-        var testModule = modules.add("Tests/Perf/src/aiskuperftests", "./Perf/dist/aiskuperftests.tests.js")
-        testModule.run = function (tests) {
-            console && console.log("Starting tests");
-            QUnit.start();
-            tests.runTests();
-        };
+            var testModule = modules.add("Tests/Perf/src/aiskuperftests", "./Perf/dist/aiskuperftests.tests.js")
+            testModule.run = function (tests) {
+                console && console.log("Starting tests");
+                QUnit.start();
+                tests.runTests();
+            };
 
-        modules.run();
+            modules.run();
+        });
     </script>
 
     <script>

diff --git a/AISKU/Tests/UnitTests.html b/AISKU/Tests/UnitTests.html
@@ -26,39 +26,16 @@
         modules.add("pako","./node_modules/pako/dist/pako");
 
         loadFetchModule(modules, "whatwg-fetch");
-        loadCommonModules(modules);
-
-        modules.add("@microsoft/dynamicproto-js", "./node_modules/@microsoft/dynamicproto-js/lib/dist/umd/dynamicproto-js", true);
-
-                // Load and define the app insights Shims module
-        modules.add("@microsoft/applicationinsights-shims", "./node_modules/@microsoft/applicationinsights-shims/browser/applicationinsights-shims");
-
-        // Load Core
-        modules.add("@microsoft/applicationinsights-core-js", "./node_modules/@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js");
-
-        // Load Common
-        modules.add("@microsoft/applicationinsights-common", "./node_modules/@microsoft/applicationinsights-common/browser/applicationinsights-common");
-
-        // Load Analytics
-        modules.add("@microsoft/applicationinsights-analytics-js", "./node_modules/@microsoft/applicationinsights-analytics-js/browser/applicationinsights-analytics-js");
-
-        // Load Channel
-        modules.add("@microsoft/applicationinsights-channel-js", "./node_modules/@microsoft/applicationinsights-channel-js/browser/applicationinsights-channel-js");
-
-        // Load Properties
-        modules.add("@microsoft/applicationinsights-properties-js", "./node_modules/@microsoft/applicationinsights-properties-js/browser/applicationinsights-properties-js");
-
-        // Load Dependencies
-        modules.add("@microsoft/applicationinsights-dependencies-js", "./node_modules/@microsoft/applicationinsights-dependencies-js/browser/applicationinsights-dependencies-js");
-
-        var testModule = modules.add("Tests/Unit/src/aiskuunittests", "./Unit/dist/aiskuunittests.tests.js")
-        testModule.run = function (tests) {
-            console && console.log("Starting tests");
-            QUnit.start();
-            tests.runTests();
-        };
-
-        modules.run();
+        loadCommonModules(modules, function() {
+            var testModule = modules.add("Tests/Unit/src/aiskuunittests", "./Unit/dist/aiskuunittests.tests.js")
+            testModule.run = function (tests) {
+                console && console.log("Starting tests");
+                QUnit.start();
+                tests.runTests();
+            };
+
+            modules.run();
+        });
     </script>
 </head>
 

diff --git a/AISKU/package.json b/AISKU/package.json
@@ -35,7 +35,9 @@
         "nightwatch:ie10": "nightwatch -c Tests/nightwatch/nightwatch.json Tests/nightwatch/run_nightwatch.js --env ie10",
         "nightwatch:ie11": "nightwatch -c Tests/nightwatch/nightwatch.json Tests/nightwatch/run_nightwatch.js --env ie11",
         "nightwatch": "start node Tests/nightwatch/serve_nightwatch.js && npx concurrently \"npm run nightwatch:chrome\" \"npm run nightwatch:ie11\" \"npm run nightwatch:ie10\" && npm run nightwatch:done || npm run nightwatch:done",
-        "nightwatch:done": "curl http://localhost:8000/_done"
+        "nightwatch:done": "curl http://localhost:8000/_done",
+        "npm-pack": "npm pack",
+        "npm-publish-ai": "node ../tools/release-tools/npm_publish.js ."
     },
     "devDependencies": {
         "@microsoft/ai-test-framework": "0.0.1",
@@ -66,7 +68,7 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.7",
+        "@microsoft/dynamicproto-js": "^1.1.9",
         "@microsoft/applicationinsights-shims": "2.0.2",
         "@microsoft/applicationinsights-analytics-js": "2.8.11",
         "@microsoft/applicationinsights-channel-js": "2.8.11",

diff --git a/AISKULight/Tests/UnitTests.html b/AISKULight/Tests/UnitTests.html
@@ -26,30 +26,16 @@
         modules.add("pako","./node_modules/pako/dist/pako");
 
         loadFetchModule(modules, "whatwg-fetch");
-        loadCommonModules(modules);
-
-        modules.add("@microsoft/dynamicproto-js", "./node_modules/@microsoft/dynamicproto-js/lib/dist/umd/dynamicproto-js", true);
-
-        // Load and define the app insights Shims module
-        modules.add("@microsoft/applicationinsights-shims", "./node_modules/@microsoft/applicationinsights-shims/browser/applicationinsights-shims");
-
-        // Load Core
-        modules.add("@microsoft/applicationinsights-core-js", "./node_modules/@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js");
-
-        // Load Common
-        modules.add("@microsoft/applicationinsights-common", "./node_modules/@microsoft/applicationinsights-common/browser/applicationinsights-common");
-
-        // Load Channel
-        modules.add("@microsoft/applicationinsights-channel-js", "./node_modules/@microsoft/applicationinsights-channel-js/browser/applicationinsights-channel-js");
-
-        var testModule = modules.add("Tests/Unit/src/aiskuliteunittests", "./Unit/dist/aiskuliteunittests.tests.js")
-        testModule.run = function (tests) {
-            console && console.log("Starting tests");
-            QUnit.start();
-            tests.runTests();
-        };
-
-        modules.run();
+        loadCommonModules(modules, function() {
+            var testModule = modules.add("Tests/Unit/src/aiskuliteunittests", "./Unit/dist/aiskuliteunittests.tests.js")
+            testModule.run = function (tests) {
+                console && console.log("Starting tests");
+                QUnit.start();
+                tests.runTests();
+            };
+
+            modules.run();
+        });
     </script>
 </head>
 

diff --git a/AISKULight/package.json b/AISKULight/package.json
@@ -19,7 +19,9 @@
         "dtsgen": "api-extractor run --local && node ../scripts/dtsgen.js 'Microsoft.ApplicationInsights'",
         "sri": "node ../tools/subResourceIntegrity/generateIntegrityFile.js",
         "ai-min": "grunt aiskulite-min",
-        "ai-restore": "grunt aiskulite-restore"
+        "ai-restore": "grunt aiskulite-restore",
+        "npm-pack": "npm pack",
+        "npm-publish-ai": "node ../tools/release-tools/npm_publish.js ."
     },
     "repository": {
         "type": "git",
@@ -51,7 +53,7 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.7",
+        "@microsoft/dynamicproto-js": "^1.1.9",
         "@microsoft/applicationinsights-shims": "2.0.2",
         "@microsoft/applicationinsights-common": "2.8.11",
         "@microsoft/applicationinsights-channel-js": "2.8.11",

diff --git a/channels/applicationinsights-channel-js/Tests/UnitTests.html b/channels/applicationinsights-channel-js/Tests/UnitTests.html
@@ -24,22 +24,16 @@
         modules.add("sinon");
 
         loadFetchModule(modules, "whatwg-fetch");
-        loadCommonModules(modules);
-
-        // Load Core
-        modules.add("@microsoft/applicationinsights-core-js", "./node_modules/@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js");
-
-        // Load Common
-        modules.add("@microsoft/applicationinsights-common", "./node_modules/@microsoft/applicationinsights-common/browser/applicationinsights-common");
-
-        var testModule = modules.add("Tests/Unit/src/aichannel.tests", "./Unit/dist/aichannel.tests.js");
-        testModule.run = function (tests) {
-            console && console.log("Starting tests");
-            QUnit.start();
-            tests.runTests();
-        };
-
-        modules.run();
+        loadCommonModules(modules, function() {
+            var testModule = modules.add("Tests/Unit/src/aichannel.tests", "./Unit/dist/aichannel.tests.js");
+            testModule.run = function (tests) {
+                console && console.log("Starting tests");
+                QUnit.start();
+                tests.runTests();
+            };
+
+            modules.run();
+        });
     </script>
 </head>
 

diff --git a/channels/applicationinsights-channel-js/package.json b/channels/applicationinsights-channel-js/package.json
@@ -21,7 +21,9 @@
         "dtsgen": "api-extractor run --local && node ../../scripts/dtsgen.js \"Microsoft Application Insights JavaScript SDK Channel\"",
         "sri": "node ../../tools/subResourceIntegrity/generateIntegrityFile.js",
         "ai-min": "grunt aichannel-min",
-        "ai-restore": "grunt aichannel-restore"
+        "ai-restore": "grunt aichannel-restore",
+        "npm-pack": "npm pack",
+        "npm-publish-ai": "node ../../tools/release-tools/npm_publish.js ."
     },
     "devDependencies": {
         "@microsoft/ai-test-framework": "0.0.1",
@@ -48,7 +50,7 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.7",
+        "@microsoft/dynamicproto-js": "^1.1.9",
         "@microsoft/applicationinsights-shims": "2.0.2",
         "@microsoft/applicationinsights-core-js": "2.8.11",
         "@microsoft/applicationinsights-common": "2.8.11"

diff --git a/common/Tests/Framework/package.json b/common/Tests/Framework/package.json
@@ -12,6 +12,7 @@
         "browser performance monitoring",
         "web analytics"
     ],
+    "main": "dist/ai-test-framework.js",
     "module": "dist-esm/src/ai-test-framework.js",
     "types": "dist-esm/src/ai-test-framework.d.ts",
     "scripts": {
@@ -34,7 +35,6 @@
         "grunt": "^1.5.3",
         "grunt-contrib-qunit": "^6.2.1",
         "@nevware21/grunt-ts-plugin": "^0.4.3",
-        "@nevware21/ts-async": "^0.1.0",
         "@rollup/plugin-commonjs": "^18.0.0",
         "@rollup/plugin-node-resolve": "^11.2.1",
         "@rollup/plugin-replace": "^2.3.3",
@@ -50,6 +50,7 @@
         "tslib": "*"
     },
     "dependencies": {
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/dynamicproto-js": "^1.1.9",
+        "@nevware21/ts-async": ">= 0.1.0 < 2.x"
     }
 }