Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

refactor: change method of installing extensions #4315

Merged
a-b-r-o-w-n merged 22 commits into from
Oct 2, 2020
Merged

refactor: change method of installing extensions #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
89b0824
update default extensions directory
a-b-r-o-w-n Oct 1, 2020
fa7d7ad
load builtin and remote extensions the same way
a-b-r-o-w-n Oct 1, 2020
ef2569a
refactor installing remote extensions
a-b-r-o-w-n Oct 1, 2020
7252529
update default extension manifest location
a-b-r-o-w-n Oct 1, 2020
2d79a5d
refactor removing an extension
a-b-r-o-w-n Oct 1, 2020
7059ae1
add tests for npm
a-b-r-o-w-n Oct 1, 2020
bec51f8
add search method to npm module
a-b-r-o-w-n Oct 1, 2020
e693a02
improve error logging
a-b-r-o-w-n Oct 1, 2020
ba66a64
add tests for downloading extension
a-b-r-o-w-n Oct 2, 2020
e9194e1
refactor manager tests
a-b-r-o-w-n Oct 2, 2020
f4ad18e
deprecate extendsComposer
a-b-r-o-w-n Oct 2, 2020
24a3cb5
add test for loadFromDir
a-b-r-o-w-n Oct 2, 2020
ba0e72c
add more manager tests
a-b-r-o-w-n Oct 2, 2020
e5ccd0e
use npm registry api to search
a-b-r-o-w-n Oct 2, 2020
8306cbb
omit installed extensions from search
a-b-r-o-w-n Oct 2, 2020
19395a6
add getBundle test
a-b-r-o-w-n Oct 2, 2020
9b271a7
remove rimraf, use remove from fs-extra
a-b-r-o-w-n Oct 2, 2020
f91f2e3
make remvoing builtin a no-op
a-b-r-o-w-n Oct 2, 2020
2d9d891
add rimraf back to dev deps
a-b-r-o-w-n Oct 2, 2020
bdb94db
fix security warning by resolving to terser-webpack-plugin version
a-b-r-o-w-n Oct 2, 2020
4b30457
ensure extensions cannot be installed outside remoteDir
a-b-r-o-w-n Oct 2, 2020
4ad104a
supress lgtm error
a-b-r-o-w-n Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Composer/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ module.exports = {
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-object-literal-type-assertion': 'off',
'@typescript-eslint/unbound-method': 'off',
'@typescript-eslint/no-explicit-any': 'off',

'security/detect-buffer-noassert': 'off',
'security/detect-child-process': 'off',
Expand Down
3 changes: 2 additions & 1 deletion Composer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"mkdirp": "^0.5.2",
"selfsigned": "1.10.8",
"serialize-javascript": "^3.1.0",
"set-value": "^3.0.2"
"set-value": "^3.0.2",
"terser-webpack-plugin": "^2.3.7"
},
"engines": {
"node": ">=12"
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/electron-server/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async function createAppDataDir() {
const azurePublishPath: string = join(composerAppDataPath, 'publishBots');
process.env.COMPOSER_APP_DATA = join(composerAppDataPath, 'data.json'); // path to the actual data file
process.env.COMPOSER_EXTENSION_DATA = join(composerAppDataPath, 'extensions.json');
process.env.COMPOSER_REMOTE_EXTENSIONS_DIR = join(composerAppDataPath, '.composer');
process.env.COMPOSER_REMOTE_EXTENSIONS_DIR = join(composerAppDataPath, 'extensions');

log('creating composer app data path at: ', composerAppDataPath);

Expand Down
7 changes: 5 additions & 2 deletions Composer/packages/extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scripts": {
"build": "yarn build:clean && yarn build:ts",
"build:ts": "tsc -p tsconfig.build.json",
"build:clean": "rimraf lib && rimraf build",
"build:clean": "rimraf lib",
"lint": "eslint --quiet ./src",
"test": "jest"
},
Expand All @@ -18,6 +18,7 @@
"@types/fs-extra": "^9.0.1",
"@types/passport": "^1.0.3",
"@types/path-to-regexp": "^1.7.0",
"@types/tar": "^4.0.3",
"json-schema": "^0.2.5",
"rimraf": "^3.0.2",
"typescript": "^3.8.3"
Expand All @@ -26,7 +27,9 @@
"debug": "^4.1.1",
"fs-extra": "^9.0.1",
"globby": "^11.0.0",
"node-fetch": "^2.6.1",
"passport": "^0.4.1",
"path-to-regexp": "^6.1.0"
"path-to-regexp": "^6.1.0",
"tar": "^6.0.5"
}
}
2 changes: 1 addition & 1 deletion Composer/packages/extension/src/extensionContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class ExtensionContext {
const packageJSON = fs.readFileSync(packageJsonPath, 'utf8');
const json = JSON.parse(packageJSON);

if (json.extendsComposer) {
if (json.composer?.enabled !== false) {
const modulePath = path.dirname(packageJsonPath);
try {
// eslint-disable-next-line security/detect-non-literal-require, @typescript-eslint/no-var-requires
Expand Down
Loading