Ver Fonte

Rename all-packages -> metapackage

Steven Silvester há 7 anos atrás
pai
commit
b4f432d742

+ 2 - 2
CONTRIBUTING.md

@@ -211,9 +211,9 @@ the packages in the repo. It will:
 - Ensure the core package version dependencies match everywhere.
 - Ensure imported packages match dependencies.
 - Ensure a consistent version of all packages.
-- Manage the all-packages meta package.
+- Manage the meta package.
 
-The `packages/all-packages` metapackage is used to build all of the TypeScript 
+The `packages/metapackage` package is used to build all of the TypeScript 
 in the repository at once, instead of 50+ individual builds.
 
 The integrity script also allows you to automatically add a dependency for

+ 2 - 2
buildutils/src/add-sibling.ts

@@ -50,8 +50,8 @@ if (fs.existsSync(path.join(packagePath, 'node_modules'))) {
 // Get the package.json of the extension.
 let data = utils.readJSONFile(path.join(packagePath, 'package.json'));
 
-// Add the extension path to packages/all-packages/tsconfig.json
-let tsconfigPath = path.join(basePath, 'packages', 'all-packages', 'tsconfig.json');
+// Add the extension path to packages/metapackage/tsconfig.json
+let tsconfigPath = path.join(basePath, 'packages', 'metapackage', 'tsconfig.json');
 let tsconfig = utils.readJSONFile(tsconfigPath);
 tsconfig.compilerOptions.paths[data.name] = [path.join('..', packageDirName, 'src')];
 fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + '\n');

+ 10 - 10
buildutils/src/ensure-repo.ts

@@ -9,7 +9,7 @@
  * Ensure the core package version dependencies match everywhere.
  * Ensure imported packages match dependencies.
  * Ensure a consistent version of all packages.
- * Manage the all-packages meta package.
+ * Manage the metapackage meta package.
  */
 import * as childProcess from 'child_process';
 import * as path from 'path';
@@ -37,23 +37,23 @@ let depCache: { [key: string]: string } = {};
 
 
 /**
- * Ensure the all-packages package.
+ * Ensure the metapackage package.
  *
  * @returns An array of messages for changes.
  */
-function ensureAllPackages(): string[] {
+function ensureMetaPackage(): string[] {
   let basePath = path.resolve('.');
-  let allPackagesPath = path.join(basePath, 'packages', 'all-packages');
-  let allPackageJson = path.join(allPackagesPath, 'package.json');
+  let MetaPackagePath = path.join(basePath, 'packages', 'metapackage');
+  let allPackageJson = path.join(MetaPackagePath, 'package.json');
   let allPackageData = utils.readJSONFile(allPackageJson);
-  let indexPath = path.join(allPackagesPath, 'src', 'index.ts');
+  let indexPath = path.join(MetaPackagePath, 'src', 'index.ts');
   let index = fs.readFileSync(indexPath, 'utf8');
   let lines = index.split('\n').slice(0, 3);
   let messages: string[] = [];
   let seen: { [key: string]: boolean } = {};
 
   utils.getCorePaths().forEach(pkgPath => {
-    if (pkgPath === allPackagesPath) {
+    if (pkgPath === MetaPackagePath) {
       return;
     }
     let name = pkgNames[pkgPath];
@@ -217,10 +217,10 @@ function ensureIntegrity(): void {
     messages['top'] = ['Update package.json'];
   }
 
-  // Handle the all-packages metapackage.
-  let pkgMessages = ensureAllPackages();
+  // Handle the metapackage metapackage.
+  let pkgMessages = ensureMetaPackage();
   if (pkgMessages.length > 0) {
-    let pkgName ='@jupyterlab/all-packages';
+    let pkgName ='@jupyterlab/metapackage';
     if (!messages[pkgName]) {
       messages[pkgName] = [];
     }

+ 4 - 4
buildutils/src/remove-package.ts

@@ -32,11 +32,11 @@ let packagePath = path.join(basePath, 'packages', target, 'package.json');
 if (!fs.existsSync(packagePath)) {
     packagePath = require.resolve(path.join(target, 'package.json'));
 }
-let data = require(packagePath);
+let data = utils.readJSONFile(packagePath);
 
-// Remove the extension path from packages/all-packages/tsconfig.json
-let tsconfigPath = path.join(basePath, 'packages', 'all-packages', 'tsconfig.json');
-let tsconfig = require(tsconfigPath);
+// Remove the extension path from packages/metapackage/tsconfig.json
+let tsconfigPath = path.join(basePath, 'packages', 'metapackage', 'tsconfig.json');
+let tsconfig = utils.readJSONFile(tsconfigPath);
 tsconfig.compilerOptions.paths[data.name] = undefined;
 fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + '\n');
 

+ 2 - 2
package.json

@@ -6,7 +6,7 @@
     "build:examples": "lerna run build --scope \"@jupyterlab/example-*\"",
     "build:main": "npm run build",
     "build:main:prod": "npm run build:packages && cd jupyterlab && npm run build:prod",
-    "build:packages": "cd packages/all-packages && npm run build",
+    "build:packages": "cd packages/metapackage && npm run build",
     "build:src": "lerna run build --scope \"@jupyterlab/!(test-|example-)*\"",
     "build:static": "node buildutils/lib/make-release.js",
     "build:test": "lerna run build:test",
@@ -35,7 +35,7 @@
     "update:dependency": "node buildutils/lib/update-dependency.js",
     "watch": "run-p watch:*",
     "watch:main": "cd jupyterlab && npm run watch",
-    "watch:packages": "cd packages/all-packages && npm run watch"
+    "watch:packages": "cd packages/metapackage && npm run watch"
   },
   "dependencies": {},
   "devDependencies": {

+ 0 - 0
packages/all-packages/README.md → packages/metapackage/README.md


+ 0 - 0
packages/all-packages/build.js → packages/metapackage/build.js


+ 1 - 1
packages/all-packages/package.json → packages/metapackage/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@jupyterlab/all-packages",
+  "name": "@jupyterlab/metapackage",
   "version": "0.11.1",
   "private": true,
   "description": "JupyterLab - All Packages",

+ 0 - 0
packages/all-packages/src/index.ts → packages/metapackage/src/index.ts


+ 0 - 0
packages/all-packages/src/typings.d.ts → packages/metapackage/src/typings.d.ts


+ 0 - 0
packages/all-packages/tsconfig.json → packages/metapackage/tsconfig.json


+ 0 - 0
packages/all-packages/watch-files.js → packages/metapackage/watch-files.js