Housekeeping (#439)

* Add LICENSE file to root and all packages * Standardize tsconfig.json files, invert default to esnext * Standardize package.json files, putting metadata first, impl last * Reduce number of stub package.json files for type=module by putting type=module one-level up where possible * Standardize dependency version ranges: ~ to external, exact for adl-* to adl-*. The latter is a prerelease policy to avoid having to debug mismatches while things are churning and breaking frequently. * `rush update --full` to pick up patches of our dependencies * Use consistent casing for CONTRIBUTING.md and README.md * Fix squigglies on some rush json files with comments in VS Code * Remove some unused dependencies * Remove some stale/unused "files" entries from package.json files * Remove unnecessary placeholder test scripts to keep some noise out of `rush test`
2021-04-13 12:17:03 -07:00 · 2021-04-13 12:17:03 -07:00 · 616642b607
--- a/packages/adl-language/package.json
+++ b/packages/adl-language/package.json
@ -1,12 +1,12 @@
 {
  "name": "@azure-tools/adl-language",
-  "private": true,
  "version": "0.1.0",
-  "description": "ADL Language Specification Source Code",
+  "private": true,
  "author": "Microsoft Corporation",
+  "description": "ADL Language Specification Source Code",
+  "homepage": "https://github.com/Azure/adl",
+  "readme": "https://github.com/Azure/adl/blob/master/README.md",
  "license": "MIT",
-  "homepage": "https://github.com/Azure/adl#readme",
-  "readme": "https://github.com/Azure/adl/blob/master/readme.md",
  "bugs": {
    "url": "https://github.com/Azure/adl/issues"
  },
@ -14,6 +14,7 @@
    "type": "git",
    "url": "git+https://github.com/Azure/adl.git"
  },
+  "type": "module",
  "scripts": {
    "build": "ecmarkup src/spec.emu.html ../../docs/spec.html",
    "watch": "node scripts/watch-spec.js"
@ -21,10 +22,10 @@
  "dependencies": {},
  "devDependencies": {
    "@types/mkdirp": "~1.0.1",
-    "@types/node": "14.0.27",
-    "ecmarkup": "^7.0.3",
+    "@types/node": "~14.0.27",
+    "ecmarkup": "~7.0.3",
    "prettier": "~2.2.1",
    "typescript": "~4.1.5",
-    "watch": "^1.0.2"
+    "watch": "~1.0.2"
  }
 }
--- a/packages/adl-language/scripts/package.json
+++ b/packages/adl-language/scripts/package.json
@ -1,3 +0,0 @@
-{
-  "type": "module"
-}
--- a/packages/adl-rest/LICENSE
+++ b/packages/adl-rest/LICENSE
@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
--- a/packages/adl-rest/package.json
+++ b/packages/adl-rest/package.json
@ -1,49 +1,41 @@
 {
  "name": "@azure-tools/adl-rest",
  "version": "0.1.1",
+  "author": "Microsoft Corporation",
  "description": "ADL REST protocol binding",
+  "homepage": "https://github.com/Azure/adl",
+  "readme": "https://github.com/Azure/adl/blob/master/README.md",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Azure/adl.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Azure/adl/issues"
+  },
+  "keywords": [
+    "adl"
+  ],
+  "type": "module",
  "main": "dist/rest.js",
  "adlMain": "lib/rest.adl",
  "engines": {
    "node": ">=14.0.0"
  },
  "scripts": {
-    "build": "npm run compile",
-    "compile": "tsc -p .",
-    "watch": "tsc -p . --watch",
-    "test": "echo \"no tests\""
+    "build": "tsc -p .",
+    "watch": "tsc -p . --watch"
  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Azure/adl.git"
-  },
-  "keywords": [
-    "adl",
-    "cli"
-  ],
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Azure/adl/issues"
-  },
-  "homepage": "https://github.com/Azure/adl#readme",
-  "readme": "https://github.com/Azure/adl/blob/master/readme.md",
  "files": [
    "lib/*.adl",
-    "dist/**",
-    "readme.md",
-    "samples",
-    "LICENSE"
+    "dist/**"
  ],
-  "devDependencies": {
-    "@types/mocha": "^7.0.2",
-    "@types/node": "14.0.27",
-    "mocha": "7.1.2",
-    "typescript": "~4.1.5",
-    "prettier": "~2.2.1"
-  },
  "dependencies": {
-    "@azure-tools/adl": "~0.8.0"
+    "@azure-tools/adl": "0.8.0"
  },
-  "type": "module"
+  "devDependencies": {
+    "@types/node": "~14.0.27",
+    "prettier": "~2.2.1",
+    "typescript": "~4.1.5"
+  }
 }
--- a/packages/adl-rest/tsconfig.json
+++ b/packages/adl-rest/tsconfig.json
@ -1,11 +1,8 @@
 {
  "extends": "../tsconfig.json",
  "compilerOptions": {
-    "module": "esnext",
    "outDir": "dist",
-    "rootDir": "./src",
-    "types": ["node", "mocha"]
+    "rootDir": "src"
  },
-  "include": ["./src/*.ts"],
-  "exclude": ["dist", "node_modules", "**/*.d.ts"]
+  "include": ["src/**/*.ts"]
 }
--- a/packages/adl-vs/package.json
+++ b/packages/adl-vs/package.json
@ -2,11 +2,23 @@
  "name": "@azure-tools/adl-vs",
  "author": "Microsoft Corporation",
  "version": "0.1.2",
-  "displayName": "ADL Language Support for Visual Studio",
  "description": "ADL Language Support for Visual Studio",
+  "homepage": "https://github.com/Azure/adl",
+  "readme": "https://github.com/Azure/adl/blob/master/README.md",
+  "license": "MIT",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/azure/adl"
+    "url": "git+https://github.com/Azure/adl.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Azure/adl/issues"
+  },
+  "keywords": [
+    "adl"
+  ],
+  "type": "module",
+  "engines": {
+    "node": ">=14.0.0"
  },
  "files": [
    "Microsoft.Adl.VisualStudio.vsix"
--- a/packages/adl-vs/scripts/package.json
+++ b/packages/adl-vs/scripts/package.json
@ -1,3 +0,0 @@
-{
-  "type": "module"
-}
--- a/packages/adl-vscode/ThirdPartyNotices.txt
+++ b/packages/adl-vscode/ThirdPartyNotices.txt
@ -8,12 +8,12 @@ original copyright notices and the licenses under which Microsoft received such
 components are set forth below. Microsoft reserves all rights not expressly
 granted herein, whether by implication, estoppel or otherwise.

-1. balanced-match version 1.0.0 (https://github.com/juliangruber/balanced-match)
+1. balanced-match version 1.0.2 (https://github.com/juliangruber/balanced-match)
 2. brace-expansion version 1.1.11 (https://github.com/juliangruber/brace-expansion)
 3. concat-map version 0.0.1 (https://github.com/substack/node-concat-map)
 4. lru-cache version 6.0.0 (https://github.com/isaacs/node-lru-cache)
 5. minimatch version 3.0.4 (https://github.com/isaacs/minimatch)
-6. semver version 7.3.4 (https://github.com/npm/node-semver)
+6. semver version 7.3.5 (https://github.com/npm/node-semver)
 7. yallist version 4.0.0 (https://github.com/isaacs/yallist)


--- a/packages/adl-vscode/package.json
+++ b/packages/adl-vscode/package.json
@ -1,53 +1,38 @@
 {
  "name": "adl-vscode",
-  "displayName": "ADL Language Support for VS Code",
+  "version": "0.4.4",
+  "author": "Microsoft Corporation",
  "description": "ADL Language Support for VS Code",
+  "homepage": "https://github.com/Azure/adl",
+  "readme": "https://github.com/Azure/adl/blob/master/README.md",
  "license": "MIT",
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/azure/adl"
+    "url": "git+https://github.com/azure/adl.git"
  },
+  "bugs": {
+    "url": "https://github.com/Azure/adl/issues"
+  },
+  "keywords": [
+    "adl"
+  ],
  "publisher": "Microsoft",
-  "version": "0.4.4",
+  "displayName": "ADL Language Support for VS Code",
+  "categories": [
+    "Programming Languages"
+  ],
+  "type": "commonjs",
+  "main": "./extension-shim.js",
  "engines": {
    "vscode": "^1.53.0"
  },
-  "main": "./extension-shim.js",
  "activationEvents": [
    "onLanguage:adl"
  ],
-  "categories": [
-    "Programming Languages"
-  ],
  "files": [
    "adl-vscode-*.vsix",
    "ThirdPartyNotices.txt"
  ],
-  "scripts": {
-    "build": "npm run compile && npm run rollup && npm run generate-tmlanguage && npm run generate-third-party-notices && npm run package-vsix",
-    "compile": "tsc -p .",
-    "watch": "tsc -p . --watch",
-    "watch-tmlanguage": "node scripts/watch-tmlanguage.js",
-    "dogfood": "node scripts/dogfood.js",
-    "generate-tmlanguage": "node scripts/generate-tmlanguage.js",
-    "generate-third-party-notices": "node scripts/generate-third-party-notices.js",
-    "rollup": "rollup --config --failAfterWarnings 2>&1",
-    "package-vsix": "vsce package --yarn"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "@azure-tools/tmlanguage-generator": "0.1.3",
-    "@rollup/plugin-commonjs": "^17.1.0",
-    "@rollup/plugin-node-resolve": "^11.2.0",
-    "@types/node": "14.0.27",
-    "@types/vscode": "^1.53.0",
-    "clear": "^0.1.0",
-    "rollup": "^2.41.4",
-    "typescript": "~4.1.5",
-    "vsce": "^1.85.1",
-    "vscode-languageclient": "^7.0.0",
-    "watch": "^1.0.2"
-  },
  "contributes": {
    "languages": [
      {
@ -82,5 +67,29 @@
        "path": "./dist/adl.tmLanguage"
      }
    ]
+  },
+  "scripts": {
+    "build": "npm run compile && npm run rollup && npm run generate-tmlanguage && npm run generate-third-party-notices && npm run package-vsix",
+    "compile": "tsc -p .",
+    "watch": "tsc -p . --watch",
+    "watch-tmlanguage": "node scripts/watch-tmlanguage.js",
+    "dogfood": "node scripts/dogfood.js",
+    "generate-tmlanguage": "node scripts/generate-tmlanguage.js",
+    "generate-third-party-notices": "node scripts/generate-third-party-notices.js",
+    "rollup": "rollup --config --failAfterWarnings 2>&1",
+    "package-vsix": "vsce package --yarn"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@azure-tools/tmlanguage-generator": "0.1.3",
+    "@rollup/plugin-commonjs": "~17.1.0",
+    "@rollup/plugin-node-resolve": "~11.2.0",
+    "@types/node": "~14.0.27",
+    "@types/vscode": "~1.53.0",
+    "rollup": "~2.41.4",
+    "typescript": "~4.1.5",
+    "vsce": "~1.85.1",
+    "vscode-languageclient": "~7.0.0",
+    "watch": "~1.0.2"
  }
 }
--- a/packages/adl-vscode/tsconfig.json
+++ b/packages/adl-vscode/tsconfig.json
@ -2,7 +2,8 @@
  "extends": "../tsconfig.json",
  "compilerOptions": {
    "outDir": "dist-dev",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "CommonJS"
  },
  "include": ["src/**/*.ts"]
 }
--- a/packages/adl/README.md
+++ b/packages/adl/README.md
--- a/packages/adl/lib/package.json
+++ b/packages/adl/lib/package.json
@ -1,13 +0,0 @@
-{
-  "name": "lib",
-  "version": "1.0.0",
-  "description": "",
-  "main": "decorators.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "type": "module"
-}
--- a/packages/adl/package.json
+++ b/packages/adl/package.json
@ -2,15 +2,35 @@
  "name": "@azure-tools/adl",
  "version": "0.8.0",
  "description": "ADL Compiler Preview",
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "homepage": "https://github.com/Azure/adl",
+  "readme": "https://github.com/Azure/adl/blob/master/README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Azure/adl.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Azure/adl/issues"
+  },
+  "keywords": [
+    "adl",
+    "cli"
+  ],
+  "type": "module",
  "main": "dist/compiler/index.js",
-  "types": "./dist/compiler/index.d.ts",
+  "types": "dist/compiler/index.d.ts",
+  "engines": {
+    "node": ">=14.0.0"
+  },
  "bin": {
    "adl": "cmd/adl.js",
    "adl-server": "cmd/adl-server.js"
  },
-  "engines": {
-    "node": ">=14.0.0"
-  },
+  "files": [
+    "lib/*.adl",
+    "dist/**"
+  ],
  "scripts": {
    "build": "npm run compile",
    "compile": "tsc -p .",
@ -19,47 +39,23 @@
    "test": "mocha 'dist/test/**/*.js'",
    "regen-samples": "node scripts/regen-samples.js"
  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Azure/adl.git"
-  },
-  "keywords": [
-    "adl",
-    "cli"
-  ],
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Azure/adl/issues"
-  },
-  "homepage": "https://github.com/Azure/adl#readme",
-  "readme": "https://github.com/Azure/adl/blob/master/readme.md",
-  "files": [
-    "cli-shim.js",
-    "lib/*.adl",
-    "dist/**",
-    "readme.md",
-    "samples",
-    "LICENSE"
-  ],
-  "devDependencies": {
-    "@types/mocha": "^7.0.2",
-    "@types/node": "14.0.27",
-    "@types/yargs": "~15.0.12",
-    "@types/mkdirp": "~1.0.1",
-    "grammarkdown": "^3.1.2",
-    "mocha": "7.1.2",
-    "typescript": "~4.1.5",
-    "prettier": "~2.2.1",
-    "@types/resolve": "~1.20.0"
-  },
  "dependencies": {
-    "yargs": "~16.2.0",
-    "mkdirp": "~1.0.4",
    "autorest": "~3.0.6335",
-    "vscode-languageserver": "^7.0.0",
-    "vscode-languageserver-textdocument": "^1.0.1",
-    "resolve": "~1.20.0"
+    "mkdirp": "~1.0.4",
+    "resolve": "~1.20.0",
+    "vscode-languageserver": "~7.0.0",
+    "vscode-languageserver-textdocument": "~1.0.1",
+    "yargs": "~16.2.0"
  },
-  "type": "module"
+  "devDependencies": {
+    "@types/mkdirp": "~1.0.1",
+    "@types/mocha": "~7.0.2",
+    "@types/node": "~14.0.27",
+    "@types/resolve": "~1.20.0",
+    "@types/yargs": "~15.0.12",
+    "grammarkdown": "~3.1.2",
+    "mocha": "~7.1.2",
+    "prettier": "~2.2.1",
+    "typescript": "~4.1.5"
+  }
 }
--- a/packages/adl/tsconfig.json
+++ b/packages/adl/tsconfig.json
@ -1,11 +1,10 @@
 {
  "extends": "../tsconfig.json",
  "compilerOptions": {
-    "module": "esnext",
    "outDir": "dist",
    "rootDir": ".",
    "types": ["node", "mocha"]
  },
  "include": ["./**/*.ts"],
-  "exclude": ["dist", "node_modules", "**/*.d.ts"]
+  "exclude": ["dist", "node_modules", "temp"]
 }
--- a/packages/tmlanguage-generator/package.json
+++ b/packages/tmlanguage-generator/package.json
@ -5,10 +5,6 @@
  "description": "Helper library to generate TextMate syntax highlighting tmLanguage files.",
  "homepage": "https://github.com/Azure/adl/tree/master/packages/tmlanguage-generator",
  "readme": "https://github.com/Azure/adl/blob/master/packages/tmlanguage-generator/README.md",
-  "keywords": [
-    "textmate",
-    "tmlanguage"
-  ],
  "license": "MIT",
  "repository": {
    "type": "git",
@ -17,6 +13,10 @@
  "bugs": {
    "url": "https://github.com/Azure/adl/issues"
  },
+  "keywords": [
+    "textmate",
+    "tmlanguage"
+  ],
  "main": "dist/tmlanguage-generator.js",
  "engines": {
    "node": ">=14.0.0"
@ -29,11 +29,11 @@
    "dist/**"
  ],
  "dependencies": {
-    "onigasm": "^2.2.5",
-    "plist": "^3.0.2"
+    "onigasm": "~2.2.5",
+    "plist": "~3.0.2"
  },
  "devDependencies": {
-    "@types/node": "14.0.27",
-    "@types/plist": "^3.0.2"
+    "@types/node": "~14.0.27",
+    "@types/plist": "~3.0.2"
  }
 }
--- a/packages/tmlanguage-generator/tsconfig.json
+++ b/packages/tmlanguage-generator/tsconfig.json
@ -3,7 +3,7 @@
  "compilerOptions": {
    "outDir": "dist",
    "rootDir": "src",
-    "types": ["node"]
+    "module": "CommonJS"
  },
  "include": ["src/**/*.ts"]
 }