Revert exposing core back to exposing old pnp with the gulp replace t…

…ransform
SharePoint · May 5, 2016 · 99efb57 · 99efb57
1 parent ccaff21
commit 99efb57
Show file tree

Hide file tree

Showing 87 changed files with 101 additions and 95 deletions.
diff --git a/buildtasks/build.js b/buildtasks/build.js
@@ -13,6 +13,7 @@
 
 var gulp = require("gulp"),
     tsc = require("gulp-typescript"),
+    print = require('gulp-print'),
     replace = require('gulp-replace');
 
 //******************************************************************************
@@ -25,5 +26,6 @@ gulp.task("build", ["lint", "build-typings", "clean"], function () {
     return gulp.src(src)
         .pipe(tsc(global.tsProject))
         .js.pipe(replace(/(\(function \(factory\) {)/g, '$1/* istanbul ignore next */'))
-        .pipe(gulp.dest(global.TSCompiledOutput.RootFolder));
+        .pipe(gulp.dest(global.TSCompiledOutput.RootFolder))
+        .pipe(print());
 });
diff --git a/buildtasks/package.js b/buildtasks/package.js
@@ -1,7 +1,7 @@
 //******************************************************************************
 //* package.js
 //*
-//* Defines a custom gulp task for creating core.js, core.min.js,
+//* Defines a custom gulp task for creating pnp.js, pnp.min.js,
 //* provisioning.js, provisioning.min.js
 //* and pnp/provisioning.min.js.map in the dist folder
 //******************************************************************************
@@ -20,7 +20,8 @@ var gulp = require("gulp"),
     buffer = require("vinyl-buffer"),
     header = require('gulp-header'),
     srcmaps = require("gulp-sourcemaps"),
-    merge = require("merge2");
+    merge = require("merge2"),
+    replace = require("gulp-replace");
 
 // we need to build src (es5, umd) -> build
 // we need to package the definitions in a single file -> dist
@@ -79,6 +80,8 @@ function packageBundle(file) {
         external: ["es6-promise", "jquery", "whatwg-fetch", "node-fetch"]
     }).ignore('*.d.ts').bundle()
         .pipe(src(file + ".js"))
+        .pipe(replace(/Object\.defineProperty\(exports, "__esModule", \{ value: true \}\);/ig, ""))
+        .pipe(replace(/exports.default = PnP;/ig, "return PnP;"))
         .pipe(buffer())
         .pipe(header(banner, { pkg: global.pkg }))
         .pipe(gulp.dest(global.TSDist.RootFolder));
@@ -95,6 +98,8 @@ function packageBundleUglify(file) {
         external: ["es6-promise", "jquery", "whatwg-fetch", "node-fetch"]
     }).ignore('*.d.ts').bundle()
         .pipe(src(file + ".min"))
+        .pipe(replace(/Object\.defineProperty\(exports, "__esModule", \{ value: true \}\);/ig, ""))
+        .pipe(replace(/exports.default = PnP;/ig, "return PnP;"))
         .pipe(buffer())
         .pipe(srcmaps.init({ loadMaps: true }))
         .pipe(uglify())
@@ -107,10 +112,10 @@ function packageBundleUglify(file) {
 //* PACKAGE
 //******************************************************************************
 gulp.task("package", ["build", "test"], function () {
-    packageDefinitions("core");
+    packageDefinitions("pnp");
     packageLib();
-    packageBundle("core");
-    packageBundleUglify("core");
+    packageBundle("pnp");
+    packageBundleUglify("pnp");
 
     packageDefinitions("provisioning");
     packageLib();

diff --git a/gulpfile.js b/gulpfile.js
@@ -28,7 +28,7 @@ global.TSCompiledOutput = {
 
 global.TSWorkspace = {
     "RootFolder": 'src',
-    "PnPFile": "src/core.ts",
+    "PnPFile": "src/pnp.ts",
     "Files": [
         'src/**/*.ts',
     ],

diff --git a/server-root/index.html b/server-root/index.html
@@ -9,10 +9,9 @@
     <script src="./require.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        require(['scripts/core'], function(pnp) {
+        require(['scripts/pnp'], function(pnp) {
 
-        var core = new pnp.Core();
-        alert("our random string: " + core.util.getRandomString(5));
+        alert("our random string: " + pnp.util.getRandomString(5));
        });
 
         require(['scripts/provisioning'], function(pnp) {

diff --git a/src/core.ts b/src/core.ts
diff --git a/src/pnp.ts b/src/pnp.ts
@@ -0,0 +1,43 @@
+"use strict";
+
+import { Util } from "./pnp/utils/Util";
+import { SharePoint } from "./pnp/SharePoint/SharePoint";
+import { PnPClientStorage } from "./pnp/utils/Storage";
+import * as Configuration from "./pnp/configuration/configuration";
+import { Logger } from "./pnp/utils/logging";
+import { Rest } from "./pnp/SharePoint/Rest/rest";
+
+/**
+ * Root class of the Patterns and Practices namespace, provides an entry point to the library
+ */
+export default class PnP {
+    /**
+     * Utility methods
+     */
+    public static util = Util;
+
+    /**
+     * The full SharePoint library
+     */
+    public static sharepoint = new SharePoint();
+
+    /**
+     * Provides easy access to the REST interface
+     */
+    public static sp = new Rest();
+
+    /**
+     * Provides access to local and session storage
+     */
+    public static storage: PnPClientStorage = new PnPClientStorage();
+
+    /**
+     * Global configuration instance to which providers can be added
+     */
+    public static configuration = Configuration;
+
+    /**
+     * Global logging instance to which subscribers can be registered and messages written
+     */
+    public static log = Logger;
+}
diff --git a/src/core/collections/collections.ts → src/pnp/collections/collections.ts b/src/core/collections/collections.ts → src/pnp/collections/collections.ts
diff --git a/src/core/configuration/configuration.ts → src/pnp/configuration/configuration.ts b/src/core/configuration/configuration.ts → src/pnp/configuration/configuration.ts
diff --git a/...providers/cachingConfigurationProvider.ts → ...providers/cachingConfigurationProvider.ts b/...providers/cachingConfigurationProvider.ts → ...providers/cachingConfigurationProvider.ts
diff --git a/...core/configuration/providers/providers.ts → src/pnp/configuration/providers/providers.ts b/...core/configuration/providers/providers.ts → src/pnp/configuration/providers/providers.ts
diff --git a/.../providers/spListConfigurationProvider.ts → .../providers/spListConfigurationProvider.ts b/.../providers/spListConfigurationProvider.ts → .../providers/spListConfigurationProvider.ts
diff --git a/src/core/net/DigestCache.ts → src/pnp/net/DigestCache.ts b/src/core/net/DigestCache.ts → src/pnp/net/DigestCache.ts
diff --git a/src/core/net/FetchClient.ts → src/pnp/net/FetchClient.ts b/src/core/net/FetchClient.ts → src/pnp/net/FetchClient.ts
diff --git a/src/core/net/HttpClient.ts → src/pnp/net/HttpClient.ts b/src/core/net/HttpClient.ts → src/pnp/net/HttpClient.ts
diff --git a/src/core/sharepoint/rest/Queryable.ts → src/pnp/sharepoint/rest/Queryable.ts b/src/core/sharepoint/rest/Queryable.ts → src/pnp/sharepoint/rest/Queryable.ts
diff --git a/src/core/sharepoint/rest/contenttypes.ts → src/pnp/sharepoint/rest/contenttypes.ts b/src/core/sharepoint/rest/contenttypes.ts → src/pnp/sharepoint/rest/contenttypes.ts
diff --git a/src/core/sharepoint/rest/fields.ts → src/pnp/sharepoint/rest/fields.ts b/src/core/sharepoint/rest/fields.ts → src/pnp/sharepoint/rest/fields.ts
diff --git a/src/core/sharepoint/rest/files.ts → src/pnp/sharepoint/rest/files.ts b/src/core/sharepoint/rest/files.ts → src/pnp/sharepoint/rest/files.ts
diff --git a/src/core/sharepoint/rest/folders.ts → src/pnp/sharepoint/rest/folders.ts b/src/core/sharepoint/rest/folders.ts → src/pnp/sharepoint/rest/folders.ts
diff --git a/src/core/sharepoint/rest/items.ts → src/pnp/sharepoint/rest/items.ts b/src/core/sharepoint/rest/items.ts → src/pnp/sharepoint/rest/items.ts
diff --git a/src/core/sharepoint/rest/lists.ts → src/pnp/sharepoint/rest/lists.ts b/src/core/sharepoint/rest/lists.ts → src/pnp/sharepoint/rest/lists.ts
diff --git a/src/core/sharepoint/rest/navigation.ts → src/pnp/sharepoint/rest/navigation.ts b/src/core/sharepoint/rest/navigation.ts → src/pnp/sharepoint/rest/navigation.ts
diff --git a/...ore/sharepoint/rest/queryableSecurable.ts → ...pnp/sharepoint/rest/queryableSecurable.ts b/...ore/sharepoint/rest/queryableSecurable.ts → ...pnp/sharepoint/rest/queryableSecurable.ts
diff --git a/src/core/sharepoint/rest/quicklaunch.ts → src/pnp/sharepoint/rest/quicklaunch.ts b/src/core/sharepoint/rest/quicklaunch.ts → src/pnp/sharepoint/rest/quicklaunch.ts
diff --git a/src/core/sharepoint/rest/rest.ts → src/pnp/sharepoint/rest/rest.ts b/src/core/sharepoint/rest/rest.ts → src/pnp/sharepoint/rest/rest.ts
diff --git a/src/core/sharepoint/rest/roleassignments.ts → src/pnp/sharepoint/rest/roleassignments.ts b/src/core/sharepoint/rest/roleassignments.ts → src/pnp/sharepoint/rest/roleassignments.ts
diff --git a/src/core/sharepoint/rest/search.ts → src/pnp/sharepoint/rest/search.ts b/src/core/sharepoint/rest/search.ts → src/pnp/sharepoint/rest/search.ts
diff --git a/src/core/sharepoint/rest/site.ts → src/pnp/sharepoint/rest/site.ts b/src/core/sharepoint/rest/site.ts → src/pnp/sharepoint/rest/site.ts
diff --git a/src/core/sharepoint/rest/siteusers.ts → src/pnp/sharepoint/rest/siteusers.ts b/src/core/sharepoint/rest/siteusers.ts → src/pnp/sharepoint/rest/siteusers.ts
diff --git a/src/core/sharepoint/rest/topnavigationbar.ts → src/pnp/sharepoint/rest/topnavigationbar.ts b/src/core/sharepoint/rest/topnavigationbar.ts → src/pnp/sharepoint/rest/topnavigationbar.ts
diff --git a/src/core/sharepoint/rest/userprofiles.ts → src/pnp/sharepoint/rest/userprofiles.ts b/src/core/sharepoint/rest/userprofiles.ts → src/pnp/sharepoint/rest/userprofiles.ts
diff --git a/src/core/sharepoint/rest/views.ts → src/pnp/sharepoint/rest/views.ts b/src/core/sharepoint/rest/views.ts → src/pnp/sharepoint/rest/views.ts
diff --git a/src/core/sharepoint/rest/webs.ts → src/pnp/sharepoint/rest/webs.ts b/src/core/sharepoint/rest/webs.ts → src/pnp/sharepoint/rest/webs.ts
diff --git a/src/core/sharepoint/sharepoint.ts → src/pnp/sharepoint/sharepoint.ts b/src/core/sharepoint/sharepoint.ts → src/pnp/sharepoint/sharepoint.ts
diff --git a/src/core/sharepoint/util.ts → src/pnp/sharepoint/util.ts b/src/core/sharepoint/util.ts → src/pnp/sharepoint/util.ts
diff --git a/src/core/types/addfieldoptions.ts → src/pnp/types/addfieldoptions.ts b/src/core/types/addfieldoptions.ts → src/pnp/types/addfieldoptions.ts
diff --git a/src/core/types/basepermissions.ts → src/pnp/types/basepermissions.ts b/src/core/types/basepermissions.ts → src/pnp/types/basepermissions.ts
diff --git a/src/core/types/calendartype.ts → src/pnp/types/calendartype.ts b/src/core/types/calendartype.ts → src/pnp/types/calendartype.ts
diff --git a/src/core/types/camlquery.ts → src/pnp/types/camlquery.ts b/src/core/types/camlquery.ts → src/pnp/types/camlquery.ts
diff --git a/src/core/types/changelogitemquery.ts → src/pnp/types/changelogitemquery.ts b/src/core/types/changelogitemquery.ts → src/pnp/types/changelogitemquery.ts
diff --git a/src/core/types/changequery.ts → src/pnp/types/changequery.ts b/src/core/types/changequery.ts → src/pnp/types/changequery.ts
diff --git a/src/core/types/changetoken.ts → src/pnp/types/changetoken.ts b/src/core/types/changetoken.ts → src/pnp/types/changetoken.ts
diff --git a/src/core/types/controlmode.ts → src/pnp/types/controlmode.ts b/src/core/types/controlmode.ts → src/pnp/types/controlmode.ts
diff --git a/src/core/types/datetimefieldformattype.ts → src/pnp/types/datetimefieldformattype.ts b/src/core/types/datetimefieldformattype.ts → src/pnp/types/datetimefieldformattype.ts
diff --git a/src/core/types/fieldtypes.ts → src/pnp/types/fieldtypes.ts b/src/core/types/fieldtypes.ts → src/pnp/types/fieldtypes.ts
diff --git a/src/core/types/followedcontent.ts → src/pnp/types/followedcontent.ts b/src/core/types/followedcontent.ts → src/pnp/types/followedcontent.ts
diff --git a/src/core/types/hashtag.ts → src/pnp/types/hashtag.ts b/src/core/types/hashtag.ts → src/pnp/types/hashtag.ts
diff --git a/src/core/types/hashtagcollection.ts → src/pnp/types/hashtagcollection.ts b/src/core/types/hashtagcollection.ts → src/pnp/types/hashtagcollection.ts
diff --git a/src/core/types/listitemcollectionposition.ts → src/pnp/types/listitemcollectionposition.ts b/src/core/types/listitemcollectionposition.ts → src/pnp/types/listitemcollectionposition.ts
diff --git a/src/core/types/listitemformupdatevalue.ts → src/pnp/types/listitemformupdatevalue.ts b/src/core/types/listitemformupdatevalue.ts → src/pnp/types/listitemformupdatevalue.ts
diff --git a/src/core/types/locale.ts → src/pnp/types/locale.ts b/src/core/types/locale.ts → src/pnp/types/locale.ts
diff --git a/src/core/types/urlfieldformattype.ts → src/pnp/types/urlfieldformattype.ts b/src/core/types/urlfieldformattype.ts → src/pnp/types/urlfieldformattype.ts
diff --git a/src/core/types/userprofile.ts → src/pnp/types/userprofile.ts b/src/core/types/userprofile.ts → src/pnp/types/userprofile.ts
diff --git a/...ypes/xmlschemafieldcreationinformation.ts → ...ypes/xmlschemafieldcreationinformation.ts b/...ypes/xmlschemafieldcreationinformation.ts → ...ypes/xmlschemafieldcreationinformation.ts
diff --git a/src/core/utils/args.ts → src/pnp/utils/args.ts b/src/core/utils/args.ts → src/pnp/utils/args.ts
diff --git a/src/core/utils/files.ts → src/pnp/utils/files.ts b/src/core/utils/files.ts → src/pnp/utils/files.ts
diff --git a/src/core/utils/logging.ts → src/pnp/utils/logging.ts b/src/core/utils/logging.ts → src/pnp/utils/logging.ts
diff --git a/src/core/utils/storage.ts → src/pnp/utils/storage.ts b/src/core/utils/storage.ts → src/pnp/utils/storage.ts
diff --git a/src/core/utils/util.ts → src/pnp/utils/util.ts b/src/core/utils/util.ts → src/pnp/utils/util.ts
diff --git a/src/provisioning/core/core.ts b/src/provisioning/core/core.ts
@@ -10,7 +10,7 @@ import { ObjectComposedLook } from "../ObjectHandlers/ObjectComposedLook/ObjectC
 import { ObjectCustomActions } from "../ObjectHandlers/ObjectCustomActions/ObjectCustomActions";
 import { ObjectFiles } from "../ObjectHandlers/ObjectFiles/ObjectFiles";
 import { ObjectLists } from "../ObjectHandlers/ObjectLists/ObjectLists";
-import { replaceUrlTokens } from "../../core/sharepoint/util";
+import { replaceUrlTokens } from "../../pnp/sharepoint/util";
 import * as Resources from "../Resources/Resources";
 import { Log } from "../Provisioning";
 import { SiteSchema } from "../schema/isiteschema";

diff --git a/src/provisioning/objecthandlers/objectcomposedlook/objectcomposedlook.ts b/src/provisioning/objecthandlers/objectcomposedlook/objectcomposedlook.ts
@@ -2,7 +2,7 @@
 
 import { IComposedLook } from "../schema/icomposedlook";
 
-import { replaceUrlTokens, getRelativeUrl } from "../../../core/sharepoint/util";
+import { replaceUrlTokens, getRelativeUrl } from "../../../pnp/sharepoint/util";
 import { ObjectHandlerBase } from "../ObjectHandlerBase/ObjectHandlerBase";
 
 export class ObjectComposedLook extends ObjectHandlerBase {

diff --git a/src/provisioning/objecthandlers/objectfiles/objectfiles.ts b/src/provisioning/objecthandlers/objectfiles/objectfiles.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 // import { Promise } from "es6-promise";
-import { replaceUrlTokens } from "../../../core/sharepoint/util";
+import { replaceUrlTokens } from "../../../pnp/sharepoint/util";
 import { ObjectHandlerBase } from "../ObjectHandlerBase/ObjectHandlerBase";
 import { IFile } from "../schema/ifile";
 import { IWebPart } from "../schema/iwebpart";

diff --git a/src/provisioning/objecthandlers/objectnavigation/objectnavigation.ts b/src/provisioning/objecthandlers/objectnavigation/objectnavigation.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 // import { Promise } from "es6-promise";
-import { getNodeFromCollectionByTitle, replaceUrlTokens } from "../../../core/sharepoint/util";
+import { getNodeFromCollectionByTitle, replaceUrlTokens } from "../../../pnp/sharepoint/util";
 import { ObjectHandlerBase } from "../ObjectHandlerBase/ObjectHandlerBase";
 import { INavigation } from "../schema/inavigation";
 import { INavigationNode } from "../schema/inavigationnode";

diff --git a/src/provisioning/objecthandlers/objectpropertybagentries/objectpropertybagentries.ts b/src/provisioning/objecthandlers/objectpropertybagentries/objectpropertybagentries.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 // import { Promise } from "es6-promise";
-import { encodePropertyKey } from "../../../core/sharepoint/util";
+import { encodePropertyKey } from "../../../pnp/sharepoint/util";
 import { ObjectHandlerBase } from "../ObjectHandlerBase/ObjectHandlerBase";
 import { IPropertyBagEntry } from "../../schema/ipropertybagentry";
 

diff --git a/tests/core/collections/collections.test.ts b/tests/core/collections/collections.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import  * as Collections  from "../../../src/core/collections/collections";
+import  * as Collections  from "../../../src/pnp/collections/collections";
 
 describe("Collections", () => {
 

diff --git a/tests/core/configuration/configuration.test.ts b/tests/core/configuration/configuration.test.ts
@@ -1,8 +1,8 @@
 "use strict";
 
 import { expect } from "chai";
-import  * as Collections  from "../../../src/core/collections/collections";
-import * as Configuration from "../../../src/core/configuration/configuration";
+import  * as Collections  from "../../../src/pnp/collections/collections";
+import * as Configuration from "../../../src/pnp/configuration/configuration";
 import {default as MockConfigurationProvider} from "../mocks/mockConfigurationProvider";
 
 describe("Configuration", () => {

diff --git a/tests/core/configuration/providers/cachingConfigurationProvider.test.ts b/tests/core/configuration/providers/cachingConfigurationProvider.test.ts
@@ -1,10 +1,10 @@
 import { expect } from "chai";
-import { default as CachingConfigurationProvider } from "../../../../src/core/configuration/providers/cachingConfigurationProvider";
-import  * as Collections  from "../../../../src/core/collections/collections";
-import * as Configuration from "../../../../src/core/configuration/configuration";
+import { default as CachingConfigurationProvider } from "../../../../src/pnp/configuration/providers/cachingConfigurationProvider";
+import  * as Collections  from "../../../../src/pnp/collections/collections";
+import * as Configuration from "../../../../src/pnp/configuration/configuration";
 import {default as MockConfigurationProvider} from "../../mocks/mockConfigurationProvider";
 import MockStorage from "../../mocks/MockStorage";
-import * as storage from "../../../../src/core/utils/storage";
+import * as storage from "../../../../src/pnp/utils/storage";
 
 describe("Configuration", () => {
 

diff --git a/tests/core/configuration/providers/spListConfigurationProvider.test.ts b/tests/core/configuration/providers/spListConfigurationProvider.test.ts
@@ -1,7 +1,7 @@
 import { expect } from "chai";
-import { default as SPListConfigurationProvider } from "../../../../src/core/configuration/providers/spListConfigurationProvider";
+import { default as SPListConfigurationProvider } from "../../../../src/pnp/configuration/providers/spListConfigurationProvider";
 import MockStorage from "../../mocks/MockStorage";
-import * as Collections  from "../../../../src/core/collections/collections";
+import * as Collections  from "../../../../src/pnp/collections/collections";
 
 declare var global: any;
 

diff --git a/tests/core/mocks/MockConfigurationProvider.ts b/tests/core/mocks/MockConfigurationProvider.ts
@@ -1,7 +1,7 @@
 "use strict";
 
-import { IConfigurationProvider } from "../../../src/core/configuration/configuration";
-import { TypedHash } from "../../../src/core/collections/collections";
+import { IConfigurationProvider } from "../../../src/pnp/configuration/configuration";
+import { TypedHash } from "../../../src/pnp/collections/collections";
 
 export default class MockConfigurationProvider implements IConfigurationProvider {
     public shouldThrow: boolean = false;

diff --git a/tests/core/mocks/MockStorage.ts b/tests/core/mocks/MockStorage.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import * as Collections  from "../../../src/core/collections/collections";
+import * as Collections  from "../../../src/pnp/collections/collections";
 
 export default class MockStorage implements Storage {
     constructor() {

diff --git a/tests/core/sharepoint/rest/contenttypes.test.ts b/tests/core/sharepoint/rest/contenttypes.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { ContentTypes } from "../../../../src/core/sharepoint/rest/ContentTypes";
+import { ContentTypes } from "../../../../src/pnp/sharepoint/rest/ContentTypes";
 
 describe("ContentTypes", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/fields.test.ts b/tests/core/sharepoint/rest/fields.test.ts
@@ -1,8 +1,8 @@
 "use strict";
 
-import { Util } from "../../../../src/core/utils/util";
+import { Util } from "../../../../src/pnp/utils/util";
 import { expect } from "chai";
-import { Fields, Field } from "../../../../src/core/sharepoint/rest/fields";
+import { Fields, Field } from "../../../../src/pnp/sharepoint/rest/fields";
 
 describe("Fields", () => {
 

diff --git a/tests/core/sharepoint/rest/items.test.ts b/tests/core/sharepoint/rest/items.test.ts
@@ -1,7 +1,7 @@
 "use strict";
-import { Util } from "../../../../src/core/utils/util";
+import { Util } from "../../../../src/pnp/utils/util";
 import { expect } from "chai";
-import { Items, Item } from "../../../../src/core/sharepoint/rest/items";
+import { Items, Item } from "../../../../src/pnp/sharepoint/rest/items";
 
 describe("Items", () => {
 

diff --git a/tests/core/sharepoint/rest/lists.test.ts b/tests/core/sharepoint/rest/lists.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { Lists, List } from "../../../../src/core/sharepoint/rest/lists";
+import { Lists, List } from "../../../../src/pnp/sharepoint/rest/lists";
 
 describe("Lists", () => {
 

diff --git a/tests/core/sharepoint/rest/navigation.test.ts b/tests/core/sharepoint/rest/navigation.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { Navigation } from "../../../../src/core/sharepoint/rest/navigation";
+import { Navigation } from "../../../../src/pnp/sharepoint/rest/navigation";
 
 describe("Navigation", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/quicklaunch.test.ts b/tests/core/sharepoint/rest/quicklaunch.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { QuickLaunch } from "../../../../src/core/sharepoint/rest/quickLaunch";
+import { QuickLaunch } from "../../../../src/pnp/sharepoint/rest/quickLaunch";
 
 describe("QuickLaunch", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/roleassignments.test.ts b/tests/core/sharepoint/rest/roleassignments.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { RoleAssignments } from "../../../../src/core/sharepoint/rest/roleAssignments";
+import { RoleAssignments } from "../../../../src/pnp/sharepoint/rest/roleAssignments";
 
 describe("RoleAssignments", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/search.test.ts b/tests/core/sharepoint/rest/search.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { Search } from "../../../../src/core/sharepoint/rest/search";
+import { Search } from "../../../../src/pnp/sharepoint/rest/search";
 
 describe("Search", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/siteusers.test.ts b/tests/core/sharepoint/rest/siteusers.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { SiteUsers } from "../../../../src/core/sharepoint/rest/siteUsers";
+import { SiteUsers } from "../../../../src/pnp/sharepoint/rest/siteUsers";
 
 describe("SiteUsers", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/topnavigationbar.test.ts b/tests/core/sharepoint/rest/topnavigationbar.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { TopNavigationBar } from "../../../../src/core/sharepoint/rest/topNavigationBar";
+import { TopNavigationBar } from "../../../../src/pnp/sharepoint/rest/topNavigationBar";
 
 describe("TopNavigationBar", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/views.test.ts b/tests/core/sharepoint/rest/views.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { Views } from "../../../../src/core/sharepoint/rest/views";
+import { Views } from "../../../../src/pnp/sharepoint/rest/views";
 
 describe("Views", () => {
     it("Should be an object", () => {

diff --git a/tests/core/sharepoint/rest/web.test.ts b/tests/core/sharepoint/rest/web.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { expect } from "chai";
-import { Web } from "../../../../src/core/sharepoint/rest/webs";
+import { Web } from "../../../../src/pnp/sharepoint/rest/webs";
 
 describe("Web", () => {